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, 5 insertions, 3 deletions

diff --git a/Carpet/CarpetLib/src/dh.hh b/Carpet/CarpetLib/src/dh.hh
index 322f7bd5a..eaa6bcbc8 100644
--- a/Carpet/CarpetLib/src/dh.hh
+++ b/Carpet/CarpetLib/src/dh.hh
@@ -118,8 +118,9 @@ public:                         // should be readonly
   int inner_buffer_width;       // buffer inside refined grids
   i2vect buffers;               // buffer outside refined grids
   
-  mboxes boxes;
-  mbases bases;
+  mboxes boxes;                 // grid hierarchy
+  mbases bases;                 // bounding boxes around the grid
+                                // hierarchy
   
   list<ggf*> gfs;               // list of all grid functions
   
@@ -137,7 +138,8 @@ public:
   int prolongation_stencil_size () const;
   
   // Modifiers
-  void recompose (const bool do_prolongate);
+  void regrid ();
+  void recompose (const int rl, const bool do_prolongate);
   
   // Grid function management
   void add (ggf* f);