CarpetLib: Split recompose functions into regrid and recompose

Split recompose functions into two stages, regrid and recompose.  The
first stage, regrid, changes the grid structure in the gh and dh
classes.  The second stage, recompose, changes the values of the
actual grid functions, i.e., changes the gf<T> and data<T> objects.
The second stage has to be called individually for every refinement
level.

This is necessary since the boundary conditions need to be applied
after recomposing one refinement level, before the next fine
refinement level can be recomposed.

darcs-hash:20060904230433-dae7b-3ba1982460f57b34da11a6fbb6b4b524dc5b348f.gz

1 files changed, 24 insertions, 20 deletions

diff --git a/Carpet/CarpetLib/param.ccl b/Carpet/CarpetLib/param.ccl
index 54501823e..1a064d0bb 100644
--- a/Carpet/CarpetLib/param.ccl
+++ b/Carpet/CarpetLib/param.ccl
@@ -16,14 +16,14 @@ BOOLEAN barriers "Insert barriers at strategic places for debugging purposes (sl
 
 
 
-BOOLEAN poison_new_memory "Try to catch uninitialised data by setting newly allocated memory to values that will catch your attention" STEERABLE=always
+BOOLEAN omit_prolongation_points_when_restricting "Do not restrict to points which are used to prolongate the boundary" STEERABLE=always
 {
 } "no"
 
-CCTK_INT poison_value "Integer value (0..255) used to poison new timelevels (with memset)" STEERABLE=always
+INT proper_nesting_distance "Minimum distance (in grid points) between two level interfaces" STEERABLE=always
 {
-  0:255 :: "Must fit into a byte.  Use 0 for zero, 255 for nan, and e.g. 113 for a large value."
-} 255
+  0:* :: "any non-negative value is fine; the default value is just a guess"
+} 4
 
 
 
@@ -31,34 +31,28 @@ BOOLEAN output_bboxes "Output bounding box information to the screen" STEERABLE=
 {
 } "no"
 
-BOOLEAN print_timestats "Print timing statistics at every iteration" STEERABLE=always
-{
-} "no"
 
-INT print_timestats_every "Print timing statistics periodically" STEERABLE=always
-{
-  0   :: "don't report"
-  1:* :: "report every so many iterations"
-} 0
 
-BOOLEAN save_memory_during_regridding "Save some memory during regridding at the expense of speed" STEERABLE=always
+BOOLEAN poison_new_memory "Try to catch uninitialised data by setting newly allocated memory to values that will catch your attention" STEERABLE=always
 {
-} "yes"
+} "no"
 
-BOOLEAN fast_recomposing "Take shortcuts during recomposing (EXPERIMENTAL)" STEERABLE=always
+CCTK_INT poison_value "Integer value (0..255) used to poison new timelevels (with memset)" STEERABLE=always
 {
-} "no"
+  0:255 :: "Must fit into a byte.  Use 0 for zero, 255 for nan, and e.g. 113 for a large value."
+} 255
 
 
 
-BOOLEAN omit_prolongation_points_when_restricting "Do not restrict to points which are used to prolongate the boundary" STEERABLE=always
+BOOLEAN print_timestats "Print timing statistics at every iteration" STEERABLE=always
 {
 } "no"
 
-INT proper_nesting_distance "Minimum distance (in grid points) between two level interfaces" STEERABLE=always
+INT print_timestats_every "Print timing statistics periodically" STEERABLE=always
 {
-  0:* :: "any non-negative value is fine; the default value is just a guess"
-} 4
+  0   :: "don't report"
+  1:* :: "report every so many iterations"
+} 0
 
 
 
@@ -80,6 +74,8 @@ STRING memstat_file "File name in which memstat output is collected (because std
   "^.+$" :: "file name"
 } "carpetlib-memory-statistics"
 
+
+
 SHARES: IO
 
 USES STRING out_dir
@@ -117,3 +113,11 @@ BOOLEAN use_collective_communication_buffers "Use collective buffers for MPI com
 BOOLEAN minimise_outstanding_communications "Minimise the number of Isend/Irecv operations that are submitted concurrently -- DEPRECATED - DO NOT USE ANYMORE" STEERABLE=always
 {
 } "no"
+
+BOOLEAN save_memory_during_regridding "Save some memory during regridding at the expense of speed -- DEPRECATED - DO NOT USE ANYMORE" STEERABLE=always
+{
+} "yes"
+
+BOOLEAN fast_recomposing "Take shortcuts during recomposing -- DEPRECATED - DO NOT USE ANYMORE" STEERABLE=always
+{
+} "no"