From 15e6579329f5a4b37177277e7f3e7d5d4e94fee8 Mon Sep 17 00:00:00 2001
From: Elias Pipping <elias.pipping@fu-berlin.de>
Date: Sat, 5 Jul 2014 20:41:46 +0200
Subject: [PATCH] [Cleanup] Do not reuse the variable ell
---
src/sand-wedge.cc | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/sand-wedge.cc b/src/sand-wedge.cc
index 52cd4665..c29a0f48 100644
--- a/src/sand-wedge.cc
+++ b/src/sand-wedge.cc
@@ -200,8 +200,8 @@ int main(int argc, char *argv[]) {
_relativeTime);
_ell += gravityFunctional;
};
- Vector ell(leafVertexCount);
- computeExternalForces(0.0, ell);
+ Vector ell0(leafVertexCount);
+ computeExternalForces(0.0, ell0);
// {{{ Initial conditions
using LinearFactory = SolverFactory<
@@ -237,7 +237,7 @@ int main(int argc, char *argv[]) {
// Solve the stationary problem
Vector u_initial(leafVertexCount);
u_initial = 0.0;
- solveLinearProblem(dirichletNodes, A, ell, u_initial, ANorm,
+ solveLinearProblem(dirichletNodes, A, ell0, u_initial, ANorm,
parset.sub("u0.solver"));
Vector ur_initial(leafVertexCount);
ur_initial = 0.0;
@@ -267,7 +267,7 @@ int main(int argc, char *argv[]) {
Vector a_initial(leafVertexCount);
a_initial = 0.0;
{
- // We solve Ma = ell - [Au + Cv + Psi(v)]
+ // We solve Ma = ell0 - [Au + Cv + Psi(v)]
Vector accelerationRHS(leafVertexCount);
{
accelerationRHS = 0.0;
@@ -276,7 +276,7 @@ int main(int argc, char *argv[]) {
// NOTE: We assume differentiability of Psi at 0 here!
myGlobalFriction->addGradient(v_initial, accelerationRHS);
accelerationRHS *= -1.0;
- accelerationRHS += ell;
+ accelerationRHS += ell0;
}
solveLinearProblem(noNodes, M, accelerationRHS, a_initial, MNorm,
parset.sub("a0.solver"));
@@ -376,6 +376,7 @@ int main(int argc, char *argv[]) {
timeSteppingScheme->nextTimeStep();
auto const relativeTime = double(timeStep) / double(timeSteps);
+ Vector ell(leafVertexCount);
computeExternalForces(relativeTime, ell);
Matrix velocityMatrix;
--
GitLab