Tidying and ParseVarsForOutput -> CCTK_ParseVarsForOutput

git-svn-id: http://svn.cactuscode.org/arrangements/CactusBase/IOBasic/trunk@62 b589c3ab-70e8-4b4d-a09f-cba2dd200880

1 files changed, 22 insertions, 12 deletions

diff --git a/src/GHExtension.c b/src/GHExtension.c
index 175daa5..a2a3ff2 100644
--- a/src/GHExtension.c
+++ b/src/GHExtension.c
@@ -25,9 +25,12 @@ void *IOBasic_SetupGH (tFleshConfig *config, int convergence_level, cGH *GH)
   iobasicGH *newGH;
 
   newGH = (iobasicGH *) malloc (sizeof (iobasicGH));
-  newGH->infovals = (CCTK_REAL **) malloc (CCTK_NumVars ()  * sizeof (CCTK_REAL *));
+  newGH->infovals = (CCTK_REAL **) 
+    malloc (CCTK_NumVars () * sizeof (CCTK_REAL *));
   for (i=0;i<CCTK_NumVars ();i++) 
+  {
     newGH->infovals[i] = (CCTK_REAL *) malloc (2  * sizeof (CCTK_REAL));
+  }
 
   newGH->do_outScalar = (char *) malloc (CCTK_NumVars () * sizeof (char));
   newGH->outScalar_last = (int *) malloc (CCTK_NumVars () * sizeof (int));
@@ -58,38 +61,45 @@ int IOBasic_InitGH (cGH *GH)
   if (outScalar_every > 0)
     myGH->outScalar_every = outScalar_every;
 
-  ParseVarsForOutput (outInfo_vars, myGH->do_outInfo);
-  ParseVarsForOutput (outScalar_vars, myGH->do_outScalar); 
+  IOUtil_ParseVarsForOutput (outInfo_vars, myGH->do_outInfo);
+  IOUtil_ParseVarsForOutput (outScalar_vars, myGH->do_outScalar); 
 
   /* Check whether "outdirScalar" was set.
      If so take this dir otherwise default to "IO::outdir" */
   paramdata = CCTK_ParameterData ("outdirScalar", CCTK_THORNSTRING);
   if (paramdata && paramdata->n_set > 0)
+  {
     myGH->outdirScalar = strdup (outdirScalar);
+  }  
   else
+  {
     myGH->outdirScalar = strdup (outdir);
+  }
 
   /* create the output dir */
   if (CCTK_MyProc (GH) == 0)
   {
     i = CCTK_CreateDirectory (0755,myGH->outdirScalar);
     if (i < 0)
+    {
       CCTK_VWarn (1, __LINE__, __FILE__, CCTK_THORNSTRING,
-          "Problem creating Scalar output directory '%s'", myGH->outdirScalar);
+		  "IOBasic_InitGH: Problem creating Scalar output directory '%s'", 
+		  myGH->outdirScalar);
+    }
     if (i > 0)
+    {
       CCTK_VWarn (2, __LINE__, __FILE__, CCTK_THORNSTRING,
-          "Scalar output directory '%s' already exists", myGH->outdirScalar);
+		  "IOBasic_InitGH: Scalar output directory '%s' already exists", 
+		  myGH->outdirScalar);
+    }
   }
 
   for (i=0; i<CCTK_NumVars(); i++)
-    myGH->outScalar_last[i] = -1;
-  for (i=0; i<CCTK_NumVars(); i++)
-    myGH->outInfo_last [i] = -1;
-
-  for (i=0; i<CCTK_NumVars(); i++)
   {
-    myGH->infovals[i][0] = 0.0;
-    myGH->infovals[i][1] = 0.0;
+    myGH->outScalar_last[i] = -1;
+    myGH->outInfo_last [i]  = -1;
+    myGH->infovals[i][0]    = 0.0;
+    myGH->infovals[i][1]    = 0.0;
   }
 
   myGH->filenameListScalar = NULL;