Removed all arrangement names from error messages since arrangement is not

defined in these routines (yet).


git-svn-id: http://svn.cactuscode.org/flesh/trunk@3272 17b73243-c579-4c4c-a9d2-2d5706c11dac

1 files changed, 10 insertions, 10 deletions

diff --git a/lib/sbin/parameter_parser.pl b/lib/sbin/parameter_parser.pl
index 30b22c73..2fd3d401 100644
--- a/lib/sbin/parameter_parser.pl
+++ b/lib/sbin/parameter_parser.pl
@@ -190,7 +190,7 @@ sub parse_param_ccl
         }
         else
         {
-          $message = "Missing description for parameter $variable in param.ccl for thorn $arrangement/$thorn.";
+          $message = "Missing description for parameter $variable in param.ccl for thorn $thorn.";
 	  $hint = "The first line of each parameter definition must have the syntax <TYPE> <NAME> <\"DESCRIPTION\">";
           &CST_error(0,$message,$hint,__LINE__,__FILE__);
         }
@@ -399,13 +399,13 @@ sub parse_param_ccl
             if($delim eq "" || ($delim =~ /::/ && $new_desc =~ /^\s*$/))
             {
 	      $new_ranges =~ /^\s*(.*)\s*\n/;
-	      $message = "Missing description for range $1 for parameter $variable in param.ccl for thorn $arrangement/$thorn.";
+	      $message = "Missing description for range $1 for parameter $variable in param.ccl for thorn $thorn.";
 	      $hint = "Each parameter range line should have the syntax <RANGE> :: <\"DESCRIPTION\">";
               &CST_error(1,$message,$hint,__LINE__,__FILE__);
             }
             elsif ($new_desc =~ /^\s*\".*[^\s\"]\s*$|^\s*[^\s\"].*\"\s*$/)
             {
-              $message = "Description of range for parameter $variable has misplaced quotes ($new_desc) in param.ccl for thorn $arrangement/$thorn";
+              $message = "Description of range for parameter $variable has misplaced quotes ($new_desc) in param.ccl for thorn $thorn";
               &CST_error(0,$message,"",__LINE__,__FILE__);
             }
             $parameter_db{"\U$thorn $variable\E range $parameter_db{\"\U$thorn $variable\E ranges\"} description"} = $new_desc;
@@ -416,7 +416,7 @@ sub parse_param_ccl
         # Give a warning if no range was given and it was needed
         if (($use_clause == 0)  && ($parameter_db{"\U$thorn $variable\E ranges"}==0 && $type =~ m:INT|REAL:))
         {
-            $message = "No range provided for parameter $variable in param.ccl for thorn $arrangement/$thorn";
+            $message = "No range provided for parameter $variable in param.ccl for thorn $thorn";
 	    $hint = "All definitions for integer and real parameters must provide one or more allowed ranges";
             &CST_error(0,$message,$hint,__LINE__,__FILE__);
         }
@@ -470,7 +470,7 @@ sub parse_param_ccl
       else
       {
 	$line =~ /^(.*)\n+$/;
-        $message = "Unknown line in param.ccl for thorn $arrangement/$thorn\n\"$1\"";
+        $message = "Unknown line in param.ccl for thorn $thorn\n\"$1\"";
         &CST_error(0,$message,"",__LINE__,__FILE__);
       }
     }
@@ -564,7 +564,7 @@ sub CheckParameterDefault
   {
     if ($default !~ m:^yes|no|y|n|1|0|t|f|true|false$:i)
       {
-      $message = "Default ($default) for boolean parameter \"$variable\" is incorrect in param.ccl for thorn $arrangement/$thorn";
+      $message = "Default ($default) for boolean parameter \"$variable\" is incorrect in param.ccl for thorn $thorn";
       $hint = "The default value for a boolean parameter must be one of yes,no,y,n,1,0,t,f,true,false";
         &CST_error(0,$message,$hint,__LINE__,__FILE__);
       }
@@ -590,7 +590,7 @@ sub CheckParameterDefault
     }
     if ($foundit == 0)
     {
-      $message = "Default ($default) for keyword parameter \"$variable\" is incorrect in param.ccl for thorn $arrangement/$thorn";
+      $message = "Default ($default) for keyword parameter \"$variable\" is incorrect in param.ccl for thorn $thorn";
       $hint = "The default value for a parameter must lie within the allowed range";
       &CST_error(0,$message,$hint,__LINE__,__FILE__);
     }
@@ -615,7 +615,7 @@ sub CheckParameterDefault
     }
     if ($foundit == 0)
     {
-      $message = "Default ($default) for string parameter \"$variable\" is incorrect in param.ccl for thorn $arrangement/$thorn";
+      $message = "Default ($default) for string parameter \"$variable\" is incorrect in param.ccl for thorn $thorn";
       $hint = "The default value for a parameter must lie within an allowed range";
       &CST_error(0,$message,$hint,__LINE__,__FILE__);
     }
@@ -660,7 +660,7 @@ sub CheckParameterDefault
     }
     if ($nranges > 0 && $foundit == 0)
     {
-      $message = "Default ($default) for integer parameter \"$variable\" is incorrect in param.ccl for thorn $arrangement/$thorn";
+      $message = "Default ($default) for integer parameter \"$variable\" is incorrect in param.ccl for thorn $thorn";
       $hint = "The default value for a parameter must lie within the allowed range";
       &CST_error(0,$message,$hint,__LINE__,__FILE__);
     }
@@ -704,7 +704,7 @@ sub CheckParameterDefault
     }
     if ($nranges > 0 && $foundit == 0)
     {
-      $message = "Default ($default) for real parameter \"$variable\" is incorrect in param.ccl for thorn $arrangement/$thorn";
+      $message = "Default ($default) for real parameter \"$variable\" is incorrect in param.ccl for thorn $thorn";
       $hint = "The default value for a parameter must lie within the allowed range";
       &CST_error(0,$message,$hint,__LINE__,__FILE__);
     }