diff options
| author | cott <schnetter@cct.lsu.edu> | 2006-11-24 08:10:00 +0000 |
|---|---|---|
| committer | cott <schnetter@cct.lsu.edu> | 2006-11-24 08:10:00 +0000 |
| commit | 13d25a1559907678975eaaa6ffaeb52eeb437a5a (patch) | |
| tree | 4fe5d5c17057aa478f12a1be5c8c368863c6683a /Carpet/CarpetRegrid/src | |
| parent | 8efe00ed0b9af14b82e417c18940d489e90d09cd (diff) | |
CarpetRegrid: Fix logic that decides when to do regridding.
Recently, Erik has changed Carpet/src/Evolve.cc.
Importantly, the way CarpetRegrid is called changed.
In order for
CarpetRegrid::activate_levels_on_regrid = "fixed"
to work properly again, the logic in CarpetRegrid needed a small modification.
darcs-hash:20061124081044-34d71-f910ed86a0e4bc8e4d754e2b0949ee9821ae891b.gz
Diffstat (limited to 'Carpet/CarpetRegrid/src')
| -rw-r--r-- | Carpet/CarpetRegrid/src/regrid.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Carpet/CarpetRegrid/src/regrid.cc b/Carpet/CarpetRegrid/src/regrid.cc index b2b91709c..7ab7d85c7 100644 --- a/Carpet/CarpetRegrid/src/regrid.cc +++ b/Carpet/CarpetRegrid/src/regrid.cc @@ -53,7 +53,8 @@ namespace CarpetRegrid { // Return if we want to regrid regularly, but not at this time if (regrid_every > 0 and cctkGH->cctk_iteration != 0 - and (cctkGH->cctk_iteration-1) % regrid_every != 0) + and ( (cctkGH->cctk_iteration-1) % regrid_every != 0) or + ( (cctkGH->cctk_iteration-1) == 0 and regrid_every > 1 )) { return 0; } |