adaption to new newton

mlmc/src/pdesolver/PDESolver.cpp

@@ -44,7 +44,7 @@ void DummyPDESolver::computeCost(SampleSolution &solution) {
 void DummyPDESolver::plotSolution(SampleSolution &solution) {}
 
 void EllipticPDESolver::run(SampleSolution &solution) {
-    newton(*assemble, solution.U);
+    NewtonMethod(assemble, solution.U);
 }
 
 void EllipticPDESolver::computeQ(SampleSolution &solution) {

mlmc/src/pdesolver/PDESolver.hpp

@@ -17,9 +17,9 @@
 
 // Mpp imports
 #include "dof/BasicDoFs.hpp"
-#include "Solver.hpp"
 #include "Newton.hpp"
 #include "TimeIntegrator.hpp"
+#include "GMRES.hpp"
 
 // Standard library
 #include <typeinfo>
@@ -143,10 +143,6 @@ public:
 
 class EllipticPDESolver : public PDESolver {
 private:
-    Solver solver;
-
-    Newton newton;
-
     MatrixGraphs *fluxMGraphs;
 
     MatrixGraphs *pressureMGraphs;
@@ -167,17 +163,12 @@ protected:
     void createOtherMatrixGraphs() override;
 
 public:
-    EllipticPDESolver(IStochasticEllipticAssemble *assemble,
-                      Meshes &meshes,
+    EllipticPDESolver(IStochasticEllipticAssemble *assemble, Meshes &meshes,
                       const std::string &quantity = "L2",
-                      const std::string &costMeasure = "size",
-                      const std::string &pc = "SuperLU") :
-        PDESolver(meshes, quantity, costMeasure), assemble(assemble),
-        solver(Solver(GetPC(pc))),
-        newton(Newton(solver)) {
+                      const std::string &costMeasure = "size") :
+        PDESolver(meshes, quantity, costMeasure), assemble(assemble) {
         solMGraphs = CreateSolutionMatrixGraphs();
         PrintInfo();
-        solver.PrintInfo();
     }
 
     ~EllipticPDESolver() {