Updated Carpet to the recent changes in Cactus.

Updated Carpet to the recent changes in Cactus.
I/O: Finding out whether this is a restart now requires looking at the
ioGH structure.

Timelevels: Timelevels now have to be allocated explicitely.

Made Carpet compile with the Intel 6.0 C++ compiler.

darcs-hash:20020429092752-07bb3-65b0b317ba98c017e16294d2ff8ac6a8a424a102.gz

1 files changed, 7 insertions, 3 deletions

diff --git a/CarpetAttic/CarpetIOFlexIO/src/ioflexio.cc b/CarpetAttic/CarpetIOFlexIO/src/ioflexio.cc
index 8d564964c..bab0d81ad 100644
--- a/CarpetAttic/CarpetIOFlexIO/src/ioflexio.cc
+++ b/CarpetAttic/CarpetIOFlexIO/src/ioflexio.cc
@@ -21,7 +21,7 @@
 #include "cctk.h"
 #include "cctk_Parameters.h"
 
-#include "CactusBase/IOUtil/src/ioutil_CheckpointRecovery.h"
+#include "CactusBase/IOUtil/src/ioGH.h"
 
 #include "Carpet/CarpetLib/src/bbox.hh"
 #include "Carpet/CarpetLib/src/data.hh"
@@ -33,7 +33,7 @@
 
 #include "ioflexio.hh"
 
-static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/CarpetAttic/CarpetIOFlexIO/src/ioflexio.cc,v 1.16 2002/03/26 13:22:29 schnetter Exp $";
+static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/CarpetAttic/CarpetIOFlexIO/src/ioflexio.cc,v 1.17 2002/04/29 11:27:57 schnetter Exp $";
 
 CCTK_FILEVERSION(CarpetIOFlexIO_ioflexio_cc)
 
@@ -136,6 +136,10 @@ namespace CarpetIOFlexIO {
       return 0;
     }
     
+    // Get grid hierarchy extentsion from IOUtil
+    const ioGH * const iogh = (const ioGH *)CCTK_GHExtension (cgh, "IO");
+    assert (iogh);
+    
     // Create the output directory
     const char* myoutdir = GetStringParameter("outdir3D", outdir);
     if (CCTK_MyProc(cgh)==0) {
@@ -171,7 +175,7 @@ namespace CarpetIOFlexIO {
       // If this is the first time, then create and truncate the file
       if (do_truncate[n]) {
 	struct stat fileinfo;
-	if (! IOUtil_RestartFromRecovery(cgh)
+	if (! iogh->recovered
 	    || stat(filename, &fileinfo)!=0) {
 	  writer = 0;
 	  if (CCTK_Equals(out3D_format, "IEEE")) {