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, 46 insertions, 23 deletions

diff --git a/Carpet/Carpet/src/CallFunction.cc b/Carpet/Carpet/src/CallFunction.cc
index f668be304..e06a8669d 100644
--- a/Carpet/Carpet/src/CallFunction.cc
+++ b/Carpet/Carpet/src/CallFunction.cc
@@ -11,7 +11,7 @@
 #include "carpet.hh"
   
 extern "C" {
-  static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/CallFunction.cc,v 1.13 2003/08/10 21:59:51 schnetter Exp $";
+  static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/CallFunction.cc,v 1.14 2004/01/25 14:57:27 schnetter Exp $";
   CCTK_FILEVERSION(Carpet_Carpet_CallFunction_cc);
 }
 
@@ -27,51 +27,74 @@ namespace Carpet {
                     cFunctionData* attribute, ///< attributes of the function
                     void* data) ///< ???
   {
-//     Checkpoint ("%*sStarting CallFunction...", 2*reflevel, "");
+//     Checkpoint ("Starting CallFunction...");
     
     cGH* cgh = (cGH*)data;
     
-    if (attribute->global || reflevel==-1) {
+// TODO: disable temporarily
+//    if (attribute->meta || is_meta_mode()) {
+    if (is_meta_mode()) {
+      // Convtest operation
+      
+      if (do_meta_mode) {
+        assert (is_meta_mode());
+        Checkpoint ("Meta mode call at %s to %s::%s",
+                    attribute->where, attribute->thorn, attribute->routine);
+        const int res = CCTK_CallFunction (function, attribute, data);
+        assert (res==0);
+      }
+      
+    } else if (attribute->global || is_global_mode()) {
       // Global operation: call once
       
       if (do_global_mode) {
-        assert (component == -1);
-        const int saved_mglevel = mglevel;
-        if (mglevel!=-1) set_mglevel (cgh, -1);
-        const int saved_reflevel = reflevel;
-        if (reflevel!=-1) set_reflevel (cgh, -1);
         Checkpoint ("Global mode call at %s to %s::%s",
                     attribute->where, attribute->thorn, attribute->routine);
-        const int res = CCTK_CallFunction (function, attribute, data);
-        assert (res==0);
-        if (reflevel!=saved_reflevel) set_reflevel (cgh, saved_reflevel);
-        if (mglevel!=saved_mglevel) set_mglevel (cgh, saved_mglevel);
+        BEGIN_GLOBAL_MODE(cgh) {
+          const int res = CCTK_CallFunction (function, attribute, data);
+          assert (res==0);
+        } END_GLOBAL_MODE;
       }
       
     } else if (attribute->level) {
       // Level operation: call once per refinement level
       
-      Checkpoint ("%*sLevel mode call at %s to %s::%s", 2*reflevel, "",
+      Checkpoint ("Level mode call at %s to %s::%s",
                   attribute->where, attribute->thorn, attribute->routine);
       const int res = CCTK_CallFunction (function, attribute, data);
       assert (res==0);
       
+// TODO: disable temporarily
+//    } else if (attribute->singlemap) {
+    } else if (false) {
+      // Single map operation: call once per refinement level and map
+      
+      BEGIN_MAP_LOOP(cgh, CCTK_GF) {
+        
+        Checkpoint ("Singlemap mode call at %s to %s::%s",
+                    attribute->where, attribute->thorn, attribute->routine);
+        const int res = CCTK_CallFunction (function, attribute, data);
+        assert (res==0);
+        
+      }	END_MAP_LOOP;
+      
     } else {
       // Local operation: call once per component
       
-      BEGIN_LOCAL_COMPONENT_LOOP(cgh, CCTK_GF) {
-	
-	Checkpoint ("%*sLocal mode call on component %d at %s to %s::%s",
-                    2*reflevel, "", component,
-                    attribute->where, attribute->thorn, attribute->routine);
-	const int res = CCTK_CallFunction (function, attribute, data);
-	assert (res==0);
-	
-      }	END_LOCAL_COMPONENT_LOOP;
+      BEGIN_MAP_LOOP(cgh, CCTK_GF) {
+        BEGIN_LOCAL_COMPONENT_LOOP(cgh, CCTK_GF) {
+          
+          Checkpoint ("Local mode call at %s to %s::%s",
+                      attribute->where, attribute->thorn, attribute->routine);
+          const int res = CCTK_CallFunction (function, attribute, data);
+          assert (res==0);
+          
+        } END_LOCAL_COMPONENT_LOOP;
+      }	END_MAP_LOOP;
       
     }
     
-//     Checkpoint ("%*sdone with CallFunction.", 2*reflevel, "");
+//     Checkpoint ("done with CallFunction.");
     
     // The return value indicates whether the grid functions have been
     // synchronised.