Fixed compiler warnings about uninitialized variables, removed assert.h from

the includes, untabified sources.


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

1 files changed, 34 insertions, 29 deletions

diff --git a/src/CartGrid3D.c b/src/CartGrid3D.c
index 178e13a..7180abd 100644
--- a/src/CartGrid3D.c
+++ b/src/CartGrid3D.c
@@ -10,7 +10,6 @@
 
 /*#define CCTK_DEBUG*/
 
-#include <assert.h>
 #include <stdio.h>
 #include <math.h>
 
@@ -43,6 +42,12 @@ void CartGrid3D(CCTK_ARGUMENTS)
   int domainsym[6];
   int cntstag[3];
 
+
+  /* Some compilers warn about variables which might be uninitialized
+     because they are assigned in some if/else statements only */
+  x_origin = y_origin = z_origin = 0.0;
+  this_dx = this_dy = this_dz = 0.0;
+
   /* Avoid origin?  Default is yes */
   cntstag[0] = no_origin && no_originx && avoid_origin && avoid_originx;
   cntstag[1] = no_origin && no_originy && avoid_origin && avoid_originy;
@@ -90,28 +95,28 @@ void CartGrid3D(CCTK_ARGUMENTS)
 
       if (xyzmax != -424242)
       {
-  	xmax1 = xyzmax;
-  	ymax1 = xyzmax;
-  	zmax1 = xyzmax;
+          xmax1 = xyzmax;
+          ymax1 = xyzmax;
+          zmax1 = xyzmax;
       }
       else
       {
-  	xmax1 = xmax;
-  	ymax1 = ymax;
-  	zmax1 = zmax;
+          xmax1 = xmax;
+          ymax1 = ymax;
+          zmax1 = zmax;
       }
   
       if (xyzmin != -424242)
       {
-  	xmin1 = xyzmin;
-  	ymin1 = xyzmin;
-  	zmin1 = xyzmin;
+          xmin1 = xyzmin;
+          ymin1 = xyzmin;
+          zmin1 = xyzmin;
       }
       else
       {
-  	xmin1 = xmin;
-  	ymin1 = ymin;
-  	zmin1 = zmin;
+          xmin1 = xmin;
+          ymin1 = ymin;
+          zmin1 = zmin;
       }
 
     }
@@ -125,13 +130,13 @@ void CartGrid3D(CCTK_ARGUMENTS)
     {
       if (cntstag[0]) 
       {
-	*coarse_dx = xmax1 / (cctk_gsh[0] - cctk_nghostzones[0] - 0.5);
-	x_origin = - (cctk_nghostzones[0] - 0.5) * *coarse_dx * iconv;
+        *coarse_dx = xmax1 / (cctk_gsh[0] - cctk_nghostzones[0] - 0.5);
+        x_origin = - (cctk_nghostzones[0] - 0.5) * *coarse_dx * iconv;
       } 
       else 
       {
-	*coarse_dx = xmax1 / (cctk_gsh[0] - cctk_nghostzones[0] - 1);
-	x_origin = -  cctk_nghostzones[0]        * *coarse_dx * iconv;
+        *coarse_dx = xmax1 / (cctk_gsh[0] - cctk_nghostzones[0] - 1);
+        x_origin = -  cctk_nghostzones[0]        * *coarse_dx * iconv;
       }
     } 
     else 
@@ -144,13 +149,13 @@ void CartGrid3D(CCTK_ARGUMENTS)
     {
       if (cntstag[1]) 
       {
-	*coarse_dy = ymax1 / (cctk_gsh[1] - cctk_nghostzones[1] - 0.5);
-	y_origin = - (cctk_nghostzones[1] - 0.5) * *coarse_dy * iconv;
+        *coarse_dy = ymax1 / (cctk_gsh[1] - cctk_nghostzones[1] - 0.5);
+        y_origin = - (cctk_nghostzones[1] - 0.5) * *coarse_dy * iconv;
       } 
       else 
       {
-	*coarse_dy = ymax1 / (cctk_gsh[1] - cctk_nghostzones[1] - 1);
-	y_origin = -  cctk_nghostzones[1]      * *coarse_dy * iconv;
+        *coarse_dy = ymax1 / (cctk_gsh[1] - cctk_nghostzones[1] - 1);
+        y_origin = -  cctk_nghostzones[1]      * *coarse_dy * iconv;
       }
     } else {
       *coarse_dy = (ymax1 - ymin1) / max(cctk_gsh[1] - 1, 1);
@@ -161,13 +166,13 @@ void CartGrid3D(CCTK_ARGUMENTS)
     {
       if (cntstag[2]) 
       {
-	*coarse_dz = zmax1 / (cctk_gsh[2] - cctk_nghostzones[2] - 0.5);
-	z_origin = - (cctk_nghostzones[2] - 0.5) * *coarse_dz * iconv;
+        *coarse_dz = zmax1 / (cctk_gsh[2] - cctk_nghostzones[2] - 0.5);
+        z_origin = - (cctk_nghostzones[2] - 0.5) * *coarse_dz * iconv;
       } 
       else 
       {
-	*coarse_dz = zmax1 / (cctk_gsh[2] - cctk_nghostzones[2] - 1);
-	z_origin = -  cctk_nghostzones[2]      * *coarse_dz * iconv;
+        *coarse_dz = zmax1 / (cctk_gsh[2] - cctk_nghostzones[2] - 1);
+        z_origin = -  cctk_nghostzones[2]      * *coarse_dz * iconv;
       }
     } 
     else 
@@ -224,7 +229,7 @@ void CartGrid3D(CCTK_ARGUMENTS)
     else 
     {
       x_origin = - 0.5 * (cctk_gsh[0]-1 - cntstag[0] * (cctk_gsh[0]-1)%2)
-	* this_dx;
+        * this_dx;
       x_origin=0;
     }
     
@@ -235,7 +240,7 @@ void CartGrid3D(CCTK_ARGUMENTS)
     else 
     {
       y_origin = - 0.5 * (cctk_gsh[1]-1 - cntstag[1] * (cctk_gsh[1]-1)%2)
-	* this_dy;
+        * this_dy;
       y_origin=0;
     }
     
@@ -262,8 +267,8 @@ void CartGrid3D(CCTK_ARGUMENTS)
         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)]));
+                                               SQR(y[CCTK_GFINDEX3D(cctkGH,i,j,k)])+
+                                               SQR(z[CCTK_GFINDEX3D(cctkGH,i,j,k)]));
       }
     }
   }