Commit e8fa1fc3 authored by Thomas Witkowski's avatar Thomas Witkowski
Browse files

Fixed tutorial.

parent e0b80da3
...@@ -187,13 +187,13 @@ The operators now are defined as follows: ...@@ -187,13 +187,13 @@ The operators now are defined as follows:
\begin{lstlisting}{} \begin{lstlisting}{}
// ===== create matrix operator ===== // ===== create matrix operator =====
Operator matrixOperator(ellipt.getFeSpace()); Operator matrixOperator(ellipt.getFeSpace());
matrixOperator.addSecondOrderTerm(new Simple_SOT); matrixOperator.addTerm(new Simple_SOT);
ellipt.addMatrixOperator(matrixOperator, 0, 0); ellipt.addMatrixOperator(matrixOperator, 0, 0);
// ===== create rhs operator ===== // ===== create rhs operator =====
int degree = ellipt.getFeSpace()->getBasisFcts()->getDegree(); int degree = ellipt.getFeSpace()->getBasisFcts()->getDegree();
Operator rhsOperator(ellipt.getFeSpace()); Operator rhsOperator(ellipt.getFeSpace());
rhsOperator.addZeroOrderTerm(new CoordsAtQP_ZOT(new F(degree))); rhsOperator.addTerm(new CoordsAtQP_ZOT(new F(degree)));
ellipt.addVectorOperator(rhsOperator, 0); ellipt.addVectorOperator(rhsOperator, 0);
\end{lstlisting} \end{lstlisting}
We define a matrix operator (left hand side operator) on the finite We define a matrix operator (left hand side operator) on the finite
......
...@@ -307,7 +307,7 @@ Now, we define the operators: ...@@ -307,7 +307,7 @@ Now, we define the operators:
// create laplace // create laplace
Operator A(heatSpace.getFeSpace()); Operator A(heatSpace.getFeSpace());
A.addSecondOrderTerm(new Simple_SOT); A.addTerm(new Simple_SOT);
A.setUhOld(heat.getOldSolution(0)); A.setUhOld(heat.getOldSolution(0));
if (*(heat.getThetaPtr()) != 0.0) if (*(heat.getThetaPtr()) != 0.0)
heatSpace.addMatrixOperator(A, 0, 0, heat.getThetaPtr(), &one); heatSpace.addMatrixOperator(A, 0, 0, heat.getThetaPtr(), &one);
...@@ -329,7 +329,7 @@ operator by \verb+setUhOld+. ...@@ -329,7 +329,7 @@ operator by \verb+setUhOld+.
\begin{lstlisting}{} \begin{lstlisting}{}
// create zero order operator // create zero order operator
Operator C(heatSpace.getFeSpace()); Operator C(heatSpace.getFeSpace());
C.addZeroOrderTerm(new Simple_ZOT); C.addTerm(new Simple_ZOT);
C.setUhOld(heat.getOldSolution(0)); C.setUhOld(heat.getOldSolution(0));
heatSpace.addMatrixOperator(C, 0, 0, heat.getInvTau(), heat.getInvTau()); heatSpace.addMatrixOperator(C, 0, 0, heat.getInvTau(), heat.getInvTau());
heatSpace.addVectorOperator(C, 0, heat.getInvTau(), heat.getInvTau()); heatSpace.addVectorOperator(C, 0, heat.getInvTau(), heat.getInvTau());
...@@ -345,7 +345,7 @@ the function \verb+getInvTau()+, which is a member of the class ...@@ -345,7 +345,7 @@ the function \verb+getInvTau()+, which is a member of the class
\begin{lstlisting}{} \begin{lstlisting}{}
// create RHS operator // create RHS operator
Operator F(heatSpace.getFeSpace()); Operator F(heatSpace.getFeSpace());
F.addZeroOrderTerm(new CoordsAtQP_ZOT(rhsFct)); F.addTerm(new CoordsAtQP_ZOT(rhsFct));
heatSpace.addVectorOperator(F, 0); heatSpace.addVectorOperator(F, 0);
\end{lstlisting} \end{lstlisting}
......
...@@ -31,5 +31,5 @@ For the compilation of the examples, described in this section, the following st ...@@ -31,5 +31,5 @@ For the compilation of the examples, described in this section, the following st
\end{enumerate} \end{enumerate}
To run the example, call:\\ To run the example, call:\\
\verb+> ./<PROG-NAME> <PARAMETER-FILE>+ \verb+> ./<PROG-NAME> <PARAMETER-FILE>+
\input{makefile.tex} %\input{makefile.tex}
...@@ -80,12 +80,12 @@ The operator definitions for the first equation are: ...@@ -80,12 +80,12 @@ The operator definitions for the first equation are:
\begin{lstlisting}{} \begin{lstlisting}{}
// ===== create operators ===== // ===== create operators =====
Operator matrixOperator00(vecellipt.getFeSpace(0), vecellipt.getFeSpace(0)); Operator matrixOperator00(vecellipt.getFeSpace(0), vecellipt.getFeSpace(0));
matrixOperator00.addSecondOrderTerm(new Simple_SOT); matrixOperator00.addTerm(new Simple_SOT);
vecellipt.addMatrixOperator(&matrixOperator00, 0, 0); vecellipt.addMatrixOperator(&matrixOperator00, 0, 0);
int degree = vecellipt.getFeSpace(0)->getBasisFcts()->getDegree(); int degree = vecellipt.getFeSpace(0)->getBasisFcts()->getDegree();
Operator rhsOperator0(vecellipt.getFeSpace(0)); Operator rhsOperator0(vecellipt.getFeSpace(0));
rhsOperator0.addZeroOrderTerm(new CoordsAtQP_ZOT(new F(degree))); rhsOperator0.addTerm(new CoordsAtQP_ZOT(new F(degree)));
vecellipt.addVectorOperator(&rhsOperator0, 0); vecellipt.addVectorOperator(&rhsOperator0, 0);
\end{lstlisting} \end{lstlisting}
...@@ -106,11 +106,11 @@ Now, the operators for the second equation are defined: ...@@ -106,11 +106,11 @@ Now, the operators for the second equation are defined:
\begin{lstlisting}{} \begin{lstlisting}{}
Operator matrixOperator10(vecellipt.getFeSpace(1), vecellipt.getFeSpace(0)); Operator matrixOperator10(vecellipt.getFeSpace(1), vecellipt.getFeSpace(0));
matrixOperator10.addZeroOrderTerm(new Simple_ZOT); matrixOperator10.addTerm(new Simple_ZOT);
vecellipt.addMatrixOperator(matrixOperator10, 1, 0); vecellipt.addMatrixOperator(matrixOperator10, 1, 0);
Operator matrixOperator11(vecellipt.getFeSpace(1), vecellipt.getFeSpace(1)); Operator matrixOperator11(vecellipt.getFeSpace(1), vecellipt.getFeSpace(1));
matrixOperator11.addZeroOrderTerm(new Simple_ZOT(-1.0)); matrixOperator11.addTerm(new Simple_ZOT(-1.0));
vecellipt.addMatrixOperator(matrixOperator11, 1, 1); vecellipt.addMatrixOperator(matrixOperator11, 1, 1);
\end{lstlisting} \end{lstlisting}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment