Commit 81cc9499 authored by niklas.baumgarten's avatar niklas.baumgarten
Browse files

adaption to new newton

parent 9c3d0186
......@@ -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) {
......
......@@ -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() {
......
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