Changed the out_style parameter from KEYWORD into STRING.

It's got a nice regular expression as its range string,
allowing you not only to specify which format to output
(exponential or fixed) but also the precision.
The default value is ".13f" complying with the former implementation
of a hard-coded precision.

No exisiting parameter files should be affected, you can still use
"e" or "f".


git-svn-id: http://svn.cactuscode.org/arrangements/CactusBase/IOBasic/trunk@81 b589c3ab-70e8-4b4d-a09f-cba2dd200880

1 files changed, 7 insertions, 8 deletions

diff --git a/param.ccl b/param.ccl
index 1f685e8..5da04de 100644
--- a/param.ccl
+++ b/param.ccl
@@ -34,7 +34,7 @@ STRING outScalar_vars "Variables to output into files" STEERABLE = ALWAYS
 ##########################
 STRING outScalar_reductions "List of reductions to output into files" STEERABLE = ALWAYS
 {
-  .* :: "A regex which matches everything"
+  ".*" :: "A regex which matches everything"
 } "minimum maximum norm1 norm2"
 
 
@@ -51,20 +51,19 @@ INT outScalar_every "How often to do Info output" STEERABLE = ALWAYS
 } -1
 
 
-#################
-# 1D output style
-#################
+#####################
+# Scalar output style
+#####################
 KEYWORD outScalar_style "Which style for Scalar output"
 {
   "gnuplot" :: "1D output readable by gnuplot"
   "xgraph"  :: "1D output readable by xgraph"
 } "xgraph"
 
-KEYWORD out_format "Which format for output"
+STRING out_format "Which format for Scalar output"
 {
-  "e" :: "1D output in exponential notation"
-  "f" :: "1D output in floating point notation"
-} "f"
+  ^(\.[0-9]{1,2})?[ef]$ :: "output with given precision in exponential / floating point notation"
+} ".13f"