Fix compiler warnings.

Most of them could be fixed by renaming .F77 files to .F
Some had to be fixed by explicitly declaring some variables using
CCTK_DECLARE() (which also only works for .F, not for .F77)



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

44 files changed, 151 insertions, 97 deletions

diff --git a/src/Bona_Masso_data.F77 b/src/Bona_Masso_data.F
index b2e36b3..b2e36b3 100644
--- a/src/Bona_Masso_data.F77
+++ b/src/Bona_Masso_data.F
diff --git a/src/blended_boundary.F77 b/src/blended_boundary.F
index c46623c..c46623c 100644
--- a/src/blended_boundary.F77
+++ b/src/blended_boundary.F
diff --git a/src/boost.F77 b/src/boost.F
index 6b993ea..6b993ea 100644
--- a/src/boost.F77
+++ b/src/boost.F
diff --git a/src/boundary.F77 b/src/boundary.F
index 644d6a5..644d6a5 100644
--- a/src/boundary.F77
+++ b/src/boundary.F
diff --git a/src/decode_pars.F77 b/src/decode_pars.F
index d51bb4a..d51bb4a 100644
--- a/src/decode_pars.F77
+++ b/src/decode_pars.F
diff --git a/src/gauge.F77 b/src/gauge.F
index 93ceb6a..93ceb6a 100644
--- a/src/gauge.F77
+++ b/src/gauge.F
diff --git a/src/initialize.F77 b/src/initialize.F
index a6bc967..a6bc967 100644
--- a/src/initialize.F77
+++ b/src/initialize.F
diff --git a/src/make.code.defn b/src/make.code.defn
index 7e41e8d..7fe7c97 100644
--- a/src/make.code.defn
+++ b/src/make.code.defn
@@ -4,22 +4,22 @@
 # Source files in this directory
 SRCS = ParamCheck.c			\
        Startup.c			\
-       decode_pars.F77			\
-       initialize.F77			\
+       decode_pars.F			\
+       initialize.F			\
 					\
        slice_initialize.F		\
        slice_evolve.F			\
        slice_data.F			\
 					\
-       gauge.F77			\
-       Bona_Masso_data.F77		\
+       gauge.F			\
+       Bona_Masso_data.F		\
 					\
-       boost.F77			\
-       metric.F77			\
+       boost.F			\
+       metric.F			\
 					\
-       boundary.F77			\
-       blended_boundary.F77		\
-       xyz_blended_boundary.F77		\
+       boundary.F			\
+       blended_boundary.F		\
+       xyz_blended_boundary.F		\
        linear_extrap_one_bndry.F
 
 # Subdirectories containing source files to be compiled
diff --git a/src/metric.F77 b/src/metric.F
index f28c948..f28c948 100644
--- a/src/metric.F77
+++ b/src/metric.F
diff --git a/src/metrics/Alvi.F77 b/src/metrics/Alvi.F
index 78bf84e..78bf84e 100644
--- a/src/metrics/Alvi.F77
+++ b/src/metrics/Alvi.F
diff --git a/src/metrics/Bertotti.F77 b/src/metrics/Bertotti.F
index 003a282..fc05972 100644
--- a/src/metrics/Bertotti.F77
+++ b/src/metrics/Bertotti.F
@@ -21,14 +21,16 @@ C $Header$
       DECLARE_CCTK_PARAMETERS
 
 c input arguments
-      CCTK_REAL x, y, z, t
+      CCTK_REAL x, z
+      CCTK_DECLARE(CCTK_REAL, y,)
+      CCTK_DECLARE(CCTK_REAL, t,)
 
 c output arguments
       CCTK_REAL gdtt, gdtx, gdty, gdtz, 
      $       gdxx, gdyy, gdzz, gdxy, gdyz, gdzx,
      $       gutt, gutx, guty, gutz, 
      $       guxx, guyy, guzz, guxy, guyz, guzx
-      CCTK_REAL psi
+      CCTK_DECLARE(CCTK_REAL, psi,)
       LOGICAL   Tmunu_flag
 
 c local variables
diff --git a/src/metrics/Bianchi_I.F77 b/src/metrics/Bianchi_I.F
index b29713e..436666d 100644
--- a/src/metrics/Bianchi_I.F77
+++ b/src/metrics/Bianchi_I.F
@@ -23,14 +23,17 @@ C $Header$
       DECLARE_CCTK_PARAMETERS
 
 c input arguments
-      CCTK_REAL x, y, z, t
+      CCTK_REAL x, t
+      CCTK_DECLARE(CCTK_REAL, y,)
+      CCTK_DECLARE(CCTK_REAL, z,)
+     
 
 c output arguments
       CCTK_REAL gdtt, gdtx, gdty, gdtz, 
      $       gdxx, gdyy, gdzz, gdxy, gdyz, gdzx,
      $       gutt, gutx, guty, gutz, 
      $       guxx, guyy, guzz, guxy, guyz, guzx
