diff options
| author | Erik Schnetter <schnetter@cct.lsu.edu> | 2009-12-05 08:43:37 -0800 |
|---|---|---|
| committer | Barry Wardell <barry.wardell@gmail.com> | 2011-12-14 16:45:24 +0000 |
| commit | 70943e1d267aa99ae4d2321424ec248f3a3e0d06 (patch) | |
| tree | f65f98aede59f340eeea43cd98500a43832ead55 /Carpet | |
| parent | 0364720f50dc00bc7365d755100ca066694de083 (diff) | |
CarpetIOHDF5: Handle both old and new IOUtil API
Diffstat (limited to 'Carpet')
| -rw-r--r-- | Carpet/CarpetIOHDF5/src/CarpetIOHDF5.cc | 19 | ||||
| -rw-r--r-- | Carpet/CarpetIOHDF5/src/OutputSlice.cc | 7 |
2 files changed, 26 insertions, 0 deletions
diff --git a/Carpet/CarpetIOHDF5/src/CarpetIOHDF5.cc b/Carpet/CarpetIOHDF5/src/CarpetIOHDF5.cc index 01888001a..d54619ee6 100644 --- a/Carpet/CarpetIOHDF5/src/CarpetIOHDF5.cc +++ b/Carpet/CarpetIOHDF5/src/CarpetIOHDF5.cc @@ -448,9 +448,15 @@ static void CheckSteerableParameters (const cGH *const cctkGH, // re-parse the 'IOHDF5::out_vars' parameter if it has changed if (strcmp (out_vars, myGH->out_vars)) { +#ifdef IOUTIL_PARSER_HAS_OUT_DT IOUtil_ParseVarsForOutput (cctkGH, CCTK_THORNSTRING, "IOHDF5::out_vars", myGH->stop_on_parse_errors, out_vars, -1, -1.0, &myGH->requests[0]); +#else + IOUtil_ParseVarsForOutput (cctkGH, CCTK_THORNSTRING, "IOHDF5::out_vars", + myGH->stop_on_parse_errors, out_vars, + -1, &myGH->requests[0]); +#endif // notify the user about the new setting if (not CCTK_Equals (verbose, "none")) { @@ -647,7 +653,11 @@ static int OutputVarAs (const cGH* const cctkGH, const char* const fullname, (CarpetIOHDF5GH *) CCTK_GHExtension (cctkGH, CCTK_THORNSTRING); ioRequest* request = myGH->requests[vindex]; if (not request) { +#ifdef IOUTIL_PARSER_HAS_OUT_DT request = IOUtil_DefaultIORequest (cctkGH, vindex, 1, -1.0); +#else + request = IOUtil_DefaultIORequest (cctkGH, vindex, 1); +#endif } // Get grid hierarchy extentsion from IOUtil @@ -757,7 +767,11 @@ static int OutputVarAs (const cGH* const cctkGH, const char* const fullname, for (int var = firstvar; var < firstvar + numvars; var++) { ioRequest* r = myGH->requests[var]; if (not r) { +#ifdef IOUTIL_PARSER_HAS_OUT_DT r = IOUtil_DefaultIORequest (cctkGH, var, 1, -1.0); +#else + r = IOUtil_DefaultIORequest (cctkGH, var, 1); +#endif } if ((CCTK_EQUALS (out_mode, "onefile") and io_out_unchunked) or r->out_unchunked or @@ -895,8 +909,13 @@ static void Checkpoint (const cGH* const cctkGH, int called_from) int first_vindex = CCTK_FirstVarIndexI (group); /* get the default I/O request for this group */ +#ifdef IOUTIL_PARSER_HAS_OUT_DT ioRequest *request = IOUtil_DefaultIORequest (cctkGH, first_vindex, 1, -1.0); +#else + ioRequest *request = + IOUtil_DefaultIORequest (cctkGH, first_vindex, 1); +#endif /* disable checking for old data objects, disable datatype conversion and downsampling */ diff --git a/Carpet/CarpetIOHDF5/src/OutputSlice.cc b/Carpet/CarpetIOHDF5/src/OutputSlice.cc index 712844b3e..77d0680e4 100644 --- a/Carpet/CarpetIOHDF5/src/OutputSlice.cc +++ b/Carpet/CarpetIOHDF5/src/OutputSlice.cc @@ -170,10 +170,17 @@ namespace CarpetIOHDF5 { if (strcmp (out_slice_vars, my_out_slice_vars)) { ostringstream parameter_name; parameter_name << "IOHDF5::out" << outdim << "D_vars"; +#ifdef IOUTIL_PARSER_HAS_OUT_DT IOUtil_ParseVarsForOutput (cctkGH, CCTK_THORNSTRING, parameter_name.str().c_str(), stop_on_parse_errors, out_slice_vars, -1, -1.0, &slice_requests[0]); +#else + IOUtil_ParseVarsForOutput (cctkGH, CCTK_THORNSTRING, + parameter_name.str().c_str(), + stop_on_parse_errors, out_slice_vars, + -1, &slice_requests[0]); +#endif // notify the user about the new setting if (not CCTK_Equals (verbose, "none")) { |