Skip to content
Snippets Groups Projects
Commit df715b6a authored by Elias Pipping's avatar Elias Pipping
Browse files

[Cleanup] Kill neumannNodes

Also rename dirichletNodes
parent a1795be0
No related branches found
No related tags found
No related merge requests found
...@@ -138,12 +138,9 @@ int main(int argc, char *argv[]) { ...@@ -138,12 +138,9 @@ int main(int argc, char *argv[]) {
// }}} // }}}
// Set up the boundary // Set up the boundary
Dune::BitSetVector<dims> velocityDirichletNodes(fineVertexCount, false); Dune::BitSetVector<dims> dirichletNodes(fineVertexCount);
Dune::BitSetVector<dims> const &displacementDirichletNodes = Dune::BitSetVector<dims> noNodes(fineVertexCount);
velocityDirichletNodes; BoundaryPatch<GridView> const neumannBoundary(leafView);
Dune::BitSetVector<dims> accelerationDirichletNodes(fineVertexCount, false);
Dune::BitSetVector<1> neumannNodes(fineVertexCount, false);
BoundaryPatch<GridView> const neumannBoundary(leafView, neumannNodes);
Vector vertexCoordinates(fineVertexCount); Vector vertexCoordinates(fineVertexCount);
Dune::BitSetVector<1> frictionalNodes(fineVertexCount, false); Dune::BitSetVector<1> frictionalNodes(fineVertexCount, false);
...@@ -283,7 +280,7 @@ int main(int argc, char *argv[]) { ...@@ -283,7 +280,7 @@ int main(int argc, char *argv[]) {
// Solve the stationary problem // Solve the stationary problem
Vector u_initial(fineVertexCount); Vector u_initial(fineVertexCount);
u_initial = 0.0; u_initial = 0.0;
solveLinearProblem(displacementDirichletNodes, A, ell, u_initial, ANorm, solveLinearProblem(dirichletNodes, A, ell, u_initial, ANorm,
parset.sub("u0.solver")); parset.sub("u0.solver"));
Vector v_initial(fineVertexCount); Vector v_initial(fineVertexCount);
v_initial = 0.0; v_initial = 0.0;
...@@ -312,8 +309,8 @@ int main(int argc, char *argv[]) { ...@@ -312,8 +309,8 @@ int main(int argc, char *argv[]) {
accelerationRHS -= ell; accelerationRHS -= ell;
accelerationRHS *= -1.0; accelerationRHS *= -1.0;
} }
solveLinearProblem(accelerationDirichletNodes, M, accelerationRHS, solveLinearProblem(noNodes, M, accelerationRHS, a_initial, MNorm,
a_initial, MNorm, parset.sub("a0.solver")); parset.sub("a0.solver"));
} }
// }}} // }}}
FrictionWriter<Dune::BitSetVector<1>> writer(frictionData, frictionalNodes); FrictionWriter<Dune::BitSetVector<1>> writer(frictionData, frictionalNodes);
...@@ -329,7 +326,7 @@ int main(int argc, char *argv[]) { ...@@ -329,7 +326,7 @@ int main(int argc, char *argv[]) {
GlobalNonlinearity<Matrix, Vector>, Matrix>>, GlobalNonlinearity<Matrix, Vector>, Matrix>>,
Grid>; Grid>;
NonlinearFactory factory(parset.sub("solver.tnnmg"), refinements, *grid, NonlinearFactory factory(parset.sub("solver.tnnmg"), refinements, *grid,
velocityDirichletNodes); dirichletNodes);
auto multigridStep = factory.getSolver(); auto multigridStep = factory.getSolver();
{ {
...@@ -344,8 +341,8 @@ int main(int argc, char *argv[]) { ...@@ -344,8 +341,8 @@ int main(int argc, char *argv[]) {
auto timeSteppingScheme = auto timeSteppingScheme =
initTimeStepper(parset.get<Config::scheme>("timeSteps.scheme"), initTimeStepper(parset.get<Config::scheme>("timeSteps.scheme"),
velocityDirichletFunction, velocityDirichletNodes, M, A, velocityDirichletFunction, dirichletNodes, M, A, C,
C, u_initial, v_initial, a_initial); u_initial, v_initial, a_initial);
auto stateUpdater = initStateUpdater<ScalarVector, Vector>( auto stateUpdater = initStateUpdater<ScalarVector, Vector>(
parset.get<Config::stateModel>("boundary.friction.stateModel"), parset.get<Config::stateModel>("boundary.friction.stateModel"),
alpha_initial, frictionalNodes, frictionData); alpha_initial, frictionalNodes, frictionData);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment