renaming routines to avoid name clashes with other streaming routines and the CST preprocessing

git-svn-id: http://svn.cactuscode.org/arrangements/CactusPUGHIO/IOStreamedHDF5/trunk@34 0888f3d4-9f52-45d2-93bc-d00801ff5e46

5 files changed, 18 insertions, 16 deletions

diff --git a/src/Output.c b/src/Output.c
index 7309065..8355f4b 100644
--- a/src/Output.c
+++ b/src/Output.c
@@ -261,7 +261,7 @@ static void CheckSteerableParameters (StreamedHDF5GH *myGH)
 
   /* re-parse the 'out_vars' parameter if it was changed */
   if (paramdata->n_set != out_vars_lastset) {
-    ParseVarsForOutput (myGH, out_vars);
+    ParseVarsForOutputH5stream (myGH, out_vars);
 
     /* Save the last setting of 'out_vars' parameter */
     out_vars_lastset = paramdata->n_set;
diff --git a/src/ParseGeometry.c b/src/ParseGeometry.c
index fa5cd63..2241f6c 100644
--- a/src/ParseGeometry.c
+++ b/src/ParseGeometry.c
@@ -16,10 +16,10 @@
 
 /* CCTK_NO_AUTOUSE_MACRO */
 
-/*#define HEAVYDEBUG*/
+/*$#define HEAVYDEBUG$*/
 
 
-int GeometryParser(const char *before, char **outname, StreamGeo_t *geo)
+int GeometryParserH5stream(const char *before, char **outname, StreamGeo_t *geo)
 {
   DECLARE_CCTK_PARAMETERS
 
@@ -45,7 +45,7 @@ int GeometryParser(const char *before, char **outname, StreamGeo_t *geo)
   if (CCTK_Equals(h5verbose,"yes"))
     verb =1;
       
-  sprintf(info,"\n\nGeometryParser \nargument: >%s<\n",before);
+  sprintf(info,"\n\nHDF5stream GeometryParser \nargument: >%s<\n",before);
 
   if((matched = CCTK_RegexMatch(before,
         	"([A-Za-z][A-Za-z0-9_]*::[A-Za-z][A-Za-z0-9_]*)\\[?(.*)?\\]?", 3, pmatch)) != 0) {
@@ -294,12 +294,12 @@ int GeometryParser(const char *before, char **outname, StreamGeo_t *geo)
   return(retval);
 }
 
-void SetDefaultGeo(StreamGeo_t *geo) {
+void SetDefaultGeoH5stream(StreamGeo_t *geo) {
   DECLARE_CCTK_PARAMETERS
 
   int idim;
   const char *argument, *token;
-  
+
   geo->vdim = -1;
   geo->sdim = slabdim;
 
diff --git a/src/ParseVars.c b/src/ParseVars.c
index d2f68c6..b59ca93 100644
--- a/src/ParseVars.c
+++ b/src/ParseVars.c
@@ -54,7 +54,7 @@ static char *rcsid = "$Header$";
    @endvar 
 @@*/
 
-int ParseVarsForOutput (StreamedHDF5GH *h5GH, const char *var_list)
+int ParseVarsForOutputH5stream (StreamedHDF5GH *h5GH, const char *var_list)
 {
   char *outname=NULL;
   char *before=NULL;
@@ -71,7 +71,8 @@ int ParseVarsForOutput (StreamedHDF5GH *h5GH, const char *var_list)
   }
 
   /* Initialize geometry structure with default */
-  SetDefaultGeo(&geo_tmp);
+
+  SetDefaultGeoH5stream(&geo_tmp);
 
   splitstring = (char *) var_list;
 
@@ -88,9 +89,9 @@ int ParseVarsForOutput (StreamedHDF5GH *h5GH, const char *var_list)
     if (strlen(before) > 0) 
     {
       /* Extract geometry information */
-      ierr=GeometryParser(before, &outname, &geo_tmp);
+      ierr=GeometryParserH5stream(before, &outname, &geo_tmp);
       if ((ierr<0)||(outname==NULL)) { 
-	CCTK_WARN(1,"GeometryParser failed.");
+	CCTK_WARN(1,"GeometryParserH5stream failed.");
         return(-1);
       }
 
@@ -159,7 +160,7 @@ int ParseVarsForOutput (StreamedHDF5GH *h5GH, const char *var_list)
   if (strlen(splitstring)>0) {
 
     /* Extract geometry information */
-    ierr=GeometryParser(splitstring, &outname, &geo_tmp);
+    ierr=GeometryParserH5stream(splitstring, &outname, &geo_tmp);
     if (ierr<0) printf("GeometryParser failed: >%s<\n",before);
 
     /* Special cases */
diff --git a/src/Startup.c b/src/Startup.c
index 2faf55a..a04db52 100644
--- a/src/Startup.c
+++ b/src/Startup.c
@@ -192,7 +192,8 @@ static int StreamedHDF5_InitGH (cGH *GH)
   handle = CCTK_GHExtensionHandle ("StreamedHDF5");
   myGH = handle >= 0 ? (StreamedHDF5GH *) GH->extensions [handle] : NULL;
   if (handle < 0 || myGH == NULL)
-  {
+  { 
+    CCTK_WARN (1, "Couldn't access GH extension handle\n");
     return (-1);
   }
 
@@ -200,7 +201,7 @@ static int StreamedHDF5_InitGH (cGH *GH)
   myGH->out_every = out_every > 0 ? out_every : -1;
   if (outHDF5_every > 0)
     myGH->out_every = outHDF5_every;
-  ParseVarsForOutput (myGH, out_vars);
+  ParseVarsForOutputH5stream (myGH, out_vars);
 
   for (i = 0; i < CCTK_NumVars (); i++)
     myGH->out_last [i] = -1;
diff --git a/src/StreamedHDF5GH.h b/src/StreamedHDF5GH.h
index 19cdac7..4317db4 100644
--- a/src/StreamedHDF5GH.h
+++ b/src/StreamedHDF5GH.h
@@ -155,9 +155,9 @@ void StreamedHDF5_Write (cGH *GH, int index, const char *alias);
 void StreamedHDF5_DumpParams (cGH *GH, hid_t group);
 void StreamedHDF5_DumpGHExtensions (cGH *GH, hid_t group);
 int StreamedHDF5_DumpVar (cGH *GH, int index, int timelevel, hid_t iof);
-int ParseVarsForOutput (StreamedHDF5GH *h5GH, const char *var_list);
-void SetDefaultGeo(StreamGeo_t *geo);
-int GeometryParser(const char *before, char **outname, StreamGeo_t *geo);
+int ParseVarsForOutputH5stream (StreamedHDF5GH *h5GH, const char *var_list);
+void SetDefaultGeoH5stream(StreamGeo_t *geo);
+int GeometryParserH5stream(const char *before, char **outname, StreamGeo_t *geo);
 
 #ifdef __cplusplus
 } // extern "C" {