From 08860f254e4638bb5012e43ad76623e0d8c3b19b Mon Sep 17 00:00:00 2001
From: Elias Pipping <elias.pipping@fu-berlin.de>
Date: Thu, 11 Jul 2013 17:41:16 +0200
Subject: [PATCH] [Cleanup] Rename: ignoreNodes -> velocityDirichletNodes,
---
src/one-body-sample.cc | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/src/one-body-sample.cc b/src/one-body-sample.cc
index 6533f408..92592b87 100644
--- a/src/one-body-sample.cc
+++ b/src/one-body-sample.cc
@@ -89,7 +89,7 @@ template <class VectorType, class MatrixType, class FunctionType, int dims>
Dune::shared_ptr<TimeSteppingScheme<VectorType, MatrixType, FunctionType, dims>>
initTimeStepper(Config::scheme scheme,
FunctionType const &velocityDirichletFunction,
- Dune::BitSetVector<dims> const &ignoreNodes,
+ Dune::BitSetVector<dims> const &velocityDirichletNodes,
MatrixType const &massMatrix, MatrixType const &stiffnessMatrix,
VectorType const &u_initial, VectorType const &v_initial,
VectorType const &a_initial) {
@@ -97,18 +97,18 @@ initTimeStepper(Config::scheme scheme,
case Config::ImplicitEuler:
return Dune::make_shared<
ImplicitEuler<VectorType, MatrixType, FunctionType, dims>>(
- stiffnessMatrix, u_initial, v_initial, ignoreNodes,
+ stiffnessMatrix, u_initial, v_initial, velocityDirichletNodes,
velocityDirichletFunction);
case Config::Newmark:
return Dune::make_shared<
Newmark<VectorType, MatrixType, FunctionType, dims>>(
stiffnessMatrix, massMatrix, u_initial, v_initial, a_initial,
- ignoreNodes, velocityDirichletFunction);
+ velocityDirichletNodes, velocityDirichletFunction);
case Config::EulerPair:
return Dune::make_shared<
EulerPair<VectorType, MatrixType, FunctionType, dims>>(
- stiffnessMatrix, massMatrix, u_initial, v_initial, ignoreNodes,
- velocityDirichletFunction);
+ stiffnessMatrix, massMatrix, u_initial, v_initial,
+ velocityDirichletNodes, velocityDirichletFunction);
default:
assert(false);
}
@@ -208,7 +208,7 @@ int main(int argc, char *argv[]) {
Assembler<P1Basis, P1Basis> const p1Assembler(p1Basis, p1Basis);
// Set up the boundary
- Dune::BitSetVector<dims> ignoreNodes(finestSize, false);
+ Dune::BitSetVector<dims> velocityDirichletNodes(finestSize, false);
Dune::BitSetVector<dims> noNodes(finestSize, false);
Dune::BitSetVector<1> neumannNodes(finestSize, false);
Dune::BitSetVector<1> frictionalNodes(finestSize, false);
@@ -227,12 +227,12 @@ int main(int argc, char *argv[]) {
// lower face
if (localCoordinates[1] == lowerLeft[1]) {
frictionalNodes[id] = true;
- ignoreNodes[id][1] = true;
+ velocityDirichletNodes[id][1] = true;
}
// upper face
else if (localCoordinates[1] == upperRight[1])
- ignoreNodes[id] = true;
+ velocityDirichletNodes[id] = true;
// right face (except for both corners)
else if (localCoordinates[0] == upperRight[0])
@@ -387,7 +387,7 @@ int main(int argc, char *argv[]) {
auto const solverTolerance = parset.get<double>("solver.tolerance");
MySolver<dims, MatrixType, VectorType, GridType> solverHost(
parset.sub("solver.tnnmg"), refinements, solverTolerance, *grid,
- ignoreNodes);
+ velocityDirichletNodes);
auto multigridStep = solverHost.getSolver();
Solver::VerbosityMode const verbosity =
parset.get<bool>("verbose") ? Solver::FULL : Solver::QUIET;
@@ -406,10 +406,10 @@ int main(int argc, char *argv[]) {
std::fstream iterationWriter("iterations", std::fstream::out);
std::fstream dampingWriter("damping", std::fstream::out);
- auto timeSteppingScheme =
- initTimeStepper(parset.get<Config::scheme>("timeSteppingScheme"),
- velocityDirichletFunction, ignoreNodes, massMatrix,
- stiffnessMatrix, u_initial, v_initial, a_initial);
+ auto timeSteppingScheme = initTimeStepper(
+ parset.get<Config::scheme>("timeSteppingScheme"),
+ velocityDirichletFunction, velocityDirichletNodes, massMatrix,
+ stiffnessMatrix, u_initial, v_initial, a_initial);
auto stateUpdater = initStateUpdater<SingletonVectorType, VectorType>(
parset.get<Config::state_model>("boundary.friction.state_model"),
alpha_initial, frictionalNodes, frictionData);
--
GitLab