Take the identity string from the cGH structure.

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

2 files changed, 4 insertions, 19 deletions

diff --git a/src/Write.c b/src/Write.c
index 97213b6..ccd2d46 100644
--- a/src/Write.c
+++ b/src/Write.c
@@ -317,12 +317,9 @@ static IEEEfile_t *OpenFile (const cGH *GH, const char *alias, int *is_new_file)
 
   file->filename = (char *) malloc (strlen (myGH->outdir) + strlen (extradir) +
                                     strlen (alias) + strlen (extra) +
-                                    (pughGH->identity_string ?
-                                     strlen (pughGH->identity_string) : 0) +
-                                    10);
+                                    strlen (GH->identity) + 10);
   sprintf (file->filename, "%s/%s%s_3d%s%s.ieee", myGH->outdir,
-           extradir, alias, extra, (pughGH->identity_string ?
-           pughGH->identity_string : ""));
+           extradir, alias, extra, GH->identity);
 
   /* no need to store file info if used only once */
   if (! out3D_septimefiles)
diff --git a/src/Write2D.c b/src/Write2D.c
index 0427ab5..1c3bd7f 100644
--- a/src/Write2D.c
+++ b/src/Write2D.c
@@ -134,23 +134,11 @@ int IOFlexIO_Write2D (const cGH *GH, int vindex, const char *alias)
     if (IEEEfile_2D == NULL) 
     {
       char *fname;
-      char *identity_string;
 
 
-#if 0
-      FIXME: get rid of PUGH here
-      identity_string = pughGH->identity_string;
-#else
-      identity_string = NULL;
-#endif
-      if (! identity_string)
-      {
-        identity_string = "";
-      }
-
       IEEEfile_2D = (IOFile *) malloc (3 * sizeof (IOFile));
       fname = (char *) malloc (strlen (myGH->outdir2D) + strlen (alias) +
-                               strlen (identity_string) + 20);
+                               strlen (GH->identity) + 20);
  
       /* Open/Create files */
       for (dir = 0; dir < 3; dir++)
@@ -161,7 +149,7 @@ int IOFlexIO_Write2D (const cGH *GH, int vindex, const char *alias)
 
 
         sprintf (fname, "%s/%s_2d_%s%s.ieee", myGH->outdir2D, alias,
-                 extensions[dir], identity_string);
+                 extensions[dir], GH->identity);
 
         /* if restart from recovery, try to open an exisiting file ... */
         IEEEfile_2D[dir] = NULL;