* fix mismatched CCTK_VWarn() formats and arguments for

  "impossible value for conformal_storage" error msgs
* also slight tweaks to surrounding code so the compiler knows that
  make_conformal_derivs  is always set before it's used


git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinInitialData/IDAnalyticBH/trunk@135 6a3ddf76-46e1-4315-99d9-bc56cac1ef84

5 files changed, 15 insertions, 34 deletions

diff --git a/src/BrillLindquist.c b/src/BrillLindquist.c
index 4e2454b..bb5e21c 100644
--- a/src/BrillLindquist.c
+++ b/src/BrillLindquist.c
@@ -46,7 +46,7 @@ void BrillLindquist(CCTK_ARGUMENTS)
   CCTK_REAL xval, yval, zval;
   CCTK_REAL x_2, y_2, z_2;
   int i, npoints;
-  int make_conformal_derivs;
+  int make_conformal_derivs = 0;
 
   CCTK_VInfo(CCTK_THORNSTRING,
              "setting up Brill-Lindquist initial data for %d black holes",
@@ -73,13 +73,9 @@ void BrillLindquist(CCTK_ARGUMENTS)
     else
     {
       CCTK_VWarn(0, __LINE__, __FILE__, CCTK_THORNSTRING,
-"BrillLindquist(): impossible value for conformal_storage=\"%s\"!");
-								/*NOTREACHED*/
+"BrillLindquist(): impossible value for conformal_storage=\"%s\"!",
+		 conformal_storage);				/*NOTREACHED*/
     }
-  }      
-  else
-  {
-    make_conformal_derivs = 0;
   }
 
 
diff --git a/src/Kerr.c b/src/Kerr.c
index 8e8c4ad..f5dfde4 100644
--- a/src/Kerr.c
+++ b/src/Kerr.c
@@ -58,7 +58,7 @@ void KerrID(CCTK_ARGUMENTS)
   CCTK_REAL d2Rdxx,d2Rdxy,d2Rdxz,d2Rdyy,d2Rdyz,d2Rdzz;
   CCTK_REAL d2qdxx,d2qdxy,d2qdxz,d2qdyy,d2qdyz,d2qdzz;
   CCTK_REAL m=mass,a=a_Kerr,a_2=a*a,m2_a2=m*m-a_2;
-  int make_conformal_derivs;
+  int make_conformal_derivs = 0;
 
   CCTK_VInfo(CCTK_THORNSTRING,
              "setting up Kerr initial data");
@@ -99,13 +99,10 @@ void KerrID(CCTK_ARGUMENTS)
     else
     {
       CCTK_VWarn(0, __LINE__, __FILE__, CCTK_THORNSTRING,
-"KerrID(): impossible value for conformal_storage=\"%s\"!");	/*NOTREACHED*/
+"KerrID(): impossible value for conformal_storage=\"%s\"!",
+		 conformal_storage);				/*NOTREACHED*/
     }
   }      
-  else
-  {
-    make_conformal_derivs = 0;
-  }
 
 
   /* printf("npoints: %i\n",npoints); */
diff --git a/src/Misner_multiple.c b/src/Misner_multiple.c
index 3c084c2..2503bc5 100644
--- a/src/Misner_multiple.c
+++ b/src/Misner_multiple.c
@@ -46,7 +46,7 @@ void Misner_multiple(CCTK_ARGUMENTS)
   const CCTK_REAL nm_eps             = 1e-6;   /* finite differencing step*/
   const CCTK_REAL halved_inv_nm_eps  = 0.5 / nm_eps;
   const CCTK_REAL inv_nm_eps_squared = 1.0 / SQR(nm_eps);
-  int make_conformal_derivs;
+  int make_conformal_derivs = 0;
 
   CCTK_VInfo(CCTK_THORNSTRING,
              "setting up Misner initial data for %d black holes",
@@ -73,13 +73,9 @@ void Misner_multiple(CCTK_ARGUMENTS)
     else
     {
       CCTK_VWarn(0, __LINE__, __FILE__, CCTK_THORNSTRING,
-"Misner_multiple(): impossible value for conformal_storage=\"%s\"!");
-								/*NOTREACHED*/
+"Misner_multiple(): impossible value for conformal_storage=\"%s\"!",
+		 conformal_storage);				/*NOTREACHED*/
     }
-  }      
-  else
-  {
-    make_conformal_derivs = 0;
   }
 
 
diff --git a/src/Misner_standard.c b/src/Misner_standard.c
index ec829b4..06dea8b 100644
--- a/src/Misner_standard.c
+++ b/src/Misner_standard.c
@@ -75,7 +75,7 @@ void Misner_standard(CCTK_ARGUMENTS)
   CCTK_INT powfac;
   CCTK_INT adm_mass;
   const CCTK_REAL zero = 0.0, one = 1.0, three = 3.0;
-  int make_conformal_derivs;
+  int make_conformal_derivs = 0;
 
   CCTK_VInfo(CCTK_THORNSTRING,
              "setting up Misner initial data");
@@ -101,14 +101,10 @@ void Misner_standard(CCTK_ARGUMENTS)
     else
     {
       CCTK_VWarn(0, __LINE__, __FILE__, CCTK_THORNSTRING,
-"Misner_Standard(): impossible value for conformal_storage=\"%s\"!");
-								/*NOTREACHED*/
+"Misner_Standard(): impossible value for conformal_storage=\"%s\"!",
+		 conformal_storage);				/*NOTREACHED*/
     }
   }      
-  else
-  {
-    make_conformal_derivs = 0;
-  }
 
   /* total number of points on this processor */
   npoints = cctk_lsh[0] * cctk_lsh[1] * cctk_lsh[2];
diff --git a/src/Schwarzschild.c b/src/Schwarzschild.c
index f2b390f..d459542 100644
--- a/src/Schwarzschild.c
+++ b/src/Schwarzschild.c
@@ -27,7 +27,7 @@ void Schwarzschild(CCTK_ARGUMENTS)
 
   const CCTK_REAL zero = 0.0, one = 1.0, two = 2.0, three = 3.0;
   CCTK_REAL tmp, r_squared, r_cubed;
-  int make_conformal_derivs;
+  int make_conformal_derivs = 0;
   int i, npoints;
 
   CCTK_VInfo(CCTK_THORNSTRING,
@@ -54,14 +54,10 @@ void Schwarzschild(CCTK_ARGUMENTS)
     else
     {
       CCTK_VWarn(0, __LINE__, __FILE__, CCTK_THORNSTRING,
-"Schwarzschild(): impossible value for conformal_storage=\"%s\"!");
-								/*NOTREACHED*/
+"Schwarzschild(): impossible value for conformal_storage=\"%s\"!",
+		 conformal_storage);				/*NOTREACHED*/
     }
   }      
-  else
-  {
-    make_conformal_derivs = 0;
-  }
 
 
   npoints = cctk_lsh[0] * cctk_lsh[1] * cctk_lsh[2];