-      CCTK_REAL psi
+      CCTK_DECLARE(CCTK_REAL, psi,)
       LOGICAL   Tmunu_flag
 
 c local variables
diff --git a/src/metrics/Goedel.F77 b/src/metrics/Goedel.F
index 5b662b2..e7dec99 100644
--- a/src/metrics/Goedel.F77
+++ b/src/metrics/Goedel.F
@@ -23,14 +23,17 @@ C $Header$
       DECLARE_CCTK_PARAMETERS
 
 c input arguments
-      CCTK_REAL x, y, z, t
+      CCTK_REAL x
+      CCTK_DECLARE(CCTK_REAL, y,)
+      CCTK_DECLARE(CCTK_REAL, z,)
+      CCTK_DECLARE(CCTK_REAL, t,)
 
 c output arguments
       CCTK_REAL gdtt, gdtx, gdty, gdtz, 
      $       gdxx, gdyy, gdzz, gdxy, gdyz, gdzx,
      $       gutt, gutx, guty, gutz, 
      $       guxx, guyy, guzz, guxy, guyz, guzx
-      CCTK_REAL psi
+      CCTK_DECLARE(CCTK_REAL, psi,)
       LOGICAL   Tmunu_flag
 
 c local variables
diff --git a/src/metrics/Gowdy_wave.F77 b/src/metrics/Gowdy_wave.F
index efdb938..580841c 100644
--- a/src/metrics/Gowdy_wave.F77
+++ b/src/metrics/Gowdy_wave.F
@@ -27,14 +27,16 @@ C @@
       DECLARE_CCTK_PARAMETERS
 
 c input arguments
-      CCTK_REAL x, y, z, t
+      CCTK_REAL z, t
+      CCTK_DECLARE(CCTK_REAL, x,)
+      CCTK_DECLARE(CCTK_REAL, y,)
 
 c output arguments
       CCTK_REAL gdtt, gdtx, gdty, gdtz, 
      $       gdxx, gdyy, gdzz, gdxy, gdyz, gdzx,
      $       gutt, gutx, guty, gutz, 
      $       guxx, guyy, guzz, guxy, guyz, guzx
-      CCTK_REAL psi
+      CCTK_DECLARE(CCTK_REAL, psi,)
       LOGICAL   Tmunu_flag
 
 c local static variables
diff --git a/src/metrics/Kasner_axisymmetric.F77 b/src/metrics/Kasner_axisymmetric.F
index 0cf292a..aa798a8 100644
--- a/src/metrics/Kasner_axisymmetric.F77
+++ b/src/metrics/Kasner_axisymmetric.F
@@ -21,14 +21,17 @@ C $Header$
       DECLARE_CCTK_PARAMETERS
 
 c input arguments
-      CCTK_REAL x, y, z, t
+      CCTK_REAL t
+      CCTK_DECLARE(CCTK_REAL, x,)
+      CCTK_DECLARE(CCTK_REAL, y,)
+      CCTK_DECLARE(CCTK_REAL, z,)
 
 c output arguments
       CCTK_REAL gdtt, gdtx, gdty, gdtz, 
      $       gdxx, gdyy, gdzz, gdxy, gdyz, gdzx,
      $       gutt, gutx, guty, gutz, 
      $       guxx, guyy, guzz, guxy, guyz, guzx
-      CCTK_REAL psi
+      CCTK_DECLARE(CCTK_REAL, psi,)
       LOGICAL   Tmunu_flag
 
 C This is a vacuum spacetime with no cosmological constant
diff --git a/src/metrics/Kasner_generalized.F77 b/src/metrics/Kasner_generalized.F
index fe29330..e0f0a82 100644
--- a/src/metrics/Kasner_generalized.F77
+++ b/src/metrics/Kasner_generalized.F
@@ -21,14 +21,17 @@ C $Header$
       DECLARE_CCTK_PARAMETERS
 
 c input arguments
-      CCTK_REAL x, y, z, t
+      CCTK_REAL t
+      CCTK_DECLARE(CCTK_REAL, x,)
+      CCTK_DECLARE(CCTK_REAL, y,)
+      CCTK_DECLARE(CCTK_REAL, z,)
 
 c output arguments
       CCTK_REAL gdtt, gdtx, gdty, gdtz, 
      $       gdxx, gdyy, gdzz, gdxy, gdyz, gdzx,
      $       gutt, gutx, guty, gutz, 
      $       guxx, guyy, guzz, guxy, guyz, guzx
-      CCTK_REAL psi
+      CCTK_DECLARE(CCTK_REAL, psi,)
       LOGICAL   Tmunu_flag
 
 c local variables
diff --git a/src/metrics/Kasner_like.F77 b/src/metrics/Kasner_like.F
index 7c7b57e..26de7cd 100644
--- a/src/metrics/Kasner_like.F77
+++ b/src/metrics/Kasner_like.F
@@ -25,14 +25,17 @@ C $Header$
       DECLARE_CCTK_PARAMETERS
 
 c input arguments
-      CCTK_REAL x, y, z, t
+      CCTK_REAL t
+      CCTK_DECLARE(CCTK_REAL, x,)
+      CCTK_DECLARE(CCTK_REAL, y,)
+      CCTK_DECLARE(CCTK_REAL, z,)
 
 c output arguments
       CCTK_REAL gdtt, gdtx, gdty, gdtz, 
      $       gdxx, gdyy, gdzz, gdxy, gdyz, gdzx,
      $       gutt, gutx, guty, gutz, 
      $       guxx, guyy, guzz, guxy, guyz, guzx
-      CCTK_REAL psi
+      CCTK_DECLARE(CCTK_REAL, psi,)
       LOGICAL   Tmunu_flag
 
 c local variables
diff --git a/src/metrics/Kerr_BoyerLindquist.F77 b/src/metrics/Kerr_BoyerLindquist.F
index 0a8c25f..5c3c933 100644
--- a/src/metrics/Kerr_BoyerLindquist.F77
+++ b/src/metrics/Kerr_BoyerLindquist.F
@@ -22,14 +22,16 @@ C $Header$
       DECLARE_CCTK_PARAMETERS
 
 c input arguments
-      CCTK_REAL x, y, z, t
+      CCTK_REAL x, y
+      CCTK_DECLARE(CCTK_REAL, z,)
+      CCTK_DECLARE(CCTK_REAL, t,)
 
 c output arguments
       CCTK_REAL gdtt, gdtx, gdty, gdtz, 
      $       gdxx, gdyy, gdzz, gdxy, gdyz, gdzx,
      $       gutt, gutx, guty, gutz, 
      $       guxx, guyy, guzz, guxy, guyz, guzx
-      CCTK_REAL psi
+      CCTK_DECLARE(CCTK_REAL, psi,)
       LOGICAL   Tmunu_flag
     
       CCTK_REAL arad, marad
diff --git a/src/metrics/Kerr_KerrSchild.F77 b/src/metrics/Kerr_KerrSchild.F
index ee1e077..36ea76f 100644
--- a/src/metrics/Kerr_KerrSchild.F77
+++ b/src/metrics/Kerr_KerrSchild.F
@@ -33,7 +33,7 @@ c output arguments
      $       gdxx, gdyy, gdzz, gdxy, gdyz, gdzx,
      $       gutt, gutx, guty, gutz, 
      $       guxx, guyy, guzz, guxy, guyz, guzx
-      CCTK_REAL psi
+      CCTK_DECLARE(CCTK_REAL, psi,)
       LOGICAL   Tmunu_flag
 
 c local variables
diff --git a/src/metrics/Kerr_KerrSchild_spherical.F77 b/src/metrics/Kerr_KerrSchild_spherical.F
index 417b224..02d356d 100644
--- a/src/metrics/Kerr_KerrSchild_spherical.F77
+++ b/src/metrics/Kerr_KerrSchild_spherical.F
@@ -36,7 +36,7 @@ c output arguments
      $       gdxx, gdyy, gdzz, gdxy, gdyz, gdzx,
      $       gutt, gutx, guty, gutz, 
      $       guxx, guyy, guzz, guxy, guyz, guzx
-      CCTK_REAL psi
+      CCTK_DECLARE(CCTK_REAL, psi,)
       LOGICAL   Tmunu_flag
 
 c local variables
@@ -44,7 +44,7 @@ c local variables
 
 c local variables
       CCTK_REAL t1, x1, y1, z1, rho1,
-     $     gamma, t0, z0, x0, y0, rho02, r02, r0, costheta0, 
+     $     gamma, t0, z0, x0, y0, r0, costheta0, 
      $     lt0, lx0, ly0, lz0, hh, lt, lx, ly, lz
 
       CCTK_REAL gd(3,3), gdt(3,3), det, jac(3,3)
diff --git a/src/metrics/Lemaitre.F77 b/src/metrics/Lemaitre.F
index 6cfef62..3318095 100644
--- a/src/metrics/Lemaitre.F77
+++ b/src/metrics/Lemaitre.F
@@ -26,14 +26,17 @@ C $Header$
       DECLARE_CCTK_FUNCTIONS      
 
 c input arguments
-      CCTK_REAL x, y, z, t
+      CCTK_REAL t
+      CCTK_DECLARE(CCTK_REAL, x,)
+      CCTK_DECLARE(CCTK_REAL, y,)
+      CCTK_DECLARE(CCTK_REAL, z,)
 
 c output arguments
       CCTK_REAL gdtt, gdtx, gdty, gdtz, 
      $       gdxx, gdyy, gdzz, gdxy, gdyz, gdzx,
      $       gutt, gutx, guty, gutz, 
      $       guxx, guyy, guzz, guxy, guyz, guzx
