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

Kill superfluous braces and indentation

parent 8de3b497
No related branches found
No related tags found
No related merge requests found
...@@ -485,49 +485,48 @@ ...@@ -485,49 +485,48 @@
auto const state_fpi_max auto const state_fpi_max
= parset.get<size_t>("solver.tnnmg.fixed_point_iterations"); = parset.get<size_t>("solver.tnnmg.fixed_point_iterations");
for (size_t run = 1; run <= timesteps; ++run) { for (size_t run = 1; run <= timesteps; ++run) {
stateUpdater->nextTimeStep();
timeSteppingScheme->nextTimeStep();
double const time = tau * run; double const time = tau * run;
{
stateUpdater->nextTimeStep(); VectorType ell(finestSize);
timeSteppingScheme->nextTimeStep(); assemble_neumann<GridType, GridView, SmallVector, P1Basis>
(leafView, p1Basis, neumannNodes, ell, neumannFunction, time);
VectorType ell(finestSize); ell += gravityFunctional;
assemble_neumann<GridType, GridView, SmallVector, P1Basis>
(leafView, p1Basis, neumannNodes, ell, neumannFunction, time); MatrixType problem_A;
ell += gravityFunctional; VectorType problem_rhs(finestSize);
VectorType problem_iterate(finestSize);
MatrixType problem_A;
VectorType problem_rhs(finestSize); stateUpdater->setup(tau);
VectorType problem_iterate(finestSize); timeSteppingScheme->setup(ell, tau, time,
problem_rhs, problem_iterate, problem_A);
stateUpdater->setup(tau);
timeSteppingScheme->setup(ell, tau, time, VectorType u_saved;
problem_rhs, problem_iterate, problem_A); for (size_t state_fpi = 1; state_fpi <= state_fpi_max; ++state_fpi) {
<<setupAndSolveProblem>>;
VectorType u_saved;
for (size_t state_fpi = 1; state_fpi <= state_fpi_max; ++state_fpi) { timeSteppingScheme->postProcess(problem_iterate);
<<setupAndSolveProblem>>; timeSteppingScheme->extractDisplacement(u);
timeSteppingScheme->extractVelocity(ud);
timeSteppingScheme->postProcess(problem_iterate);
timeSteppingScheme->extractDisplacement(u); stateUpdater->solve(ud);
timeSteppingScheme->extractVelocity(ud); stateUpdater->extractState(alpha);
stateUpdater->solve(ud); <<printInnerProgress>>;
stateUpdater->extractState(alpha); if (state_fpi > 1 && energyNorm.diff(u_saved, u)
< parset.get<double>("solver.tnnmg.fixed_point_tolerance"))
<<printInnerProgress>>; break;
if (state_fpi > 1 && energyNorm.diff(u_saved, u) else
< parset.get<double>("solver.tnnmg.fixed_point_tolerance")) u_saved = u;
break;
else if (state_fpi == state_fpi_max)
u_saved = u; std::cerr << "[ref = " << refinements
<< "]: FPI did not converge after "
if (state_fpi == state_fpi_max) << state_fpi_max << " iterations" << std::endl;
std::cerr << "[ref = " << refinements
<< "]: FPI did not converge after "
<< state_fpi_max << " iterations" << std::endl;
}
<<printOuterProgress>>;
} }
<<printOuterProgress>>;
<<writeData>>; <<writeData>>;
<<assembleAndWriteStress>>; <<assembleAndWriteStress>>;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment