Added lots of missing function prototypes.

Tom


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

2 files changed, 67 insertions, 56 deletions

diff --git a/src/CartGrid3D.c b/src/CartGrid3D.c
index 7cd2e6e..e25c435 100644
--- a/src/CartGrid3D.c
+++ b/src/CartGrid3D.c
@@ -272,69 +272,78 @@ void CartGrid3D(CCTK_CARGUMENTS)
     if (cctk_gsh[2] == 1) z_origin = 0.0;
 
   }
+  else
+  {
+    /* Put some sort of default here to stop 
+     * unitialised values being used later.
+     */
+    this_dx = 1;
+    this_dy = 1;
+    this_dz = 1;
+  }
 
   /* Set spatial coordinates */
 
-      for(i=0; i < cctk_lsh[0]; i++)
+  for(i=0; i < cctk_lsh[0]; i++)
+  {
+    for(j=0; j < cctk_lsh[1]; j++)
+    {
+      for(k=0; k < cctk_lsh[2]; k++)
       {
-        for(j=0; j < cctk_lsh[1]; j++)
-        {
-          for(k=0; k < cctk_lsh[2]; k++)
-          {
-            x[CCTK_GFINDEX3D(cctkGH,i,j,k)] = this_dx*(i+cctk_lbnd[0]) + x_origin;
-            y[CCTK_GFINDEX3D(cctkGH,i,j,k)] = this_dy*(j+cctk_lbnd[1]) + y_origin;
-            z[CCTK_GFINDEX3D(cctkGH,i,j,k)] = this_dz*(k+cctk_lbnd[2]) + z_origin;
-            r[CCTK_GFINDEX3D(cctkGH,i,j,k)] = sqrt(SQR(x[CCTK_GFINDEX3D(cctkGH,i,j,k)])+SQR(y[CCTK_GFINDEX3D(cctkGH,i,j,k)])+SQR(z[CCTK_GFINDEX3D(cctkGH,i,j,k)]));
-          }
-        }
+        x[CCTK_GFINDEX3D(cctkGH,i,j,k)] = this_dx*(i+cctk_lbnd[0]) + x_origin;
+        y[CCTK_GFINDEX3D(cctkGH,i,j,k)] = this_dy*(j+cctk_lbnd[1]) + y_origin;
+        z[CCTK_GFINDEX3D(cctkGH,i,j,k)] = this_dz*(k+cctk_lbnd[2]) + z_origin;
+        r[CCTK_GFINDEX3D(cctkGH,i,j,k)] = sqrt(SQR(x[CCTK_GFINDEX3D(cctkGH,i,j,k)])+SQR(y[CCTK_GFINDEX3D(cctkGH,i,j,k)])+SQR(z[CCTK_GFINDEX3D(cctkGH,i,j,k)]));
       }
+    }
+  }
+  
+  cctk_delta_space[0] = this_dx;
+  cctk_delta_space[1] = this_dy;
+  cctk_delta_space[2] = this_dz;
+  
+  cctk_origin_space[0] = x_origin;
+  cctk_origin_space[1] = y_origin;
+  cctk_origin_space[2] = z_origin;
+  
+  lowerx = x_origin;
+  upperx = x_origin+this_dx*(cctk_gsh[0]-1); 
+  CCTK_RegisterCoordRange(cctkGH,lowerx,upperx,"x");
+  lowery = y_origin;
+  uppery = y_origin+this_dy*(cctk_gsh[1]-1); 
+  CCTK_RegisterCoordRange(cctkGH,lowery,uppery,"y");
+  lowerz = z_origin;
+  upperz = z_origin+this_dz*(cctk_gsh[2]-1); 
+  CCTK_RegisterCoordRange(cctkGH,lowerz,upperz,"z");
+  
+  sprintf(infoline," %s%12.7e  %s%12.7e  %s%12.7e  ",  
+                   "dx=>",cctk_delta_space[0],
+                   "dy=>",cctk_delta_space[1],
+                   "dz=>",cctk_delta_space[2]);
+  CCTK_INFO(infoline);
   