-      CCTK_REAL psi
+      CCTK_DECLARE(CCTK_REAL, psi,)
       LOGICAL   Tmunu_flag
       
 c local variables
diff --git a/src/metrics/Milne.F77 b/src/metrics/Milne.F
index abd1019..90ec9c6 100644
--- a/src/metrics/Milne.F77
+++ b/src/metrics/Milne.F
@@ -28,7 +28,7 @@ c output arguments
      $       gdxx, gdyy, gdzz, gdxy, gdyz, gdzx,
      $       gutt, gutx, guty, gutz, 
      $       guxx, guyy, guzz, guxy, guyz, guzx
-      CCTK_REAL psi
+      CCTK_DECLARE(CCTK_REAL, psi,)
       LOGICAL   Tmunu_flag
 
 c local variables
diff --git a/src/metrics/Minkowski.F77 b/src/metrics/Minkowski.F
index ac9918c..f5fe4aa 100644
--- a/src/metrics/Minkowski.F77
+++ b/src/metrics/Minkowski.F
@@ -14,14 +14,17 @@ C $Header$
       implicit none
 
 c input arguments
-      CCTK_REAL x, y, z, t
+      CCTK_DECLARE(CCTK_REAL, x,)
+      CCTK_DECLARE(CCTK_REAL, y,)
+      CCTK_DECLARE(CCTK_REAL, z,)
+      CCTK_DECLARE(CCTK_REAL, t,)
 
 c output arguments
       CCTK_REAL gdtt, gdtx, gdty, gdtz, 
      $       gdxx, gdyy, gdzz, gdxy, gdyz, gdzx,
      $       gutt, gutx, guty, gutz, 
      $       guxx, guyy, guzz, guxy, guyz, guzx
-      CCTK_REAL psi
+      CCTK_DECLARE(CCTK_REAL, psi,)
       LOGICAL   Tmunu_flag
 
 C This is a vacuum spacetime with no cosmological constant
diff --git a/src/metrics/Minkowski_conf_wave.F77 b/src/metrics/Minkowski_conf_wave.F
index 983c6ce..e2ed79a 100644
--- a/src/metrics/Minkowski_conf_wave.F77
+++ b/src/metrics/Minkowski_conf_wave.F
@@ -27,7 +27,8 @@ C of this thorn.
       DECLARE_CCTK_FUNCTIONS
 
 c input arguments
-      CCTK_REAL x, y, z, t
+      CCTK_REAL x, y, z
+      CCTK_DECLARE(CCTK_REAL, t,)
 
 c output arguments
       CCTK_REAL gdtt, gdtx, gdty, gdtz, 
diff --git a/src/metrics/Minkowski_funny.F77 b/src/metrics/Minkowski_funny.F
index 7e376f3..48a5981 100644
--- a/src/metrics/Minkowski_funny.F77
+++ b/src/metrics/Minkowski_funny.F
@@ -31,14 +31,17 @@ c $Header$
       DECLARE_CCTK_PARAMETERS
 
 c input arguments
-      CCTK_REAL x,y,z,t
+      CCTK_DECLARE(CCTK_REAL, x,)
+      CCTK_DECLARE(CCTK_REAL, y,)
+      CCTK_DECLARE(CCTK_REAL, z,)
+      CCTK_DECLARE(CCTK_REAL, t,)
 
 c output arguments
       CCTK_REAL gdtt, gdtx, gdty, gdtz, 
      $          gdxx, gdyy, gdzz, gdxy, gdyz, gdzx,
      $          gutt, gutx, guty, gutz, 
      $          guxx, guyy, guzz, guxy, guyz, guzx
-      CCTK_REAL psi
+      CCTK_DECLARE(CCTK_REAL, psi,)
       LOGICAL   Tmunu_flag
 
 c local variables
diff --git a/src/metrics/Minkowski_gauge_wave.F77 b/src/metrics/Minkowski_gauge_wave.F
index 639b0a7..3edb3ef 100644
--- a/src/metrics/Minkowski_gauge_wave.F77
+++ b/src/metrics/Minkowski_gauge_wave.F
@@ -26,14 +26,15 @@ C
       DECLARE_CCTK_FUNCTIONS
 
 c input arguments
-      CCTK_REAL x, y, z, t
+      CCTK_REAL x, y, t
+      CCTK_DECLARE(CCTK_REAL, z,)
 
 c output arguments
       CCTK_REAL gdtt, gdtx, gdty, gdtz, 
      $       gdxx, gdyy, gdzz, gdxy, gdyz, gdzx,
      $       gutt, gutx, guty, gutz, 
      $       guxx, guyy, guzz, guxy, guyz, guzx
-      CCTK_REAL psi
+      CCTK_DECLARE(CCTK_REAL, psi,)
       LOGICAL   Tmunu_flag
 
 c local parameter copies
