Revert "Externalise some more"

This reverts commit 3c2fc4080e8af5ed4b17512914e6a7db866a11e6.

Conflicts:

	src/one-body-sample.org

src/one-body-sample.org

@@ -165,26 +165,6 @@
   if (parset.get<bool>("printProgress"))
     std::cerr << std::endl;
 #+end_src
-#+name: setupAndSolveProblem
-#+begin_src c++
-  {
-    auto myGlobalNonlinearity
-      = assemble_nonlinearity<MatrixType, VectorType>
-      (parset.sub("boundary.friction"), *nodalIntegrals, alpha,
-       surfaceNormalStress);
-  
-    MyConvexProblemType const myConvexProblem
-      (problem_A, *myGlobalNonlinearity, problem_rhs);
-    MyBlockProblemType myBlockProblem(parset, myConvexProblem);
-    auto multigridStep = mySolver.getSolver();
-    multigridStep->setProblem(problem_iterate, myBlockProblem);
-  
-    LoopSolver<VectorType> overallSolver
-      (multigridStep, parset.get<size_t>("solver.tnnmg.maxiterations"),
-       solver_tolerance, &energyNorm, verbosity, false); // absolute error
-    overallSolver.solve();
-  }
-#+end_src
 * Functions
 #+name: defineInitTimeStepper
 #+begin_src c++
@@ -414,7 +394,23 @@
       // displacement as a convergence criterion
       VectorType u_saved;
       for (size_t state_fpi = 1; state_fpi <= state_fpi_max; ++state_fpi) {
-        <<setupAndSolveProblem>>;
+        {
+          auto myGlobalNonlinearity
+            = assemble_nonlinearity<MatrixType, VectorType>
+            (parset.sub("boundary.friction"), *nodalIntegrals, alpha,
+             surfaceNormalStress);
+  
+          MyConvexProblemType const myConvexProblem
+            (problem_A, *myGlobalNonlinearity, problem_rhs);
+          MyBlockProblemType myBlockProblem(parset, myConvexProblem);
+          auto multigridStep = mySolver.getSolver();
+          multigridStep->setProblem(problem_iterate, myBlockProblem);
+  
+          LoopSolver<VectorType> overallSolver
+            (multigridStep, parset.get<size_t>("solver.tnnmg.maxiterations"),
+             solver_tolerance, &energyNorm, verbosity, false); // absolute error
+          overallSolver.solve();
+        }
   
         timeSteppingScheme->postProcess(problem_iterate);
         timeSteppingScheme->extractDisplacement(u);