From b227426f38ad09aa1d78d274092c949ce28ed3df Mon Sep 17 00:00:00 2001
From: Elias Pipping <elias.pipping@fu-berlin.de>
Date: Sat, 12 Jul 2014 02:16:18 +0200
Subject: [PATCH] [Cleanup] Rename: timeSteppingScheme -> velocityUpdater
---
src/sand-wedge.cc | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/sand-wedge.cc b/src/sand-wedge.cc
index 67695cee..b3dc3dd8 100644
--- a/src/sand-wedge.cc
+++ b/src/sand-wedge.cc
@@ -340,7 +340,7 @@ int main(int argc, char *argv[]) {
dirichletNodes);
auto multigridStep = factory.getSolver();
- auto timeSteppingScheme = initTimeStepper(
+ auto velocityUpdater = initTimeStepper(
parset.get<Config::scheme>("timeSteps.scheme"),
velocityDirichletFunction, dirichletNodes, M, A, C, u_initial,
ur_initial, v_initial, vr_initial, a_initial);
@@ -365,7 +365,7 @@ int main(int argc, char *argv[]) {
auto const lambda = parset.get<double>("v.fpi.lambda");
for (size_t timeStep = 1; timeStep <= timeSteps; ++timeStep) {
stateUpdater->nextTimeStep();
- timeSteppingScheme->nextTimeStep();
+ velocityUpdater->nextTimeStep();
auto const relativeTime = double(timeStep) / double(timeSteps);
Vector ell(leafVertexCount);
@@ -376,8 +376,8 @@ int main(int argc, char *argv[]) {
Vector velocityIterate(leafVertexCount);
stateUpdater->setup(tau);
- timeSteppingScheme->setup(ell, tau, relativeTime, velocityRHS,
- velocityIterate, velocityMatrix);
+ velocityUpdater->setup(ell, tau, relativeTime, velocityRHS,
+ velocityIterate, velocityMatrix);
LoopSolver<Vector> velocityProblemSolver(multigridStep, maximumIterations,
tolerance, &AMNorm, verbosity,
@@ -403,7 +403,7 @@ int main(int argc, char *argv[]) {
Vector v_saved;
for (size_t stateFPI = 1; stateFPI <= maximumStateFPI; ++stateFPI) {
- timeSteppingScheme->extractOldVelocity(v_m);
+ velocityUpdater->extractOldVelocity(v_m);
v_m *= 1.0 - lambda;
Arithmetic::addProduct(v_m, lambda, velocityIterate);
@@ -423,13 +423,13 @@ int main(int argc, char *argv[]) {
v_saved = velocityIterate;
}
- timeSteppingScheme->postProcess(velocityIterate);
+ velocityUpdater->postProcess(velocityIterate);
Vector u, ur, vr;
- timeSteppingScheme->extractDisplacement(u);
- timeSteppingScheme->postProcessRelativeQuantities();
- timeSteppingScheme->extractRelativeDisplacement(ur);
- timeSteppingScheme->extractRelativeVelocity(vr);
+ velocityUpdater->extractDisplacement(u);
+ velocityUpdater->postProcessRelativeQuantities();
+ velocityUpdater->extractRelativeDisplacement(ur);
+ velocityUpdater->extractRelativeVelocity(vr);
report(ur, vr, alpha);
--
GitLab