CarpetRegrid2: Enforce regridding when the number of levels has changed

When using the movement_threshold parameters to regrid less often,
still regrid when the number of levels has changed, or when a region
has become active or inactive, or when the radius has changed
significantly.

darcs-hash:20070927164001-dae7b-d70720cb48753f0554f2301c4da2407d52ccb2f4.gz

1 files changed, 20 insertions, 5 deletions

diff --git a/Carpet/CarpetRegrid2/interface.ccl b/Carpet/CarpetRegrid2/interface.ccl
index dc688d24d..7b55ed523 100644
--- a/Carpet/CarpetRegrid2/interface.ccl
+++ b/Carpet/CarpetRegrid2/interface.ccl
@@ -78,16 +78,16 @@ CCTK_INT last_map "Last map at which there was a regridding at last_iteration"
 
 PUBLIC:
 
-CCTK_INT num_levels[10] TYPE=scalar
-{
-  num_levels
-} "Number of refinement levels"
-
 CCTK_INT active[10] TYPE=scalar
 {
   active
 } "Whether this centre is active"
 
+CCTK_INT num_levels[10] TYPE=scalar
+{
+  num_levels
+} "Number of refinement levels"
+
 CCTK_REAL positions[10] TYPE=scalar
 {
   position_x position_y position_z
@@ -100,7 +100,22 @@ CCTK_REAL radii[10] TYPE=array DIM=1 SIZE=30 DISTRIB=constant
 
 PRIVATE:
 
+CCTK_INT old_active[10] TYPE=scalar
+{
+  old_active
+} "Old whether this centre is active"
+
+CCTK_INT old_num_levels[10] TYPE=scalar
+{
+  old_num_levels
+} "Old number of refinement levels"
+
 CCTK_REAL old_positions[10] TYPE=scalar
 {
   old_position_x old_position_y old_position_z
 } "Old positions of refined regions"
+
+CCTK_REAL old_radii[10] TYPE=array DIM=1 SIZE=30 DISTRIB=constant
+{
+  old_radius
+} "Old radii of refined regions for each level"