Merge lp:~morandini/dolfin/resetjacobian into lp:~fenics-core/dolfin/trunk

[Marco Morandini]

fix NonlinearVariationalSolver reset_jacobian parameter handling

=== modified file 'dolfin/fem/NonlinearVariationalSolver.cpp'
--- dolfin/fem/NonlinearVariationalSolver.cpp	2012-03-09 14:43:29 +0000
+++ dolfin/fem/NonlinearVariationalSolver.cpp	2012-03-09 15:18:41 +0000
@@ -63,19 +63,24 @@
   dolfin_assert(problem);
   boost::shared_ptr<Function> u(problem->solution());
 
+  const bool reset_jacobian = parameters["reset_jacobian"];
   // Create nonlinear problem
-  NonlinearDiscreteProblem nonlinear_problem(problem,
-                                             reference_to_no_delete_pointer(*this));
-
+  if ((!nonlinear_problem.get()) || reset_jacobian) {
+    nonlinear_problem = boost::shared_ptr<NonlinearDiscreteProblem>(new NonlinearDiscreteProblem(problem,
+                                             reference_to_no_delete_pointer(*this)));
+  }
   // Create Newton solver and set parameters
-  NewtonSolver newton_solver(parameters["linear_solver"],
-                             parameters["preconditioner"]);
-  newton_solver.parameters.update(parameters("newton_solver"));
+  if ((!newton_solver.get()) || reset_jacobian) {
+    // Create Newton solver and set parameters
+    newton_solver = boost::shared_ptr<NewtonSolver>(new NewtonSolver(parameters["linear_solver"],
+                                             parameters["preconditioner"]));
+  }
+  newton_solver->parameters.update(parameters("newton_solver"));
 
   // Solve nonlinear problem using Newton's method
   dolfin_assert(u->vector());
   const std::pair<uint, bool> ret
-    = newton_solver.solve(nonlinear_problem, *u->vector());
+    = newton_solver->solve(*nonlinear_problem, *u->vector());
 
   end();
 

=== modified file 'dolfin/fem/NonlinearVariationalSolver.h'
--- dolfin/fem/NonlinearVariationalSolver.h	2011-10-20 13:50:55 +0000
+++ dolfin/fem/NonlinearVariationalSolver.h	2012-03-09 15:18:41 +0000
@@ -106,6 +106,12 @@
     // The nonlinear problem
     boost::shared_ptr<NonlinearVariationalProblem> problem;
 
+    // The nonlinear discrete problem
+    boost::shared_ptr<NonlinearDiscreteProblem> nonlinear_problem;
+
+    // The Newton solver
+    boost::shared_ptr<NewtonSolver> newton_solver;
+
   };
 
 }