Completly reworked IOJpeg. All the old hyperslabbing crap and dependency on

IOASCII is gone now. IOJpeg uses the new Hyperslab API and does its own
slice center setup. It also uses the new filenaming scheme.


git-svn-id: http://svn.cactuscode.org/arrangements/CactusIO/IOJpeg/trunk@59 eff87b29-5268-4891-90a3-a07138403961

1 files changed, 66 insertions, 73 deletions

diff --git a/param.ccl b/param.ccl
index f98494f..b6d1f46 100644
--- a/param.ccl
+++ b/param.ccl
@@ -1,12 +1,44 @@
 # Parameter definitions for thorn IOJpeg
 # $Header$
 
+#############################################################################
+### declare IOASCII parameters
+#############################################################################
 private:
 
 ########################
+# The basic parameters:
+# how often to do output
+# for which variables
+# into which output directory
+########################
+INT out2D_every "How often to do output, overrides IO::out_every" STEERABLE = ALWAYS
+{
+  -1   :: "Never"
+   1:* :: "Every so many iterations"	
+} -1
+
+STRING out2D_vars "Variables to output as JPEGs" STEERABLE = ALWAYS
+{
+  .* :: "A regex which matches everything"
+} ""
+
+STRING out2D_dir "Name of IOJpeg output directory, overrides IO::outdir"
+{
+  .* :: "A regex which matches everything"
+} "."
+
+KEYWORD mode "Output mode to use" STEERABLE = ALWAYS
+{
+  "remove"   :: "Remove files from old timesteps"
+  "standard" :: "Generate a file for each out2D_every timesteps"
+} "standard"
+
+
+########################
 # Specific to jpegs
 ########################
-REAL colormap_bias "Bias automatic colormap generation towards red  (low) or blue (high)" STEERABLE = ALWAYS
+REAL colormap_bias "Bias automatic colormap generation towards red (low) or blue (high)" STEERABLE = ALWAYS
 {
   -1:1 :: "Could be unrestricted"
 } 0.5
@@ -21,7 +53,7 @@ INT colormap_factor "How to scale float values to rgb color" STEERABLE = ALWAYS
   2:256 :: "Positive scaling"
 } 32
 
-KEYWORD colormap "how to set the colormap" STEERABLE=ALWAYS
+KEYWORD colormap "How to set the colormap" STEERABLE = ALWAYS
 {
   "auto"   :: "Set automatically using min/max of grid variables"
   "custom" :: "Set min/max manually"
@@ -29,94 +61,55 @@ KEYWORD colormap "how to set the colormap" STEERABLE=ALWAYS
 
 REAL colormap_min "minimum value to be mapped to colors" STEERABLE = ALWAYS
 {
- *:* :: "Only for custom colormap scale"
+  *:* :: "Only for custom colormap scale"
 } -1.0
-
 REAL colormap_max "maximum value to be mapped to colors" STEERABLE = ALWAYS
 {
- *:* :: "Only for custom colormap scale"
+  *:* :: "Only for custom colormap scale"
 } +1.0
 
-########################
-# How often to do output
-########################
-INT out2D_every "How often to do output, overrides IO::out_every" STEERABLE = ALWAYS
-{
-  -1   :: "Never"
-   1:* :: "Every so many iterations"	
-} -1
-
-KEYWORD verbose "Verbosity level"
-{
-  "yes"  :: "information output"
-  "debug":: "debugging output"
-  "no"   :: "silent"
-} "no"
- 
-#####################
-# Variables to output
-#####################
-STRING out2D_vars "Variables to extract data from" STEERABLE = ALWAYS
-{
-  .* :: "A regex which matches everything"
-} ""
 
-STRING out2D_dir "Name of 2D Jpeg output directory, overrides outdir"
+################################
+# Choosing what planes to output
+################################
+CCTK_REAL out2D_yzplane_x "x-coord for 2D planes in yz"
 {
-  .* :: "A regex which matches everything"
-} "."
-
-KEYWORD mode "Output mode to use" STEERABLE=ALWAYS
+  *:* :: ""
+} 0.0
+CCTK_REAL out2D_xzplane_y "y-coord for 2D planes in xz"
 {
-  "remove" :: "Remove files from old timesteps"
-  "standard" :: "Generate a file for each out2D_every timesteps"
-} "standard"
-
-#####################
-# Geometry information on the slab to extract
-#####################
-
-STRING origin2D "Common Intersection point of the n Slices" STEERABLE = ALWAYS
+  *:* :: ""
+} 0.0
+CCTK_REAL out2D_xyplane_z "z-coord for 2D planes in xy"
 {
-  .* :: "Comma separated list of positive integer values"
-} "-1,-1,-1"
-
-STRING downsampling2D "Default downsampling" STEERABLE = ALWAYS
+  *:* :: ""
+} 0.0
+CCTK_INT out2D_xyplane_zi "z-index (from 0) for 2D planes in xy"
 {
-  .* :: "Comma separated list of positive integer values"
-} "1,1,1"
-
-STRING length2D "Default length of the hyperslab to stream" STEERABLE = ALWAYS
+  0:* :: ""
+} 0
+CCTK_INT out2D_xzplane_yi "y-index (from 0) for 2D planes in xz"
 {
-  .* :: "Comma separated list of integer values"
-} "-1,-1,-1"
-
-STRING direction2D "Default direction of hyperslab to stream" STEERABLE = ALWAYS
-{
-  .* :: "Comma separated list of positive integer values"
-} "0,1,2"
-
-CCTK_INT slabdim "default dimension of slab"
+  0:* :: ""
+} 0
+CCTK_INT out2D_yzplane_xi "x-index (from 0) for 2D planes in yz"
 {
- 1:3 :: "dimension of slab (1,2,3)"
-} 2
+  0:* :: ""
+} 0
 
 
 #############################################################################
 ### import IOUtil parameters
 #############################################################################
-
 shares: IO
 
+USES INT out_every
+USES STRING outdir
+USES BOOLEAN verbose
 USES KEYWORD newverbose
-
-########################
-# How often to do output
-########################
-USES INT out_every 
-
-####################
-# Output directories
-####################
-USES STRING outdir 
-
+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