User: hinder Date: 2012/05/14 03:24 PM

Modified: /trunk/ configuration.ccl /trunk/src/patch/ patch_system.cc

Log: Use optional HDF5 capability

The previous method no longer works

File Changes:

Directory: /trunk/src/patch/ ============================

File [modified]: patch_system.cc Delta lines: +3 -3 =================================================================== --- trunk/src/patch/patch_system.cc 2012-05-12 00:40:26 UTC (rev 1564) +++ trunk/src/patch/patch_system.cc 2012-05-14 20:24:04 UTC (rev 1565) @@ -80,7 +80,7 @@ #include "../jtutil/linear_map.hh" using jtutil::error_exit;

-#ifdef CCTK_HDF5 +#ifdef HAVE_CAPABILITY_HDF5 // Some macros to fix compatibility issues as long as 1.8.0 is in beta // phase # define H5_USE_16_API 1 @@ -2539,7 +2539,7 @@

//******************************************************************************

-#ifdef CCTK_HDF5 +#ifdef HAVE_CAPABILITY_HDF5

static void WriteAttribute (const hid_t dataset, const char* name, char value); static void WriteAttribute (const hid_t dataset, const char* name, const char* values); @@ -2616,7 +2616,7 @@ unknown_gfn, unknown_radius_gfn); /*NOTREACHED*/

-#ifdef CCTK_HDF5 +#ifdef HAVE_CAPABILITY_HDF5

using std::ostringstream; using std::string;

Directory: /trunk/ ==================

File [modified]: configuration.ccl Delta lines: +4 -0 =================================================================== --- trunk/configuration.ccl 2012-05-12 00:40:26 UTC (rev 1564) +++ trunk/configuration.ccl 2012-05-14 20:24:04 UTC (rev 1565) @@ -1 +1,5 @@ REQUIRES THORNS: SpaceMask + +OPTIONAL HDF5 +{ +}