Parameter names changes as announced in today's mail to users@cactuscode.org.

You must also update thorn IOUtil now.


git-svn-id: http://svn.cactuscode.org/arrangements/CactusPUGHIO/IsoSurfacer/trunk@60 bfcf8e34-485d-4d46-a995-1fd6fa6fb178

1 files changed, 48 insertions, 21 deletions

diff --git a/param.ccl b/param.ccl
index 8985537..c0f9137 100644
--- a/param.ccl
+++ b/param.ccl
@@ -3,31 +3,64 @@
 
 private:
 
-STRING output_format "What form to output the datasets" # STEERABLE = ALWAYS
+STRING out_dir "Output directory for IsoSurfacer files, overrides IO::out_dir"
 {
-  .* :: "Comma separated list.  Can be UCD, VRML, ASCII, SOCK or None"
-} "None"
+  ".+" :: "A valid directory name"
+  "^$" :: "An empty string to choose the default from IO::out_dir"
+} ""
+STRING outdir "Output directory for IsoSurfacer files, overrides IO::out_dir DEPRECATED IN BETA13)"
+{
+  ".+" :: "A valid directory name"
+  "^$" :: "An empty string to choose the default from IO::out_dir"
+} ""
 
-STRING output_var "What Grid Function name to output" # STEERABLE = ALWAYS
+STRING out_vars "Variable to output isosurfaces for" # STEERABLE = ALWAYS
 {
- .* :: "Eventually a comma separated list, but now a single name"
-} "None"
+  ".+" :: "Fully qualified variable name"
+  "^$" :: "An empty string to output nothing"
+} ""
+STRING output_var "Variable to output isosurfaces for (DEPRECATED IN BETA13)" # STEERABLE = ALWAYS
+{
+  ".+" :: "Fully qualified variable name"
+  "^$" :: "An empty string to output nothing"
+} ""
 
-CCTK_REAL isovalue "Isosurface value" STEERABLE = ALWAYS
+INT out_every "How often to output isosurfaces, overrides IO::out_every" # STEERABLE = ALWAYS
 {
- : :: "Any floating point value"
-} 1.0
+   1:* :: "Every so many iterations"
+   0:  :: "Disable IsoSurfacer output"
+  -1:  :: "Default to IO::out_every"
+} -1
+INT output_frequency "How often to output isosurfaces, overrides IO::out_every (DEPRECATED IN BETA13)" # STEERABLE = ALWAYS
+{
+   1:* :: "Every so many iterations"
+   0:  :: "Disable IsoSurfacer output"
+  -1:  :: "Default to IO::out_every"
+} -1
 
-INT output_frequency "How often to output the isosurfaces" # STEERABLE = ALWAYS
+INT out_start "First iteration to start drawing isosurfaces" # STEERABLE = ALWAYS
 {
   1: :: "Some positive integer"
 } 1
-
-INT output_start "First iteration to start drawing isosurfaces. Default=1" # STEERABLE = ALWAYS
+INT output_start "First iteration to start drawing isosurfaces (DEPRECATED IN BETA13)" # STEERABLE = ALWAYS
 {
   1: :: "Some positive integer"
 } 1
 
+STRING out_format "What format to output isosufaces" # STEERABLE = ALWAYS
+{
+  .* :: "Comma separated list.  Can be UCD, VRML, ASCII, SOCK or None"
+} "None"
+STRING output_format "What format to output isosufaces (DEPRECATED IN BETA13)" # STEERABLE = ALWAYS
+{
+  .* :: "Comma separated list.  Can be UCD, VRML, ASCII, SOCK or None"
+} "None"
+
+REAL isovalue "Isosurface value" STEERABLE = ALWAYS
+{
+ : :: "Any floating point value"
+} 1.0
+
 INT dataport "dataport for socket connection (output port)"
 {
   1:65535 :: "Some positive integer"
@@ -51,11 +84,6 @@ BOOLEAN allow_empty_sends "Allow the Isosurfacer to send zero-length vertex list
 {
 } "no"
 
-STRING outdir "Output directory for isosurface data files"
-{
-  .* :: "A regex which matches everything"
-} "."
-
 STRING isosurfacer " What to isosurface and how. Format:{(functionName) (isolevel1, isolevel2, ...) (format1, format2, ...) (itiso, resolution, firstIteration, uniqverts)} {} ...:: only for backward compability with old isosurfacer"
 {
  .* :: "compatability with original isosurfacer"
@@ -67,7 +95,6 @@ STRING isosurfacer " What to isosurface and how. Format:{(functionName) (isoleve
 #############################################################################
 shares: IO
 
-####################
-# verbose flag
-####################
-USES BOOLEAN verbose 
+#FIXME: want USES STRING out_dir AS default_out_dir
+#FIXME: want USES INT out_every AS default_out_every
+USES KEYWORD verbose