Commit 91a53036 authored by Jonathan Wunderlich's avatar Jonathan Wunderlich

Merge branch 'adapt-182' into 'feature'

Adapt 182

See merge request !5
parents ee37b031 46609d86
Pipeline #125147 failed with stages
in 12 minutes and 42 seconds
...@@ -48,7 +48,7 @@ public: ...@@ -48,7 +48,7 @@ public:
explicit CirculantEmbedding(Meshes &meshes) : explicit CirculantEmbedding(Meshes &meshes) :
meshes(meshes), meshes(meshes),
normalDist(meshes), normalDist(meshes),
cellMGraphs(meshes, dof(new LagrangeDoF(0))) { cellMGraphs(meshes, new LagrangeDoF(0)) {
config.get("evtol", evtol); config.get("evtol", evtol);
config.get("StochasticField", fieldType); config.get("StochasticField", fieldType);
...@@ -220,4 +220,4 @@ public: ...@@ -220,4 +220,4 @@ public:
string Name() const override { return "Circulant Embedding"; } string Name() const override { return "Circulant Embedding"; }
}; };
#endif //M_CIRCULANTEMBEDDING_H #endif //M_CIRCULANTEMBEDDING_H
\ No newline at end of file
...@@ -67,8 +67,8 @@ public: ...@@ -67,8 +67,8 @@ public:
// MatrixGraphs cellMGraphs; cellMGraphs(MatrixGraphs(meshes, dof(new CellDoF(3)))), // MatrixGraphs cellMGraphs; cellMGraphs(MatrixGraphs(meshes, new CellDoF(3))),
// MatrixGraphs faceMGraphs; faceMGraphs(MatrixGraphs(meshes, dof(new FaceDoF(1)))), // MatrixGraphs faceMGraphs; faceMGraphs(MatrixGraphs(meshes, new FaceDoF(1))),
// //
// Vector *faceFlux = nullptr; // Vector *faceFlux = nullptr;
// Vector *faceValues = nullptr; // Vector *faceValues = nullptr;
......
...@@ -12,7 +12,7 @@ MatrixGraphs *PDESolver::CreateSolutionMatrixGraphs(Meshes &meshes) { ...@@ -12,7 +12,7 @@ MatrixGraphs *PDESolver::CreateSolutionMatrixGraphs(Meshes &meshes) {
auto assemble = this->GetAssemble(); auto assemble = this->GetAssemble();
auto assembleType = typeid(*assemble).name(); auto assembleType = typeid(*assemble).name();
if (assembleType == typeid(HybridEllipticAssemble).name()) if (assembleType == typeid(HybridEllipticAssemble).name())
return new MatrixGraphs(meshes, dof(new FaceDoF(1))); return new MatrixGraphs(meshes, new FaceDoF(1));
if (assembleType == typeid(MixedEllipticAssemble).name()) if (assembleType == typeid(MixedEllipticAssemble).name())
return new MatrixGraphs(meshes, *disc); return new MatrixGraphs(meshes, *disc);
} }
...@@ -65,11 +65,11 @@ void EllipticPDESolver::plotSolution(SampleSolution &solution) { ...@@ -65,11 +65,11 @@ void EllipticPDESolver::plotSolution(SampleSolution &solution) {
void EllipticPDESolver::createOtherMatrixGraphs(Meshes &meshes) { void EllipticPDESolver::createOtherMatrixGraphs(Meshes &meshes) {
if (plotting) { if (plotting) {
fluxMGraphs = new MatrixGraphs(meshes, dof(new LagrangeDoF(0, 3))); fluxMGraphs = new MatrixGraphs(meshes, new LagrangeDoF(0, 3));
if (typeid(*assemble).name() == typeid(HybridEllipticAssemble).name()) if (typeid(*assemble).name() == typeid(HybridEllipticAssemble).name())
pressureMGraphs = new MatrixGraphs(meshes, dof(new LagrangeDoF(0, 1))); pressureMGraphs = new MatrixGraphs(meshes, new LagrangeDoF(0, 1));
else else
pressureMGraphs = new MatrixGraphs(meshes, dof(new LagrangeDoF(1, 1))); pressureMGraphs = new MatrixGraphs(meshes, new LagrangeDoF(1, 1));
} else { } else {
fluxMGraphs = nullptr; fluxMGraphs = nullptr;
pressureMGraphs = nullptr; pressureMGraphs = nullptr;
......
...@@ -42,7 +42,7 @@ protected: ...@@ -42,7 +42,7 @@ protected:
new MatrixGraphs(*meshes, *(new LagrangeDiscretization(*meshes, 3))), new MatrixGraphs(*meshes, *(new LagrangeDiscretization(*meshes, 3))),
new MatrixGraphs(*meshes, *(new RTLagrangeDiscretization(*meshes, 0, 0))), new MatrixGraphs(*meshes, *(new RTLagrangeDiscretization(*meshes, 0, 0))),
new MatrixGraphs(*meshes, dof(new FaceDoF(1))), new MatrixGraphs(*meshes, new FaceDoF(1)),
new CellMatrixGraphs(*meshes, *(new DGDiscretization(*meshes, 0))), new CellMatrixGraphs(*meshes, *(new DGDiscretization(*meshes, 0))),
new CellMatrixGraphs(*meshes, *(new DGDiscretization(*meshes, 1))), new CellMatrixGraphs(*meshes, *(new DGDiscretization(*meshes, 1))),
......
Subproject commit e477a577a518ee4095416147b1c5d75b22a0262b Subproject commit f00f5cd2cfe71b80e2c87e377dc9c5f8f65df67a
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