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/CactusIO/IOJpeg/trunk@69 eff87b29-5268-4891-90a3-a07138403961

1 files changed, 60 insertions, 34 deletions

diff --git a/param.ccl b/param.ccl
index d8dfc53..7dc3157 100644
--- a/param.ccl
+++ b/param.ccl
@@ -12,19 +12,39 @@ private:
 # for which variables
 # into which output directory
 ########################
-INT out2D_every "How often to do output, overrides IO::out_every" STEERABLE = ALWAYS
+INT out_every "How often to do IOJpeg output, overrides IO::out_every" STEERABLE = ALWAYS
 {
-  -1:* :: "Every so many iterations, values <= 0 disable IOJpeg output"	
+   1:* :: "Every so many iterations"
+   0:  :: "Disable IOJpeg output"
+  -1:  :: "Choose the default from IO::out_every"
+} -1
+INT out2D_every "How often to do IOJpeg output, overrides IO::out_every (DEPRICATED IN BETA13)" STEERABLE = ALWAYS
+{
+   1:* :: "Every so many iterations"
+   0:  :: "Disable IOJpeg output"
+  -1:  :: "Choose the default from IO::out_every"
 } -1
 
-STRING out2D_vars "Variables to output as JPEGs" STEERABLE = ALWAYS
+STRING out_vars "Variables to output by IOJpeg" STEERABLE = ALWAYS
 {
-  .* :: "A regex which matches everything"
+  ".+" :: "Space-separated list of fully qualified variable/group names"
+  "^$" :: "An empty string to output nothing"
+} ""
+STRING out2D_vars "Variables to output by IOJpeg (DEPRICATED IN BETA13)" STEERABLE = ALWAYS
+{
+  ".+" :: "Space-separated list of fully qualified variable/group names"
+  "^$" :: "An empty string to output nothing"
 } ""
 
-STRING out2D_dir "Name of IOJpeg output directory, overrides IO::outdir"
+STRING out_dir "Output directory for IOJpeg files, overrides IO::out_dir" STEERABLE = RECOVER
+{
+  ".+" :: "A valid directory name"
+  "^$" :: "An empty string to choose the default from IO::out_dir"
+} ""
+STRING out2D_dir "Output directory for IOJpeg files, overrides IO::out_dir (DEPRECATED IN BETA13)" STEERABLE = RECOVER
 {
-  .* :: "Any valid directory name, an empty string defaults to outdir"
+  ".+" :: "A valid directory name"
+  "^$" :: "An empty string to choose the default from IO::out_dir"
 } ""
 
 KEYWORD mode "Output mode to use" STEERABLE = ALWAYS
@@ -71,30 +91,37 @@ REAL colormap_max "maximum value to be mapped to colors" STEERABLE = ALWAYS
 ################################
 # Choosing what planes to output
 ################################
-CCTK_REAL out2D_yzplane_x "x-coord for 2D planes in yz"
+REAL out2D_yzplane_x "x-coord for 2D planes in yz" STEERABLE = RECOVER
 {
-  *:* :: ""
-} 0.0
-CCTK_REAL out2D_xzplane_y "y-coord for 2D planes in xz"
+  *:*      :: "A value between [xmin, xmax]"
+  -424242: :: "Default to IO::out_yzplane_x"
+} -424242
+REAL out2D_xzplane_y "y-coord for 2D planes in xz" STEERABLE = RECOVER
 {
-  *:* :: ""
-} 0.0
-CCTK_REAL out2D_xyplane_z "z-coord for 2D planes in xy"
+  *:*      :: "A value between [ymin, ymax]"
+  -424242: :: "Default to IO::out_xzplane_y"
+} -424242
+REAL out2D_xyplane_z "z-coord for 2D planes in xy" STEERABLE = RECOVER
 {
-  *:* :: ""
-} 0.0
-CCTK_INT out2D_xyplane_zi "z-index (from 0) for 2D planes in xy"
+  *:*      :: "A value between [zmin, zmax]"
+  -424242: :: "Default to IO::out_xyplane_z"
+} -424242
+
+INT out2D_yzplane_xi "x-index (from 0) for 2D planes in yz" STEERABLE = RECOVER
 {
-  0:* :: ""
-} 0
-CCTK_INT out2D_xzplane_yi "y-index (from 0) for 2D planes in xz"
+   0:* :: "An index between [0, nx)"
+  -1:  :: "Choose the default from IO::out_yzplane_xi"
+} -1
+INT out2D_xzplane_yi "y-index (from 0) for 2D planes in xz" STEERABLE = RECOVER
 {
-  0:* :: ""
-} 0
-CCTK_INT out2D_yzplane_xi "x-index (from 0) for 2D planes in yz"
+   0:* :: "An index between [0, ny)"
+  -1:  :: "Choose the default from IO::out_xzplane_yi"
+} -1
+INT out2D_xyplane_zi "z-index (from 0) for 2D planes in xy" STEERABLE = RECOVER
 {
-  0:* :: ""
-} 0
+   0:* :: "An index between [0, nz)"
+  -1:  :: "Choose the default from IO::out_xyplane_zi"
+} -1
 
 
 #############################################################################
@@ -102,13 +129,12 @@ CCTK_INT out2D_yzplane_xi "x-index (from 0) for 2D planes in yz"
 #############################################################################
 shares: IO
 
-USES INT out_every
-USES STRING outdir
-USES BOOLEAN verbose
-USES KEYWORD newverbose
-USES CCTK_REAL out_yzplane_x
-USES CCTK_REAL out_xzplane_y
-USES CCTK_REAL out_xyplane_z
-USES CCTK_INT out_xyplane_zi
-USES CCTK_INT out_xzplane_yi
-USES CCTK_INT out_yzplane_xi
+#FIXME: want USES STRING out_dir AS default_out_dir
+#FIXME: want USES INT out_every AS default_out_every
+USES KEYWORD verbose
+USES REAL out_yzplane_x
+USES REAL out_xzplane_y
+USES REAL out_xyplane_z
+USES INT out_yzplane_xi
+USES INT out_xzplane_yi
+USES INT out_xyplane_zi