diff --git a/src/one-body-sample.cc b/src/one-body-sample.cc index 8f1d7ab4e22d2ea3cce15c0dca5ea255439aab14..284462dacc253334f45d869c6cd53680e6fe95a3 100644 --- a/src/one-body-sample.cc +++ b/src/one-body-sample.cc @@ -456,7 +456,7 @@ int main(int argc, char *argv[]) { std::fstream velocityWriter("velocities", std::fstream::out); std::fstream coefficientWriter("coefficients", std::fstream::out); std::fstream iterationWriter("iterations", std::fstream::out); - std::fstream dampingWriter("damping", std::fstream::out); + std::fstream relaxationWriter("relaxation", std::fstream::out); auto timeSteppingScheme = initTimeStepper(parset.get<Config::scheme>("timeSteps.scheme"), @@ -475,7 +475,7 @@ int main(int argc, char *argv[]) { parset.get<size_t>("solver.tnnmg.fixed_point_iterations"); auto const fixedPointTolerance = parset.get<double>("solver.tnnmg.fixed_point_tolerance"); - auto const damping = parset.get<double>("solver.damping"); + auto const relaxation = parset.get<double>("solver.relaxation"); auto const requiredReduction = parset.get<double>("solver.requiredReduction"); auto const printProgress = parset.get<bool>("io.printProgress"); @@ -537,11 +537,11 @@ int main(int argc, char *argv[]) { if (state_fpi <= 2 // Let the first two steps pass through unchanged || correction < requiredReduction * lastCorrection) { alpha = computed_state; - dampingWriter << "N "; + relaxationWriter << "N "; } else { // alpha is still the old time step here - alpha *= damping; - Arithmetic::addProduct(alpha, 1.0 - damping, computed_state); - dampingWriter << "Y "; + alpha *= relaxation; + Arithmetic::addProduct(alpha, 1.0 - relaxation, computed_state); + relaxationWriter << "Y "; } lastCorrection = correction; } @@ -586,7 +586,7 @@ int main(int argc, char *argv[]) { velocityWriter << std::endl; coefficientWriter << std::endl; iterationWriter << std::endl; - dampingWriter << std::endl; + relaxationWriter << std::endl; if (parset.get<bool>("io.writeVTK")) { SingletonVectorType vonMisesStress; @@ -610,7 +610,7 @@ int main(int argc, char *argv[]) { velocityWriter.close(); coefficientWriter.close(); iterationWriter.close(); - dampingWriter.close(); + relaxationWriter.close(); Python::stop(); } diff --git a/src/one-body-sample.parset b/src/one-body-sample.parset index 680ec3a87c93db7314acbdd738ab6a9ee4df2fbb..8ffaf11570c3c131d95bd5e1a1f146b1e349bd77 100644 --- a/src/one-body-sample.parset +++ b/src/one-body-sample.parset @@ -48,7 +48,7 @@ verbosity = quiet [solver] tolerance = 1e-10 -damping = 0.5 +relaxation = 0.5 requiredReduction = 0.5 [solver.tnnmg]