diff options
| author | Erik Schnetter <schnetter@cct.lsu.edu> | 2008-10-06 17:02:26 -0500 |
|---|---|---|
| committer | Erik Schnetter <schnetter@cct.lsu.edu> | 2008-10-06 17:02:26 -0500 |
| commit | f091cf09cc7b6dbc8284915a6b093a0a9f82e646 (patch) | |
| tree | a2598d4607e8ecffd037a7bd71455503e62602a8 /Carpet | |
| parent | 07b611483bfa651ff5368dd0c93c6fcc91e83782 (diff) | |
| parent | 1cf671bfa25d85f8eac4744b41a7e7f4ad1190c9 (diff) | |
Merge branch 'master' of carpetgit@carpetcode.dyndns.org:carpet
Diffstat (limited to 'Carpet')
| -rw-r--r-- | Carpet/Carpet/src/modes.cc | 12 | ||||
| -rw-r--r-- | Carpet/CarpetLib/src/vect.cc | 1 |
2 files changed, 9 insertions, 4 deletions
diff --git a/Carpet/Carpet/src/modes.cc b/Carpet/Carpet/src/modes.cc index 1b092aab9..ed012f20b 100644 --- a/Carpet/Carpet/src/modes.cc +++ b/Carpet/Carpet/src/modes.cc @@ -176,10 +176,11 @@ namespace Carpet { DECLARE_CCTK_PARAMETERS; assert (is_global_mode() or is_meta_mode()); - Checkpoint ("Leaving global mode"); if (mglevel == -1) return; // early return + Checkpoint ("Leaving global mode"); + // Save and unset time delta delta_time = cctkGH->cctk_delta_time / mglevelfact; cctkGH->cctk_delta_time = 0.0; @@ -286,10 +287,11 @@ namespace Carpet { DECLARE_CCTK_PARAMETERS; assert (is_level_mode() or is_global_mode()); - Checkpoint ("Leaving level mode"); if (reflevel == -1) return; // early return + Checkpoint ("Leaving level mode"); + // Save and unset current time assert (mglevel>=0 and mglevel<(int)leveltimes.size()); assert (reflevel>=0 and reflevel<(int)leveltimes.at(mglevel).size()); @@ -374,10 +376,11 @@ namespace Carpet { DECLARE_CCTK_PARAMETERS; assert (is_singlemap_mode() or is_level_mode()); - Checkpoint ("Leaving singlemap mode"); if (map == -1) return; // early return + Checkpoint ("Leaving singlemap mode"); + assert (mc_grouptype == CCTK_SCALAR or mc_grouptype == CCTK_ARRAY or mc_grouptype == CCTK_GF); @@ -538,9 +541,10 @@ namespace Carpet { DECLARE_CCTK_PARAMETERS; assert (is_local_mode() or is_singlemap_mode()); - Checkpoint ("Leaving local mode"); if (component == -1) return; // early return + + Checkpoint ("Leaving local mode"); if (mc_grouptype == CCTK_GF) { diff --git a/Carpet/CarpetLib/src/vect.cc b/Carpet/CarpetLib/src/vect.cc index 545b0d6d3..28eff14dc 100644 --- a/Carpet/CarpetLib/src/vect.cc +++ b/Carpet/CarpetLib/src/vect.cc @@ -55,6 +55,7 @@ template void vect<vect<bool,3>,2>::input (istream& is); template void vect<bool,2>::output (ostream& os) const; template void vect<bool,3>::output (ostream& os) const; +template void vect<CCTK_REAL,2>::output (ostream& os) const; template void vect<CCTK_REAL,3>::output (ostream& os) const; template void vect<vect<bool,2>,3>::output (ostream& os) const; template void vect<vect<int,2>,3>::output (ostream& os) const; |