diff options
author | tradke <tradke@4825ed28-b72c-4eae-9704-e50c059e567d> | 2002-04-18 13:09:04 +0000 |
---|---|---|
committer | tradke <tradke@4825ed28-b72c-4eae-9704-e50c059e567d> | 2002-04-18 13:09:04 +0000 |
commit | 4f5f673c10484cbe50290ce6122e0294f1205f7f (patch) | |
tree | 122ff5ebda92f8a2c86480429b67b9a769fbd779 | |
parent | 3ab35805a43706df1905c3196046be7d9d0828e3 (diff) |
Take the identity string from the cGH structure.
At least this file doesn't depend on PUGH anymore.
git-svn-id: http://svn.cactuscode.org/arrangements/CactusPUGHIO/IOHDF5/trunk@122 4825ed28-b72c-4eae-9704-e50c059e567d
-rw-r--r-- | src/Write.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/src/Write.c b/src/Write.c index 69454fa..a390385 100644 --- a/src/Write.c +++ b/src/Write.c @@ -17,7 +17,6 @@ #include "CactusBase/IOUtil/src/ioGH.h" #include "CactusBase/IOUtil/src/ioutil_Utils.h" #include "CactusBase/IOUtil/src/ioutil_AdvertisedFiles.h" -#include "CactusPUGH/PUGH/src/include/pugh.h" #include "ioHDF5GH.h" @@ -238,7 +237,6 @@ static char *IOHDF5_GetFilename (const cGH *GH, { const ioGH *ioUtilGH; ioHDF5GH *myGH; - const pGH *pughGH; int myproc, result; /* FIXME: make these strings dynamic */ char extra[256], extradir[256]; @@ -247,8 +245,7 @@ static char *IOHDF5_GetFilename (const cGH *GH, DECLARE_CCTK_PARAMETERS - /* get GH extensions for PUGH, IOUtil, and IOHDF5 */ - pughGH = (const pGH *) PUGH_pGH (GH); + /* get GH extensions for IOUtil and IOHDF5 */ ioUtilGH = (const ioGH *) CCTK_GHExtension (GH, "IO"); myGH = (ioHDF5GH *) CCTK_GHExtension (GH, "IOHDF5"); @@ -337,19 +334,15 @@ static char *IOHDF5_GetFilename (const cGH *GH, strlen (extradir) + strlen (varname) + strlen (extra) + - (pughGH->identity_string ? strlen (pughGH->identity_string) : 0) + - 8); + strlen (GH->identity) + 8); if (strcmp (myGH->outdir, ".")) { sprintf (filename, "%s/%s%s%s%s.h5", - myGH->outdir, extradir, varname, extra, - (pughGH->identity_string ? pughGH->identity_string : "")); + myGH->outdir, extradir, varname, extra, GH->identity); } else { - sprintf (filename, "%s%s%s%s.h5", - extradir, varname, extra, - (pughGH->identity_string ? pughGH->identity_string : "")); + sprintf (filename, "%s%s%s%s.h5", extradir, varname, extra, GH->identity); } /* no need to store filenames if used only once */ |