1 files changed, 22 insertions, 26 deletions
diff --git a/src/ParseGeometry.c b/src/ParseGeometry.c
index cda7b0d..e065438 100644
--- a/src/ParseGeometry.c
+++ b/src/ParseGeometry.c
@@ -13,7 +13,7 @@
  
 /* CCTK_NO_AUTOUSE_MACRO */
 
-#define HEAVYDEBUG
+/*#define HEAVYDEBUG*/
 
 
 int GeometryParser(const char *before, char **outname, StreamGeo_t *geo)
@@ -32,8 +32,7 @@ int GeometryParser(const char *before, char **outname, StreamGeo_t *geo)
   int  dim = 0, idim, iidim;
   int index;
 
-  char *info;
-  
+  char info[8000];
   
   /* Debugging switches */
   if (CCTK_Equals(h5verbose,"debug")) {
@@ -43,8 +42,6 @@ int GeometryParser(const char *before, char **outname, StreamGeo_t *geo)
   if (CCTK_Equals(h5verbose,"yes"))
     verb =1;
       
-
-  info = (char*) malloc (8000*sizeof(char));
   sprintf(info,"\n\nGeometryParser \nargument: >%s<\n",before);
 
   if((matched = CCTK_RegexMatch(before,
@@ -271,27 +268,26 @@ int GeometryParser(const char *before, char **outname, StreamGeo_t *geo)
     if (geo_s) free(geo_s);
   }
 
-  sprintf(info, "%sGeometry Data: \n",info);
-  sprintf(info, "%s  Argument/Slab dimension: %d / %d \n",
-          info,geo->vdim,geo->sdim);
-  sprintf(info, "%s  Origin: ",info);
-  for (idim=0;idim<geo->vdim;idim++)
-    sprintf(info,"%s %d ",info,geo->origin[idim]);
-  sprintf(info,"%s\n  Downs : ",info);
-  for (idim=0;idim<geo->sdim;idim++)
-    sprintf(info,"%s %d ",info,geo->downs[idim]);
-  sprintf(info,"%s\n  Length: ",info);
-  for (idim=0;idim<geo->sdim;idim++)
-    sprintf(info,"%s %d ",info,geo->length[idim]);
-  sprintf(info,"%s\n  Dirs  : ",info);
-  for (idim=0;idim<geo->sdim;idim++)
-    sprintf(info,"%s %d ",info,geo->direction[idim]);
-  sprintf(info,"%s\n\n",info);
-
-
-  printf("%s",info);
-  free(info);
-  info=NULL;
+  if (verb) {
+    sprintf(info, "%sGeometry Data: \n",info);
+    sprintf(info, "%s  Argument/Slab dimension: %d / %d \n",
+            info,geo->vdim,geo->sdim);
+    sprintf(info, "%s  Origin: ",info);
+    for (idim=0;idim<geo->vdim;idim++)
+      sprintf(info,"%s %d ",info,geo->origin[idim]);
+    sprintf(info,"%s\n  Downs : ",info);
+    for (idim=0;idim<geo->sdim;idim++)
+      sprintf(info,"%s %d ",info,geo->downs[idim]);
+    sprintf(info,"%s\n  Length: ",info);
+    for (idim=0;idim<geo->sdim;idim++)
+      sprintf(info,"%s %d ",info,geo->length[idim]);
+    sprintf(info,"%s\n  Dirs  : ",info);
+    for (idim=0;idim<geo->sdim;idim++)
+      sprintf(info,"%s %d ",info,geo->direction[idim]);
+    sprintf(info,"%s\n\n",info);
+
+    printf("%s",info);
+  }
 
   USE_CCTK_PARAMETERS