Include file name changes

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

10 files changed, 30 insertions, 30 deletions

diff --git a/src/DumpGH.c b/src/DumpGH.c
index 4c4b306..d9978fe 100644
--- a/src/DumpGH.c
+++ b/src/DumpGH.c
@@ -18,7 +18,7 @@ static char *rcsid = "$Id$";
 
 #include "cctk.h"
 #include "flesh.h"
-#include "declare_parameters.h"
+#include "cctk_parameters.h"
 #include "Groups.h"
 #include "Comm.h"
 #include "GHExtensions.h"
@@ -66,7 +66,7 @@ void IOFlexIO_DumpGH (cGH *GH, int called_from);
 
 void IOFlexIO_ConditionallyDumpGH (cGH *GH)
 {
-  DECLARE_PARAMETERS
+  DECLARE_CCTK_PARAMETERS
 
   if (checkpoint_every > 0 &&
       GH->cctk_iteration % checkpoint_every == 0) {
@@ -211,7 +211,7 @@ void IOFlexIO_IEEEIOStructDump (cGH *GH, IOFile iof)
 
 void IOFlexIO_DumpGH (cGH *GH, int called_from)
 {
-  DECLARE_PARAMETERS
+  DECLARE_CCTK_PARAMETERS
   char dumpfname [1024], tmpfname [1024];
   IOFile iof;
   int index, wrotech;
diff --git a/src/DumpVar.c b/src/DumpVar.c
index dd1359a..6d8612f 100644
--- a/src/DumpVar.c
+++ b/src/DumpVar.c
@@ -39,7 +39,7 @@ static char *rcsid = "$Id$";
 #include "Comm.h"
 #include "WarnLevel.h"
 #include "GHExtensions.h"
-#include "declare_parameters.h"
+#include "cctk_parameters.h"
 #ifdef CACTUSBASE_PUGH
 #include "CactusBase/pugh/src/include/pugh.h"
 #endif
@@ -356,7 +356,7 @@ void IOFlexIO_DumpArray (cGH *GH, int index, int timelevel, IOFile iof,
 void IOFlexIO_DumpGF (cGH *GH, int index, int timelevel, IOFile iof,
                     int ioflex_type, int mpi_type, int element_size)
 {
-  DECLARE_PARAMETERS
+  DECLARE_CCTK_PARAMETERS
   ioGH *ioUtilGH;
   pGH *pughGH;
   int myproc;
@@ -510,7 +510,7 @@ void IOFlexIO_DumpGF (cGH *GH, int index, int timelevel, IOFile iof,
 void IOFlexIO_AddCommonAttributes (cGH *GH, int index, int timelevel,
                                  CCTK_INT4 gsz [3], IOFile iof)
 {
-  DECLARE_PARAMETERS
+  DECLARE_CCTK_PARAMETERS
   CCTK_REAL d3_to_IO [3]; /* buffer for writing doubles to IEEEIO */
   CCTK_INT4 i_to_IO;      /* buffer for writing an int to IEEEIO */
   char *name, *gname;
@@ -690,7 +690,7 @@ void IOFlexIO_AddChunkAttributes (cGH *GH, int index, CCTK_INT4 chunk_origin [3]
 void IOFlexIO_getDumpData (cGH *GH, int index, int timelevel, void **outme,
                          int *free_outme, CCTK_INT4 bnd [9], int element_size) 
 {
-  DECLARE_PARAMETERS
+  DECLARE_CCTK_PARAMETERS
   int i;
   int myproc;
   ioGH *ioUtilGH;
diff --git a/src/GHExtension.c b/src/GHExtension.c
index 824a7a2..910a897 100644
--- a/src/GHExtension.c
+++ b/src/GHExtension.c
@@ -22,7 +22,7 @@
 #include "Comm.h"
 #include "Misc.h"
 #include "GHExtensions.h"
-#include "declare_parameters.h"
+#include "cctk_parameters.h"
 #ifdef	CACTUSBASE_PUGH
 #include "CactusBase/pugh/src/include/pugh.h"
 #endif
@@ -58,7 +58,7 @@ void *IOFlexIO_SetupGH (tFleshConfig *config, int convergence_level, cGH *GH)
 
 int IOFlexIO_InitGH (cGH *GH)
 {
-  DECLARE_PARAMETERS
+  DECLARE_CCTK_PARAMETERS
   int i;
   ioGH *ioUtilGH;
   flexioGH *myGH;
diff --git a/src/Output2D.c b/src/Output2D.c
index f863970..927c114 100644
--- a/src/Output2D.c
+++ b/src/Output2D.c
@@ -16,7 +16,7 @@
 
 #include "flesh.h"
 #include "Groups.h"
-#include "declare_parameters.h"
+#include "cctk_parameters.h"
 #include "CactusBase/IOUtil/src/ioGH.h"
 #include "ioFlexGH.h"
 
@@ -51,7 +51,7 @@ int IOFlexIO_TimeFor2D (cGH *GH, int index);
 
 int IOFlexIO_Output2DGH (cGH *GH)
 {
-  DECLARE_PARAMETERS
+  DECLARE_CCTK_PARAMETERS
   int i;
   flexioGH *myGH;
   char *name, *fullname;
@@ -125,7 +125,7 @@ int IOFlexIO_Output2DGH (cGH *GH)
 
 int IOFlexIO_Output2DVarAs (cGH *GH, const char *fullname, const char *alias)
 {
-  DECLARE_PARAMETERS
+  DECLARE_CCTK_PARAMETERS
   int index, first;
   flexioGH *myGH;
 
@@ -251,7 +251,7 @@ int IOFlexIO_TimeFor2D (cGH *GH, int index)
 
 int IOFlexIO_TriggerOutput2D (cGH *GH, int index)
 {
-  DECLARE_PARAMETERS
+  DECLARE_CCTK_PARAMETERS
   int first;
   flexioGH *myGH;
   char *varname;
diff --git a/src/Output3D.c b/src/Output3D.c
index 404f0e6..df835d4 100644
--- a/src/Output3D.c
+++ b/src/Output3D.c
@@ -16,7 +16,7 @@
 
 #include "flesh.h"
 #include "Groups.h"
-#include "declare_parameters.h"
+#include "cctk_parameters.h"
 #include "CactusBase/IOUtil/src/ioGH.h"
 #include "ioFlexGH.h"
 
@@ -55,7 +55,7 @@ int IOFlexIO_Output3DGH (cGH *GH)
   char *implementation;
   char *name;
   char *fullname;
-  DECLARE_PARAMETERS
+  DECLARE_CCTK_PARAMETERS
 
   /* Get the GH extension for IOFlexIO */
   myGH = (flexioGH *) GH->extensions [CCTK_GetGHExtensionHandle ("IOFlexIO")];
@@ -128,7 +128,7 @@ int IOFlexIO_Output3DGH (cGH *GH)
 
 int IOFlexIO_Output3DVarAs (cGH *GH, const char *fullname, const char *alias)
 {
-  DECLARE_PARAMETERS
+  DECLARE_CCTK_PARAMETERS
   int index, first;
   flexioGH *myGH;
 
@@ -253,7 +253,7 @@ int IOFlexIO_TimeFor3D (cGH *GH, int index)
 
 int IOFlexIO_TriggerOutput3D (cGH *GH, int index)
 {
-  DECLARE_PARAMETERS
+  DECLARE_CCTK_PARAMETERS
   int first;
   flexioGH *myGH;
   char *varname;
diff --git a/src/RecoverGH.c b/src/RecoverGH.c
index 3606da3..b19dcbf 100644
--- a/src/RecoverGH.c
+++ b/src/RecoverGH.c
@@ -24,7 +24,7 @@ static char *rcsid = "$Id$";
 
 #include "cctk.h"
 #include "flesh.h"
-#include "declare_parameters.h"
+#include "cctk_parameters.h"
 #include "GHExtensions.h"
 #include "WarnLevel.h"
 #include "Comm.h"
@@ -67,7 +67,7 @@ int IOFlexIO_RecoverGH (cGH *GH, const char *basename, int called_from)
 {
 #ifdef CACTUSBASE_PUGH
 
-  DECLARE_PARAMETERS
+  DECLARE_CCTK_PARAMETERS
   IOFile ifp;
   char ftmp [1024], fname [1024];
   int proc, nprocs, myproc;
diff --git a/src/RestoreFile.c b/src/RestoreFile.c
index 19158b4..4492cec 100644
--- a/src/RestoreFile.c
+++ b/src/RestoreFile.c
@@ -24,7 +24,7 @@ static char *rcsid = "$Id$";
 #include "Comm.h"
 #include "GHExtensions.h"
 #include "WarnLevel.h"
-#include "declare_parameters.h"
+#include "cctk_parameters.h"
 #ifdef CACTUSBASE_PUGH
 #include "CactusBase/pugh/src/include/pugh.h"
 #endif
@@ -281,7 +281,7 @@ int IOFlexIO_RestoreIEEEIOfile (cGH *GH, IOFile ifp, int file_ioproc,
 {
 #ifdef CACTUSBASE_PUGH
 
-  DECLARE_PARAMETERS
+  DECLARE_CCTK_PARAMETERS
   int index, gtype;
   int myproc, nprocs;
   int nDatasets, currentDataset;
diff --git a/src/Startup.c b/src/Startup.c
index affbcf6..31da402 100644
--- a/src/Startup.c
+++ b/src/Startup.c
@@ -15,7 +15,7 @@
 
 #include "flesh.h"
 #include "GHExtensions.h"
-#include "declare_parameters.h"
+#include "cctk_parameters.h"
 #include "CactusBase/IOUtil/src/ioGH.h"
 
 /* prototypes of functions to be registered */
@@ -53,7 +53,7 @@ int IOFlexIO_RecoverGH (cGH *GH, const char *basename, int called_from);
 @@*/
 void IOFlexIO_Startup (void)
 {
-  DECLARE_PARAMETERS
+  DECLARE_CCTK_PARAMETERS
   int IO_GHExtension;
   int IOMethod;
 
diff --git a/src/Write2D.c b/src/Write2D.c
index 4153d4c..2f00099 100644
--- a/src/Write2D.c
+++ b/src/Write2D.c
@@ -29,7 +29,7 @@ static char *rcsid = "$Id$";
 #include "cctk.h"
 #include "flesh.h"
 #include "Comm.h"
-#include "declare_parameters.h"
+#include "cctk_parameters.h"
 #include "GroupsOnGH.h"
 #ifdef CACTUSBASE_PUGH
 #include "CactusBase/pugh/src/include/pugh.h"
@@ -83,7 +83,7 @@ static char *rcsid = "$Id$";
 
 void IOFlexIO_Write2D (cGH *GH, int index, const char *alias, int first)
 {
-  DECLARE_PARAMETERS
+  DECLARE_CCTK_PARAMETERS
   int i, j, k, l;
   int myproc, nprocs;
   pGH *pughGH;
diff --git a/src/Write3D.c b/src/Write3D.c
index c12747a..429ae31 100644
--- a/src/Write3D.c
+++ b/src/Write3D.c
@@ -42,7 +42,7 @@ static char *rcsid = "$Id$";
 #include "Groups.h"
 #include "GHExtensions.h"
 #include "WarnLevel.h"
-#include "declare_parameters.h"
+#include "cctk_parameters.h"
 #ifdef CACTUSBASE_PUGH
 #include "CactusBase/pugh/src/include/pugh.h"
 #endif
@@ -135,7 +135,7 @@ void IOFlexIO_DumpVar (cGH *GH, int index, int timelevel, IOFile iof);
 
 void IOFlexIO_Write3D (cGH *GH, int index, const char *alias, int first)
 {
-  DECLARE_PARAMETERS
+  DECLARE_CCTK_PARAMETERS
   int myproc, nprocs;
   int timelevel;
   ioGH *ioUtilGH;
@@ -236,7 +236,7 @@ void IOFlexIO_Write3D (cGH *GH, int index, const char *alias, int first)
 
 void IOFlexIO_Write3D_closeFile (cGH *GH, const char *filename, IOFile *iofile)
 {
-  DECLARE_PARAMETERS
+  DECLARE_CCTK_PARAMETERS
   ioGH *ioUtilGH;
   flexioGH *myGH;
 
@@ -284,7 +284,7 @@ void IOFlexIO_Write3D_closeFile (cGH *GH, const char *filename, IOFile *iofile)
 
 void IOFlexIO_Write3D_openFile (cGH *GH, const char *filename, IOFile *iofile, int first)
 {
-  DECLARE_PARAMETERS
+  DECLARE_CCTK_PARAMETERS
   ioGH *ioUtilGH;
   flexioGH *myGH;
 
@@ -364,7 +364,7 @@ void IOFlexIO_Write3D_openFile (cGH *GH, const char *filename, IOFile *iofile, i
 
 void IOFlexIO_Write3D_filename (cGH *GH, char *filename, const char *name)
 {
-  DECLARE_PARAMETERS
+  DECLARE_CCTK_PARAMETERS
   ioGH *ioUtilGH;       /* handle for IOUtil extensions */
   pGH *pughGH;          /* handle for PUGH extensions */
   int nprocs;