[Cleanup] Group declarations/assignments

src/one-body-sample.cc

@@ -257,8 +257,8 @@ int main(int argc, char *argv[]) {
           .toC<typename FunctionMap::Base>(functions);
     }
     auto const &velocityDirichletFunction =
-        functions.get("velocityDirichletCondition");
-    auto const &neumannFunction = functions.get("neumannCondition");
+                   functions.get("velocityDirichletCondition"),
+               &neumannFunction = functions.get("neumannCondition");
 
     // Set up normal stress, mass matrix, and gravity functional
     double normalStress;
@@ -451,12 +451,12 @@ int main(int argc, char *argv[]) {
           coordinateWriter << coordinates[i] << std::endl;
       coordinateWriter.close();
     }
-    std::fstream stateWriter("states", std::fstream::out);
-    std::fstream displacementWriter("displacements", std::fstream::out);
-    std::fstream velocityWriter("velocities", std::fstream::out);
-    std::fstream coefficientWriter("coefficients", std::fstream::out);
-    std::fstream iterationWriter("iterations", std::fstream::out);
-    std::fstream relaxationWriter("relaxation", std::fstream::out);
+    std::fstream stateWriter("states", std::fstream::out),
+        displacementWriter("displacements", std::fstream::out),
+        velocityWriter("velocities", std::fstream::out),
+        coefficientWriter("coefficients", std::fstream::out),
+        iterationWriter("iterations", std::fstream::out),
+        relaxationWriter("relaxation", std::fstream::out);
 
     auto timeSteppingScheme =
         initTimeStepper(parset.get<Config::scheme>("timeSteps.scheme"),
@@ -466,22 +466,22 @@ int main(int argc, char *argv[]) {
         parset.get<Config::stateModel>("boundary.friction.stateModel"),
         alpha_initial, frictionalNodes, frictionData);
 
-    auto const timesteps = parset.get<size_t>("timeSteps.number");
-    auto const tau = parset.get<double>("problem.finalTime") / timesteps;
-
     VectorType v = v_initial;
     SingletonVectorType alpha = alpha_initial;
-    auto const state_fpi_max = parset.get<size_t>("v.fpi.maximumIterations");
-    auto const fixedPointTolerance = parset.get<double>("v.fpi.tolerance");
-    auto const relaxation = parset.get<double>("v.fpi.relaxation");
-    auto const requiredReduction =
-        parset.get<double>("v.fpi.requiredReduction");
+
+    auto const timesteps = parset.get<size_t>("timeSteps.number"),
+               state_fpi_max = parset.get<size_t>("v.fpi.maximumIterations"),
+               maximumIterations =
+                   parset.get<size_t>("v.solver.maximumIterations");
+    auto const tau = parset.get<double>("problem.finalTime") / timesteps,
+               tolerance = parset.get<double>("v.solver.tolerance"),
+               fixedPointTolerance = parset.get<double>("v.fpi.tolerance"),
+               relaxation = parset.get<double>("v.fpi.relaxation"),
+               requiredReduction =
+                   parset.get<double>("v.fpi.requiredReduction");
     auto const printProgress = parset.get<bool>("io.printProgress");
     auto const verbosity =
         parset.get<Solver::VerbosityMode>("v.solver.verbosity");
-    auto const maximumIterations =
-        parset.get<size_t>("v.solver.maximumIterations");
-    auto const tolerance = parset.get<double>("v.solver.tolerance");
     for (size_t run = 1; run <= timesteps; ++run) {
       VectorType u;
       double lastCorrection;