Restructured regridding. Instead of registering the new grid

Restructured regridding.  Instead of registering the new grid
structure every time you want to regrid, you register a routine that
is called every time it is possible to regrid.  This is much cleaner.

darcs-hash:20020111161945-07bb3-a03d269b8a81c5cc3e7196679535c3a4c21b3a78.gz

1 files changed, 13 insertions, 6 deletions

diff --git a/Carpet/CarpetRegrid/src/regrid.hh b/Carpet/CarpetRegrid/src/regrid.hh
index 8779d6a38..0491816b8 100644
--- a/Carpet/CarpetRegrid/src/regrid.hh
+++ b/Carpet/CarpetRegrid/src/regrid.hh
@@ -1,4 +1,4 @@
-// $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetRegrid/src/regrid.hh,v 1.1 2001/12/14 16:34:39 schnetter Exp $
+// $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetRegrid/src/regrid.hh,v 1.2 2002/01/11 17:19:49 schnetter Exp $
 
 #ifndef REGRID_HH
 #define REGRID_HH
@@ -6,9 +6,9 @@
 #include <list>
 
 #include "cctk.h"
-#include "cctk_Arguments.h"
 
 #include "Carpet/CarpetLib/src/gf.hh"
+#include "Carpet/CarpetLib/src/gh.hh"
 
 #include "carpet.hh"
 
@@ -21,11 +21,17 @@ namespace CarpetRegrid {
   
   // scheduled functions
   extern "C" {
-    int CarpetRegridRegrid (CCTK_ARGUMENTS);
+    int CarpetRegridStartup ();
   }
   
   
   
+  int CarpetRegridRegrid (const cGH * const cctkGH,
+			  gh<dim>::rexts& bbsss,
+			  gh<dim>::rprocs& pss);
+  
+  
+  
   void MakeRegions_BaseLevel    (const cGH* cctkGH,
 				 list<bbox<int,dim> >& bbl);
   
@@ -33,12 +39,13 @@ namespace CarpetRegrid {
 				 list<bbox<int,dim> >& bbl);
   
   void MakeRegions_AsSpecified  (const cGH* cctkGH, const int reflevels,
-				 const vector<vect<int,dim> > lower,
-				 const vector<vect<int,dim> > upper,
+				 const vector<vect<CCTK_REAL,dim> > lower,
+				 const vector<vect<CCTK_REAL,dim> > upper,
 				 list<bbox<int,dim> >& bbl);
   
   void MakeRegions_Adaptively   (const cGH* cctkGH,
-				 const int minwidth, const double minfraction,
+				 const int minwidth,
+				 const CCTK_REAL minfraction,
 				 const CCTK_REAL maxerror,
 				 const gf<CCTK_REAL,dim>& error,
 				 list<bbox<int,dim> >& bbl);