@@ -79,6 +80,8 @@ c$$$        H = exp(a*sin(x/d)*cos(t/d))
         write (warn_buffer, '(a,a,a)')
      $        'Unknown Minkowski_gauge_wave__what_fn = "',
      $         Minkowski_gauge_wave__what_fn, '"'
+C       silence compiler warning about uninitialized H
+        H = one
         call CCTK_WARN(0, warn_buffer)
       end if
 
diff --git a/src/metrics/Minkowski_shift.F77 b/src/metrics/Minkowski_shift.F
index 394bf67..3115a75 100644
--- a/src/metrics/Minkowski_shift.F77
+++ b/src/metrics/Minkowski_shift.F
@@ -33,14 +33,15 @@ c $Header$
       DECLARE_CCTK_PARAMETERS
 
 c input arguments
-      CCTK_REAL x,y,z,t
+      CCTK_REAL x,y,z
+      CCTK_DECLARE(CCTK_REAL, t,)
 
 c output arguments
       CCTK_REAL gdtt, gdtx, gdty, gdtz, 
      $          gdxx, gdyy, gdzz, gdxy, gdyz, gdzx,
      $          gutt, gutx, guty, gutz, 
      $          guxx, guyy, guzz, guxy, guyz, guzx
-      CCTK_REAL psi
+      CCTK_DECLARE(CCTK_REAL, psi,)
       LOGICAL   Tmunu_flag
 
 c local variables
diff --git a/src/metrics/Minkowski_shifted_gauge_wave.F77 b/src/metrics/Minkowski_shifted_gauge_wave.F
index 2806a58..68caf89 100644
--- a/src/metrics/Minkowski_shifted_gauge_wave.F77
+++ b/src/metrics/Minkowski_shifted_gauge_wave.F
@@ -26,14 +26,15 @@ C
       DECLARE_CCTK_FUNCTIONS
 
 c input arguments
-      CCTK_REAL x, y, z, t
+      CCTK_REAL x, y, t
+      CCTK_DECLARE(CCTK_REAL, z,)
 
 c output arguments
       CCTK_REAL gdtt, gdtx, gdty, gdtz, 
      $       gdxx, gdyy, gdzz, gdxy, gdyz, gdzx,
      $       gutt, gutx, guty, gutz, 
      $       guxx, guyy, guzz, guxy, guyz, guzx
-      CCTK_REAL psi
+      CCTK_DECLARE(CCTK_REAL, psi,)
       LOGICAL   Tmunu_flag
 
 c local parameter copies
@@ -68,6 +69,8 @@ C     How should the wave look like.
         write (warn_buffer, '(a,a,a)')
      $        'Unknown Minkowski_gauge_wave__what_fn = "',
      $         Minkowski_gauge_wave__what_fn, '"'
+C       silence compiler warning about unused variable
+        H = one
         call CCTK_WARN(0, warn_buffer)
       end if
 
diff --git a/src/metrics/Schwarzschild_BL.F77 b/src/metrics/Schwarzschild_BL.F
index f9d63f7..ed6e220 100644
--- a/src/metrics/Schwarzschild_BL.F77
+++ b/src/metrics/Schwarzschild_BL.F
@@ -18,14 +18,15 @@ c $Header$
       DECLARE_CCTK_PARAMETERS
 
 c input arguments
-      CCTK_REAL x, y, z, t
+      CCTK_REAL x, y, z
+      CCTK_DECLARE(CCTK_REAL, t,)
 
 c output arguments
       CCTK_REAL gdtt, gdtx, gdty, gdtz, 
      $       gdxx, gdyy, gdzz, gdxy, gdyz, gdzx,
      $       gutt, gutx, guty, gutz, 
      $       guxx, guyy, guzz, guxy, guyz, guzx
-      CCTK_REAL psi
+      CCTK_DECLARE(CCTK_REAL, psi,)
       LOGICAL   Tmunu_flag
 
 c local variables
diff --git a/src/metrics/Schwarzschild_EF.F77 b/src/metrics/Schwarzschild_EF.F
index 66a9db4..bed3fad 100644
--- a/src/metrics/Schwarzschild_EF.F77
+++ b/src/metrics/Schwarzschild_EF.F
@@ -22,14 +22,15 @@ c $Header$
       DECLARE_CCTK_PARAMETERS
 
 c input arguments
-      CCTK_REAL x, y, z, t
+      CCTK_REAL x, y, z
+      CCTK_DECLARE(CCTK_REAL, t,)
 
 c output arguments
       CCTK_REAL gdtt, gdtx, gdty, gdtz, 
      $       gdxx, gdyy, gdzz, gdxy, gdyz, gdzx,
      $       gutt, gutx, guty, gutz, 
      $       guxx, guyy, guzz, guxy, guyz, guzx
-      CCTK_REAL psi
+      CCTK_DECLARE(CCTK_REAL, psi,)
       LOGICAL   Tmunu_flag
 
 c local static variables
