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

[Cleanup] Rename: timeSteppingScheme -> velocityUpdater

parent 27cef2aa
No related branches found
No related tags found
No related merge requests found
...@@ -340,7 +340,7 @@ int main(int argc, char *argv[]) { ...@@ -340,7 +340,7 @@ int main(int argc, char *argv[]) {
dirichletNodes); dirichletNodes);
auto multigridStep = factory.getSolver(); auto multigridStep = factory.getSolver();
auto timeSteppingScheme = initTimeStepper( auto velocityUpdater = initTimeStepper(
parset.get<Config::scheme>("timeSteps.scheme"), parset.get<Config::scheme>("timeSteps.scheme"),
velocityDirichletFunction, dirichletNodes, M, A, C, u_initial, velocityDirichletFunction, dirichletNodes, M, A, C, u_initial,
ur_initial, v_initial, vr_initial, a_initial); ur_initial, v_initial, vr_initial, a_initial);
...@@ -365,7 +365,7 @@ int main(int argc, char *argv[]) { ...@@ -365,7 +365,7 @@ int main(int argc, char *argv[]) {
auto const lambda = parset.get<double>("v.fpi.lambda"); auto const lambda = parset.get<double>("v.fpi.lambda");
for (size_t timeStep = 1; timeStep <= timeSteps; ++timeStep) { for (size_t timeStep = 1; timeStep <= timeSteps; ++timeStep) {
stateUpdater->nextTimeStep(); stateUpdater->nextTimeStep();
timeSteppingScheme->nextTimeStep(); velocityUpdater->nextTimeStep();
auto const relativeTime = double(timeStep) / double(timeSteps); auto const relativeTime = double(timeStep) / double(timeSteps);
Vector ell(leafVertexCount); Vector ell(leafVertexCount);
...@@ -376,8 +376,8 @@ int main(int argc, char *argv[]) { ...@@ -376,8 +376,8 @@ int main(int argc, char *argv[]) {
Vector velocityIterate(leafVertexCount); Vector velocityIterate(leafVertexCount);
stateUpdater->setup(tau); stateUpdater->setup(tau);
timeSteppingScheme->setup(ell, tau, relativeTime, velocityRHS, velocityUpdater->setup(ell, tau, relativeTime, velocityRHS,
velocityIterate, velocityMatrix); velocityIterate, velocityMatrix);
LoopSolver<Vector> velocityProblemSolver(multigridStep, maximumIterations, LoopSolver<Vector> velocityProblemSolver(multigridStep, maximumIterations,
tolerance, &AMNorm, verbosity, tolerance, &AMNorm, verbosity,
...@@ -403,7 +403,7 @@ int main(int argc, char *argv[]) { ...@@ -403,7 +403,7 @@ int main(int argc, char *argv[]) {
Vector v_saved; Vector v_saved;
for (size_t stateFPI = 1; stateFPI <= maximumStateFPI; ++stateFPI) { for (size_t stateFPI = 1; stateFPI <= maximumStateFPI; ++stateFPI) {
timeSteppingScheme->extractOldVelocity(v_m); velocityUpdater->extractOldVelocity(v_m);
v_m *= 1.0 - lambda; v_m *= 1.0 - lambda;
Arithmetic::addProduct(v_m, lambda, velocityIterate); Arithmetic::addProduct(v_m, lambda, velocityIterate);
...@@ -423,13 +423,13 @@ int main(int argc, char *argv[]) { ...@@ -423,13 +423,13 @@ int main(int argc, char *argv[]) {
v_saved = velocityIterate; v_saved = velocityIterate;
} }
timeSteppingScheme->postProcess(velocityIterate); velocityUpdater->postProcess(velocityIterate);
Vector u, ur, vr; Vector u, ur, vr;
timeSteppingScheme->extractDisplacement(u); velocityUpdater->extractDisplacement(u);
timeSteppingScheme->postProcessRelativeQuantities(); velocityUpdater->postProcessRelativeQuantities();
timeSteppingScheme->extractRelativeDisplacement(ur); velocityUpdater->extractRelativeDisplacement(ur);
timeSteppingScheme->extractRelativeVelocity(vr); velocityUpdater->extractRelativeVelocity(vr);
report(ur, vr, alpha); report(ur, vr, alpha);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment