Implemented Checkpointing skeleton

darcs-hash:20040310205506-19929-5beefe2abe6894284d9b008189a6cc3f14d65c8c.gz

4 files changed, 19 insertions, 11 deletions

diff --git a/Carpet/CarpetIOHDF5/schedule.ccl b/Carpet/CarpetIOHDF5/schedule.ccl
index 44df41401..1f5627808 100644
--- a/Carpet/CarpetIOHDF5/schedule.ccl
+++ b/Carpet/CarpetIOHDF5/schedule.ccl
@@ -1,5 +1,5 @@
 # Schedule definitions for thorn CarpetIOHDF5
-# $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetIOHDF5/schedule.ccl,v 1.2 2004/03/08 22:50:54 cott Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetIOHDF5/schedule.ccl,v 1.3 2004/03/10 21:55:06 cott Exp $
 
 schedule CarpetIOHDF5Startup at STARTUP after IOUtil_Startup
 {
@@ -11,3 +11,17 @@ schedule CarpetIOHDF5ReadData at INITIAL
   LANG: C
   OPTIONS: global
 } "Read initial data from file"
+
+schedule CarpetIOHDF5_EvolutionCheckpoint at CHECKPOINT
+{
+  LANG: C
+  OPTIONS: global
+} "Do checkpointing"
+
+#if (! CCTK_Equals (recover, "no") && *recover_file)
+#{
+#  schedule CarpetIOHDF5_RecoverParameters at RECOVER_PARAMETERS
+#  {
+#    LANG:C
+#  } "Parameter recovery routine"
+#}
diff --git a/Carpet/CarpetIOHDF5/src/iohdf5.h b/Carpet/CarpetIOHDF5/src/iohdf5.h
index fa63a425a..d5b77bf14 100644
--- a/Carpet/CarpetIOHDF5/src/iohdf5.h
+++ b/Carpet/CarpetIOHDF5/src/iohdf5.h
@@ -1,4 +1,4 @@
-/* $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetIOHDF5/src/iohdf5.h,v 1.1 2004/03/03 09:44:26 schnetter Exp $ */
+/* $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetIOHDF5/src/iohdf5.h,v 1.2 2004/03/10 21:55:06 cott Exp $ */
 
 #ifndef CARPETIOHDF5_H
 #define CARPETIOHDF5_H
@@ -13,6 +13,7 @@ namespace CarpetIOHDF5 {
     /* Scheduled functions */
     int CarpetIOHDF5Startup (void);
     int CarpetIOHDF5ReadData (CCTK_ARGUMENTS);
+    void CarpetIOHDF5_EvolutionCheckpoint (const cGH*);
     
 #ifdef __cplusplus
   } /* extern "C" */
diff --git a/Carpet/CarpetIOHDF5/src/iohdf5GH.h b/Carpet/CarpetIOHDF5/src/iohdf5GH.h
index 0516201c2..1e7607d33 100644
--- a/Carpet/CarpetIOHDF5/src/iohdf5GH.h
+++ b/Carpet/CarpetIOHDF5/src/iohdf5GH.h
@@ -1,6 +1,3 @@
-// This was adopted from Thomas Radke's IOHDF5 thorn.
-// Thanks, Thomas!
-
 #ifndef _CARPETIOHDF5_IOHDF5GH_H_
 #define _CARPETIOHDF5_IOHDF5GH_H_ 1
 
@@ -46,10 +43,6 @@ typedef struct
   /* iteration number of the last checkpoint */
   int last_checkpoint_iteration;
 
-  /* hdf5 datatype for stupid complex variables; to be set at run time */
-  hid_t HDF5_COMPLEX, HDF5_COMPLEX8, HDF5_COMPLEX16, HDF5_COMPLEX32;
-  
-
 } CarpetIOHDF5GH;
 
 
diff --git a/Carpet/CarpetIOHDF5/src/make.code.defn b/Carpet/CarpetIOHDF5/src/make.code.defn
index bec17dbf5..28db20612 100644
--- a/Carpet/CarpetIOHDF5/src/make.code.defn
+++ b/Carpet/CarpetIOHDF5/src/make.code.defn
@@ -1,5 +1,5 @@
 # Main make.code.defn file for thorn CarpetIOHDF5
-# $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetIOHDF5/src/make.code.defn,v 1.2 2004/03/08 09:43:41 cott Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetIOHDF5/src/make.code.defn,v 1.3 2004/03/10 21:55:06 cott Exp $
 
 # Source files in this directory
-SRCS = iohdf5.cc iohdf5utils.cc
+SRCS = iohdf5.cc iohdf5utils.cc iohdf5chckpt_recover.cc