aboutsummaryrefslogtreecommitdiff
path: root/Carpet
diff options
context:
space:
mode:
authorErik Schnetter <schnetter@cct.lsu.edu>2007-04-19 02:05:00 +0000
committerErik Schnetter <schnetter@cct.lsu.edu>2007-04-19 02:05:00 +0000
commitb3a634937c88805ee266ae4b1c817386981badc7 (patch)
tree2db002827908f5b09f606d3e1dd2016d09f534cb /Carpet
parentb5a5c6106691bddaf1775d471c667b993f85ece5 (diff)
Carpet: Various change to handling simulation time
Checkpoint and recover each level's simulation time. darcs-hash:20070419020537-dae7b-af93980a5f25527a4c9eed4ccb7693a56f13c190.gz
Diffstat (limited to 'Carpet')
-rw-r--r--Carpet/Carpet/src/Initialise.cc10
1 files changed, 7 insertions, 3 deletions
diff --git a/Carpet/Carpet/src/Initialise.cc b/Carpet/Carpet/src/Initialise.cc
index 95a0709e9..812195fdd 100644
--- a/Carpet/Carpet/src/Initialise.cc
+++ b/Carpet/Carpet/src/Initialise.cc
@@ -55,6 +55,10 @@ namespace Carpet {
do_meta_mode = true;
global_time = cctk_initial_time;
delta_time = 1.0;
+ for (int ml = 0; ml < mglevel; ++ ml) {
+ assert (leveltimes.at(ml).size() == 1);
+ leveltimes.at(ml).at(0) = global_time;
+ }
cctkGH->cctk_iteration = 0;
cctkGH->cctk_time = global_time;
@@ -75,7 +79,7 @@ namespace Carpet {
// Write grid structure to file
for (int m=0; m<maps; ++m) {
- OutputGridStructure (cctkGH, m, vhh.at(m)->regions());
+ OutputGridStructure (cctkGH, m, vhh.at(m)->regions);
} // for m
CallSetup (cctkGH);
@@ -162,7 +166,7 @@ namespace Carpet {
do_global_mode = reflevel==0; // on first iteration, coarsest grid
do_meta_mode = do_global_mode and mglevel==mglevels-1; // on first iteration, coarsest grid
- cctkGH->cctk_time = global_time;
+ // cctkGH->cctk_time = global_time;
Waypoint ("Recover I at iteration %d time %g%s%s",
cctkGH->cctk_iteration, (double)cctkGH->cctk_time,
@@ -248,7 +252,7 @@ namespace Carpet {
do_global_mode = reflevel==0; // on first iteration, coarsest grid
do_meta_mode = do_global_mode and mglevel==mglevels-1; // on first iteration, coarsest grid
- cctkGH->cctk_time = global_time;
+ // cctkGH->cctk_time = global_time;
Waypoint ("Initialisation I at iteration %d time %g%s%s",
cctkGH->cctk_iteration, (double)cctkGH->cctk_time,