aboutsummaryrefslogtreecommitdiff
path: root/CarpetAttic
diff options
context:
space:
mode:
authorschnetter <>2003-07-14 13:41:00 +0000
committerschnetter <>2003-07-14 13:41:00 +0000
commitb7f1c8bf37644802bc4ed9fa7ae146addf5839be (patch)
treecb7b26f41c2f69eb7c43ef345e4e3464dfd1f3a4 /CarpetAttic
parentc974dad7f4fb853e82e62fddea12c23839ddf630 (diff)
Declare some more routines as taking a const cGH *, to match the
Declare some more routines as taking a const cGH *, to match the recent changes in the flesh. darcs-hash:20030714134134-07bb3-6c0078627d40a9d05320632feba2277afdd33bdf.gz
Diffstat (limited to 'CarpetAttic')
-rw-r--r--CarpetAttic/CarpetIOFlexIO/interface.ccl5
-rw-r--r--CarpetAttic/CarpetIOFlexIO/src/ioflexio.cc9
2 files changed, 11 insertions, 3 deletions
diff --git a/CarpetAttic/CarpetIOFlexIO/interface.ccl b/CarpetAttic/CarpetIOFlexIO/interface.ccl
index 264ae92ce..4247a40ba 100644
--- a/CarpetAttic/CarpetIOFlexIO/interface.ccl
+++ b/CarpetAttic/CarpetIOFlexIO/interface.ccl
@@ -1,10 +1,12 @@
# Interface definition for thorn CarpetIOFlexIO
-# $Header: /home/eschnett/C/carpet/Carpet/CarpetAttic/CarpetIOFlexIO/interface.ccl,v 1.6 2003/07/04 16:02:49 tradke Exp $
+# $Header: /home/eschnett/C/carpet/Carpet/CarpetAttic/CarpetIOFlexIO/interface.ccl,v 1.7 2003/07/14 15:41:34 schnetter Exp $
implements: IOFlexIO
inherits: CarpetLib driver Hyperslab FlexIO
+
+
uses include header: carpet.hh
uses include header: bbox.hh
@@ -18,6 +20,7 @@ uses include header: ggf.hh
# FlexIO header files
uses include header: IO.hh
uses include header: IEEEIO.hh
+uses include header: HDFIO.hh
uses include header: H5IO.hh
uses include header: AMRwriter.hh
uses include header: AmrGridReader.hh
diff --git a/CarpetAttic/CarpetIOFlexIO/src/ioflexio.cc b/CarpetAttic/CarpetIOFlexIO/src/ioflexio.cc
index e92292991..813ddf882 100644
--- a/CarpetAttic/CarpetIOFlexIO/src/ioflexio.cc
+++ b/CarpetAttic/CarpetIOFlexIO/src/ioflexio.cc
@@ -11,13 +11,18 @@
#include <sstream>
#include <vector>
+
+
#include "cctk.h"
#include "cctk_Parameters.h"
#include "AMRwriter.hh"
#include "AmrGridReader.hh"
+#ifdef HDF4
+# include "HDFIO.hh"
+#endif
#ifdef HDF5
-#include "H5IO.hh"
+# include "H5IO.hh"
#endif
#include "IEEEIO.hh"
#include "IO.hh"
@@ -35,7 +40,7 @@
#include "ioflexio.hh"
extern "C" {
- static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/CarpetAttic/CarpetIOFlexIO/src/ioflexio.cc,v 1.29 2003/07/03 10:51:05 tradke Exp $";
+ static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/CarpetAttic/CarpetIOFlexIO/src/ioflexio.cc,v 1.30 2003/07/14 15:41:34 schnetter Exp $";
CCTK_FILEVERSION(Carpet_CarpetIOFlexIO_ioflexio_cc);
}