Import the recently announced changes:

Import the recently announced changes:
1. Carpet has now an infrastructure for multiple maps (aka "grid
patches").  Instead of a single grid hierarchy there can now be
several.  This is largely untested, because the remainder of Cactus
cannot handle multiple coordinate systems.

2. The order in which the schedule bins are called has changed.  As Ian
Hawke pointed out, the previous order during time evolution was
inconsistent.  The initial data ordering did not allow for recovering
and was not usable for progressively solving elliptic equations for
initial data.

3. Carpet now supports convergence levels.  The convergence level
specifies by how many factors of two the resolution in the parameter
file should be coarsened (or refined, if negative).  This should make
convergence tests and test runs much easier.  It is, in principle, also
possible to run several convergence levels at once.  This has not been
tested because the remainder of Cactus cannot handle multiple
resolutions.  This will be necessary for a multigrid solver, and also
for having a shadow hierarchy to determine where to refine adaptively.

4. Carpet works together with the new CoordBase domain specification
parameters.  Without these, using convergence levels will lead to very
strange results.

5. The "modes" have changed.  There are now:
        meta mode:      the whole simulation
        global mode:    one convergence level
        level mode:     one refinement level
        singlemap mode: one map on one refinement level
        local mode:     as previously
The whole mode handling has been cleaned up.

6. The regridding thorn has been cleaned up.

7. The kind of prolongation stencil is now determined in Carpet, i.e. at
a fairly hight level, instead of in CarpetLib.

8. The low-order prolongation operators have been made much more
efficient (as have previously the higher-order ones).

9. Assorted smaller changes.

For Carpet users, there should be no major incompatibilities.  The major
improvements are 3 and 4 combined.  Here is an example:

CoordBase::domainsize    = extent
CoordBase::spacing       = gridspacing
CoordBase::zero_origin_x = yes
CoordBase::zero_origin_y = yes
CoordBase::zero_origin_z = yes
CoordBase::xextent       = 20.0
CoordBase::yextent       = 20.0
CoordBase::zextent       = 20.0
CoordBase::dx            = 1.0
CoordBase::dy            = 1.0
CoordBase::dz            = 1.0

CoordBase::boundary_shiftout_x_lower = 1
CoordBase::boundary_shiftout_y_lower = 1
CoordBase::boundary_shiftout_z_lower = 1

Carpet::domain_from_coordbase   = yes
Carpet::convergence_level       = 0

grid::type         = coordbase
grid::domain       = octant
grid::avoid_origin = no

This gives you a grid that extends from the origin ("zero_origin") up to
20.0 with a grid spacing of 1.0.  Symmetry zones and boundary zones are
added automatically.  The "shiftout" says that there is no boundary
point on the origin.  The staggering parameters (not shown) default to
"no".  In order to change the resolution, only the convergence level
has to be adjusted.  Note that the old way of specifying the domain
extent still works.

For Carpet developers, one major change is the new mode handling.  As
described in 5, the looping macros (that loop over all refinement
levels, or all components) have changed.

darcs-hash:20040125135727-07bb3-51c9647c1b5080e7e180b52a1b81fa155cfd19e9.gz

1 files changed, 33 insertions, 17 deletions

diff --git a/Carpet/CarpetSlab/src/slab.cc b/Carpet/CarpetSlab/src/slab.cc
index d15f9d48d..deff045d7 100644
--- a/Carpet/CarpetSlab/src/slab.cc
+++ b/Carpet/CarpetSlab/src/slab.cc
@@ -1,4 +1,4 @@
-// $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetSlab/src/slab.cc,v 1.14 2004/01/22 13:31:07 tradke Exp $
+// $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetSlab/src/slab.cc,v 1.15 2004/01/25 14:57:31 schnetter Exp $
 
 #include <assert.h>
 #include <stdlib.h>
@@ -23,7 +23,7 @@
 #include "slab.hh"
 
 extern "C" {
-  static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetSlab/src/slab.cc,v 1.14 2004/01/22 13:31:07 tradke Exp $";
+  static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetSlab/src/slab.cc,v 1.15 2004/01/25 14:57:31 schnetter Exp $";
   CCTK_FILEVERSION(Carpet_CarpetSlab_slab_cc);
 }
 
@@ -110,10 +110,15 @@ namespace CarpetSlab {
     assert (typesize>0);
     
     if (gp.grouptype==CCTK_GF && reflevel==-1) {
-      CCTK_WARN (0, "It is not possible to use hyperslabbing for a grid function in global mode");
+      CCTK_WARN (0, "It is not possible to use hyperslabbing for a grid function in global mode (use singlemap mode instead)");
     }
     const int rl = gp.grouptype==CCTK_GF ? reflevel : 0;
     
+    if (gp.grouptype==CCTK_GF && Carpet::map==-1) {
+      CCTK_WARN (0, "It is not possible to use hyperslabbing for a grid function in level mode (use singlemap mode instead)");
+    }
+    const int m = gp.grouptype==CCTK_GF ? Carpet::map : 0;
+    
     // Check dimension
     assert (hdim>=0 && hdim<=gp.dim);
     
@@ -152,12 +157,12 @@ namespace CarpetSlab {
     const dh<dim>* mydd;
     const ggf<dim>* myff;
     assert (group < (int)arrdata.size());
-    myhh = arrdata[group].hh;
+    myhh = arrdata[group][m].hh;
     assert (myhh);
-    mydd = arrdata[group].dd;
+    mydd = arrdata[group][m].dd;
     assert (mydd);
-    assert (var < (int)arrdata[group].data.size());
-    myff = arrdata[group].data[var];
+    assert (var < (int)arrdata[group][m].data.size());
+    myff = arrdata[group][m].data[var];
     assert (myff);
     
     // Detemine collecting processor
@@ -313,10 +318,15 @@ namespace CarpetSlab {
     assert (typesize>0);
     
     if (gp.grouptype==CCTK_GF && reflevel==-1) {
-      CCTK_WARN (0, "It is not possible to use hyperslabbing for a grid function in global mode");
+      CCTK_WARN (0, "It is not possible to use hyperslabbing for a grid function in global mode (use singlemap mode instead)");
     }
     const int rl = gp.grouptype==CCTK_GF ? reflevel : 0;
     
+    if (gp.grouptype==CCTK_GF && Carpet::map==-1) {
+      CCTK_WARN (0, "It is not possible to use hyperslabbing for a grid function in level mode (use singlemap mode instead)");
+    }
+    const int m = gp.grouptype==CCTK_GF ? Carpet::map : 0;
+    
     // Check dimension
     assert (hdim>=0 && hdim<=gp.dim);
     
@@ -355,12 +365,12 @@ namespace CarpetSlab {
     const dh<dim>* mydd;
     const ggf<dim>* myff;
     assert (group < (int)arrdata.size());
-    myhh = arrdata[group].hh;
+    myhh = arrdata[group][m].hh;
     assert (myhh);
-    mydd = arrdata[group].dd;
+    mydd = arrdata[group][m].dd;
     assert (mydd);
-    assert (var < (int)arrdata[group].data.size());
-    myff = arrdata[group].data[var];
+    assert (var < (int)arrdata[group][m].data.size());
+    myff = arrdata[group][m].data[var];
     assert (myff);
     
     // Detemine collecting processor
@@ -486,7 +496,7 @@ namespace CarpetSlab {
   
   
   
-  CCTK_INT CarpetSlab_Get (cGH const * const cctkGH,
+  CCTK_INT CarpetSlab_Get (CCTK_POINTER_TO_CONST const cctkGH_,
                            CCTK_INT const mapping_handle,
                            CCTK_INT const proc,
                            CCTK_INT const vindex,
@@ -494,6 +504,8 @@ namespace CarpetSlab {
                            CCTK_INT const hdatatype,
                            void * const hdata)
   {
+    cGH const * const cctkGH = (cGH const *) cctkGH_;
+    
     // Check arguments
     assert (cctkGH);
     assert (mapping_handle>=0);
@@ -526,7 +538,7 @@ namespace CarpetSlab {
   
   
   
-  CCTK_INT CarpetSlab_GetList (cGH const * const cctkGH,
+  CCTK_INT CarpetSlab_GetList (CCTK_POINTER_TO_CONST const cctkGH_,
                                CCTK_INT const mapping_handle,
                                CCTK_INT const num_arrays,
                                CCTK_INT const * const procs,
@@ -536,6 +548,8 @@ namespace CarpetSlab {
                                void * const * const hdata,
                                CCTK_INT * const retvals)
   {
+    cGH const * const cctkGH = (cGH const *) cctkGH_;
+    
     // Check arguments
     assert (cctkGH);
     assert (mapping_handle>=0);
@@ -564,7 +578,7 @@ namespace CarpetSlab {
   
   
   
-  CCTK_INT CarpetSlab_LocalMappingByIndex (cGH const * const cctkGH,
+  CCTK_INT CarpetSlab_LocalMappingByIndex (CCTK_POINTER_TO_CONST const cctkGH_,
                                            CCTK_INT const vindex,
                                            CCTK_INT const hdim,
                                            CCTK_INT const * const direction,
@@ -589,7 +603,7 @@ namespace CarpetSlab {
   
   
   
-  CCTK_INT CarpetSlab_GlobalMappingByIndex (cGH const * const cctkGH,
+  CCTK_INT CarpetSlab_GlobalMappingByIndex (CCTK_POINTER_TO_CONST const cctkGH_,
                                             CCTK_INT const vindex,
                                             CCTK_INT const hdim,
                                             CCTK_INT const * const direction,
@@ -606,6 +620,8 @@ namespace CarpetSlab {
                                                                               void * const to),
                                             CCTK_INT * const hsize)
   {
+    cGH const * const cctkGH = (cGH const *) cctkGH_;
+    
     // Check arguments
     assert (cctkGH);
     assert (vindex>=0 && vindex<CCTK_NumVars());
@@ -751,7 +767,7 @@ namespace CarpetSlab {
   
   
   
-  int Hyperslab_GetHyperslab (cGH* const GH,
+  int Hyperslab_GetHyperslab (const cGH* const GH,
 			      const int target_proc,
 			      const int vindex,
 			      const int vtimelvl,