Adapted Carpet to the new Cactus API. Works on Linux. High hopes for SGIs.

darcs-hash:20011105165301-07bb3-7021e7a839dfd9970aad6ff46278b551dc5a239e.gz

2 files changed, 12 insertions, 12 deletions

diff --git a/CarpetAttic/CarpetIOFlexIO/src/ioflexio.cc b/CarpetAttic/CarpetIOFlexIO/src/ioflexio.cc
index bbf8235d4..b1cd2f97a 100644
--- a/CarpetAttic/CarpetIOFlexIO/src/ioflexio.cc
+++ b/CarpetAttic/CarpetIOFlexIO/src/ioflexio.cc
@@ -32,7 +32,7 @@
 
 #include "ioflexio.hh"
 
-static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/CarpetAttic/CarpetIOFlexIO/src/ioflexio.cc,v 1.11 2001/07/09 09:00:22 schnetter Exp $";
+static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/CarpetAttic/CarpetIOFlexIO/src/ioflexio.cc,v 1.12 2001/11/05 17:53:03 schnetter Exp $";
 
 
 
@@ -54,7 +54,7 @@ namespace CarpetIOFlexIO {
   static const char* GetStringParameter (const char* const parametername,
 					 const char* const fallback);
   static int GetIntParameter (const char* const parametername, int fallback);
-  static bool CheckForVariable (cGH* const cgh,
+  static bool CheckForVariable (const cGH* const cgh,
 				const char* const varlist, const int vindex);
   static void SetFlag (int index, const char* optstring, void* arg);
   
@@ -100,7 +100,7 @@ namespace CarpetIOFlexIO {
   
   
   
-  int OutputGH (cGH* const cgh) {
+  int OutputGH (const cGH* const cgh) {
     for (int vindex=0; vindex<CCTK_NumVars(); ++vindex) {
       if (TimeToOutput(cgh, vindex)) {
 	TriggerOutput(cgh, vindex);
@@ -111,7 +111,7 @@ namespace CarpetIOFlexIO {
   
   
   
-  int OutputVarAs (cGH* const cgh, const char* const varname,
+  int OutputVarAs (const cGH* const cgh, const char* const varname,
 		   const char* const alias) {
     DECLARE_CCTK_PARAMETERS;
     
@@ -293,7 +293,7 @@ namespace CarpetIOFlexIO {
   
   
   
-  int TimeToOutput (cGH* const cgh, const int vindex) {
+  int TimeToOutput (const cGH* const cgh, const int vindex) {
     DECLARE_CCTK_PARAMETERS;
     
     assert (vindex>=0 && vindex<(int)last_output[reflevel].size());
@@ -335,7 +335,7 @@ namespace CarpetIOFlexIO {
   
   
   
-  int TriggerOutput (cGH* const cgh, const int vindex) {
+  int TriggerOutput (const cGH* const cgh, const int vindex) {
     assert (vindex>=0 && vindex<CCTK_NumVars());
     
     char* varname = CCTK_FullName(vindex);
@@ -613,7 +613,7 @@ namespace CarpetIOFlexIO {
   
   
   
-  bool CheckForVariable (cGH* const cgh,
+  bool CheckForVariable (const cGH* const cgh,
 			 const char* const varlist, const int vindex)
   {
     const int numvars = CCTK_NumVars();
diff --git a/CarpetAttic/CarpetIOFlexIO/src/ioflexio.hh b/CarpetAttic/CarpetIOFlexIO/src/ioflexio.hh
index 332f60ed4..31bcb9cc5 100644
--- a/CarpetAttic/CarpetIOFlexIO/src/ioflexio.hh
+++ b/CarpetAttic/CarpetIOFlexIO/src/ioflexio.hh
@@ -1,4 +1,4 @@
-// $Header: /home/eschnett/C/carpet/Carpet/CarpetAttic/CarpetIOFlexIO/src/ioflexio.hh,v 1.3 2001/03/17 22:37:28 eschnett Exp $
+// $Header: /home/eschnett/C/carpet/Carpet/CarpetAttic/CarpetIOFlexIO/src/ioflexio.hh,v 1.4 2001/11/05 17:53:04 schnetter Exp $
 
 #include <vector>
 
@@ -22,11 +22,11 @@ namespace CarpetIOFlexIO {
   void* SetupGH (tFleshConfig* const fc,
 		 const int convLevel, cGH* const cgh);
   
-  int OutputGH (cGH* const cgh);
-  int OutputVarAs (cGH* const cgh, const char* const varname,
+  int OutputGH (const cGH* const cgh);
+  int OutputVarAs (const cGH* const cgh, const char* const varname,
 		   const char* const alias);
-  int TimeToOutput (cGH* const cgh, const int vindex);
-  int TriggerOutput (cGH* const cgh, const int vindex);
+  int TimeToOutput (const cGH* const cgh, const int vindex);
+  int TriggerOutput (const cGH* const cgh, const int vindex);
   
   int InputGH (cGH* const cgh);
   int InputVarAs (cGH* const cgh, const char* const varname,