diff options
author | eschnett <eschnett@7842ec3a-9562-4be5-9c5b-06ba18f2b668> | 2014-02-07 20:24:52 +0000 |
---|---|---|
committer | eschnett <eschnett@7842ec3a-9562-4be5-9c5b-06ba18f2b668> | 2014-02-07 20:24:52 +0000 |
commit | 0bc3455b35874c7348a0a2302d1e572b52ac6aa7 (patch) | |
tree | 9fe17395d55236a8df3c9499eccde44fdbe7970b | |
parent | 8a901ab68e3f0da1faad2e339e43dfe54d008c28 (diff) |
Use #ifdef HAVE_CCTK_REAL8 instead of #ifdef CCTK_REAL8
git-svn-id: http://svn.cactuscode.org/arrangements/CactusPUGHIO/IOHDF5Util/trunk@173 7842ec3a-9562-4be5-9c5b-06ba18f2b668
-rw-r--r-- | src/DumpUtils.c | 14 | ||||
-rw-r--r-- | src/Startup.c | 12 | ||||
-rw-r--r-- | src/ioHDF5UtilGH.h | 14 |
3 files changed, 20 insertions, 20 deletions
diff --git a/src/DumpUtils.c b/src/DumpUtils.c index 75b2e8b..ad99e00 100644 --- a/src/DumpUtils.c +++ b/src/DumpUtils.c @@ -493,27 +493,27 @@ hid_t IOHDF5Util_DataType (const ioHDF5UtilGH *myGH, int cctk_type) case CCTK_VARIABLE_INT: retval = HDF5_INT; break; case CCTK_VARIABLE_REAL: retval = HDF5_REAL; break; case CCTK_VARIABLE_COMPLEX: retval = myGH->HDF5_COMPLEX; break; -#ifdef CCTK_INT1 +#ifdef HAVE_CCTK_INT1 case CCTK_VARIABLE_INT1: retval = HDF5_INT1; break; #endif -#ifdef CCTK_INT2 +#ifdef HAVE_CCTK_INT2 case CCTK_VARIABLE_INT2: retval = HDF5_INT2; break; #endif -#ifdef CCTK_INT4 +#ifdef HAVE_CCTK_INT4 case CCTK_VARIABLE_INT4: retval = HDF5_INT4; break; #endif -#ifdef CCTK_INT8 +#ifdef HAVE_CCTK_INT8 case CCTK_VARIABLE_INT8: retval = HDF5_INT8; break; #endif -#ifdef CCTK_REAL4 +#ifdef HAVE_CCTK_REAL4 case CCTK_VARIABLE_REAL4: retval = HDF5_REAL4; break; case CCTK_VARIABLE_COMPLEX8: retval = myGH->HDF5_COMPLEX8; break; #endif -#ifdef CCTK_REAL8 +#ifdef HAVE_CCTK_REAL8 case CCTK_VARIABLE_REAL8: retval = HDF5_REAL8; break; case CCTK_VARIABLE_COMPLEX16: retval = myGH->HDF5_COMPLEX16; break; #endif -#ifdef CCTK_REAL16 +#ifdef HAVE_CCTK_REAL16 case CCTK_VARIABLE_REAL16: retval = HDF5_REAL16; break; case CCTK_VARIABLE_COMPLEX32: retval = myGH->HDF5_COMPLEX32; break; #endif diff --git a/src/Startup.c b/src/Startup.c index 76d3459..0cfba34 100644 --- a/src/Startup.c +++ b/src/Startup.c @@ -107,19 +107,19 @@ void IOHDF5Util_Terminate (cGH *GH) { HDF5_ERROR (H5Tclose (myGH->HDF5_COMPLEX)); } -#ifdef CCTK_REAL4 +#ifdef HAVE_CCTK_REAL4 if (myGH->HDF5_COMPLEX8 >= 0) { HDF5_ERROR (H5Tclose (myGH->HDF5_COMPLEX8)); } #endif -#ifdef CCTK_REAL8 +#ifdef HAVE_CCTK_REAL8 if (myGH->HDF5_COMPLEX16 >= 0) { HDF5_ERROR (H5Tclose (myGH->HDF5_COMPLEX16)); } #endif -#ifdef CCTK_REAL16 +#ifdef HAVE_CCTK_REAL16 if (myGH->HDF5_COMPLEX32 >= 0) { HDF5_ERROR (H5Tclose (myGH->HDF5_COMPLEX32)); @@ -197,7 +197,7 @@ static void *IOHDF5Util_SetupGH (tFleshConfig *config, int conv_level, cGH *GH) 0, HDF5_REAL)); HDF5_ERROR (H5Tinsert (myGH->HDF5_COMPLEX, "imag", sizeof (CCTK_REAL), HDF5_REAL)); -#ifdef CCTK_REAL4 +#ifdef HAVE_CCTK_REAL4 HDF5_ERROR (myGH->HDF5_COMPLEX8 = H5Tcreate (H5T_COMPOUND, sizeof (CCTK_COMPLEX8))); HDF5_ERROR (H5Tinsert (myGH->HDF5_COMPLEX8, "real", @@ -205,7 +205,7 @@ static void *IOHDF5Util_SetupGH (tFleshConfig *config, int conv_level, cGH *GH) HDF5_ERROR (H5Tinsert (myGH->HDF5_COMPLEX8, "imag", sizeof (CCTK_REAL4), HDF5_REAL4)); #endif -#ifdef CCTK_REAL8 +#ifdef HAVE_CCTK_REAL8 HDF5_ERROR (myGH->HDF5_COMPLEX16 = H5Tcreate (H5T_COMPOUND, sizeof (CCTK_COMPLEX16))); HDF5_ERROR (H5Tinsert (myGH->HDF5_COMPLEX16, "real", @@ -213,7 +213,7 @@ static void *IOHDF5Util_SetupGH (tFleshConfig *config, int conv_level, cGH *GH) HDF5_ERROR (H5Tinsert (myGH->HDF5_COMPLEX16, "imag", sizeof (CCTK_REAL8), HDF5_REAL8)); #endif -#ifdef CCTK_REAL16 +#ifdef HAVE_CCTK_REAL16 HDF5_ERROR (myGH->HDF5_COMPLEX32 = H5Tcreate (H5T_COMPOUND, sizeof (CCTK_COMPLEX32))); HDF5_ERROR (H5Tinsert (myGH->HDF5_COMPLEX32, "real", diff --git a/src/ioHDF5UtilGH.h b/src/ioHDF5UtilGH.h index b1f11d4..7acfa78 100644 --- a/src/ioHDF5UtilGH.h +++ b/src/ioHDF5UtilGH.h @@ -123,13 +123,13 @@ ie. a float has always 4 bytes, and a double has 8 bytes HDF5_REAL is used for storing reals of the generic CCTK_REAL type HDF5_REALn is used to explicitely store n-byte reals */ -#ifdef CCTK_REAL4 +#ifdef HAVE_CCTK_REAL4 #define HDF5_REAL4 H5T_NATIVE_FLOAT #endif -#ifdef CCTK_REAL8 +#ifdef HAVE_CCTK_REAL8 #define HDF5_REAL8 H5T_NATIVE_DOUBLE #endif -#ifdef CCTK_REAL16 +#ifdef HAVE_CCTK_REAL16 #define HDF5_REAL16 (sizeof (CCTK_REAL16) == sizeof (long double) ? \ H5T_NATIVE_LDOUBLE : -1) #endif @@ -147,25 +147,25 @@ /* integer types are architecture-dependent: HDF5_INT is used for communicating integers of the generic CCTK_INT type HDF5_INTn is used to explicitely communicate n-byte integers */ -#ifdef CCTK_INT8 +#ifdef HAVE_CCTK_INT8 #define HDF5_INT8 (sizeof (CCTK_INT8) == sizeof (int) ? H5T_NATIVE_INT : \ sizeof (CCTK_INT8) == sizeof (long) ? H5T_NATIVE_LONG : \ sizeof (CCTK_INT8) == sizeof (long long) ? \ H5T_NATIVE_LLONG : -1) #endif -#ifdef CCTK_INT4 +#ifdef HAVE_CCTK_INT4 #define HDF5_INT4 (sizeof (CCTK_INT4) == sizeof (int) ? H5T_NATIVE_INT : \ sizeof (CCTK_INT4) == sizeof (short) ? \ H5T_NATIVE_SHORT : -1) #endif -#ifdef CCTK_INT2 +#ifdef HAVE_CCTK_INT2 #define HDF5_INT2 (sizeof (CCTK_INT2) == sizeof (short) ? \ H5T_NATIVE_SHORT : -1) #endif -#ifdef CCTK_INT1 +#ifdef HAVE_CCTK_INT1 #define HDF5_INT1 H5T_NATIVE_SCHAR #endif |