From 41c7ab83fbae736a1c003d51bf4db13a12d3fa86 Mon Sep 17 00:00:00 2001
From: Elias Pipping <elias.pipping@fu-berlin.de>
Date: Tue, 30 Oct 2012 14:35:17 +0100
Subject: [PATCH] Kill superfluous braces and indentation
---
src/one-body-sample.org | 81 ++++++++++++++++++++---------------------
1 file changed, 40 insertions(+), 41 deletions(-)
diff --git a/src/one-body-sample.org b/src/one-body-sample.org
index ab8164bf..6055ddd2 100644
--- a/src/one-body-sample.org
+++ b/src/one-body-sample.org
@@ -485,49 +485,48 @@
auto const state_fpi_max
= parset.get<size_t>("solver.tnnmg.fixed_point_iterations");
for (size_t run = 1; run <= timesteps; ++run) {
+ stateUpdater->nextTimeStep();
+ timeSteppingScheme->nextTimeStep();
+
double const time = tau * run;
- {
- stateUpdater->nextTimeStep();
- timeSteppingScheme->nextTimeStep();
-
- VectorType ell(finestSize);
- assemble_neumann<GridType, GridView, SmallVector, P1Basis>
- (leafView, p1Basis, neumannNodes, ell, neumannFunction, time);
- ell += gravityFunctional;
-
- MatrixType problem_A;
- VectorType problem_rhs(finestSize);
- VectorType problem_iterate(finestSize);
-
- stateUpdater->setup(tau);
- timeSteppingScheme->setup(ell, tau, time,
- problem_rhs, problem_iterate, problem_A);
-
- VectorType u_saved;
- for (size_t state_fpi = 1; state_fpi <= state_fpi_max; ++state_fpi) {
- <<setupAndSolveProblem>>;
-
- timeSteppingScheme->postProcess(problem_iterate);
- timeSteppingScheme->extractDisplacement(u);
- timeSteppingScheme->extractVelocity(ud);
-
- stateUpdater->solve(ud);
- stateUpdater->extractState(alpha);
-
- <<printInnerProgress>>;
- if (state_fpi > 1 && energyNorm.diff(u_saved, u)
- < parset.get<double>("solver.tnnmg.fixed_point_tolerance"))
- break;
- else
- u_saved = u;
-
- if (state_fpi == state_fpi_max)
- std::cerr << "[ref = " << refinements
- << "]: FPI did not converge after "
- << state_fpi_max << " iterations" << std::endl;
- }
- <<printOuterProgress>>;
+
+ VectorType ell(finestSize);
+ assemble_neumann<GridType, GridView, SmallVector, P1Basis>
+ (leafView, p1Basis, neumannNodes, ell, neumannFunction, time);
+ ell += gravityFunctional;
+
+ MatrixType problem_A;
+ VectorType problem_rhs(finestSize);
+ VectorType problem_iterate(finestSize);
+
+ stateUpdater->setup(tau);
+ timeSteppingScheme->setup(ell, tau, time,
+ problem_rhs, problem_iterate, problem_A);
+
+ VectorType u_saved;
+ for (size_t state_fpi = 1; state_fpi <= state_fpi_max; ++state_fpi) {
+ <<setupAndSolveProblem>>;
+
+ timeSteppingScheme->postProcess(problem_iterate);
+ timeSteppingScheme->extractDisplacement(u);
+ timeSteppingScheme->extractVelocity(ud);
+
+ stateUpdater->solve(ud);
+ stateUpdater->extractState(alpha);
+
+ <<printInnerProgress>>;
+ if (state_fpi > 1 && energyNorm.diff(u_saved, u)
+ < parset.get<double>("solver.tnnmg.fixed_point_tolerance"))
+ break;
+ else
+ u_saved = u;
+
+ if (state_fpi == state_fpi_max)
+ std::cerr << "[ref = " << refinements
+ << "]: FPI did not converge after "
+ << state_fpi_max << " iterations" << std::endl;
}
+ <<printOuterProgress>>;
<<writeData>>;
<<assembleAndWriteStress>>;
--
GitLab