diff --git a/src/metrics/Schwarzschild_Lemaitre.F77 b/src/metrics/Schwarzschild_Lemaitre.F
index b5a2dc7..aff86a9 100644
--- a/src/metrics/Schwarzschild_Lemaitre.F77
+++ b/src/metrics/Schwarzschild_Lemaitre.F
@@ -23,14 +23,15 @@ C $Header$
       DECLARE_CCTK_PARAMETERS
 
 c input arguments
-      CCTK_REAL x, y, z, t
+      CCTK_REAL x, y, z
+      CCTK_DECLARE(CCTK_REAL, t,)
 
 c output arguments
       CCTK_REAL gdtt, gdtx, gdty, gdtz, 
      $       gdxx, gdyy, gdzz, gdxy, gdyz, gdzx,
      $       gutt, gutx, guty, gutz, 
      $       guxx, guyy, guzz, guxy, guyz, guzx
-      CCTK_REAL psi
+      CCTK_DECLARE(CCTK_REAL, psi,)
       LOGICAL   Tmunu_flag
 
 c local variables
diff --git a/src/metrics/Schwarzschild_Novikov.F77 b/src/metrics/Schwarzschild_Novikov.F
index 2f797d2..4b3109c 100644
--- a/src/metrics/Schwarzschild_Novikov.F77
+++ b/src/metrics/Schwarzschild_Novikov.F
@@ -33,7 +33,7 @@ c output arguments
      $       gdxx, gdyy, gdzz, gdxy, gdyz, gdzx,
      $       gutt, gutx, guty, gutz, 
      $       guxx, guyy, guzz, guxy, guyz, guzx
-      CCTK_REAL psi
+      CCTK_DECLARE(CCTK_REAL, psi,)
       LOGICAL   Tmunu_flag
 
 c local variables
diff --git a/src/metrics/Schwarzschild_PG.F77 b/src/metrics/Schwarzschild_PG.F
index e8f21fb..e0ba3c2 100644
--- a/src/metrics/Schwarzschild_PG.F77
+++ b/src/metrics/Schwarzschild_PG.F
@@ -23,14 +23,15 @@ c $Header$
       DECLARE_CCTK_PARAMETERS
 
 c input arguments
-      CCTK_REAL x, y, z, t
+      CCTK_REAL x, y, z
+      CCTK_DECLARE(CCTK_REAL, t,)
 
 c output arguments
       CCTK_REAL gdtt, gdtx, gdty, gdtz, 
      $       gdxx, gdyy, gdzz, gdxy, gdyz, gdzx,
      $       gutt, gutx, guty, gutz, 
      $       guxx, guyy, guzz, guxy, guyz, guzx
-      CCTK_REAL psi
+      CCTK_DECLARE(CCTK_REAL, psi,)
       LOGICAL   Tmunu_flag
 
 c local variables
diff --git a/src/metrics/Thorne_fakebinary.F77 b/src/metrics/Thorne_fakebinary.F
index c04effb..b1321fb 100644
--- a/src/metrics/Thorne_fakebinary.F77
+++ b/src/metrics/Thorne_fakebinary.F
@@ -31,7 +31,7 @@ c output arguments
      $       gdxx, gdyy, gdzz, gdxy, gdyz, gdxz,
      $       gutt, gutx, guty, gutz, 
      $       guxx, guyy, guzz, guxy, guyz, guxz
-      CCTK_REAL psi
+      CCTK_DECLARE(CCTK_REAL, psi,)
       LOGICAL   Tmunu_flag
 
 c local variables
diff --git a/src/metrics/anti_de_Sitter_Lambda.F77 b/src/metrics/anti_de_Sitter_Lambda.F
index dea8898..03cbcc3 100644
--- a/src/metrics/anti_de_Sitter_Lambda.F77
+++ b/src/metrics/anti_de_Sitter_Lambda.F
@@ -21,14 +21,17 @@ C $Header$
       DECLARE_CCTK_PARAMETERS
 
 c input arguments
-      CCTK_REAL x, y, z, t
+      CCTK_REAL x
+      CCTK_DECLARE(CCTK_REAL, y,)
+      CCTK_DECLARE(CCTK_REAL, z,)
+      CCTK_DECLARE(CCTK_REAL, t,)
 
 c output arguments
       CCTK_REAL gdtt, gdtx, gdty, gdtz, 
      $       gdxx, gdyy, gdzz, gdxy, gdyz, gdzx,
      $       gutt, gutx, guty, gutz, 
      $       guxx, guyy, guzz, guxy, guyz, guzx
-      CCTK_REAL psi
+      CCTK_DECLARE(CCTK_REAL, psi,)
       LOGICAL   Tmunu_flag
 
 c local variables
