CarpetIO: Adapt to changes in CactusBase/IOUtil

The CactusBase/IOUtil routine IOUtil_ParseVarsForOutput now accepts an
additional parameter out_dt_default.

4 files changed, 10 insertions, 8 deletions

diff --git a/Carpet/CarpetIOASCII/src/ioascii.cc b/Carpet/CarpetIOASCII/src/ioascii.cc
index f09513c7e..fc46a20ca 100644
--- a/Carpet/CarpetIOASCII/src/ioascii.cc
+++ b/Carpet/CarpetIOASCII/src/ioascii.cc
@@ -205,7 +205,7 @@ namespace CarpetIOASCII {
       IOUtil_ParseVarsForOutput (cctkGH, CCTK_THORNSTRING,
                                  parameter_name.str().c_str(),
                                  stop_on_parse_errors, out_vars,
-                                 -1, &requests[0]);
+                                 -1, -1.0, &requests[0]);
 
       // notify the user about the new setting
       if (not CCTK_Equals (verbose, "none")) {
@@ -410,7 +410,7 @@ namespace CarpetIOASCII {
     // get the default I/O request for this variable
     ioRequest* request = requests[vindex];
     if (not request) {
-      request = IOUtil_DefaultIORequest (cctkGH, vindex, 1);
+      request = IOUtil_DefaultIORequest (cctkGH, vindex, 1, -1.0);
     }
 
     // check if the file has been created already
diff --git a/Carpet/CarpetIOBasic/src/iobasic.cc b/Carpet/CarpetIOBasic/src/iobasic.cc
index 817634276..126792795 100644
--- a/Carpet/CarpetIOBasic/src/iobasic.cc
+++ b/Carpet/CarpetIOBasic/src/iobasic.cc
@@ -596,7 +596,7 @@ namespace CarpetIOBasic {
       IOUtil_ParseVarsForOutput (cctkGH, CCTK_THORNSTRING,
                                  "IOBasic::outInfo_vars",
                                  IOparameters.stop_on_parse_errors,
-                                 outInfo_vars, -1, IOparameters.requests);
+                                 outInfo_vars, -1, -1.0, IOparameters.requests);
 
       // save the last setting of 'IOBasic::outInfo_vars' parameter
       free (IOparameters.out_vars);
diff --git a/Carpet/CarpetIOHDF5/src/CarpetIOHDF5.cc b/Carpet/CarpetIOHDF5/src/CarpetIOHDF5.cc
index e00494f3c..e3b37c312 100644
--- a/Carpet/CarpetIOHDF5/src/CarpetIOHDF5.cc
+++ b/Carpet/CarpetIOHDF5/src/CarpetIOHDF5.cc
@@ -401,7 +401,7 @@ static void CheckSteerableParameters (const cGH *const cctkGH,
   if (strcmp (out_vars, myGH->out_vars)) {
     IOUtil_ParseVarsForOutput (cctkGH, CCTK_THORNSTRING, "IOHDF5::out_vars",
                                myGH->stop_on_parse_errors, out_vars,
-                               -1, &myGH->requests[0]);
+                               -1, -1.0, &myGH->requests[0]);
 
     // notify the user about the new setting
     if (not CCTK_Equals (verbose, "none")) {
@@ -595,7 +595,7 @@ 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) {
-    request = IOUtil_DefaultIORequest (cctkGH, vindex, 1);
+    request = IOUtil_DefaultIORequest (cctkGH, vindex, 1, -1.0);
   }
 
   // Get grid hierarchy extentsion from IOUtil
@@ -705,7 +705,7 @@ 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) {
-      r = IOUtil_DefaultIORequest (cctkGH, var, 1);
+      r = IOUtil_DefaultIORequest (cctkGH, var, 1, -1.0);
     }
     if ((CCTK_EQUALS (out_mode, "onefile") and io_out_unchunked) or
         r->out_unchunked or
@@ -842,7 +842,8 @@ 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 */
-        ioRequest *request = IOUtil_DefaultIORequest (cctkGH, first_vindex, 1);
+        ioRequest *request =
+          IOUtil_DefaultIORequest (cctkGH, first_vindex, 1, -1.0);
 
         /* disable checking for old data objects, disable datatype conversion
            and downsampling */
diff --git a/Carpet/CarpetIOScalar/src/ioscalar.cc b/Carpet/CarpetIOScalar/src/ioscalar.cc
index 88a35541d..de8331733 100644
--- a/Carpet/CarpetIOScalar/src/ioscalar.cc
+++ b/Carpet/CarpetIOScalar/src/ioscalar.cc
@@ -650,7 +650,8 @@ namespace CarpetIOScalar {
       IOUtil_ParseVarsForOutput (cctkGH, CCTK_THORNSTRING,
                                  "IOScalar::outScalar_vars",
                                  IOparameters.stop_on_parse_errors,
-                                 outScalar_vars, -1, IOparameters.requests);
+                                 outScalar_vars, -1, -1.0,
+                                 IOparameters.requests);
 
       // notify the user about the new setting
       if (not CCTK_Equals (verbose, "none")) {