Regrid based on the current level, not on the number of existing

Regrid based on the current level, not on the number of existing
levels.

darcs-hash:20040422095837-07bb3-b1689fa338c200881f1bde6563288fd277cbc990.gz

5 files changed, 11 insertions, 11 deletions

diff --git a/Carpet/CarpetRegrid/src/centre.cc b/Carpet/CarpetRegrid/src/centre.cc
index ef347b099..be101c73c 100644
--- a/Carpet/CarpetRegrid/src/centre.cc
+++ b/Carpet/CarpetRegrid/src/centre.cc
@@ -9,7 +9,7 @@
 #include "regrid.hh"
 
 extern "C" {
-  static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetRegrid/src/centre.cc,v 1.2 2004/04/18 13:29:43 schnetter Exp $";
+  static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetRegrid/src/centre.cc,v 1.3 2004/04/22 11:58:37 schnetter Exp $";
   CCTK_FILEVERSION(Carpet_CarpetRegrid_centre_cc);
 }
 
@@ -33,7 +33,7 @@ namespace CarpetRegrid {
     assert (refinement_levels >= 1);
     
     // do nothing if the levels already exist
-    if (bbsss.size() == refinement_levels) return 0;
+    if (reflevel == refinement_levels) return 0;
     
     assert (bbsss.size() >= 1);
     
diff --git a/Carpet/CarpetRegrid/src/manualcoordinatelist.cc b/Carpet/CarpetRegrid/src/manualcoordinatelist.cc
index 6cc8d719c..199636f3f 100644
--- a/Carpet/CarpetRegrid/src/manualcoordinatelist.cc
+++ b/Carpet/CarpetRegrid/src/manualcoordinatelist.cc
@@ -12,7 +12,7 @@
 #include "regrid.hh"
 
 extern "C" {
-  static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetRegrid/src/manualcoordinatelist.cc,v 1.2 2004/04/18 13:29:43 schnetter Exp $";
+  static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetRegrid/src/manualcoordinatelist.cc,v 1.3 2004/04/22 11:58:42 schnetter Exp $";
   CCTK_FILEVERSION(Carpet_CarpetRegrid_manualcoordinatelist_cc);
 }
 
@@ -37,7 +37,7 @@ namespace CarpetRegrid {
     assert (refinement_levels >= 1);
     
     // do nothing if the levels already exist
-    if (bbsss.size() == refinement_levels) return 0;
+    if (reflevel == refinement_levels) return 0;
     
     assert (bbsss.size() >= 1);
     
@@ -72,7 +72,7 @@ namespace CarpetRegrid {
 
     vector<vector<bbvect> > newobss;
     if (smart_outer_boundaries) {
-#warning "TODO"
+      // TODO:
       // assert (domain_from_coordbase);
       
       newobss.resize(newbbss.size());
diff --git a/Carpet/CarpetRegrid/src/manualcoordinates.cc b/Carpet/CarpetRegrid/src/manualcoordinates.cc
index cf6ce3f94..3ebb40d7d 100644
--- a/Carpet/CarpetRegrid/src/manualcoordinates.cc
+++ b/Carpet/CarpetRegrid/src/manualcoordinates.cc
@@ -11,7 +11,7 @@
 #include "regrid.hh"
 
 extern "C" {
-  static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetRegrid/src/manualcoordinates.cc,v 1.3 2004/04/18 13:29:43 schnetter Exp $";
+  static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetRegrid/src/manualcoordinates.cc,v 1.4 2004/04/22 11:58:42 schnetter Exp $";
   CCTK_FILEVERSION(Carpet_CarpetRegrid_manualcoordinates_cc);
 }
 
@@ -38,7 +38,7 @@ namespace CarpetRegrid {
     assert (refinement_levels >= 1 && refinement_levels <= 4);
     
     // do nothing if the levels already exist
-    if (bbsss.size() == refinement_levels) return 0;
+    if (reflevel == refinement_levels) return 0;
     
     assert (bbsss.size() >= 1);
     
diff --git a/Carpet/CarpetRegrid/src/manualgridpointlist.cc b/Carpet/CarpetRegrid/src/manualgridpointlist.cc
index 6d5c4cd78..a3862e7fe 100644
--- a/Carpet/CarpetRegrid/src/manualgridpointlist.cc
+++ b/Carpet/CarpetRegrid/src/manualgridpointlist.cc
@@ -12,7 +12,7 @@
 #include "regrid.hh"
 
 extern "C" {
-  static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetRegrid/src/manualgridpointlist.cc,v 1.2 2004/04/18 13:29:43 schnetter Exp $";
+  static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetRegrid/src/manualgridpointlist.cc,v 1.3 2004/04/22 11:58:42 schnetter Exp $";
   CCTK_FILEVERSION(Carpet_CarpetRegrid_manualgridpointlist_cc);
 }
 
@@ -36,7 +36,7 @@ namespace CarpetRegrid {
     assert (refinement_levels >= 1);
     
     // do nothing if the levels already exist
-    if (bbsss.size() == refinement_levels) return 0;
+    if (reflevel == refinement_levels) return 0;
     
     assert (bbsss.size() >= 1);
     
diff --git a/Carpet/CarpetRegrid/src/manualgridpoints.cc b/Carpet/CarpetRegrid/src/manualgridpoints.cc
index f8be5eb57..a5f631935 100644
--- a/Carpet/CarpetRegrid/src/manualgridpoints.cc
+++ b/Carpet/CarpetRegrid/src/manualgridpoints.cc
@@ -11,7 +11,7 @@
 #include "regrid.hh"
 
 extern "C" {
-  static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetRegrid/src/manualgridpoints.cc,v 1.2 2004/04/18 13:29:43 schnetter Exp $";
+  static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetRegrid/src/manualgridpoints.cc,v 1.3 2004/04/22 11:58:42 schnetter Exp $";
   CCTK_FILEVERSION(Carpet_CarpetRegrid_manualgridpoints_cc);
 }
 
@@ -38,7 +38,7 @@ namespace CarpetRegrid {
     assert (refinement_levels >= 1 && refinement_levels <= 4);
     
     // do nothing if the levels already exist
-    if (bbsss.size() == refinement_levels) return 0;
+    if (reflevel == refinement_levels) return 0;
     
     assert (bbsss.size() >= 1);