New function and structure names

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

5 files changed, 19 insertions, 24 deletions

diff --git a/src/DumpGH.c b/src/DumpGH.c
index 61185e4..faa9b1f 100644
--- a/src/DumpGH.c
+++ b/src/DumpGH.c
@@ -18,7 +18,6 @@ static char *rcsid = "$Id$";
 
 #include "cctk.h"
 #include "cctk_Parameters.h"
-#include "cctk_ParameterFunctions.h"
 #include "CactusBase/IOUtil/src/ioGH.h"
 #include "ioFlexGH.h"
 
diff --git a/src/GHExtension.c b/src/GHExtension.c
index 7ea3265..2eebdb9 100644
--- a/src/GHExtension.c
+++ b/src/GHExtension.c
@@ -19,7 +19,6 @@
 
 #include "cctk.h"
 #include "cctk_Parameters.h"
-#include "cctk_ParameterFunctions.h"
 #include "CactusPUGH/PUGH/src/include/pugh.h"
 #include "CactusBase/IOUtil/src/ioGH.h"
 #include "ioFlexGH.h"
@@ -61,7 +60,7 @@ int IOFlexIO_InitGH (cGH *GH)
   int i;
   ioGH *ioUtilGH;
   flexioGH *myGH; 
-  t_param_prop *param_prop;
+  cParamData *paramdata;
 
 
   /* get the handles for IOUtil and IOFlexIO extensions */
@@ -81,14 +80,14 @@ int IOFlexIO_InitGH (cGH *GH)
 
   /* Check whether "outdir2D" and/or "outdir3D" was set.
      If so take these dirs otherwise default to "IO::outdir" */
-  param_prop = CCTK_ParameterInfo ("outdir2D", CCTK_THORNSTRING);
-  if (param_prop && param_prop->n_set > 0)
+  paramdata = CCTK_ParameterData ("outdir2D", CCTK_THORNSTRING);
+  if (paramdata && paramdata->n_set > 0)
     myGH->outdir2D = strdup (outdir2D);
   else
     myGH->outdir2D = strdup (outdir);
 
-  param_prop = CCTK_ParameterInfo ("outdir3D", CCTK_THORNSTRING);
-  if (param_prop && param_prop->n_set > 0)
+  paramdata = CCTK_ParameterData ("outdir3D", CCTK_THORNSTRING);
+  if (paramdata && paramdata->n_set > 0)
     myGH->outdir3D = strdup (outdir3D);
   else
     myGH->outdir3D = strdup (outdir);
diff --git a/src/Output2D.c b/src/Output2D.c
index 86f189d..fb3e8ca 100644
--- a/src/Output2D.c
+++ b/src/Output2D.c
@@ -17,7 +17,6 @@
 
 #include "cctk.h"
 #include "cctk_Parameters.h"
-#include "cctk_ParameterFunctions.h"
 #include "CactusBase/IOUtil/src/ioGH.h"
 #include "ioFlexGH.h"
 
@@ -53,7 +52,7 @@ int IOFlexIO_Output2DGH (cGH *GH)
   flexioGH *myGH;
   const char *name;
   char *fullname;
-  t_param_prop *param_prop;
+  cParamData *paramdata;
   static int out2D_vars_lastset = 0;
 
 
@@ -64,18 +63,20 @@ int IOFlexIO_Output2DGH (cGH *GH)
     return (0);
 
   /* Check the 'out2D_vars' parameter */
-  param_prop = CCTK_ParameterInfo ("out2D_vars", CCTK_THORNSTRING);
-  if (! param_prop) {
+  paramdata = CCTK_ParameterData ("out2D_vars", CCTK_THORNSTRING);
+  if (! paramdata) 
+  {
     CCTK_WARN (2, "Couldn't get info on parameter 'out2D_vars'");
     return (0);
   }
 
   /* re-parse the 'out2D_vars' parameter if it was changed */
-  if (param_prop->n_set != out2D_vars_lastset) {
+  if (paramdata->n_set != out2D_vars_lastset) 
+  {
     ParseVarsForOutput (out2D_vars, myGH->do_out2D);
 
     /* Save the last setting of 'out2D_vars' parameter */
-    out2D_vars_lastset = param_prop->n_set;
+    out2D_vars_lastset = paramdata->n_set;
   }
 
   /* Loop over all variables */
diff --git a/src/Output3D.c b/src/Output3D.c
index 99a845d..f9f6873 100644
--- a/src/Output3D.c
+++ b/src/Output3D.c
@@ -18,7 +18,6 @@
 
 #include "cctk.h"
 #include "cctk_Parameters.h"
-#include "cctk_ParameterFunctions.h"
 #include "CactusBase/IOUtil/src/ioGH.h"
 #include "ioFlexGH.h"
 
@@ -53,7 +52,7 @@ int IOFlexIO_Output3DGH (cGH *GH)
   flexioGH *myGH;
   const char *name;
   char *fullname;
-  t_param_prop *param_prop;
+  cParamData *paramdata;
   static int out3D_vars_lastset = 0;
 
 
@@ -64,18 +63,20 @@ int IOFlexIO_Output3DGH (cGH *GH)
     return (0);
 
   /* Check the 'out3D_vars' parameter */
-  param_prop = CCTK_ParameterInfo ("out3D_vars", CCTK_THORNSTRING);
-  if (! param_prop) {
+  paramdata = CCTK_ParameterData ("out3D_vars", CCTK_THORNSTRING);
+  if (! paramdata) 
+  {
     CCTK_WARN (3, "Couldn't get info on parameter 'out3D_vars'");
     return (0);
   }
 
   /* re-parse the 'out3D_vars' parameter if it was changed */
-  if (param_prop->n_set != out3D_vars_lastset) {
+  if (paramdata->n_set != out3D_vars_lastset) 
+  {
     ParseVarsForOutput (out3D_vars, myGH->do_out3D);
 
     /* Save the last setting of 'out3D_vars' parameter */
-    out3D_vars_lastset = param_prop->n_set;
+    out3D_vars_lastset = paramdata->n_set;
   }
 
   /* Loop over all variables */
diff --git a/src/RecoverGH.c b/src/RecoverGH.c
index 5270216..9f0bbf7 100644
--- a/src/RecoverGH.c
+++ b/src/RecoverGH.c
@@ -24,12 +24,7 @@ static char *rcsid = "$Id$";
 #include <stdlib.h>
 
 #include "cctk.h"
-#include "cctk_Flesh.h"
 #include "cctk_Parameters.h"
-#include "cctk_GHExtensions.h"
-#include "cctk_WarnLevel.h"
-#include "cctk_Comm.h"
-#include "cctk_ParameterFunctions.h"
 #include "CactusPUGH/PUGH/src/include/pugh.h"
 #include "CactusBase/IOUtil/src/ioGH.h"
 #include "ioFlexGH.h"