-      cctk_delta_space[0] = this_dx;
-      cctk_delta_space[1] = this_dy;
-      cctk_delta_space[2] = this_dz;
-
-      cctk_origin_space[0] = x_origin;
-      cctk_origin_space[1] = y_origin;
-      cctk_origin_space[2] = z_origin;
-
-      lowerx = x_origin;
-      upperx = x_origin+this_dx*(cctk_gsh[0]-1); 
-      CCTK_RegisterCoordRange(cctkGH,lowerx,upperx,"x");
-      lowery = y_origin;
-      uppery = y_origin+this_dy*(cctk_gsh[1]-1); 
-      CCTK_RegisterCoordRange(cctkGH,lowery,uppery,"y");
-      lowerz = z_origin;
-      upperz = z_origin+this_dz*(cctk_gsh[2]-1); 
-      CCTK_RegisterCoordRange(cctkGH,lowerz,upperz,"z");
-
-      sprintf(infoline," %s%12.7e  %s%12.7e  %s%12.7e  ",  
-              "dx=>",cctk_delta_space[0],
-              "dy=>",cctk_delta_space[1],
-              "dz=>",cctk_delta_space[2]);
-      CCTK_INFO(infoline);
-
-      sprintf(infoline," %s[%6.3f,%6.3f]  %s[%6.3f,%6.3f]  %s[%6.3f,%6.3f]  ", 
-              "x=>",lowerx,upperx,
-              "y=>",lowery,uppery,
-              "z=>",lowerz,upperz);
-      CCTK_INFO(infoline);
+  sprintf(infoline," %s[%6.3f,%6.3f]  %s[%6.3f,%6.3f]  %s[%6.3f,%6.3f]  ", 
+                   "x=>",lowerx,upperx,
+                   "y=>",lowery,uppery,
+                   "z=>",lowerz,upperz);
+  CCTK_INFO(infoline);
 
 
 #ifdef CCTK_DEBUG
-      printf("\n");
-      printf("CartGrid3D\n");
-      printf(" ----------\n");
-      printf("Dx,Dy,Dz on coarse grid %6.3f %6.3f, %6.3f\n", coarse_dx,coarse_dy,coarse_dz);
-      printf("Dx,Dy,Dz on this grid %6.3f %6.3f, %6.3f\n", cctk_delta_space[0],cctk_delta_space[1],cctk_delta_space[2]);
-      printf(" Convergence level = %d\n",cctk_convlevel);
-      printf("  Minimum global coords %6.3f %6.3f %6.3f\n", x_origin,y_origin,z_origin);
-      printf("  Maximum global coords %6.3f %6.3f %6.3f\n", x_origin+this_dx*(cctk_gsh[0]-1),
-                                                          y_origin+this_dy*(cctk_gsh[1]-1),
-                                                          z_origin+this_dz*(cctk_gsh[2]-1)); 
-      printf("  Minimum local coords %6.3f %6.3f %6.3f\n", x[0],y[0],z[0]);
-      printf("  Maximum local coords %6.3f %6.3f %6.3f\n", x[CCTK_GFINDEX3D(cctkGH, cctk_lsh[0],cctk_lsh[1],cctk_lsh[2])],
-                                                         y[CCTK_GFINDEX3D(cctkGH, cctk_lsh[0],cctk_lsh[1],cctk_lsh[2])],
-                                                         z[CCTK_GFINDEX3D(cctkGH, cctk_lsh[0],cctk_lsh[1],cctk_lsh[2])]);
+  printf("\n");
+  printf("CartGrid3D\n");
+  printf(" ----------\n");
+  printf("Dx,Dy,Dz on coarse grid %6.3f %6.3f, %6.3f\n", coarse_dx,coarse_dy,coarse_dz);
+  printf("Dx,Dy,Dz on this grid %6.3f %6.3f, %6.3f\n", cctk_delta_space[0],cctk_delta_space[1],cctk_delta_space[2]);
+  printf(" Convergence level = %d\n",cctk_convlevel);
+  printf("  Minimum global coords %6.3f %6.3f %6.3f\n", x_origin,y_origin,z_origin);
+  printf("  Maximum global coords %6.3f %6.3f %6.3f\n", x_origin+this_dx*(cctk_gsh[0]-1),
+                                                        y_origin+this_dy*(cctk_gsh[1]-1),
+                                                        z_origin+this_dz*(cctk_gsh[2]-1)); 
+  printf("  Minimum local coords %6.3f %6.3f %6.3f\n", x[0],y[0],z[0]);
+  printf("  Maximum local coords %6.3f %6.3f %6.3f\n", x[CCTK_GFINDEX3D(cctkGH, cctk_lsh[0],cctk_lsh[1],cctk_lsh[2])],
+                                                       y[CCTK_GFINDEX3D(cctkGH, cctk_lsh[0],cctk_lsh[1],cctk_lsh[2])],
+                                                       z[CCTK_GFINDEX3D(cctkGH, cctk_lsh[0],cctk_lsh[1],cctk_lsh[2])]);
 
 #endif
 }
diff --git a/src/Symmetry.h b/src/Symmetry.h
index 9d6347e..1f626fb 100644
--- a/src/Symmetry.h
+++ b/src/Symmetry.h
@@ -24,7 +24,8 @@
 #define GFSYM_UNSET -42
 #define GFSYM_NOSYM -41
 
-typedef struct Symmetry {
+typedef struct Symmetry 
+{
 
   /* Symmetry[0..GF-1][0..dim-1] */
   /* in each direction [0,..dim-1], this will hold the symmetry 
@@ -35,7 +36,8 @@ typedef struct Symmetry {
 } SymmetryGHex;
 
 #ifdef __cplusplus
-extern "C" {
+extern "C" 
+{
 #endif
 
 void SetCartSymmetry(cGH *GH, int *sym, const char *imp_gf);