[Cleanup] Rename: velocityEnergyNorm -> AMNorm

src/one-body-sample.cc

@@ -329,7 +329,7 @@ int main(int argc, char *argv[]) {
                                    frictionalBoundaryMassMatrix);
     }
     // Q: Does it make sense to weigh them in this manner?
-    SumNorm<VectorType> const velocityEnergyNorm(1.0, ANorm, 1.0, MNorm);
+    SumNorm<VectorType> const AMNorm(1.0, ANorm, 1.0, MNorm);
 
     auto const nodalIntegrals = assemble_frictional<GridView, SmallVector>(
         leafView, p1Assembler, frictionalNodes);
@@ -458,8 +458,7 @@ int main(int argc, char *argv[]) {
 
       LoopSolver<VectorType> velocityProblemSolver(
           multigridStep, parset.get<size_t>("solver.tnnmg.maxiterations"),
-          solverTolerance, &velocityEnergyNorm, verbosity,
-          false); // absolute error
+          solverTolerance, &AMNorm, verbosity, false); // absolute error
 
       size_t iterationCounter;
       auto solveVelocityProblem = [&](VectorType &_problem_iterate,
@@ -511,7 +510,7 @@ int main(int argc, char *argv[]) {
           (std::cerr << '.').flush();
 
         if (state_fpi > 1) {
-          double const correctionNorm = velocityEnergyNorm.diff(u_saved, u);
+          double const correctionNorm = AMNorm.diff(u_saved, u);
           if (correctionNorm < fixedPointTolerance) {
             if (printProgress)
               (std::cerr << '#').flush();