* make various error messages more specific, i.e. instead of just

  saying that we got an impossible value of some variable, now also
  say what that value was
* declare a number of variables with the   save   attribute which
  are set on the first call and assumed-in-the-code to be preserved
  across calls


git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinInitialData/Exact/trunk@180 e296648e-0e4f-0410-bd07-d597d9acff87

6 files changed, 23 insertions, 9 deletions

diff --git a/src/metrics/Bianchi_I.F77 b/src/metrics/Bianchi_I.F77
index 2c98cdb..41eb14b 100644
--- a/src/metrics/Bianchi_I.F77
+++ b/src/metrics/Bianchi_I.F77
@@ -35,11 +35,12 @@ c output arguments
 
 c local static variables
       logical firstcall
+      CCTK_REAL arad
       data firstcall /.true./
-      save firstcall
+      save firstcall, arad
  
 c local variables
-      CCTK_REAL bx, by, arad
+      CCTK_REAL bx, by
 
 C This is a vacuum spacetime with no cosmological constant
       Tmunu_flag = .false.
diff --git a/src/metrics/Goedel.F77 b/src/metrics/Goedel.F77
index c711104..7663bc8 100644
--- a/src/metrics/Goedel.F77
+++ b/src/metrics/Goedel.F77
@@ -35,11 +35,10 @@ c output arguments
 
 c local static variables
       logical firstcall
+      CCTK_REAL arad
       data firstcall /.true./
-      save firstcall
+      save firstcall, arad
  
-c local variables
-      CCTK_REAL arad
 
 C This is a vacuum spacetime with no cosmological constant
       Tmunu_flag = .false.
diff --git a/src/metrics/Minkowski_gauge_wave.F77 b/src/metrics/Minkowski_gauge_wave.F77
index 7d666cf..5bdf103 100644
--- a/src/metrics/Minkowski_gauge_wave.F77
+++ b/src/metrics/Minkowski_gauge_wave.F77
@@ -44,6 +44,7 @@ c local static variables
 
 c local variables
       CCTK_REAL H
+      character*100 warn_buffer
 
 c constants
       CCTK_REAL zero,half,one
@@ -75,6 +76,11 @@ C     How should the wave look like.
         H = exp(a*sin(x/d)*cos(t/d))
       elseif (CCTK_Equals(Minkowski_gauge_wave__what_fn,"Gaussian").eq.1) then
         H = one - a*dexp(-(x-t)**2/d**2)
+      else
+        write (warn_buffer, '(a,a,a)')
+     $        'Unknown Minkowski_gauge_wave__what_fn = "',
+     $         Minkowski_gauge_wave__what_fn, '"'
+        call CCTK_WARN(0, warn_buffer)
       end if
 
 C     write metric.
diff --git a/src/metrics/Schwarzschild_Lemaitre.F77 b/src/metrics/Schwarzschild_Lemaitre.F77
index 07dee55..844975d 100644
--- a/src/metrics/Schwarzschild_Lemaitre.F77
+++ b/src/metrics/Schwarzschild_Lemaitre.F77
@@ -35,11 +35,12 @@ c output arguments
 
 c local static variables
       logical firstcall
+      CCTK_REAL lam, mas
       data firstcall /.true./
-      save firstcall
+      save firstcall, lam, mas
 
 c local variables
-      CCTK_REAL lam, mas, r2, ppp, unu, doi
+      CCTK_REAL r2, ppp, unu, doi
 
 C This model has a cosmological constant
       Tmunu_flag = .true.
diff --git a/src/metrics/Schwarzschild_Novikov.F77 b/src/metrics/Schwarzschild_Novikov.F77
index 2d1376c..6446790 100644
--- a/src/metrics/Schwarzschild_Novikov.F77
+++ b/src/metrics/Schwarzschild_Novikov.F77
@@ -43,7 +43,6 @@ c local static variables
       save firstcall, eps, mass
 
 c local variables
-      CCTK_REAL radius
       CCTK_REAL r,c,psi4
 
       CCTK_REAL nov_dr_drmax, nov_rmax, nov_r
diff --git a/src/metrics/bowl.F77 b/src/metrics/bowl.F77
index 95dca9c..ec239f6 100644
--- a/src/metrics/bowl.F77
+++ b/src/metrics/bowl.F77
@@ -89,6 +89,7 @@ c local static variables
 
 c local variables
       integer type
+      character*100 warn_buffer
 
       CCTK_REAL r,r2,rr2
       CCTK_REAL xr,yr,zr,xr2,yr2,zr2
@@ -119,7 +120,9 @@ c     Get parameters of the metric.
          else if (CCTK_Equals(bowl__shape,"Fermi").ne.0) then
             type = 2
          else
-            call CCTK_WARN(0,"Unknown parameter bowl__shape")
+            write (warn_buffer, '(a,a,a)')
+     $            'Unknown bowl__shape = "', bowl__shape, '"'
+            call CCTK_WARN(0, warn_buffer)
          end if
 
          if (bowl__evolve.eq.1) then
@@ -189,6 +192,11 @@ c        I use the same trick as above.
          fac = one - two/(dexp(4.0d0*r) + dexp(-4.0d0*r))
          rr2 = (one - a*fac/(one + dexp(-s*(r-c)))/r)**2
 
+      else
+         write (warn_buffer, '(a,i)')
+     $         'Unknown type = ', type
+         call CCTK_WARN(0, warn_buffer)
+
       end if
 
 c     Give metric components.