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, 11 deletions

diff --git a/Carpet/CarpetIOASCII/src/ioascii.cc b/Carpet/CarpetIOASCII/src/ioascii.cc
index bf1393571..d55852b40 100644
--- a/Carpet/CarpetIOASCII/src/ioascii.cc
+++ b/Carpet/CarpetIOASCII/src/ioascii.cc
@@ -24,7 +24,7 @@
 
 #include "ioascii.hh"
 
-static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetIOASCII/src/ioascii.cc,v 1.19 2001/11/02 17:09:18 schnetter Exp $";
+static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetIOASCII/src/ioascii.cc,v 1.20 2001/11/05 17:53:02 schnetter Exp $";
 
 
 
@@ -107,7 +107,7 @@ void* CarpetIOASCII<outdim>
 
 template<int outdim>
 int CarpetIOASCII<outdim>
-::OutputGH (cGH* const cgh)
+::OutputGH (const cGH* const cgh)
 {
   for (int vindex=0; vindex<CCTK_NumVars(); ++vindex) {
     if (TimeToOutput(cgh, vindex)) {
@@ -121,7 +121,7 @@ int CarpetIOASCII<outdim>
 
 template<int outdim>
 int CarpetIOASCII<outdim>
-::OutputVarAs (cGH* const cgh,
+::OutputVarAs (const cGH* const cgh,
 	       const char* const varname, const char* const alias)
 {
   DECLARE_CCTK_PARAMETERS;
@@ -137,7 +137,7 @@ int CarpetIOASCII<outdim>
   const int tl = 0;
   
   // Check for storage
-  if (! CCTK_QueryGroupStorageI((cGH*)cgh, group)) {
+  if (! CCTK_QueryGroupStorageI(cgh, group)) {
     CCTK_VWarn (1, __LINE__, __FILE__, CCTK_THORNSTRING,
 		"Cannot output variable \"%s\" because it has no storage",
 		varname);
@@ -367,7 +367,7 @@ int CarpetIOASCII<outdim>
 
 template<int outdim>
 int CarpetIOASCII<outdim>
-::TimeToOutput (cGH* const cgh, const int vindex)
+::TimeToOutput (const cGH* const cgh, const int vindex)
 {
   DECLARE_CCTK_PARAMETERS;
   
@@ -412,7 +412,7 @@ int CarpetIOASCII<outdim>
 
 template<int outdim>
 int CarpetIOASCII<outdim>
-::TriggerOutput (cGH* const cgh, const int vindex)
+::TriggerOutput (const cGH* const cgh, const int vindex)
 {
   assert (vindex>=0 && vindex<CCTK_NumVars());
   
diff --git a/Carpet/CarpetIOASCII/src/ioascii.hh b/Carpet/CarpetIOASCII/src/ioascii.hh
index 3e80b1eaa..7bb8f3bb5 100644
--- a/Carpet/CarpetIOASCII/src/ioascii.hh
+++ b/Carpet/CarpetIOASCII/src/ioascii.hh
@@ -1,4 +1,4 @@
-// $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetIOASCII/src/ioascii.hh,v 1.8 2001/11/02 17:09:18 schnetter Exp $
+// $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetIOASCII/src/ioascii.hh,v 1.9 2001/11/05 17:53:03 schnetter Exp $
 
 #include <vector>
 
@@ -47,10 +47,11 @@ struct CarpetIOASCII {
   
   static void* SetupGH (tFleshConfig* fc, int convLevel, cGH* cgh);
   
-  static int OutputGH (cGH* cgh);
-  static int OutputVarAs (cGH* cgh, const char* varname, const char* alias);
-  static int TimeToOutput (cGH* cgh, int vindex);
-  static int TriggerOutput (cGH* cgh, int vindex);
+  static int OutputGH (const cGH* cgh);
+  static int OutputVarAs (const cGH* cgh,
+			  const char* varname, const char* alias);
+  static int TimeToOutput (const cGH* cgh, int vindex);
+  static int TriggerOutput (const cGH* cgh, int vindex);
   
   static int GetGridOffset (const cGH* cgh, int dir,
 			    const char* itempl, const char* iglobal,