Allow individual reductions on variables by parsing the options string

in the 'IOBasic::outScalar_vars' parameter.
This closes PR CactusBase/895.


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

1 files changed, 13 insertions, 13 deletions

diff --git a/src/iobasicGH.h b/src/iobasicGH.h
index c75b70e..e957a00 100644
--- a/src/iobasicGH.h
+++ b/src/iobasicGH.h
@@ -26,25 +26,26 @@ typedef struct IOBASIC_REDUCTIONLIST
   iobasic_reduction_t *reductions;
 } iobasic_reductionlist_t;
 
+typedef struct IOBASIC_PARSEINFO
+{
+  const char *reductions_string;
+  iobasic_reductionlist_t *reduction_list;
+} iobasic_parseinfo_t;
+
 typedef struct IOBASIC_GH
 {
   /* how often to output */
-  int  outScalar_every;
-  int  outInfo_every;
+  int  outScalar_every, outInfo_every;
   char info_reductions_changed;
 
-  /* flags indicating output for variable i */
-  char   *do_outScalar;
-
   /* directory in which to place scalar output */
-  char  *outdirScalar;
+  char *outdir;
 
   /* The last iteration output */
-  int   *outInfo_last;
-  int   *outScalar_last;
+  int *outInfo_last, *outScalar_last;
 
-  /* The reduction lists for info output for all variables */
-  iobasic_reductionlist_t *info_reductions;
+  /* The reduction lists for info and scalar output for all variables */
+  iobasic_reductionlist_t *info_reductions, *scalar_reductions;
 
   /* database for names of output files that were already created */
   pNamedData *filenameListScalar;
@@ -59,9 +60,8 @@ int IOBasic_TimeForInfoOutput (const cGH *GH, int vindex);
 int IOBasic_ScalarOutputGH (const cGH *GH);
 int IOBasic_TriggerScalarOutput (const cGH *GH, int vindex);
 int IOBasic_TimeForScalarOutput (const cGH *GH, int vindex);
-int IOBasic_ScalarOutputVarAs (const cGH *GH, const char *vname, const char *alias);
 
 /* other function prototypes */
+void IOBasic_AssignReductionList (int vindex, const char *optstring, void *arg);
 int IOBasic_WriteInfo (const cGH *GH, int vindex);
-int IOBasic_WriteScalarGS (const cGH *GH, int vindex, const char *alias);
-int IOBasic_WriteScalarGA (const cGH *GH, int vindex, const char *alias);
+int IOBasic_WriteScalar (const cGH *GH, int vindex, const char *alias);