diff options
| author | bzink <> | 2004-06-02 05:11:00 +0000 |
|---|---|---|
| committer | bzink <> | 2004-06-02 05:11:00 +0000 |
| commit | 536cfeb8995147e7cc5b459178661ae6f9b6f3b9 (patch) | |
| tree | 2e548add5808dc13cb730037c32b9ce00cb9696e | |
| parent | 02eb4523ffa14893d9501a927349c23bef2a564f (diff) | |
Added boolean parameter checkpoint_recovery to Regrid() to change its
behaviour under recovery situations. The default is false.
darcs-hash:20040602051122-5b8bb-626da2ff2833f25e7fb9624ecb1afc282d12d154.gz
| -rw-r--r-- | Carpet/Carpet/src/Recompose.cc | 7 | ||||
| -rw-r--r-- | Carpet/Carpet/src/carpet.hh | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/Carpet/Carpet/src/Recompose.cc b/Carpet/Carpet/src/Recompose.cc index e51e5cd32..dfd1d0ee1 100644 --- a/Carpet/Carpet/src/Recompose.cc +++ b/Carpet/Carpet/src/Recompose.cc @@ -27,7 +27,7 @@ #include "modes.hh" extern "C" { - static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/Recompose.cc,v 1.65 2004/04/22 14:16:16 schnetter Exp $"; + static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/Recompose.cc,v 1.66 2004/06/02 07:11:22 bzink Exp $"; CCTK_FILEVERSION(Carpet_Carpet_Recompose_cc); } @@ -119,7 +119,7 @@ namespace Carpet { - void Regrid (const cGH* cgh) + void Regrid (const cGH* cgh, bool checkpoint_recovery) { assert (is_level_mode()); @@ -139,7 +139,8 @@ namespace Carpet { gh<dim>::rprocs pss = vhh.at(map)->processors; // Check whether to recompose - CCTK_INT const do_recompose = Carpet_Regrid (cgh, &bbsss, &obss, &pss); + CCTK_INT const do_recompose = Carpet_Regrid (cgh, &bbsss, &obss, &pss, + checkpoint_recovery); assert (do_recompose >= 0); if (do_recompose) { diff --git a/Carpet/Carpet/src/carpet.hh b/Carpet/Carpet/src/carpet.hh index 02924095c..b1912ea31 100644 --- a/Carpet/Carpet/src/carpet.hh +++ b/Carpet/Carpet/src/carpet.hh @@ -1,4 +1,4 @@ -// $Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/carpet.hh,v 1.28 2004/04/18 13:29:43 schnetter Exp $ +// $Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/carpet.hh,v 1.29 2004/06/02 07:11:22 bzink Exp $ #ifndef CARPET_HH #define CARPET_HH @@ -34,7 +34,7 @@ namespace Carpet { int CallFunction (void* function, cFunctionData* attribute, void* data); // Other functions - void Regrid (const cGH* cgh); + void Regrid (const cGH* cgh, bool checkpoint_recovery = false); void CycleTimeLevels (const cGH* cgh); void FlipTimeLevels (const cGH* cgh); void Restrict (const cGH* cgh); |