CarpetIOHDF5: remove deprecated I/O parameters

This patch finally closes the long-standing issue of keeping both old and new
CarpetIOHDF5 parameters around. Now the old parameters have been removed, only
the new ones can be used further on.
If you still have old-style parameter files, you must convert them now.
The perl script CarpetIOHDF5/srcutil/SubstituteDeprecatedParameters.pl does
that for you automatically.

darcs-hash:20060206184519-776a0-29d9d612e011dda4bf2b6054cee73546beae373a.gz

1 files changed, 0 insertions, 98 deletions

diff --git a/Carpet/CarpetIOHDF5/src/CarpetIOHDF5.cc b/Carpet/CarpetIOHDF5/src/CarpetIOHDF5.cc
index 58f413ec0..4392fa4e3 100644
--- a/Carpet/CarpetIOHDF5/src/CarpetIOHDF5.cc
+++ b/Carpet/CarpetIOHDF5/src/CarpetIOHDF5.cc
@@ -47,7 +47,6 @@ static void GetVarIndex (int vindex, const char* optstring, void* arg);
 
 static void CheckSteerableParameters (const cGH *const cctkGH,
                                       CarpetIOHDF5GH *myGH);
-static void WarnAboutDeprecatedParameters (void);
 static int WriteMetadata (const cGH *cctkGH, int nioprocs,
                           bool called_from_checkpoint, hid_t file);
 
@@ -62,26 +61,6 @@ int CarpetIOHDF5_Startup (void)
   const int GHExtension = CCTK_RegisterGHExtension (CCTK_THORNSTRING);
   CCTK_RegisterGHExtensionSetupGH (GHExtension, SetupGH);
 
-  // warn about deprecated parameters if they are still being used
-  if (CCTK_ParameterQueryTimesSet ("out_unchunked", CCTK_THORNSTRING) > 0) {
-    CCTK_WARN (CCTK_WARN_ALERT,
-      "You set the parameter 'IOHDF5::out_unchunked'"
-      " in your parfile. This parameter is deprecated and should not be used"
-      " anymore. Use 'IO::out_unchunked' instead.");
-  }
-  if (CCTK_ParameterQueryTimesSet ("in_dir", CCTK_THORNSTRING) > 0) {
-    CCTK_WARN (CCTK_WARN_ALERT,
-      "You set the parameter 'IOHDF5::in_dir'"
-      " in your parfile. This parameter is deprecated and should not be used"
-      " anymore. Use 'IO::filereader_dir' instead.");
-  }
-  if (CCTK_ParameterQueryTimesSet ("in_vars", CCTK_THORNSTRING) > 0) {
-    CCTK_WARN (CCTK_WARN_ALERT,
-      "You set the parameter 'IOHDF5::in_vars'"
-      " in your parfile. This parameter is deprecated and should not be used"
-      " anymore. Use 'IO::filereader_vars' instead.");
-  }
-
   return (0);
 }
 