diff --git a/src/metrics/boost_rotation_symmetric.F77 b/src/metrics/boost_rotation_symmetric.F
index 85f303d..4d34b21 100644
--- a/src/metrics/boost_rotation_symmetric.F77
+++ b/src/metrics/boost_rotation_symmetric.F
@@ -29,7 +29,7 @@ c output arguments
      $       gdxx, gdyy, gdzz, gdxy, gdyz, gdzx,
      $       gutt, gutx, guty, gutz,
      $       guxx, guyy, guzz, guxy, guyz, guzx
-      CCTK_REAL psi
+      CCTK_DECLARE(CCTK_REAL, psi,)
       LOGICAL   Tmunu_flag
 
 c functions local to this file
diff --git a/src/metrics/bowl.F77 b/src/metrics/bowl.F
index 5592dd1..9ae4edf 100644
--- a/src/metrics/bowl.F77
+++ b/src/metrics/bowl.F
@@ -77,7 +77,7 @@ c output arguments
      $          gdxx, gdyy, gdzz, gdxy, gdyz, gdzx,
      $          gutt, gutx, guty, gutz, 
      $          guxx, guyy, guzz, guxy, guyz, guzx
-      CCTK_REAL psi
+      CCTK_DECLARE(CCTK_REAL, psi,)
       LOGICAL   Tmunu_flag
 
 c local static variables
@@ -197,6 +197,8 @@ c        I use the same trick as above.
       else
          write (warn_buffer, '(a,i8)')
      $         'Unknown type = ', type
+c        silence compiler warning about uninitialized variable
+         rr2 = one
          call CCTK_WARN(0, warn_buffer)
 
       end if
diff --git a/src/metrics/constant_density_star.F77 b/src/metrics/constant_density_star.F
index 9543c9b..3a67c1c 100644
--- a/src/metrics/constant_density_star.F77
+++ b/src/metrics/constant_density_star.F
@@ -34,14 +34,15 @@ c     the use of this metric.
       DECLARE_CCTK_PARAMETERS
 
 c input arguments
-      CCTK_REAL x, y, z, t
+      CCTK_REAL x, y, z
+      CCTK_DECLARE(CCTK_REAL, t,)
 
 c output arguments
       CCTK_REAL gdtt, gdtx, gdty, gdtz, 
      $       gdxx, gdyy, gdzz, gdxy, gdyz, gdzx,
      $       gutt, gutx, guty, gutz, 
      $       guxx, guyy, guzz, guxy, guyz, guzx
-      CCTK_REAL psi
+      CCTK_DECLARE(CCTK_REAL, psi,)
       LOGICAL   Tmunu_flag
 
 c local variables
diff --git a/src/metrics/de_Sitter.F77 b/src/metrics/de_Sitter.F
index e6cb642..94901a9 100644
--- a/src/metrics/de_Sitter.F77
+++ b/src/metrics/de_Sitter.F
@@ -27,14 +27,17 @@ C $Header$
       DECLARE_CCTK_PARAMETERS
 
 c input arguments
-      CCTK_REAL x, y, z, t
+      CCTK_DECLARE(CCTK_REAL, x,)
+      CCTK_DECLARE(CCTK_REAL, y,)
+      CCTK_DECLARE(CCTK_REAL, z,)
+      CCTK_REAL t
 
 c output arguments
       CCTK_REAL gdtt, gdtx, gdty, gdtz, 
      $       gdxx, gdyy, gdzz, gdxy, gdyz, gdzx,
      $       gutt, gutx, guty, gutz, 
      $       guxx, guyy, guzz, guxy, guyz, guzx
-      CCTK_REAL psi
+      CCTK_DECLARE(CCTK_REAL, psi,)
       LOGICAL   Tmunu_flag
 
 c local variables
diff --git a/src/metrics/de_Sitter_Lambda.F77 b/src/metrics/de_Sitter_Lambda.F
index fa507fa..f2b613d 100644
--- a/src/metrics/de_Sitter_Lambda.F77
+++ b/src/metrics/de_Sitter_Lambda.F
@@ -21,14 +21,17 @@ C $Header$
       DECLARE_CCTK_PARAMETERS
 
 c input arguments
-      CCTK_REAL x, y, z, t
+      CCTK_DECLARE(CCTK_REAL, x,)
+      CCTK_DECLARE(CCTK_REAL, y,)
+      CCTK_DECLARE(CCTK_REAL, z,)
+      CCTK_REAL t
 
 c output arguments
       CCTK_REAL gdtt, gdtx, gdty, gdtz, 
      $       gdxx, gdyy, gdzz, gdxy, gdyz, gdzx,
      $       gutt, gutx, guty, gutz, 
      $       guxx, guyy, guzz, guxy, guyz, guzx
-      CCTK_REAL psi
+      CCTK_DECLARE(CCTK_REAL, psi,)
       LOGICAL   Tmunu_flag
 
 c local variables
