Declare some more routines as taking a const cGH *, to match the

Declare some more routines as taking a const cGH *, to match the
recent changes in the flesh.

darcs-hash:20030714134134-07bb3-6c0078627d40a9d05320632feba2277afdd33bdf.gz

5 files changed, 26 insertions, 16 deletions

diff --git a/Carpet/Carpet/src/carpet.hh b/Carpet/Carpet/src/carpet.hh
index 1110dc608..650dbe492 100644
--- a/Carpet/Carpet/src/carpet.hh
+++ b/Carpet/Carpet/src/carpet.hh
@@ -1,4 +1,4 @@
-// $Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/carpet.hh,v 1.23 2003/06/18 18:28:07 schnetter Exp $
+// $Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/carpet.hh,v 1.24 2003/07/14 15:41:34 schnetter Exp $
 
 #ifndef CARPET_HH
 #define CARPET_HH
@@ -31,12 +31,12 @@ namespace Carpet {
   int mintl (checktimes where, int num_tl);
   int maxtl (checktimes where, int num_tl);
   
-  void Poison (cGH* cgh, checktimes where);
-  void PoisonGroup (cGH* cgh, int group, checktimes where);
-  void PoisonCheck (cGH* cgh, checktimes where);
+  void Poison (const cGH* cgh, checktimes where);
+  void PoisonGroup (const cGH* cgh, int group, checktimes where);
+  void PoisonCheck (const cGH* cgh, checktimes where);
   
-  void CalculateChecksums (cGH* cgh, checktimes where);
-  void CheckChecksums (cGH* cgh, checktimes where);
+  void CalculateChecksums (const cGH* cgh, checktimes where);
+  void CheckChecksums (const cGH* cgh, checktimes where);
   
   // Debugging output
   void Waypoint (const char* fmt, ...);
diff --git a/Carpet/Carpet/src/carpet_public.hh b/Carpet/Carpet/src/carpet_public.hh
index b4eba6764..0cee399c4 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.31 2003/06/20 11:58:32 schnetter Exp $
+// $Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/carpet_public.hh,v 1.32 2003/07/14 15:41:34 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
@@ -117,11 +117,11 @@ namespace Carpet {
   int Shutdown (tFleshConfig* config);
   int CallFunction (void* function, cFunctionData* attribute, void* data);
   
-  int SyncGroup (cGH* cgh, const char* groupname);
-  int EnableGroupStorage (cGH* cgh, const char* groupname);
-  int DisableGroupStorage (cGH* cgh, const char* groupname); 
-  int EnableGroupComm (cGH* cgh, const char* groupname);
-  int DisableGroupComm (cGH* cgh, const char* groupname);
+  int SyncGroup (const cGH* cgh, const char* groupname);
+  int EnableGroupStorage (const cGH* cgh, const char* groupname);
+  int DisableGroupStorage (const cGH* cgh, const char* groupname); 
+  int EnableGroupComm (const cGH* cgh, const char* groupname);
+  int DisableGroupComm (const cGH* cgh, const char* groupname);
   int Barrier (const cGH* cgh);
   int Exit (cGH* cgh, int retval);
   int Abort (cGH* cgh, int retval);
diff --git a/Carpet/CarpetLib/src/dh.cc b/Carpet/CarpetLib/src/dh.cc
index 4cbee384b..c9c15e1da 100644
--- a/Carpet/CarpetLib/src/dh.cc
+++ b/Carpet/CarpetLib/src/dh.cc
@@ -1,4 +1,4 @@
-// $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/dh.cc,v 1.35 2003/05/23 23:52:31 schnetter Exp $
+// $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/dh.cc,v 1.36 2003/07/14 15:41:34 schnetter Exp $
 
 #include <assert.h>
 
@@ -411,7 +411,9 @@ void dh<D>::recompose (const int initialise_upto) {
 	// Assert that all boundaries are synced or received
         {
           const ibset& sync_not = boxes[rl][c][ml].sync_not;
+#if 0
           const ibset& recv_not = boxes[rl][c][ml].recv_not;
+#endif
           
           // Check that no boundaries are left over
           if (rl==0) assert (sync_not.empty());
diff --git a/CarpetAttic/CarpetIOFlexIO/interface.ccl b/CarpetAttic/CarpetIOFlexIO/interface.ccl
index 264ae92ce..4247a40ba 100644
--- a/CarpetAttic/CarpetIOFlexIO/interface.ccl
+++ b/CarpetAttic/CarpetIOFlexIO/interface.ccl
@@ -1,10 +1,12 @@
 # Interface definition for thorn CarpetIOFlexIO
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetAttic/CarpetIOFlexIO/interface.ccl,v 1.6 2003/07/04 16:02:49 tradke Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetAttic/CarpetIOFlexIO/interface.ccl,v 1.7 2003/07/14 15:41:34 schnetter Exp $
 
 implements: IOFlexIO
 
 inherits: CarpetLib driver Hyperslab FlexIO
 
+
+
 uses include header: carpet.hh
 
 uses include header: bbox.hh
@@ -18,6 +20,7 @@ uses include header: ggf.hh
 # FlexIO header files
 uses include header: IO.hh
 uses include header: IEEEIO.hh
+uses include header: HDFIO.hh
 uses include header: H5IO.hh
 uses include header: AMRwriter.hh
 uses include header: AmrGridReader.hh
diff --git a/CarpetAttic/CarpetIOFlexIO/src/ioflexio.cc b/CarpetAttic/CarpetIOFlexIO/src/ioflexio.cc
index e92292991..813ddf882 100644
--- a/CarpetAttic/CarpetIOFlexIO/src/ioflexio.cc
+++ b/CarpetAttic/CarpetIOFlexIO/src/ioflexio.cc
@@ -11,13 +11,18 @@
 #include <sstream>
 #include <vector>
 
+
+
 #include "cctk.h"
 #include "cctk_Parameters.h"
 
 #include "AMRwriter.hh"
 #include "AmrGridReader.hh"
+#ifdef HDF4
+#  include "HDFIO.hh"
+#endif
 #ifdef HDF5
-#include "H5IO.hh"
+#  include "H5IO.hh"
 #endif
 #include "IEEEIO.hh"
 #include "IO.hh"
@@ -35,7 +40,7 @@
 #include "ioflexio.hh"
 
 extern "C" {
-  static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/CarpetAttic/CarpetIOFlexIO/src/ioflexio.cc,v 1.29 2003/07/03 10:51:05 tradke Exp $";
+  static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/CarpetAttic/CarpetIOFlexIO/src/ioflexio.cc,v 1.30 2003/07/14 15:41:34 schnetter Exp $";
   CCTK_FILEVERSION(Carpet_CarpetIOFlexIO_ioflexio_cc);
 }