Adding USE_CCTK_PARAMETERS

Removing compiler warnings

Renaming

   CCTK_RegisterCoordI     -> CCTK_CoordRegisterI
   CCTK_RegisterCoord      -> CCTK_CoordRegister
   CCTK_RegisterCoordRange -> CCTK_CoordRegisterRange

old names remain, but are deprecated


git-svn-id: http://svn.cactuscode.org/arrangements/CactusBase/CartGrid3D/trunk@83 c78560ca-4b45-4335-b268-5f3340f3cb52

5 files changed, 56 insertions, 29 deletions

diff --git a/src/Bitant.c b/src/Bitant.c
index ba51ba1..93592e6 100644
--- a/src/Bitant.c
+++ b/src/Bitant.c
@@ -119,4 +119,7 @@ void bitant_byspacing(CCTK_CARGUMENTS,
 
   }
 
+  USE_CCTK_CARGUMENTS
+  USE_CCTK_PARAMETERS
+
 }
diff --git a/src/CartGrid3D.c b/src/CartGrid3D.c
index e25c435..14bdb0e 100644
--- a/src/CartGrid3D.c
+++ b/src/CartGrid3D.c
@@ -18,20 +18,22 @@ static char *rcsid = "$Header$";
 #include "cctk.h"
 #include "cctk_arguments.h"
 #include "cctk_parameters.h"
-/*
-void bitant_byrange(CCTK_DECLARE_CARGUMENTS,
-		    CCTK_REAL this_dx,
-		    CCTK_REAL this_dy,
-		    CCTK_REAL this_dz,
-		    CCTK_REAL *x_origin,
-		    CCTK_REAL *y_origin,
-		    CCTK_REAL *z_origin);
-*/
+
+void bitant_byspacing(CCTK_CARGUMENTS,
+		      CCTK_REAL this_dx,
+		      CCTK_REAL this_dy,
+		      CCTK_REAL this_dz,
+		      CCTK_REAL *x_origin,
+		      CCTK_REAL *y_origin,
+		      CCTK_REAL *z_origin);
+
+
 #define max(a,b) ((a) > (b) ? (a) : (b))
 #define SQR(a) ((a)*(a))
 
 void CartGrid3D(CCTK_CARGUMENTS)
 {
+
   DECLARE_CCTK_CARGUMENTS
   DECLARE_CCTK_PARAMETERS
   
@@ -40,7 +42,6 @@ void CartGrid3D(CCTK_CARGUMENTS)
   CCTK_REAL this_dx,this_dy,this_dz;
   CCTK_REAL xmin1,ymin1,zmin1,xmax1,ymax1,zmax1;
   CCTK_REAL lowerx,upperx,lowery,uppery,lowerz,upperz;
-  CCTK_REAL olower,oupper;
   char infoline[120];
 
   iconv = pow(2, cctk_convlevel-1);
@@ -185,12 +186,12 @@ void CartGrid3D(CCTK_CARGUMENTS)
     if (CCTK_Equals(domain,"bitant")) 
     { 
       bitant_byspacing(CCTK_PASS_CTOC,
-		     this_dx,
-		     this_dy,
-		     this_dz,
-		     &x_origin,
-		     &y_origin,
-		     &z_origin);
+		       this_dx,
+		       this_dy,
+		       this_dz,
+		       &x_origin,
+		       &y_origin,
+		       &z_origin);
     }
     else if (CCTK_Equals(domain,"quadrant")) 
     { 
@@ -308,13 +309,13 @@ void CartGrid3D(CCTK_CARGUMENTS)
   
   lowerx = x_origin;
   upperx = x_origin+this_dx*(cctk_gsh[0]-1); 
-  CCTK_RegisterCoordRange(cctkGH,lowerx,upperx,"x");
+  CCTK_CoordRegisterRange(cctkGH,lowerx,upperx,"x");
   lowery = y_origin;
   uppery = y_origin+this_dy*(cctk_gsh[1]-1); 
-  CCTK_RegisterCoordRange(cctkGH,lowery,uppery,"y");
+  CCTK_CoordRegisterRange(cctkGH,lowery,uppery,"y");
   lowerz = z_origin;
   upperz = z_origin+this_dz*(cctk_gsh[2]-1); 
-  CCTK_RegisterCoordRange(cctkGH,lowerz,upperz,"z");
+  CCTK_CoordRegisterRange(cctkGH,lowerz,upperz,"z");
   
   sprintf(infoline," %s%12.7e  %s%12.7e  %s%12.7e  ",  
                    "dx=>",cctk_delta_space[0],
@@ -346,6 +347,10 @@ void CartGrid3D(CCTK_CARGUMENTS)
                                                        z[CCTK_GFINDEX3D(cctkGH, cctk_lsh[0],cctk_lsh[1],cctk_lsh[2])]);
 
 #endif
+
+  USE_CCTK_CARGUMENTS
+  USE_CCTK_PARAMETERS 
+
 }
 
 
