Don't set too many array elements in the cGroupDynamicData structure.

darcs-hash:20030512114805-07bb3-f1dad12750ff3b9c98d89cd98714c3550efb308b.gz

2 files changed, 10 insertions, 7 deletions

diff --git a/Carpet/Carpet/src/SetupGH.cc b/Carpet/Carpet/src/SetupGH.cc
index 3c109f352..d54e9f88a 100644
--- a/Carpet/Carpet/src/SetupGH.cc
+++ b/Carpet/Carpet/src/SetupGH.cc
@@ -19,7 +19,7 @@
 #include "carpet.hh"
 
 extern "C" {
-  static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/SetupGH.cc,v 1.41 2003/05/08 15:35:49 schnetter Exp $";
+  static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/SetupGH.cc,v 1.42 2003/05/12 13:48:05 schnetter Exp $";
   CCTK_FILEVERSION(Carpet_Carpet_SetupGH_cc);
 }
 
@@ -361,7 +361,7 @@ namespace Carpet {
         const vect<vect<bool,2>,dim>& obnds = arrdata[group].hh->outer_boundaries[rl][c];
 	const bbox<int,dim>& ext  = arrdata[group].dd->boxes[rl][c][ml].exterior;
         
-        for (int d=0; d<dim; ++d) {
+        for (int d=0; d<arrdata[group].info.dim; ++d) {
           ((int*)arrdata[group].info.gsh )[d] = (base.shape() / base.stride())[d];
           ((int*)arrdata[group].info.lsh )[d] = (ext.shape() / ext.stride())[d];
           ((int*)arrdata[group].info.lbnd)[d] = (ext.lower() / ext.stride())[d];
@@ -370,8 +370,11 @@ namespace Carpet {
             ((int*)arrdata[group].info.bbox)[2*d+f] = obnds[d][f];
           }
           
-          assert (arrdata[group].info.lsh[d]>=0 && arrdata[group].info.lsh[d]<=arrdata[group].info.gsh[d]);
-          assert (arrdata[group].info.lbnd[d]>=0 && arrdata[group].info.ubnd[d]<arrdata[group].info.gsh[d]);
+          assert (arrdata[group].info.lsh[d]>=0
+                  && arrdata[group].info.lsh[d]<=arrdata[group].info.gsh[d]);
+          assert (arrdata[group].info.lbnd[d]>=0
+                  && arrdata[group].info.lbnd[d]<=arrdata[group].info.ubnd[d]
+                  && arrdata[group].info.ubnd[d]<arrdata[group].info.gsh[d]);
           assert (arrdata[group].info.ubnd[d]-arrdata[group].info.lbnd[d]+1 == arrdata[group].info.lsh[d]);
           assert (arrdata[group].info.lbnd[d]<=arrdata[group].info.ubnd[d]+1);
         }
diff --git a/Carpet/Carpet/src/helpers.cc b/Carpet/Carpet/src/helpers.cc
index 743faad90..49bce1d0f 100644
--- a/Carpet/Carpet/src/helpers.cc
+++ b/Carpet/Carpet/src/helpers.cc
@@ -13,7 +13,7 @@
 #include "carpet.hh"
 
 extern "C" {
-  static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/helpers.cc,v 1.30 2003/05/08 15:35:49 schnetter Exp $";
+  static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/helpers.cc,v 1.31 2003/05/12 13:48:05 schnetter Exp $";
   CCTK_FILEVERSION(Carpet_Carpet_helpers_cc);
 }
 
@@ -295,7 +295,7 @@ namespace Carpet {
       for (int group=0; group<CCTK_NumGroups(); ++group) {
         if (CCTK_GroupTypeI(group) == CCTK_GF) {
           
-          for (int d=0; d<dim; ++d) {
+          for (int d=0; d<arrdata[group].info.dim; ++d) {
             ((int*)arrdata[group].info.lsh)[d]      = 0xdeadbeef;
             ((int*)arrdata[group].info.bbox)[2*d  ] = 0xdeadbeef;
             ((int*)arrdata[group].info.bbox)[2*d+1] = 0xdeadbeef;
@@ -359,7 +359,7 @@ namespace Carpet {
           const vect<vect<bool,2>,dim>& obnds = arrdata[group].hh->outer_boundaries[reflevel][component];
           const bbox<int,dim>& ext = arrdata[group].dd->boxes[reflevel][component][mglevel].exterior;
           
-          for (int d=0; d<dim; ++d) {
+          for (int d=0; d<arrdata[group].info.dim; ++d) {
             
             ((int*)arrdata[group].info.lsh)[d]  = (ext.shape() / ext.stride())[d];
             ((int*)arrdata[group].info.lbnd)[d] = ((ext.lower() - baseext.lower()) / ext.stride())[d];