From 9682aa5170555b0479b2e24d82d3a6ee4c71026d Mon Sep 17 00:00:00 2001
From: Elias Pipping <elias.pipping@fu-berlin.de>
Date: Fri, 2 Nov 2012 11:53:03 +0100
Subject: [PATCH] Move declarations
---
src/one-body-sample.org | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/one-body-sample.org b/src/one-body-sample.org
index a4d6629a..39bd10a8 100644
--- a/src/one-body-sample.org
+++ b/src/one-body-sample.org
@@ -330,17 +330,13 @@
= assemble_frictional<GridType, GridView, SmallVector, P1Basis>
(leafView, p1Basis, frictionalNodes);
- // {{{ Initialise vectors
- VectorType u(finestSize); u = 0.0;
- VectorType ud(finestSize); ud = 0.0;
-
+ // {{{ Initial conditions
VectorType u_initial(finestSize); u_initial = 0.0;
VectorType ud_initial(finestSize); ud_initial = 0.0;
VectorType udd_initial(finestSize); udd_initial = 0.0;
SingletonVectorType alpha_initial(finestSize);
alpha_initial = parset.get<double>("boundary.friction.initial_log_state");
- SingletonVectorType alpha(alpha_initial);
// }}}
// Set up TNNMG solver
@@ -371,6 +367,11 @@
auto const state_fpi_max
= parset.get<size_t>("solver.tnnmg.fixed_point_iterations");
for (size_t run = 1; run <= timesteps; ++run) {
+ VectorType u;
+ VectorType ud;
+ SingletonVectorType alpha;
+ stateUpdater->extractState(alpha);
+
stateUpdater->nextTimeStep();
timeSteppingScheme->nextTimeStep();
--
GitLab