adapt the solver to the new structure of the OgdenAssembler class

[[Imported from SVN: r10470]]

nonlinelast.cc

@@ -14,10 +14,12 @@
 #include <dune/ag-common/prolongboundarypatch.hh>
 #include <dune/ag-common/sampleonbitfield.hh>
 #include <dune/ag-common/readbitfield.hh>
-#include <dune-solvers/solvers/quadraticipopt.hh>
-#include <dune-solvers/solvers/loopsolver.hh>
-#include <dune-solvers/norms/energynorm.hh>
-#include <dune-solvers/iterationsteps/mmgstep.hh>
+#include <dune/ag-common/functionspacebases/p1nodalbasis.hh>
+
+#include <dune/solvers/solvers/quadraticipopt.hh>
+#include <dune/solvers/solvers/loopsolver.hh>
+#include <dune/solvers/norms/energynorm.hh>
+#include <dune/solvers/iterationsteps/mmgstep.hh>
 
 // Choose a solver
 #define IPOPT
@@ -27,7 +29,7 @@
 //#define IPOPT_BASE
 
 // The grid dimension
-const int dim = 2;
+const int dim = 3;
 
 using namespace Dune;
 
@@ -139,6 +141,7 @@ int main (int argc, char *argv[]) try
     VectorType rhs(grid.size(grid.maxLevel(), dim));
     VectorType x(grid.size(grid.maxLevel(), dim));
     VectorType corr(grid.size(grid.maxLevel(), dim));
+    OperatorType problemMatrix;
     
     // Initial solution
     x = 0;
@@ -213,9 +216,11 @@ int main (int argc, char *argv[]) try
 #else
     #warning You have to specify a solver!
 #endif
+    typedef P1NodalBasis<GridType::LeafGridView,double> P1Basis;
+    typedef OgdenAssembler<P1Basis,P1Basis> Assembler;
     
-    typedef OgdenAssembler<GridType> Assembler;
-    Assembler ogdenAssembler(grid);
+    P1Basis p1Basis(grid.leafView());
+    Assembler ogdenAssembler(p1Basis,p1Basis);
     
     for (int i=0; i<numHomotopySteps; i++) {
 
@@ -237,7 +242,7 @@ int main (int argc, char *argv[]) try
 
         	// Assemble the Jacobi matrix at the current solution
             rhs = 0;
-          ogdenAssembler.assembleMatrix(x, rhs);
+            ogdenAssembler.assembleProblem(problemMatrix,x, rhs);
 
             corr = 0;
           
@@ -247,7 +252,7 @@ int main (int argc, char *argv[]) try
             		if (dirichletNodes[maxlevel][k][l])
             			rhs[k][l] = 0;
 
-          solver.setProblem(*ogdenAssembler.matrix_, corr, rhs);
+            solver.setProblem(problemMatrix, corr, rhs);
 
             solver.preprocess();
 #ifdef MULTIGRID