[Algorit] Use a different mixed energy norm

src/sand-wedge.cc

@@ -264,8 +264,6 @@ int main(int argc, char *argv[]) {
                                   body.getBulkViscosityField(), C);
     myAssembler.assembleMass(body.getDensityField(), M);
     EnergyNorm<Matrix, Vector> const ANorm(A), MNorm(M);
-    // Q: Does it make sense to weigh them in this manner?
-    SumNorm<Vector> const AMNorm(1.0, ANorm, 1.0, MNorm);
 
     ScalarMatrix frictionalBoundaryMass;
     myAssembler.assembleFrictionalBoundaryMass(frictionalBoundary,
@@ -449,12 +447,13 @@ int main(int argc, char *argv[]) {
       stateUpdater->setup(tau);
       velocityUpdater->setup(ell, tau, relativeTime, velocityRHS,
                              velocityIterate, velocityMatrix);
+      EnergyNorm<Matrix, Vector> const velocityMatrixNorm(velocityMatrix);
 
       FixedPointIterator<NonlinearFactory, StateUpdater<ScalarVector, Vector>,
                          TimeSteppingScheme<Vector, Matrix, Function, dims>>
       fixedPointIterator(factory, parset, myGlobalFriction);
       fixedPointIterator.run(stateUpdater, velocityUpdater, velocityMatrix,
-                             AMNorm, velocityRHS, velocityIterate);
+                             velocityMatrixNorm, velocityRHS, velocityIterate);
 
       Vector u, ur, vr;
       ScalarVector alpha;