diff options
| author | Erik Schnetter <schnetter@gmail.com> | 2012-09-27 22:28:50 -0400 |
|---|---|---|
| committer | Erik Schnetter <schnetter@gmail.com> | 2012-09-27 22:28:50 -0400 |
| commit | 57e512682d7dd8fd5e2b5b084ecbb1076a5bea12 (patch) | |
| tree | 65f350e2138a81b0549b864897ea067c67da0f5f /Carpet/Carpet | |
| parent | cec4ff4e2c8765d8a671f9355f68a3fb755517e4 (diff) | |
Carpet: Correct errors with adaptive time stepping
Diffstat (limited to 'Carpet/Carpet')
| -rw-r--r-- | Carpet/Carpet/src/Cycle.cc | 4 | ||||
| -rw-r--r-- | Carpet/Carpet/src/modes.cc | 10 |
2 files changed, 11 insertions, 3 deletions
diff --git a/Carpet/Carpet/src/Cycle.cc b/Carpet/Carpet/src/Cycle.cc index 79137ad4e..7e9bf0dd7 100644 --- a/Carpet/Carpet/src/Cycle.cc +++ b/Carpet/Carpet/src/Cycle.cc @@ -32,7 +32,9 @@ namespace Carpet { assert (timelevel == 0); tt->advance_time (mglevel, reflevel); - cctkGH->cctk_time = tt->get_time (mglevel, reflevel, timelevel); + if (not adaptive_stepsize) { + cctkGH->cctk_time = tt->get_time (mglevel, reflevel, timelevel); + } int errors = 0; diff --git a/Carpet/Carpet/src/modes.cc b/Carpet/Carpet/src/modes.cc index 7de113e10..12a36d3b0 100644 --- a/Carpet/Carpet/src/modes.cc +++ b/Carpet/Carpet/src/modes.cc @@ -78,6 +78,8 @@ namespace Carpet { void enter_global_mode (cGH * const cctkGH, int const ml) { + DECLARE_CCTK_PARAMETERS; + assert (is_meta_mode()); assert (ml>=0 and ml<mglevels); Checkpoint ("Entering global mode"); @@ -93,7 +95,9 @@ namespace Carpet { #endif // Set time delta - cctkGH->cctk_delta_time = delta_time * mglevelfact; + if (not adaptive_stepsize) { + cctkGH->cctk_delta_time = delta_time * mglevelfact; + } if (maps == 1) { // Set space delta for (int d=0; d<dim; ++d) { @@ -202,7 +206,9 @@ namespace Carpet { Checkpoint ("Leaving global mode"); // Unset time delta - cctkGH->cctk_delta_time = 0.0; + if (not adaptive_stepsize) { + cctkGH->cctk_delta_time = 0.0; + } if (maps == 1) { // Save and unset space delta for (int d=0; d<dim; ++d) { |