1. Added interface for AMR. Carpet still contains no clusterer, but

1. Added interface for AMR.  Carpet still contains no clusterer, but
the application can now determine where to refine.

2. Made scalars (again) available all the time.  This allows the
scheduler to use scalars.

darcs-hash:20010826115851-07bb3-eca06f09fe49430522d9770bdf5ff2e99f7578a6.gz

1 files changed, 19 insertions, 7 deletions

diff --git a/Carpet/Carpet/src/carpet_public.hh b/Carpet/Carpet/src/carpet_public.hh
index 5c12b3ce3..7b75869e1 100644
--- a/Carpet/Carpet/src/carpet_public.hh
+++ b/Carpet/Carpet/src/carpet_public.hh
@@ -1,4 +1,4 @@
-// $Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/carpet_public.hh,v 1.1 2001/07/09 09:00:14 schnetter Exp $
+// $Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/carpet_public.hh,v 1.2 2001/08/26 13:59:08 schnetter Exp $
 
 // It is assumed that the number of components of all arrays is equal
 // to the number of components of the grid functions, and that their
@@ -88,6 +88,8 @@ namespace Carpet {
 #include "carpet_public.h"
   }
   
+  
+  
   // Registered functions
   void* SetupGH (tFleshConfig* fc, int convLevel, cGH* cgh);
   
@@ -113,6 +115,15 @@ namespace Carpet {
   
   
   
+  // Functions for recomposing the grid hierarchy
+  void RegisterRecomposeRegions (const gh<dim>::rexts& bbsss,
+				 const gh<dim>::rprocs& pss);
+  
+  void MakeRegions_RefineCentre (cGH* cgh, int reflevels,
+				 gh<dim>::rexts& bbsss, gh<dim>::rprocs& pss);
+  
+  
+  
   // Helper functions
   void set_reflevel (cGH* cgh, int rl);
   void set_mglevel (cGH* cgh, int ml);
@@ -162,12 +173,13 @@ namespace Carpet {
   
   // Component iterator
   
-#define BEGIN_COMPONENT_LOOP(cgh)		\
-  do {						\
-    int _cl;					\
-    assert (component==-1);			\
-    set_component ((cgh), 0);			\
-    for (;;) {					\
+#define BEGIN_COMPONENT_LOOP(cgh)			\
+  do {							\
+    int _cl;						\
+    assert (reflevel>=0 && reflevel<hh->reflevels());	\
+    assert (component==-1);				\
+    set_component ((cgh), 0);				\
+    for (;;) {						\
       {
 #define END_COMPONENT_LOOP(cgh)				\
       }							\