Adapt to recent changes in CarpetLib: grid function shapes do not any

Adapt to recent changes in CarpetLib: grid function shapes do not any
more have ghost zones added at the outer boundaries.

darcs-hash:20021014184135-07bb3-3b2aa6bb31f3dd61d83d95dddd135715d2e98cb4.gz

3 files changed, 17 insertions, 14 deletions

diff --git a/Carpet/Carpet/src/Comm.cc b/Carpet/Carpet/src/Comm.cc
index 02855bc5b..8504947b0 100644
--- a/Carpet/Carpet/src/Comm.cc
+++ b/Carpet/Carpet/src/Comm.cc
@@ -9,7 +9,7 @@
 
 #include "carpet.hh"
 
-static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/Comm.cc,v 1.12 2002/10/12 13:02:52 schnetter Exp $";
+static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/Comm.cc,v 1.13 2002/10/14 20:41:35 schnetter Exp $";
 
 CCTK_FILEVERSION(Carpet_Comm_cc)
 
@@ -23,7 +23,13 @@ namespace Carpet {
   
   int SyncGroup (cGH* cgh, const char* groupname)
   {
-    if (hh->local_components(reflevel) > 1) assert (component == -1);
+    if (hh->local_components(reflevel) != 1 && component != -1) {
+      CCTK_VWarn (0, __LINE__, __FILE__, CCTK_THORNSTRING,
+		  "Cannot synchronise in local mode "
+		  "(Tried to synchronise group \"%s\")",
+		  groupname);
+    }
+    if (hh->local_components(reflevel) != 1) assert (component == -1);
     
     Checkpoint ("%*sSyncGroup %s", 2*reflevel, "", groupname);
     
diff --git a/Carpet/Carpet/src/SetupGH.cc b/Carpet/Carpet/src/SetupGH.cc
index 9704b8743..77cdad6a8 100644
--- a/Carpet/Carpet/src/SetupGH.cc
+++ b/Carpet/Carpet/src/SetupGH.cc
@@ -18,7 +18,7 @@
 
 #include "carpet.hh"
 
-static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/SetupGH.cc,v 1.32 2002/09/25 19:55:06 schnetter Exp $";
+static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/SetupGH.cc,v 1.33 2002/10/14 20:41:35 schnetter Exp $";
 
 CCTK_FILEVERSION(Carpet_SetupGH_cc)
 
@@ -78,8 +78,8 @@ namespace Carpet {
     }
     
     const vect<int,dim> str(stride);
-    const vect<int,dim> lb(lghosts * str);
-    const vect<int,dim> ub((npoints - ughosts - 1) * str);
+    const vect<int,dim> lb(0);
+    const vect<int,dim> ub((npoints - 1) * str);
     
     const bbox<int,dim> baseext(lb, ub, str);
     
@@ -157,8 +157,8 @@ namespace Carpet {
 	  sizes[dim-1] = (sizes[dim-1] - 2*ghostsizes[dim-1]) * CCTK_nProcs(cgh) + 2*ghostsizes[dim-1];
 	}
 	
-	const vect<int,dim> alb(ghostsizes);
-	const vect<int,dim> aub(sizes-ghostsizes-1);
+	const vect<int,dim> alb(0);
+	const vect<int,dim> aub(sizes-1);
 	const vect<int,dim> astr(1);
 	const bbox<int,dim> arrext(alb, aub, astr);
 	
diff --git a/Carpet/Carpet/src/helpers.cc b/Carpet/Carpet/src/helpers.cc
index 9c04879b8..bdb85575b 100644
--- a/Carpet/Carpet/src/helpers.cc
+++ b/Carpet/Carpet/src/helpers.cc
@@ -12,7 +12,7 @@
 
 #include "carpet.hh"
 
-static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/helpers.cc,v 1.25 2002/09/25 15:50:32 schnetter Exp $";
+static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/helpers.cc,v 1.26 2002/10/14 20:41:35 schnetter Exp $";
 
 CCTK_FILEVERSION(Carpet_helpers_cc)
 
@@ -224,15 +224,12 @@ namespace Carpet {
       assert (all(base.shape() % base.stride() == 0));
       assert (all((base.shape() / base.stride()) % mglevelfact == 0));
       vect<int,dim>::ref(cgh->cctk_gsh)
-	= (((base.shape() / base.stride() - 1) / mglevelfact
-	    + dd->lghosts + dd->ughosts)
-	   * reflevelfact + 1);
+	= (base.shape() / base.stride() - 1) / mglevelfact * reflevelfact + 1;
       for (int group=0; group<CCTK_NumGroups(); ++group) {
 	const bbox<int,dim>& base = arrdata[group].hh->baseextent;
 	vect<int,dim>::ref((int*)arrdata[group].info.gsh)
-	  = (((base.shape() / base.stride() - 1) / mglevelfact
-	      + arrdata[group].dd->lghosts + arrdata[group].dd->ughosts)
-	     * reflevelfact + 1);
+	  = ((base.shape() / base.stride() - 1)
+	     / mglevelfact * reflevelfact + 1);
       }
       
     } // if mglevel != -1