diff --git a/src/metrics/make.code.defn b/src/metrics/make.code.defn
index 1e90de0..c597115 100644
--- a/src/metrics/make.code.defn
+++ b/src/metrics/make.code.defn
@@ -6,40 +6,40 @@
 # ... if adding new files, please keep this list in the same order as the
 #     metrics in this thorn's param.ccl file
 #
-SRCS = Minkowski.F77			\
-       Minkowski_funny.F77		\
-       Minkowski_shift.F77		\
-       Minkowski_gauge_wave.F77		\
-       Minkowski_shifted_gauge_wave.F77	\
-       Minkowski_conf_wave.F77		\
+SRCS = Minkowski.F			\
+       Minkowski_funny.F		\
+       Minkowski_shift.F		\
+       Minkowski_gauge_wave.F		\
+       Minkowski_shifted_gauge_wave.F	\
+       Minkowski_conf_wave.F		\
 					\
-       Schwarzschild_EF.F77		\
-       Schwarzschild_PG.F77		\
-       Schwarzschild_BL.F77		\
-       Schwarzschild_Novikov.F77	\
-       Kerr_BoyerLindquist.F77		\
-       Kerr_KerrSchild.F77		\
-       Kerr_KerrSchild_spherical.F77	\
-       Schwarzschild_Lemaitre.F77	\
-       multi_BH.F77			\
-       Thorne_fakebinary.F77		\
+       Schwarzschild_EF.F		\
+       Schwarzschild_PG.F		\
+       Schwarzschild_BL.F		\
+       Schwarzschild_Novikov.F	\
+       Kerr_BoyerLindquist.F		\
+       Kerr_KerrSchild.F		\
+       Kerr_KerrSchild_spherical.F	\
+       Schwarzschild_Lemaitre.F	\
+       multi_BH.F			\
+       Thorne_fakebinary.F		\
 					\
-       Lemaitre.F77			\
-       de_Sitter.F77			\
-       de_Sitter_Lambda.F77		\
-       anti_de_Sitter_Lambda.F77	\
-       Bianchi_I.F77			\
-       Goedel.F77			\
-       Bertotti.F77			\
-       Kasner_like.F77			\
-       Kasner_axisymmetric.F77		\
-       Kasner_generalized.F77		\
-       Gowdy_wave.F77			\
-       Milne.F77			\
+       Lemaitre.F			\
+       de_Sitter.F			\
+       de_Sitter_Lambda.F		\
+       anti_de_Sitter_Lambda.F	\
+       Bianchi_I.F			\
+       Goedel.F			\
+       Bertotti.F			\
+       Kasner_like.F			\
+       Kasner_axisymmetric.F		\
+       Kasner_generalized.F		\
+       Gowdy_wave.F			\
+       Milne.F			\
 					\
-       boost_rotation_symmetric.F77	\
-       bowl.F77				\
-       constant_density_star.F77
+       boost_rotation_symmetric.F	\
+       bowl.F				\
+       constant_density_star.F
 
 # not fully implemented yet -- see Nina Jansen for details
-#      Alvi.F77 Alvidef.c
+#      Alvi.F Alvidef.c
diff --git a/src/metrics/multi_BH.F77 b/src/metrics/multi_BH.F
index 212c41c..827dbb7 100644
--- a/src/metrics/multi_BH.F77
+++ b/src/metrics/multi_BH.F
@@ -39,7 +39,7 @@ c output arguments
      $       gdxx, gdyy, gdzz, gdxy, gdyz, gdzx,
      $       gutt, gutx, guty, gutz, 
      $       guxx, guyy, guzz, guxy, guyz, guzx
-      CCTK_REAL psi
+      CCTK_DECLARE(CCTK_REAL, psi,)
       LOGICAL   Tmunu_flag
 
 c local static variables
diff --git a/src/slice_data.F b/src/slice_data.F
index 3ade6f5..c8b49c1 100644
--- a/src/slice_data.F
+++ b/src/slice_data.F
@@ -13,13 +13,13 @@ C $Header$
 
 c #define-ing the symbol EXACT_NO_F90 will turn this subroutine into a no-op
 #ifndef EXACT_NO_F90
-      integer i, j, k, l, m, n, p, q, s
+      integer i, j, k, l, m, n, p, q
       integer nx,ny,nz
       integer ierr
 
       CCTK_REAL s1d(4,3), nd(4), nu(4), norm, gd(4,4), gu(4,4), g3(3,3),
      $   gd_p(4,4), gd_m(4,4), gd1d(4,4,4), s2d(4,3,3), k3(3,3), 
-     $   ex_eps, d3(3,3,3), dx, dy, dz, exact_psi
+     $   ex_eps, dx, dy, dz, exact_psi
       parameter (ex_eps=1.d-6)
 
 C     Grid parameters.
diff --git a/src/xyz_blended_boundary.F77 b/src/xyz_blended_boundary.F
index 06db214..06db214 100644
--- a/src/xyz_blended_boundary.F77
+++ b/src/xyz_blended_boundary.F