aboutsummaryrefslogtreecommitdiff
path: root/Carpet/CarpetRegrid/src/regrid.cc
diff options
context:
space:
mode:
Diffstat (limited to 'Carpet/CarpetRegrid/src/regrid.cc')
-rw-r--r--Carpet/CarpetRegrid/src/regrid.cc11
1 files changed, 6 insertions, 5 deletions
diff --git a/Carpet/CarpetRegrid/src/regrid.cc b/Carpet/CarpetRegrid/src/regrid.cc
index 677ba3728..979b96f39 100644
--- a/Carpet/CarpetRegrid/src/regrid.cc
+++ b/Carpet/CarpetRegrid/src/regrid.cc
@@ -13,7 +13,7 @@
#include "regrid.hh"
extern "C" {
- static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetRegrid/src/regrid.cc,v 1.44 2004/05/29 19:42:19 schnetter Exp $";
+ static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetRegrid/src/regrid.cc,v 1.45 2004/05/31 19:04:00 schnetter Exp $";
CCTK_FILEVERSION(Carpet_CarpetRegrid_regrid_cc);
}
@@ -55,7 +55,8 @@ namespace CarpetRegrid {
// Return if we want to regrid regularly, but not at this time
if (regrid_every > 0 && cctkGH->cctk_iteration != 0
- && (cctkGH->cctk_iteration-1) % regrid_every != 0) {
+ && (cctkGH->cctk_iteration-1) % regrid_every != 0)
+ {
return 0;
}
@@ -131,10 +132,10 @@ namespace CarpetRegrid {
- // Return if this is not during initial data generation and if no
+ // Return if this is not during initial data generation, and if no
// change in the grid structure is desired
- if (cctkGH->cctk_iteration != 0 && keep_same_grid_structure) {
- return refinement_levels != oldnumlevels;
+ if (cctkGH->cctk_iteration != 0) {
+ if (keep_same_grid_structure) return refinement_levels != oldnumlevels;
}