diff --git a/src/ParamCheck.c b/src/ParamCheck.c
index e893fd5..6c6dd81 100644
--- a/src/ParamCheck.c
+++ b/src/ParamCheck.c
@@ -91,5 +91,9 @@ void ParamCheck_CartGrid3D(CCTK_CARGUMENTS)
   }
 
   return;
+
+  USE_CCTK_CARGUMENTS
+  USE_CCTK_PARAMETERS
+
 }
 
diff --git a/src/Startup.c b/src/Startup.c
index 6a72536..557c8c0 100644
--- a/src/Startup.c
+++ b/src/Startup.c
@@ -65,10 +65,10 @@ int RegisterCartGrid3DCoords()
 
   int handle;
 
-  handle=CCTK_RegisterCoord(1,"grid::x","x");
-  handle=CCTK_RegisterCoord(2,"grid::y","y");
-  handle=CCTK_RegisterCoord(3,"grid::z","z");
-  handle=CCTK_RegisterCoord(0,"grid::r","r");
+  handle=CCTK_CoordRegister(1,"grid::x","x");
+  handle=CCTK_CoordRegister(2,"grid::y","y");
+  handle=CCTK_CoordRegister(3,"grid::z","z");
+  handle=CCTK_CoordRegister(0,"grid::r","r");
 
   return 0;
 }
diff --git a/src/Symmetry.c b/src/Symmetry.c
index e2c7f01..55a1acb 100644
--- a/src/Symmetry.c
+++ b/src/Symmetry.c
@@ -49,7 +49,8 @@ void SetCartSymmetry(cGH *GH, int *sym, const char *imp_gf) {
 
   /* now that we have the same, get the index to the GFs */
   index = CCTK_VarIndex(imp_gf);
-  if (index<0) {
+  if (index<0) 
+  {
     char *message;
     message = (char *)malloc((100*strlen(imp_gf))*sizeof(char));
     sprintf(message,"Grid function %s has no index",imp_gf);
@@ -64,7 +65,8 @@ void SetCartSymmetry(cGH *GH, int *sym, const char *imp_gf) {
      When we apply a symmetry and find ESYM_UNSET, something went wrong! 
    */
 
-  if (CCTK_Equals(domain,"full")) {
+  if (CCTK_Equals(domain,"full")) 
+  {
 
 #ifdef DEBUG_BOUND
     printf(" Registered full grid symmetries for -%s- in SetCartSymmetry\n",imp_gf);
@@ -74,7 +76,9 @@ void SetCartSymmetry(cGH *GH, int *sym, const char *imp_gf) {
     sGHex->GFSym[index][2] = GFSYM_NOSYM;
     sGHex->GFSym[index][4] = GFSYM_NOSYM;
 
-  } else if (CCTK_Equals(domain,"octant")) {
+  } 
+  else if (CCTK_Equals(domain,"octant")) 
+  {
 
 #ifdef DEBUG_BOUND
     printf(" Registered octant symmetries for -%s- in SetCartSymmetry\n",imp_gf);
@@ -84,7 +88,9 @@ void SetCartSymmetry(cGH *GH, int *sym, const char *imp_gf) {
     sGHex->GFSym[index][2] = sym[1];
     sGHex->GFSym[index][4] = sym[2];
 
-  } else if (CCTK_Equals(domain,"quadrant")) {
+  } 
+  else if (CCTK_Equals(domain,"quadrant")) 
+  {
 
 #ifdef DEBUG_BOUND
     printf("Registered quadrant symmetries for -%s- in SetCartSymmetry\n",imp_gf);
@@ -94,7 +100,9 @@ void SetCartSymmetry(cGH *GH, int *sym, const char *imp_gf) {
     sGHex->GFSym[index][2] = sym[1];
     sGHex->GFSym[index][4] = GFSYM_NOSYM;
 
-  } else if (CCTK_Equals(domain,"bitant")) {
+  } 
+  else if (CCTK_Equals(domain,"bitant")) 
+  {
 
 #ifdef DEBUG_BOUND
     printf("Registered bitant symmetries for -%s- in SetCartSymmetry\n",imp_gf);
@@ -107,6 +115,8 @@ void SetCartSymmetry(cGH *GH, int *sym, const char *imp_gf) {
 
   /* All untouched GFSym[][] will hold GFSYM_UNSET */
 
+  USE_CCTK_PARAMETERS
+
 }
 
 void FMODIFIER FORTRAN_NAME(SetCartSymmetry)(cGH *GH,  int *sym, ONE_FORTSTRING_ARG) {
@@ -222,6 +232,8 @@ int CartSymBCGroupI(cGH *GH, int groupnum) {
 
   return 0;
 
+  USE_CCTK_PARAMETERS
+
 }
 
 
@@ -289,9 +301,12 @@ int CartSymBCVarI(cGH *GH, int varnum) {
 	     doSym
 	     /* flags whether to apply syms */
 	     );                       
-  }
+    }
 
     return 0;
+
+    USE_CCTK_PARAMETERS
+
 }