Trying to be a good citizen and checking parameters in beforehand

Trying to be a good citizen and checking parameters in beforehand
instead of aborting later.

darcs-hash:20011205163454-07bb3-43689c13233a07b2a7082816cdca5430b2c35589.gz

1 files changed, 3 insertions, 20 deletions

diff --git a/Carpet/Carpet/src/CarpetParamCheck.cc b/Carpet/Carpet/src/CarpetParamCheck.cc
index e3e407120..cea4d186b 100644
--- a/Carpet/Carpet/src/CarpetParamCheck.cc
+++ b/Carpet/Carpet/src/CarpetParamCheck.cc
@@ -2,15 +2,10 @@
 #include <stdlib.h>
 
 #include "cctk.h"
-#include "cctk_Arguments.h"
-#include "cctk_Parameters.h"
 
 #include "carpet.hh"
 
-extern "C" {
-  static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/CarpetParamCheck.cc,v 1.9 2003/09/19 16:04:31 schnetter Exp $";
-  CCTK_FILEVERSION(Carpet_Carpet_CarpetParamCheck_cc);
-}
+static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/CarpetParamCheck.cc,v 1.1 2001/12/05 17:34:54 schnetter Exp $";
 
 
 
@@ -18,22 +13,10 @@ namespace Carpet {
   
   using namespace std;
   
-  /** Ensure that the parameters have legal values.
-   *
-   * Note that this checking happens only after most of Carpet has
-   * already been set up.
-   */
-  void CarpetParamCheck (CCTK_ARGUMENTS)
+  int CarpetParamCheck()
   {
-    DECLARE_CCTK_ARGUMENTS;
-    DECLARE_CCTK_PARAMETERS;
     
-    if (CCTK_ParameterQueryTimesSet ("periodic", "Carpet")
-	|| CCTK_ParameterQueryTimesSet ("periodic_x", "Carpet")
-	|| CCTK_ParameterQueryTimesSet ("periodic_y", "Carpet")
-	|| CCTK_ParameterQueryTimesSet ("periodic_z", "Carpet")) {
-      CCTK_PARAMWARN ("Some of the parameters \"Carpet::periodic*\" have been set.  These parameters are there for compatibility reasons only and must not be used.");
-    }
+    return 0;
   }
   
 } // namespace Carpet