Moving file list structure definitions into ioFlexGH.h.

Removed unused timers for parameter recovery.


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

3 files changed, 11 insertions, 16 deletions

diff --git a/src/Write2D.c b/src/Write2D.c
index aa02934..dfa5d8a 100644
--- a/src/Write2D.c
+++ b/src/Write2D.c
@@ -158,7 +158,7 @@ void IOFlexIO_Write2D (cGH *GH, int index, const char *alias)
   if (myproc == 0) {
 
     /* see if output file for this alias name was already created */
-    IEEEfile_2D = (IOFile *) GetNamedData (myGH->filenameList2D, alias);
+    IEEEfile_2D = (IOFile *) GetNamedData (myGH->fileList_2D, alias);
     if (IEEEfile_2D == NULL) 
     {
       char *fname;
@@ -193,7 +193,7 @@ void IOFlexIO_Write2D (cGH *GH, int index, const char *alias)
       }
       
       /* store file desriptors in database */
-      StoreNamedData (&myGH->filenameList2D, alias, IEEEfile_2D);
+      StoreNamedData (&myGH->fileList_2D, alias, IEEEfile_2D);
 
       free (fname);
     }
diff --git a/src/Write3D.c b/src/Write3D.c
index 9fb0ef8..3815059 100644
--- a/src/Write3D.c
+++ b/src/Write3D.c
@@ -46,13 +46,6 @@ static char *rcsid = "$Header$";
 CCTK_FILEVERSION(CactusPUGHIO_IOFlexIO_Write3D_c)
 
 
-/* info structure describing IEEEIO files 
-   For each opened file there is one entry in the file database. */
-typedef struct {
-  IOFile iofile;
-  char *filename;
-} IEEEfile_3D_t;
-
 /* Function prototypes from other files in this thorn */
 void IOFlexIOi_DumpGHExtensions (cGH *GH, IOFile iof);
 void IOFlexIOi_DumpParameters (cGH *GH, IOFile iof);
diff --git a/src/ioFlexGH.h b/src/ioFlexGH.h
index 4835945..bfe059e 100644
--- a/src/ioFlexGH.h
+++ b/src/ioFlexGH.h
@@ -65,6 +65,14 @@
     } while (0)
 
 
+/* info structure describing 3D IEEEIO output files
+   For each open file there is one entry in the file database. */
+typedef struct {
+  IOFile iofile;
+  char *filename;
+} IEEEfile_3D_t;
+
+
 /* structure holding necessary information about a recovery file */
 typedef struct { 
   int is_IEEEIO_file;       /* flag indicating valid file info */
@@ -96,12 +104,8 @@ typedef struct IOFlexIOGH {
   int   *out2D_last;
   int   *out3D_last;
 
-  /* IEEEIO file name and pointer for 3D output */
-  char  **IEEEfname_3D;
-  IOFile *IEEEfile_3D;
-
   /* filename database for opened files */
-  pNamedData *filenameList2D;
+  pNamedData *fileList_2D;
   pNamedData *fileList_3D;
 
   /* slice point for 2D output */
@@ -111,8 +115,6 @@ typedef struct IOFlexIOGH {
   int dumpVarsTimer;
   int dumpParamsTimer;
   int checkpointTotalTimer;
-  int recoverVarsTimer;
-  int recoverParamsTimer;
   int recoverTotalTimer;
 
 } flexioGH;