From 254b613d10c1e97335866223c76f2167d515f44d Mon Sep 17 00:00:00 2001
From: schnetter <>
Date: Mon, 29 Apr 2002 09:27:00 +0000
Subject: 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
---
 CarpetAttic/CarpetIOFlexIO/src/ioflexio.cc | 10 +++++++---
 CarpetAttic/Cart3dTest/README              |  5 +++--
 2 files changed, 10 insertions(+), 5 deletions(-)

(limited to 'CarpetAttic')

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")) {
diff --git a/CarpetAttic/Cart3dTest/README b/CarpetAttic/Cart3dTest/README
index 1cd89293d..5fcc111c8 100644
--- a/CarpetAttic/Cart3dTest/README
+++ b/CarpetAttic/Cart3dTest/README
@@ -1,7 +1,8 @@
 Cactus Code Thorn Cart3dTest
-Authors    : ...
-CVS info   : $Header: /home/eschnett/C/carpet/Carpet/CarpetAttic/Cart3dTest/README,v 1.1 2001/03/01 15:49:27 eschnett Exp $
+Authors    : Erik Schnetter <schnetter@uni-tuebingen.de>
+CVS info   : $Header: /home/eschnett/C/carpet/Carpet/CarpetAttic/Cart3dTest/README,v 1.2 2002/04/29 11:28:00 schnetter Exp $
 --------------------------------------------------------------------------
 
 Purpose of the thorn:
 
+Test certain internals of Carpet.
-- 
cgit v1.2.3