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

Rename: energyNorm -> velocityEnergyNorm

parent eb84ac8d
No related branches found
No related tags found
No related merge requests found
...@@ -374,10 +374,11 @@ int main(int argc, char *argv[]) { ...@@ -374,10 +374,11 @@ int main(int argc, char *argv[]) {
stateUpdater->setup(tau); stateUpdater->setup(tau);
timeSteppingScheme->setup(ell, tau, time, problem_rhs, problem_iterate, timeSteppingScheme->setup(ell, tau, time, problem_rhs, problem_iterate,
problem_A); problem_A);
EnergyNorm<MatrixType, VectorType> energyNorm(problem_A); EnergyNorm<MatrixType, VectorType> velocityEnergyNorm(problem_A);
LoopSolver<VectorType> overallSolver( LoopSolver<VectorType> overallSolver(
multigridStep, parset.get<size_t>("solver.tnnmg.maxiterations"), multigridStep, parset.get<size_t>("solver.tnnmg.maxiterations"),
solver_tolerance, &energyNorm, verbosity, false); // absolute error solver_tolerance, &velocityEnergyNorm, verbosity,
false); // absolute error
size_t iterationCounter; size_t iterationCounter;
auto solveDisplacementProblem = [&](VectorType &_problem_iterate, auto solveDisplacementProblem = [&](VectorType &_problem_iterate,
...@@ -435,7 +436,7 @@ int main(int argc, char *argv[]) { ...@@ -435,7 +436,7 @@ int main(int argc, char *argv[]) {
std::cerr.flush(); std::cerr.flush();
} }
if (state_fpi > 1) { if (state_fpi > 1) {
double const correctionNorm = energyNorm.diff(u_saved, u); double const correctionNorm = velocityEnergyNorm.diff(u_saved, u);
if (correctionNorm < fixedPointTolerance) { if (correctionNorm < fixedPointTolerance) {
if (parset.get<bool>("printProgress")) { if (parset.get<bool>("printProgress")) {
std::cerr << '#'; std::cerr << '#';
......
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