diff --git a/dune/tectonic/spatial-solving/fixedpointiterator.cc b/dune/tectonic/spatial-solving/fixedpointiterator.cc index 586272ff24bccd260a8ce42d3ad437ceca263d4a..f21aa580a2ee4db3707c4657f2d24d157abc3dd5 100644 --- a/dune/tectonic/spatial-solving/fixedpointiterator.cc +++ b/dune/tectonic/spatial-solving/fixedpointiterator.cc @@ -124,6 +124,8 @@ FixedPointIterator<Factory, NBodyAssembler, Updaters, ErrorNorms>::run( Vector total_v; nBodyAssembler_.nodalToTransformed(velocityIterates, total_v); + print(velocityIterates, "velocityIterates start:"); + for (fixedPointIteration = 0; fixedPointIteration < fixedPointMaxIterations_; ++fixedPointIteration) { @@ -148,8 +150,11 @@ FixedPointIterator<Factory, NBodyAssembler, Updaters, ErrorNorms>::run( updaters.state_->extractAlpha(newAlpha); nBodyAssembler_.postprocess(total_v, velocityIterates); + //Rprint(velocityIterates, "velocityIterates loop:"); updaters.rate_->postProcess(velocityIterates); - bool breakCriterion = displacementCriterion(updaters, last_u); //stateCriterion(alpha, newAlpha); + bool breakCriterion = true; //displacementCriterion(updaters, last_u); //stateCriterion(alpha, newAlpha); + + printRegularityTruncation(globalFriction_, total_v); if (lambda_ < 1e-12 or breakCriterion) { fixedPointIteration++; @@ -171,6 +176,8 @@ FixedPointIterator<Factory, NBodyAssembler, Updaters, ErrorNorms>::run( nBodyAssembler_.postprocess(total_v, velocityIterates); updaters.rate_->postProcess(velocityIterates); + print(velocityIterates, "velocityIterates end:"); + // Cannot use return { fixedPointIteration, multigridIterations }; // with gcc 4.9.2, see also http://stackoverflow.com/a/37777814/179927 FixedPointIterationCounter ret;