Tidying up several things:

 - sp2xyz moved from PUGH's into IOFlexIO's GH extension
   call SetupSliceCenter() at startup to set up slice center for 2D output
 - fixed wrong indexing on ownership[] which caused buggy 2D output
 - use ParseVarsForOutput() instead of InitIONum() for parsing the out_vars
   parameter
 - decide which output dir shall be used by using CCTK_ParameterInfo()
   rather than comparing it with its old "outdir" default value
 - outdirs are always created now (not only if out_vars was non-empty)
   because IO methods might be invoked via CCTK_OutputVarAs() also
 - some variables renamed for better readability
 - fixed compiler warnings
 - hopefully get rid of empty IEEEIO subdir


git-svn-id: http://svn.cactuscode.org/arrangements/CactusPUGHIO/IOFlexIO/trunk@62 ebee0441-1374-4afa-a3b5-247f3ba15b9a

1 files changed, 16 insertions, 12 deletions

diff --git a/src/ioFlexGH.h b/src/ioFlexGH.h
index 4138fa5..69d3d73 100644
--- a/src/ioFlexGH.h
+++ b/src/ioFlexGH.h
@@ -21,6 +21,7 @@
 
 #include "external/IEEEIO/src/IOProtos.h"
 #include "external/IEEEIO/src/IEEEIO.h"
+#include "external/IEEEIO/src/MPIO.h"
 
 
 /* define the IOFlexIO datatypes according to CCTK_??? datatypes */
@@ -66,21 +67,21 @@
 
 typedef struct IOFlexIOGH {
 
-  /* The number of times output */
-  int   *IO_2Dnum;
-  int   *IO_3Dnum;
+  /* flags indicating output for var [i] */
+  char   *do_out2D;
+  char   *do_out3D;
 
-  /* How often to output */
-  int  IO_2Devery;
-  int  IO_3Devery;
+  /* how often to output */
+  int  out2D_every;
+  int  out3D_every;
 
-  /* Directory in which to output */
-  char  *outpfx_2D;
-  char  *outpfx_3D;
+  /* directory in which to output */
+  char  *outdir2D;
+  char  *outdir3D;
 
-  /* The last iteration output */
-  int   *IO_2Dlast;
-  int   *IO_3Dlast;
+  /* the last iteration output */
+  int   *out2D_last;
+  int   *out3D_last;
 
   /* IEEEIO file name and pointer for 3D output */
   char  **IEEEfname_3D;
@@ -93,6 +94,9 @@ typedef struct IOFlexIOGH {
   pNamedData *filenameList2D;
   pNamedData *fileList_3D;
 
+  /* slice point for 2D output */
+  int sp2xyz [3];
+
 } flexioGH;