From 7b8d9318d9e5983ab5bfceb16d8726428ff39ace Mon Sep 17 00:00:00 2001
From: Elias Pipping <elias.pipping@fu-berlin.de>
Date: Sun, 6 Jul 2014 19:50:21 +0200
Subject: [PATCH] [Algorit] Use a different mixed energy norm
---
src/sand-wedge.cc | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/sand-wedge.cc b/src/sand-wedge.cc
index db6fc471..ef458948 100644
--- a/src/sand-wedge.cc
+++ b/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;
--
GitLab