aboutsummaryrefslogtreecommitdiff
path: root/CarpetAttic
diff options
context:
space:
mode:
authortradke <>2003-07-03 08:51:00 +0000
committertradke <>2003-07-03 08:51:00 +0000
commit89fc4d03c10661b0bea00c4fe52f436a18ac7e55 (patch)
tree4b19e500ddfad1e391c12209cd1fa51a08f6cbaa /CarpetAttic
parentd01559cf115b3ff9c369a9fa3086c31721652454 (diff)
More #ifdefs for HDF[45]-specific parts of the code.
darcs-hash:20030703085105-1d9bf-756568b9fef77ca637942aa831be7706b18f5250.gz
Diffstat (limited to 'CarpetAttic')
-rw-r--r--CarpetAttic/CarpetIOFlexIO/src/ioflexio.cc10
1 files changed, 7 insertions, 3 deletions
diff --git a/CarpetAttic/CarpetIOFlexIO/src/ioflexio.cc b/CarpetAttic/CarpetIOFlexIO/src/ioflexio.cc
index 11be50401..e92292991 100644
--- a/CarpetAttic/CarpetIOFlexIO/src/ioflexio.cc
+++ b/CarpetAttic/CarpetIOFlexIO/src/ioflexio.cc
@@ -35,7 +35,7 @@
#include "ioflexio.hh"
extern "C" {
- static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/CarpetAttic/CarpetIOFlexIO/src/ioflexio.cc,v 1.28 2003/07/03 10:02:03 tradke Exp $";
+ 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 $";
CCTK_FILEVERSION(Carpet_CarpetIOFlexIO_ioflexio_cc);
}
@@ -155,9 +155,11 @@ namespace CarpetIOFlexIO {
const char* extension = 0;
if (CCTK_Equals(out3D_format, "IEEE")) {
extension = ".raw";
-#ifdef HDF5
+#ifdef HDF4
} else if (CCTK_Equals(out3D_format, "HDF4")) {
extension = ".hdf";
+#endif
+#ifdef HDF5
} else if (CCTK_Equals(out3D_format, "HDF5")) {
extension = ".h5";
#endif
@@ -430,9 +432,11 @@ namespace CarpetIOFlexIO {
const char* extension = 0;
if (CCTK_Equals(in3D_format, "IEEE")) {
extension = ".raw";
-#ifdef HDF5
+#ifdef HDF4
} else if (CCTK_Equals(in3D_format, "HDF4")) {
extension = ".hdf";
+#endif
+#ifdef HDF5
} else if (CCTK_Equals(in3D_format, "HDF5")) {
extension = ".h5";
#endif