@@ -404,19 +383,6 @@ static void CheckSteerableParameters (const cGH *const cctkGH,
 
 static int OutputGH (const cGH* const cctkGH)
 {
-  DECLARE_CCTK_PARAMETERS;
-  static bool first_time = true;
-
-  // check if any deprecated parameters have been set in the parameter file
-  //  (don't check after recovery though)
-  if (first_time) {
-
-    if (CCTK_Equals (recover, "no") or not *recover_file) {
-      WarnAboutDeprecatedParameters ();
-    }
-    first_time = false;
-  }
-
   for (int vindex = CCTK_NumVars () - 1; vindex >= 0; vindex--) {
     if (TimeToOutput (cctkGH, vindex)) {
       TriggerOutput (cctkGH, vindex);
@@ -1000,68 +966,4 @@ static int WriteMetadata (const cGH *cctkGH, int nioprocs,
 }
 
 
-static void WarnAboutDeprecatedParameters (void)
-{
-  DECLARE_CCTK_PARAMETERS;
-  char buffer[20];
-
-  if (CCTK_ParameterQueryTimesSet ("out3D_dir", CCTK_THORNSTRING) >
-      CCTK_ParameterQueryTimesSet ("out_dir", CCTK_THORNSTRING)) {
-    CCTK_WARN (CCTK_WARN_ALERT, "Parameter 'IOHDF5::out3D_dir' is deprecated, "
-               "please use 'IOHDF5::out_dir' instead");
-    CCTK_ParameterSet ("out_dir", CCTK_THORNSTRING, out3D_dir);
-  }
-  if (CCTK_ParameterQueryTimesSet ("out3D_vars", CCTK_THORNSTRING) >
-      CCTK_ParameterQueryTimesSet ("out_vars", CCTK_THORNSTRING)) {
-    CCTK_WARN (CCTK_WARN_ALERT, "Parameter 'IOHDF5::out3D_vars' is deprecated, "
-               "please use 'IOHDF5::out_vars' instead");
-    CCTK_ParameterSet ("out_vars", CCTK_THORNSTRING, out3D_vars);
-  }
-  if (CCTK_ParameterQueryTimesSet ("out3D_extension", CCTK_THORNSTRING) >
-      CCTK_ParameterQueryTimesSet ("out_extension", CCTK_THORNSTRING)) {
-    CCTK_WARN (CCTK_WARN_ALERT, "Parameter 'IOHDF5::out3D_extension' is "
-               "deprecated, please use 'IOHDF5::out_extension' instead");
-    CCTK_ParameterSet ("out_extension", CCTK_THORNSTRING, out3D_extension);
-  }
-  if (CCTK_ParameterQueryTimesSet ("out3D_criterion", CCTK_THORNSTRING) >
-      CCTK_ParameterQueryTimesSet ("out_criterion", CCTK_THORNSTRING)) {
-    CCTK_WARN (CCTK_WARN_ALERT, "Parameter 'IOHDF5::out3D_criterion' is "
-               "deprecated, please use 'IOHDF5::out_criterion' instead");
-    CCTK_ParameterSet ("out_criterion", CCTK_THORNSTRING, out3D_criterion);
-  }
-  if (CCTK_ParameterQueryTimesSet ("out3D_every", CCTK_THORNSTRING) >
-      CCTK_ParameterQueryTimesSet ("out_every", CCTK_THORNSTRING)) {
-    CCTK_WARN (CCTK_WARN_ALERT, "Parameter 'IOHDF5::out3D_every' is "
-               "deprecated, please use 'IOHDF5::out_every' instead");
-    snprintf (buffer, sizeof (buffer), "%d", out3D_every);
-    CCTK_ParameterSet ("out_every", CCTK_THORNSTRING, buffer);
-  }
-  if (CCTK_ParameterQueryTimesSet ("out3D_dt", CCTK_THORNSTRING) >
-      CCTK_ParameterQueryTimesSet ("out_dt", CCTK_THORNSTRING)) {
-    CCTK_WARN (CCTK_WARN_ALERT, "Parameter 'IOHDF5::out3D_dt' is deprecated, "
-               "please use 'IOHDF5::out_dt' instead");
-    snprintf (buffer, sizeof (buffer), "%f", (double)out3D_dt);
-    CCTK_ParameterSet ("out_dt", CCTK_THORNSTRING, buffer);
-  }
-  if (CCTK_ParameterQueryTimesSet ("in3D_dir", CCTK_THORNSTRING) >
-      CCTK_ParameterQueryTimesSet ("in_dir", CCTK_THORNSTRING)) {
-    CCTK_WARN (CCTK_WARN_ALERT, "Parameter 'IOHDF5::in3D_dir' is deprecated, "
-               "please use 'IOHDF5::in_dir' instead");
-    CCTK_ParameterSet ("in_dir", CCTK_THORNSTRING, in3D_dir);
-  }
-  if (CCTK_ParameterQueryTimesSet ("in3D_vars", CCTK_THORNSTRING) >
-      CCTK_ParameterQueryTimesSet ("in_vars", CCTK_THORNSTRING)) {
-    CCTK_WARN (CCTK_WARN_ALERT, "Parameter 'IOHDF5::in3D_vars' is deprecated, "
-               "please use 'IOHDF5::in_vars' instead");
-    CCTK_ParameterSet ("in_vars", CCTK_THORNSTRING, in3D_vars);
-  }
-  if (CCTK_ParameterQueryTimesSet ("in3D_extension", CCTK_THORNSTRING) >
-      CCTK_ParameterQueryTimesSet ("in_extension", CCTK_THORNSTRING)) {
-    CCTK_WARN (CCTK_WARN_ALERT, "Parameter 'IOHDF5::in3D_extension' is "
-               "deprecated, please use 'IOHDF5::in_extension' instead");
-    CCTK_ParameterSet ("in_extension", CCTK_THORNSTRING, in3D_extension);
-  }
-}
-
-
 } // namespace CarpetIOHDF5