CarpetIOHDF5/src/Output.cc: changed warning level for deprecated parameters from 1 to 2; don't sleep(3) after such warnings

darcs-hash:20041207163828-3fd61-dac602f5c3a0285ed05e79046d3fde3c57e22c33.gz

1 files changed, 11 insertions, 9 deletions

diff --git a/Carpet/CarpetIOHDF5/src/Output.cc b/Carpet/CarpetIOHDF5/src/Output.cc
index 280ad4024..46434b5ff 100644
--- a/Carpet/CarpetIOHDF5/src/Output.cc
+++ b/Carpet/CarpetIOHDF5/src/Output.cc
@@ -556,10 +556,12 @@ static int OutputGH (const cGH* const cctkGH)
     {
       if (WarnAboutDeprecatedParameters ())
       {
+#if 0
         // annoy the user if (s)he still used deprecated parameters
         CCTK_WARN (1, "Now waiting 5 seconds to let your notice the "
                       "warning message(s) above...");
         sleep (5);
+#endif
       }
     }
     first_time = 0;
@@ -875,7 +877,7 @@ static int WarnAboutDeprecatedParameters (void)
   if (CCTK_ParameterQueryTimesSet ("out3D_dir", CCTK_THORNSTRING) >
       CCTK_ParameterQueryTimesSet ("out_dir", CCTK_THORNSTRING))
   {
-    CCTK_WARN (1, "Parameter 'IOHDF5::out3D_dir' is deprecated, please use "
+    CCTK_WARN (2, "Parameter 'IOHDF5::out3D_dir' is deprecated, please use "
                   "'IOHDF5::out_dir' instead");
     CCTK_ParameterSet ("out_dir", CCTK_THORNSTRING, out3D_dir);
     warnings++;
@@ -883,7 +885,7 @@ static int WarnAboutDeprecatedParameters (void)
   if (CCTK_ParameterQueryTimesSet ("out3D_vars", CCTK_THORNSTRING) >
       CCTK_ParameterQueryTimesSet ("out_vars", CCTK_THORNSTRING))
   {
-    CCTK_WARN (1, "Parameter 'IOHDF5::out3D_vars' is deprecated, please use "
+    CCTK_WARN (2, "Parameter 'IOHDF5::out3D_vars' is deprecated, please use "
                   "'IOHDF5::out_vars' instead");
     CCTK_ParameterSet ("out_vars", CCTK_THORNSTRING, out3D_vars);
     warnings++;
@@ -891,7 +893,7 @@ static int WarnAboutDeprecatedParameters (void)
   if (CCTK_ParameterQueryTimesSet ("out3D_extension", CCTK_THORNSTRING) >
       CCTK_ParameterQueryTimesSet ("out_extension", CCTK_THORNSTRING))
   {
-    CCTK_WARN (1, "Parameter 'IOHDF5::out3D_extension' is deprecated, please use "
+    CCTK_WARN (2, "Parameter 'IOHDF5::out3D_extension' is deprecated, please use "
                   "'IOHDF5::out_extension' instead");
     CCTK_ParameterSet ("out_extension", CCTK_THORNSTRING, out3D_extension);
     warnings++;
@@ -899,7 +901,7 @@ static int WarnAboutDeprecatedParameters (void)
   if (CCTK_ParameterQueryTimesSet ("out3D_criterion", CCTK_THORNSTRING) >
       CCTK_ParameterQueryTimesSet ("out_criterion", CCTK_THORNSTRING))
   {
-    CCTK_WARN (1, "Parameter 'IOHDF5::out3D_criterion' is deprecated, please use "
+    CCTK_WARN (2, "Parameter 'IOHDF5::out3D_criterion' is deprecated, please use "
                   "'IOHDF5::out_criterion' instead");
     CCTK_ParameterSet ("out_criterion", CCTK_THORNSTRING, out3D_criterion);
     warnings++;
@@ -907,7 +909,7 @@ static int WarnAboutDeprecatedParameters (void)
   if (CCTK_ParameterQueryTimesSet ("out3D_every", CCTK_THORNSTRING) >
       CCTK_ParameterQueryTimesSet ("out_every", CCTK_THORNSTRING))
   {
-    CCTK_WARN (1, "Parameter 'IOHDF5::out3D_every' is deprecated, please use "
+    CCTK_WARN (2, "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);
@@ -916,7 +918,7 @@ static int WarnAboutDeprecatedParameters (void)
   if (CCTK_ParameterQueryTimesSet ("out3D_dt", CCTK_THORNSTRING) >
       CCTK_ParameterQueryTimesSet ("out_dt", CCTK_THORNSTRING))
   {
-    CCTK_WARN (1, "Parameter 'IOHDF5::out3D_dt' is deprecated, please use "
+    CCTK_WARN (2, "Parameter 'IOHDF5::out3D_dt' is deprecated, please use "
                   "'IOHDF5::out_dt' instead");
     snprintf (buffer, sizeof (buffer), "%f", out3D_dt);
     CCTK_ParameterSet ("out_dt", CCTK_THORNSTRING, buffer);
@@ -925,7 +927,7 @@ static int WarnAboutDeprecatedParameters (void)
   if (CCTK_ParameterQueryTimesSet ("in3D_dir", CCTK_THORNSTRING) >
       CCTK_ParameterQueryTimesSet ("in_dir", CCTK_THORNSTRING))
   {
-    CCTK_WARN (1, "Parameter 'IOHDF5::in3D_dir' is deprecated, please use "
+    CCTK_WARN (2, "Parameter 'IOHDF5::in3D_dir' is deprecated, please use "
                   "'IOHDF5::in_dir' instead");
     CCTK_ParameterSet ("in_dir", CCTK_THORNSTRING, in3D_dir);
     warnings++;
@@ -933,7 +935,7 @@ static int WarnAboutDeprecatedParameters (void)
   if (CCTK_ParameterQueryTimesSet ("in3D_vars", CCTK_THORNSTRING) >
       CCTK_ParameterQueryTimesSet ("in_vars", CCTK_THORNSTRING))
   {
-    CCTK_WARN (1, "Parameter 'IOHDF5::in3D_vars' is deprecated, please use "
+    CCTK_WARN (2, "Parameter 'IOHDF5::in3D_vars' is deprecated, please use "
                   "'IOHDF5::in_vars' instead");
     CCTK_ParameterSet ("in_vars", CCTK_THORNSTRING, in3D_vars);
     warnings++;
@@ -941,7 +943,7 @@ static int WarnAboutDeprecatedParameters (void)
   if (CCTK_ParameterQueryTimesSet ("in3D_extension", CCTK_THORNSTRING) >
       CCTK_ParameterQueryTimesSet ("in_extension", CCTK_THORNSTRING))
   {
-    CCTK_WARN (1, "Parameter 'IOHDF5::in3D_extension' is deprecated, please use "
+    CCTK_WARN (2, "Parameter 'IOHDF5::in3D_extension' is deprecated, please use "
                   "'IOHDF5::in_extension' instead");
     CCTK_ParameterSet ("in_extension", CCTK_THORNSTRING, in3D_extension);
     warnings++;