- add one new metric: Minkowski/conf wave

  This is Minkowski with a cosine in the conformal factor
- added support for using a static conformal factor


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

31 files changed, 189 insertions, 57 deletions

diff --git a/src/metrics/Alvi.F77 b/src/metrics/Alvi.F77
index 81789e6..7ee21fb 100644
--- a/src/metrics/Alvi.F77
+++ b/src/metrics/Alvi.F77
@@ -11,7 +11,8 @@ C $Header$
      $     gdtt, gdtx, gdty, gdtz, 
      $     gdxx, gdyy, gdzz, gdxy, gdyz, gdzx,
      $     gutt, gutx, guty, gutz, 
-     $     guxx, guyy, guzz, guxy, guyz, guzx)
+     $     guxx, guyy, guzz, guxy, guyz, guzx,
+     $     psi)
 
       implicit none
 
@@ -30,7 +31,8 @@ C $Header$
       CCTK_REAL gdtt, gdtx, gdty, gdtz, 
      $       gdxx, gdyy, gdzz, gdxy, gdyz, gdzx,
      $       gutt, gutx, guty, gutz, 
-     $       guxx, guyy, guzz, guxy, guyz, guzx
+     $       guxx, guyy, guzz, guxy, guyz, guzx,
+     $       psi
 
 
       CCTK_REAL rin1,rin2,rout,x1,x2, r1, r2, r3, results(10)
diff --git a/src/metrics/Bertotti.F77 b/src/metrics/Bertotti.F77
index f9b32df..5533422 100644
--- a/src/metrics/Bertotti.F77
+++ b/src/metrics/Bertotti.F77
@@ -10,7 +10,8 @@ C $Header$
      $     gdtt, gdtx, gdty, gdtz, 
      $     gdxx, gdyy, gdzz, gdxy, gdyz, gdzx,
      $     gutt, gutx, guty, gutz, 
-     $     guxx, guyy, guzz, guxy, guyz, guzx)
+     $     guxx, guyy, guzz, guxy, guyz, guzx,
+     $     psi)
 
       implicit none
 
@@ -20,7 +21,8 @@ C $Header$
       CCTK_REAL gdtt, gdtx, gdty, gdtz, 
      $       gdxx, gdyy, gdzz, gdxy, gdyz, gdzx,
      $       gutt, gutx, guty, gutz, 
-     $       guxx, guyy, guzz, guxy, guyz, guzx
+     $       guxx, guyy, guzz, guxy, guyz, guzx,
+     $       psi
 
       logical firstcall
     
diff --git a/src/metrics/Bianchi_I.F77 b/src/metrics/Bianchi_I.F77
index 0af7b12..feece73 100644
--- a/src/metrics/Bianchi_I.F77
+++ b/src/metrics/Bianchi_I.F77
@@ -12,7 +12,8 @@ C $Header$
      $     gdtt, gdtx, gdty, gdtz, 
      $     gdxx, gdyy, gdzz, gdxy, gdyz, gdzx,
      $     gutt, gutx, guty, gutz, 
-     $     guxx, guyy, guzz, guxy, guyz, guzx)
+     $     guxx, guyy, guzz, guxy, guyz, guzx,
+     $     psi)
 
       implicit none
 
@@ -22,7 +23,8 @@ C $Header$
       CCTK_REAL gdtt, gdtx, gdty, gdtz, 
      $       gdxx, gdyy, gdzz, gdxy, gdyz, gdzx,
      $       gutt, gutx, guty, gutz, 
-     $       guxx, guyy, guzz, guxy, guyz, guzx
+     $       guxx, guyy, guzz, guxy, guyz, guzx,
+     $       psi
 
       logical firstcall
     
diff --git a/src/metrics/Goedel.F77 b/src/metrics/Goedel.F77
index fec2c73..513e3e1 100644
--- a/src/metrics/Goedel.F77
+++ b/src/metrics/Goedel.F77
@@ -12,7 +12,8 @@ C $Header$
      $     gdtt, gdtx, gdty, gdtz, 
      $     gdxx, gdyy, gdzz, gdxy, gdyz, gdzx,
      $     gutt, gutx, guty, gutz, 
-     $     guxx, guyy, guzz, guxy, guyz, guzx)
+     $     guxx, guyy, guzz, guxy, guyz, guzx,
+     $     psi)
 
       implicit none
 
@@ -22,7 +23,8 @@ C $Header$
       CCTK_REAL gdtt, gdtx, gdty, gdtz, 
      $       gdxx, gdyy, gdzz, gdxy, gdyz, gdzx,
      $       gutt, gutx, guty, gutz, 
-     $       guxx, guyy, guzz, guxy, guyz, guzx
+     $       guxx, guyy, guzz, guxy, guyz, guzx,
+     $       psi
 
       logical firstcall
     
diff --git a/src/metrics/Gowdy.F77 b/src/metrics/Gowdy.F77
index 06370bf..8573710 100644
--- a/src/metrics/Gowdy.F77
+++ b/src/metrics/Gowdy.F77
@@ -20,7 +20,8 @@ C @@
      $     gdtt, gdtx, gdty, gdtz, 
      $     gdxx, gdyy, gdzz, gdxy, gdyz, gdzx,
      $     gutt, gutx, guty, gutz, 
-     $     guxx, guyy, guzz, guxy, guyz, guzx)
+     $     guxx, guyy, guzz, guxy, guyz, guzx,
+     $     psi)
 
       implicit none
 
@@ -30,7 +31,8 @@ C @@
       CCTK_REAL gdtt, gdtx, gdty, gdtz, 
      $       gdxx, gdyy, gdzz, gdxy, gdyz, gdzx,
      $       gutt, gutx, guty, gutz, 
-     $       guxx, guyy, guzz, guxy, guyz, guzx
+     $       guxx, guyy, guzz, guxy, guyz, guzx,
+     $       psi
 
       logical firstcall
     
diff --git a/src/metrics/Kasner_axisymmetric.F77 b/src/metrics/Kasner_axisymmetric.F77
index 0dc98d1..d6480dd 100644
--- a/src/metrics/Kasner_axisymmetric.F77
+++ b/src/metrics/Kasner_axisymmetric.F77
@@ -10,7 +10,8 @@ C $Header$
      $     gdtt, gdtx, gdty, gdtz, 
      $     gdxx, gdyy, gdzz, gdxy, gdyz, gdzx,
      $     gutt, gutx, guty, gutz, 
-     $     guxx, guyy, guzz, guxy, guyz, guzx)
+     $     guxx, guyy, guzz, guxy, guyz, guzx,
+     $     psi)
 
       implicit none
 
@@ -20,7 +21,8 @@ C $Header$
       CCTK_REAL gdtt, gdtx, gdty, gdtz, 
      $       gdxx, gdyy, gdzz, gdxy, gdyz, gdzx,
      $       gutt, gutx, guty, gutz, 
-     $       guxx, guyy, guzz, guxy, guyz, guzx
+     $       guxx, guyy, guzz, guxy, guyz, guzx,
+     $       psi
 
       gdtt = -t**(-0.5d0) 
       gdtx = 0.d0 
diff --git a/src/metrics/Kasner_generalized.F77 b/src/metrics/Kasner_generalized.F77
index 9ec71d5..c3e8a63 100644
--- a/src/metrics/Kasner_generalized.F77
+++ b/src/metrics/Kasner_generalized.F77
@@ -10,7 +10,8 @@ C $Header$
      $     gdtt, gdtx, gdty, gdtz, 
      $     gdxx, gdyy, gdzz, gdxy, gdyz, gdzx,
      $     gutt, gutx, guty, gutz, 
-     $     guxx, guyy, guzz, guxy, guyz, guzx)
+     $     guxx, guyy, guzz, guxy, guyz, guzx,
+     $     psi)
 
       implicit none
 
@@ -20,7 +21,8 @@ C $Header$
       CCTK_REAL gdtt, gdtx, gdty, gdtz, 
      $       gdxx, gdyy, gdzz, gdxy, gdyz, gdzx,
      $       gutt, gutx, guty, gutz, 
-     $       guxx, guyy, guzz, guxy, guyz, guzx
+     $       guxx, guyy, guzz, guxy, guyz, guzx,
+     $       psi
 
       logical firstcall
     
diff --git a/src/metrics/Kasner_like.F77 b/src/metrics/Kasner_like.F77
index 15e5cff..bd24380 100644
--- a/src/metrics/Kasner_like.F77
+++ b/src/metrics/Kasner_like.F77
@@ -14,7 +14,8 @@ C $Header$
      $     gdtt, gdtx, gdty, gdtz, 
      $     gdxx, gdyy, gdzz, gdxy, gdyz, gdzx,
      $     gutt, gutx, guty, gutz, 
-     $     guxx, guyy, guzz, guxy, guyz, guzx)
+     $     guxx, guyy, guzz, guxy, guyz, guzx,
+     $     psi)
 
       implicit none
 
@@ -24,7 +25,8 @@ C $Header$
       CCTK_REAL gdtt, gdtx, gdty, gdtz, 
      $       gdxx, gdyy, gdzz, gdxy, gdyz, gdzx,
      $       gutt, gutx, guty, gutz, 
-     $       guxx, guyy, guzz, guxy, guyz, guzx
+     $       guxx, guyy, guzz, guxy, guyz, guzx,
+     $       psi
 
       logical firstcall
     
diff --git a/src/metrics/Kerr_BoyerLindquist.F77 b/src/metrics/Kerr_BoyerLindquist.F77
index 3a16cc6..076d9f8 100644
--- a/src/metrics/Kerr_BoyerLindquist.F77
+++ b/src/metrics/Kerr_BoyerLindquist.F77
@@ -11,7 +11,8 @@ C $Header$
      $     gdtt, gdtx, gdty, gdtz, 
      $     gdxx, gdyy, gdzz, gdxy, gdyz, gdzx,
      $     gutt, gutx, guty, gutz, 
-     $     guxx, guyy, guzz, guxy, guyz, guzx)
+     $     guxx, guyy, guzz, guxy, guyz, guzx,
+     $     psi)
 
       implicit none
 
@@ -21,7 +22,8 @@ C $Header$
       CCTK_REAL gdtt, gdtx, gdty, gdtz, 
      $       gdxx, gdyy, gdzz, gdxy, gdyz, gdzx,
      $       gutt, gutx, guty, gutz, 
-     $       guxx, guyy, guzz, guxy, guyz, guzx
+     $       guxx, guyy, guzz, guxy, guyz, guzx,
+     $       psi
 
       logical firstcall
     
diff --git a/src/metrics/Kerr_KerrSchild.F77 b/src/metrics/Kerr_KerrSchild.F77
index d998fb4..ad9ac27 100644
--- a/src/metrics/Kerr_KerrSchild.F77
+++ b/src/metrics/Kerr_KerrSchild.F77
@@ -12,7 +12,8 @@ C $Header$
      $     gdtt, gdtx, gdty, gdtz, 
      $     gdxx, gdyy, gdzz, gdxy, gdyz, gdzx,
      $     gutt, gutx, guty, gutz, 
-     $     guxx, guyy, guzz, guxy, guyz, guzx)
+     $     guxx, guyy, guzz, guxy, guyz, guzx,
+     $     psi)
 
       implicit none
 
@@ -23,7 +24,8 @@ C $Header$
       CCTK_REAL gdtt, gdtx, gdty, gdtz, 
      $       gdxx, gdyy, gdzz, gdxy, gdyz, gdzx,
      $       gutt, gutx, guty, gutz, 
-     $       guxx, guyy, guzz, guxy, guyz, guzx
+     $       guxx, guyy, guzz, guxy, guyz, guzx,
+     $       psi
 
       CCTK_REAL gamma, t0, z0, x0, y0, rho02, r02, r0, costheta0, 
      $     lt0, lx0, ly0, lz0, hh, lt, lx, ly, lz
diff --git a/src/metrics/Lemaitre.F77 b/src/metrics/Lemaitre.F77
index 2062f4b..9819c45 100644
--- a/src/metrics/Lemaitre.F77
+++ b/src/metrics/Lemaitre.F77
@@ -12,7 +12,8 @@ C $Header$
      $     gdtt, gdtx, gdty, gdtz, 
      $     gdxx, gdyy, gdzz, gdxy, gdyz, gdzx,
      $     gutt, gutx, guty, gutz, 
-     $     guxx, guyy, guzz, guxy, guyz, guzx)
+     $     guxx, guyy, guzz, guxy, guyz, guzx,
+     $     psi)
 
       implicit none
 
@@ -24,7 +25,8 @@ C $Header$
       CCTK_REAL gdtt, gdtx, gdty, gdtz, 
      $       gdxx, gdyy, gdzz, gdxy, gdyz, gdzx,
      $       gutt, gutx, guty, gutz, 
-     $       guxx, guyy, guzz, guxy, guyz, guzx
+     $       guxx, guyy, guzz, guxy, guyz, guzx,
+     $       psi
       
 
       logical firstcall
diff --git a/src/metrics/Milne.F77 b/src/metrics/Milne.F77
index 0167873..d441cb6 100644
--- a/src/metrics/Milne.F77
+++ b/src/metrics/Milne.F77
@@ -12,7 +12,8 @@ C $Header$
      $     gdtt, gdtx, gdty, gdtz, 
      $     gdxx, gdyy, gdzz, gdxy, gdyz, gdzx,
      $     gutt, gutx, guty, gutz, 
-     $     guxx, guyy, guzz, guxy, guyz, guzx)
+     $     guxx, guyy, guzz, guxy, guyz, guzx,
+     $     psi)
 
       implicit none
 
@@ -26,6 +27,7 @@ c     Output.
      $       gdxx, gdyy, gdzz, gdxy, gdyz, gdzx,
      $       gutt, gutx, guty, gutz, 
      $       guxx, guyy, guzz, guxy, guyz, guzx,
+     $       psi,
      $       coef, x2,y2,z2,t2
 
       x2= x*x
diff --git a/src/metrics/Minkowski.F77 b/src/metrics/Minkowski.F77
index 5318332..88031c2 100644
--- a/src/metrics/Minkowski.F77
+++ b/src/metrics/Minkowski.F77
@@ -8,7 +8,8 @@ C $Header$
      $     gdtt, gdtx, gdty, gdtz, 
      $     gdxx, gdyy, gdzz, gdxy, gdyz, gdzx,
      $     gutt, gutx, guty, gutz, 
-     $     guxx, guyy, guzz, guxy, guyz, guzx)
+     $     guxx, guyy, guzz, guxy, guyz, guzx,
+     $     psi)
 
       implicit none
 
@@ -21,7 +22,8 @@ c     Output.
       CCTK_REAL gdtt, gdtx, gdty, gdtz, 
      $       gdxx, gdyy, gdzz, gdxy, gdyz, gdzx,
      $       gutt, gutx, guty, gutz, 
-     $       guxx, guyy, guzz, guxy, guyz, guzx
+     $       guxx, guyy, guzz, guxy, guyz, guzx,
+     $       psi
 
       gdtt = -1.d0 
       gdtx = 0.d0 
diff --git a/src/metrics/Minkowski_conf_wave.F77 b/src/metrics/Minkowski_conf_wave.F77
new file mode 100644
index 0000000..301fb62
--- /dev/null
+++ b/src/metrics/Minkowski_conf_wave.F77
@@ -0,0 +1,75 @@
+c $Header$
+
+C     Author: Frank Loeffler (frank.loeffler@aei.mpg.de)
+C     Licence: GPL 2 or later
+
+#include "cctk.h"
+#include "cctk_Arguments.h"
+#include "cctk_Parameters.h"
+
+#define Pi (4 * atan(1.d0))
+
+
+      subroutine Exact__Minkowski_conf_wave(
+     $     x, y, z, t,
+     $     gdtt, gdtx, gdty, gdtz, 
+     $     gdxx, gdyy, gdzz, gdxy, gdyz, gdzx,
+     $     gutt, gutx, guty, gutz, 
+     $     guxx, guyy, guzz, guxy, guyz, guzx,
+     $     psi)
+
+      implicit none
+      DECLARE_CCTK_PARAMETERS
+      DECLARE_CCTK_FUNCTIONS
+
+      CCTK_REAL x, y, z, t
+      CCTK_REAL gdtt, gdtx, gdty, gdtz, 
+     $       gdxx, gdyy, gdzz, gdxy, gdyz, gdzx,
+     $       gutt, gutx, guty, gutz, 
+     $       guxx, guyy, guzz, guxy, guyz, guzx,
+     $       psi
+
+C     write conformal factor
+      if (Minkowski_conf_wave__direction .eq. 0) then
+        psi = Minkowski_conf_wave__amplitude *
+     .        sin(2.0d0*Pi/Minkowski_conf_wave__wavelength* x ) + 1.0d0
+      else if (Minkowski_conf_wave__direction .eq. 1) then
+        psi = Minkowski_conf_wave__amplitude *
+     .        sin(2.0d0*Pi/Minkowski_conf_wave__wavelength* y ) + 1.0d0
+      else if (Minkowski_conf_wave__direction .eq. 2) then
+        psi = Minkowski_conf_wave__amplitude *
+     .        sin(2.0d0*Pi/Minkowski_conf_wave__wavelength* z ) + 1.0d0
+      end if
+
+C     write metric.
+
+      gdxx = psi**(-4.0d0)
+      gdyy = gdxx
+      gdzz = gdxx
+
+      gdxy = 0.0d0
+      gdyz = 0.0d0
+      gdzx = 0.0d0
+
+      gdtt = -1.0d0
+      gdtx = 0.0d0
+      gdty = 0.0d0
+      gdtz = 0.0d0
+
+C     and upper metric.
+
+      guxx = psi**4.0d0
+      guyy = guxx
+      guzz = guxx
+
+      guxy = 0.0d0
+      guyz = 0.0d0
+      guzx = 0.0d0
+
+      gutt = -1.0d0
+      gutx = 0.0d0
+      guty = 0.0d0
+      gutz = 0.0d0
+
+      return
+      end
diff --git a/src/metrics/Minkowski_funny.F77 b/src/metrics/Minkowski_funny.F77
index 5a9c8e2..a1b5af7 100644
--- a/src/metrics/Minkowski_funny.F77
+++ b/src/metrics/Minkowski_funny.F77
@@ -19,7 +19,8 @@ c $Header$
      $     gdtt, gdtx, gdty, gdtz, 
      $     gdxx, gdyy, gdzz, gdxy, gdyz, gdzx,
      $     gutt, gutx, guty, gutz, 
-     $     guxx, guyy, guzz, guxy, guyz, guzx)
+     $     guxx, guyy, guzz, guxy, guyz, guzx,
+     $     psi)
 
       implicit none
 
@@ -34,7 +35,8 @@ c     Output.
       CCTK_REAL gdtt, gdtx, gdty, gdtz, 
      $          gdxx, gdyy, gdzz, gdxy, gdyz, gdzx,
      $          gutt, gutx, guty, gutz, 
-     $          guxx, guyy, guzz, guxy, guyz, guzx
+     $          guxx, guyy, guzz, guxy, guyz, guzx,
+     $          psi
 
 c     Internal.
 
diff --git a/src/metrics/Minkowski_gauge_wave.F77 b/src/metrics/Minkowski_gauge_wave.F77
index 5e67a70..a4f8a6f 100644
--- a/src/metrics/Minkowski_gauge_wave.F77
+++ b/src/metrics/Minkowski_gauge_wave.F77
@@ -12,7 +12,8 @@ c $Header$
      $     gdtt, gdtx, gdty, gdtz, 
      $     gdxx, gdyy, gdzz, gdxy, gdyz, gdzx,
      $     gutt, gutx, guty, gutz, 
-     $     guxx, guyy, guzz, guxy, guyz, guzx)
+     $     guxx, guyy, guzz, guxy, guyz, guzx,
+     $     psi)
 
       implicit none
       DECLARE_CCTK_PARAMETERS
@@ -22,7 +23,8 @@ c $Header$
       CCTK_REAL gdtt, gdtx, gdty, gdtz, 
      $       gdxx, gdyy, gdzz, gdxy, gdyz, gdzx,
      $       gutt, gutx, guty, gutz, 
-     $       guxx, guyy, guzz, guxy, guyz, guzx
+     $       guxx, guyy, guzz, guxy, guyz, guzx,
+     $       psi
 
       logical firstcall
 
diff --git a/src/metrics/Minkowski_shift.F77 b/src/metrics/Minkowski_shift.F77
index f999d15..ab8bca4 100644
--- a/src/metrics/Minkowski_shift.F77
+++ b/src/metrics/Minkowski_shift.F77
@@ -21,7 +21,8 @@ c $Header$
      $     gdtt, gdtx, gdty, gdtz, 
      $     gdxx, gdyy, gdzz, gdxy, gdyz, gdzx,
      $     gutt, gutx, guty, gutz, 
-     $     guxx, guyy, guzz, guxy, guyz, guzx)
+     $     guxx, guyy, guzz, guxy, guyz, guzx,
+     $     psi)
 
       implicit none
 
@@ -36,7 +37,8 @@ c     Output.
       CCTK_REAL gdtt, gdtx, gdty, gdtz, 
      $          gdxx, gdyy, gdzz, gdxy, gdyz, gdzx,
      $          gutt, gutx, guty, gutz, 
-     $          guxx, guyy, guzz, guxy, guyz, guzx
+     $          guxx, guyy, guzz, guxy, guyz, guzx,
+     $          psi
 
 
 c     Internal.
diff --git a/src/metrics/Robertson_Walker.F77 b/src/metrics/Robertson_Walker.F77
index 85e0739..8335762 100644
--- a/src/metrics/Robertson_Walker.F77
+++ b/src/metrics/Robertson_Walker.F77
@@ -13,7 +13,7 @@ C $Header$
      $     gdtt, gdtx, gdty, gdtz, 
      $     gdxx, gdyy, gdzz, gdxy, gdyz, gdzx,
      $     gutt, gutx, guty, gutz, 
-     $     guxx, guyy, guzz, guxy, guyz, guzx,rama)
+     $     guxx, guyy, guzz, guxy, guyz, guzx, psi, rama)
 
       implicit none
 
@@ -25,7 +25,7 @@ C $Header$
       CCTK_REAL gdtt, gdtx, gdty, gdtz, 
      $       gdxx, gdyy, gdzz, gdxy, gdyz, gdzx,
      $       gutt, gutx, guty, gutz, 
-     $       guxx, guyy, guzz, guxy, guyz, guzx,rama
+     $       guxx, guyy, guzz, guxy, guyz, guzx, psi, rama
       
 
       logical firstcall
diff --git a/src/metrics/Schwarzschild_EF.F77 b/src/metrics/Schwarzschild_EF.F77
index a53858d..4f69802 100644
--- a/src/metrics/Schwarzschild_EF.F77
+++ b/src/metrics/Schwarzschild_EF.F77
@@ -10,7 +10,8 @@ c $Header$
      $     gdtt, gdtx, gdty, gdtz, 
      $     gdxx, gdyy, gdzz, gdxy, gdyz, gdzx,
      $     gutt, gutx, guty, gutz, 
-     $     guxx, guyy, guzz, guxy, guyz, guzx)
+     $     guxx, guyy, guzz, guxy, guyz, guzx,
+     $     psi)
 
       implicit none
 
@@ -20,7 +21,8 @@ c $Header$
       CCTK_REAL gdtt, gdtx, gdty, gdtz, 
      $       gdxx, gdyy, gdzz, gdxy, gdyz, gdzx,
      $       gutt, gutx, guty, gutz, 
-     $       guxx, guyy, guzz, guxy, guyz, guzx
+     $       guxx, guyy, guzz, guxy, guyz, guzx,
+     $       psi
 
       logical firstcall
 
diff --git a/src/metrics/Schwarzschild_Lemaitre.F77 b/src/metrics/Schwarzschild_Lemaitre.F77
index 9ff7835..6d9d033 100644
--- a/src/metrics/Schwarzschild_Lemaitre.F77
+++ b/src/metrics/Schwarzschild_Lemaitre.F77
@@ -12,7 +12,8 @@ C $Header$
      $     gdtt, gdtx, gdty, gdtz, 
      $     gdxx, gdyy, gdzz, gdxy, gdyz, gdzx,
      $     gutt, gutx, guty, gutz, 
-     $     guxx, guyy, guzz, guxy, guyz, guzx)
+     $     guxx, guyy, guzz, guxy, guyz, guzx,
+     $     psi)
 
       implicit none
 
@@ -22,7 +23,8 @@ C $Header$
       CCTK_REAL gdtt, gdtx, gdty, gdtz, 
      $       gdxx, gdyy, gdzz, gdxy, gdyz, gdzx,
      $       gutt, gutx, guty, gutz, 
-     $       guxx, guyy, guzz, guxy, guyz, guzx
+     $       guxx, guyy, guzz, guxy, guyz, guzx,
+     $       psi
 
       logical firstcall
     
diff --git a/src/metrics/Schwarzschild_Novikov.F77 b/src/metrics/Schwarzschild_Novikov.F77
index 61a2d1a..38dafc7 100644
--- a/src/metrics/Schwarzschild_Novikov.F77
+++ b/src/metrics/Schwarzschild_Novikov.F77
@@ -14,7 +14,8 @@ C $Header$
      $     gdtt, gdtx, gdty, gdtz, 
      $     gdxx, gdyy, gdzz, gdxy, gdyz, gdzx,
      $     gutt, gutx, guty, gutz, 
-     $     guxx, guyy, guzz, guxy, guyz, guzx)
+     $     guxx, guyy, guzz, guxy, guyz, guzx,
+     $     psi)
 
       implicit none
 
@@ -29,7 +30,8 @@ c     Output.
       CCTK_REAL gdtt, gdtx, gdty, gdtz, 
      $       gdxx, gdyy, gdzz, gdxy, gdyz, gdzx,
      $       gutt, gutx, guty, gutz, 
-     $       guxx, guyy, guzz, guxy, guyz, guzx
+     $       guxx, guyy, guzz, guxy, guyz, guzx,
+     $       psi
 
 c     Internal.
       logical firstcall
diff --git a/src/metrics/Schwarzschild_PG.F77 b/src/metrics/Schwarzschild_PG.F77
index 37072fc..13db0f1 100644
--- a/src/metrics/Schwarzschild_PG.F77
+++ b/src/metrics/Schwarzschild_PG.F77
@@ -11,7 +11,8 @@ c $Header$
      $     gdtt, gdtx, gdty, gdtz, 
      $     gdxx, gdyy, gdzz, gdxy, gdyz, gdzx,
      $     gutt, gutx, guty, gutz, 
-     $     guxx, guyy, guzz, guxy, guyz, guzx)
+     $     guxx, guyy, guzz, guxy, guyz, guzx,
+     $     psi)
 
       implicit none
 
@@ -21,7 +22,8 @@ c $Header$
       CCTK_REAL gdtt, gdtx, gdty, gdtz, 
      $       gdxx, gdyy, gdzz, gdxy, gdyz, gdzx,
      $       gutt, gutx, guty, gutz, 
-     $       guxx, guyy, guzz, guxy, guyz, guzx
+     $       guxx, guyy, guzz, guxy, guyz, guzx,
+     $       psi
 
       logical firstcall
 
diff --git a/src/metrics/Thorne_fakebinary.F77 b/src/metrics/Thorne_fakebinary.F77
index 2cd954b..8c3f842 100644
--- a/src/metrics/Thorne_fakebinary.F77
+++ b/src/metrics/Thorne_fakebinary.F77
@@ -15,7 +15,8 @@ C $Header$
      $     gdtt, gdtx, gdty, gdtz, 
      $     gdxx, gdyy, gdzz, gdxy, gdyz, gdxz,
      $     gutt, gutx, guty, gutz, 
-     $     guxx, guyy, guzz, guxy, guyz, guxz)
+     $     guxx, guyy, guzz, guxy, guyz, guxz,
+     $     psi)
 
       implicit none
       DECLARE_CCTK_PARAMETERS
@@ -28,7 +29,8 @@ C     output
       CCTK_REAL gdtt, gdtx, gdty, gdtz, 
      $       gdxx, gdyy, gdzz, gdxy, gdyz, gdxz,
      $       gutt, gutx, guty, gutz, 
-     $       guxx, guyy, guzz, guxy, guyz, guxz
+     $       guxx, guyy, guzz, guxy, guyz, guxz,
+     $       psi
 
 C     static
 
diff --git a/src/metrics/anti_de_Sitter_Lambda.F77 b/src/metrics/anti_de_Sitter_Lambda.F77
index 5e2733c..483d847 100644
--- a/src/metrics/anti_de_Sitter_Lambda.F77
+++ b/src/metrics/anti_de_Sitter_Lambda.F77
@@ -10,7 +10,8 @@ C $Header$
      $     gdtt, gdtx, gdty, gdtz, 
      $     gdxx, gdyy, gdzz, gdxy, gdyz, gdzx,
      $     gutt, gutx, guty, gutz, 
-     $     guxx, guyy, guzz, guxy, guyz, guzx)
+     $     guxx, guyy, guzz, guxy, guyz, guzx,
+     $     psi)
 
       implicit none
 
@@ -20,7 +21,8 @@ C $Header$
       CCTK_REAL gdtt, gdtx, gdty, gdtz, 
      $       gdxx, gdyy, gdzz, gdxy, gdyz, gdzx,
      $       gutt, gutx, guty, gutz, 
-     $       guxx, guyy, guzz, guxy, guyz, guzx
+     $       guxx, guyy, guzz, guxy, guyz, guzx,
+     $       psi
 
       logical firstcall
     
diff --git a/src/metrics/boost_rotation_symmetric.F77 b/src/metrics/boost_rotation_symmetric.F77
index ec3dbf9..0a69f8d 100644
--- a/src/metrics/boost_rotation_symmetric.F77
+++ b/src/metrics/boost_rotation_symmetric.F77
@@ -10,7 +10,8 @@ c $Header$
      $     gdtt, gdtx, gdty, gdtz, 
      $     gdxx, gdyy, gdzz, gdxy, gdyz, gdzx,
      $     gutt, gutx, guty, gutz, 
-     $     guxx, guyy, guzz, guxy, guyz, guzx)
+     $     guxx, guyy, guzz, guxy, guyz, guzx,
+     $     psi)
 
       implicit none
 
@@ -20,7 +21,8 @@ c $Header$
      $    gdtt, gdtx, gdty, gdtz, 
      $    gdxx, gdyy, gdzz, gdxy, gdyz, gdzx,
      $    gutt, gutx, guty, gutz, 
-     $    guxx, guyy, guzz, guxy, guyz, guzx
+     $    guxx, guyy, guzz, guxy, guyz, guzx,
+     $    psi
       CCTK_REAL a, b, mu0, mu1, lam1, mu2, lam2,
      $    lam3, mu4, lam4, mu5, lam5, num, div, f,
      $    elam, emu0, delta, gfunc, tmp
diff --git a/src/metrics/bowl.F77 b/src/metrics/bowl.F77
index 192c4e0..36a1cf7 100644
--- a/src/metrics/bowl.F77
+++ b/src/metrics/bowl.F77
@@ -57,7 +57,8 @@ c $Header$
      $     gdtt, gdtx, gdty, gdtz, 
      $     gdxx, gdyy, gdzz, gdxy, gdyz, gdzx,
      $     gutt, gutx, guty, gutz, 
-     $     guxx, guyy, guzz, guxy, guyz, guzx)
+     $     guxx, guyy, guzz, guxy, guyz, guzx,
+     $     psi)
 
       implicit none
 
@@ -71,7 +72,8 @@ c     Output.
       CCTK_REAL gdtt, gdtx, gdty, gdtz, 
      $          gdxx, gdyy, gdzz, gdxy, gdyz, gdzx,
      $          gutt, gutx, guty, gutz, 
-     $          guxx, guyy, guzz, guxy, guyz, guzx
+     $          guxx, guyy, guzz, guxy, guyz, guzx,
+     $          psi
 
       logical firstcall,evolve
 
diff --git a/src/metrics/constant_density_star.F77 b/src/metrics/constant_density_star.F77
index ab3aa30..aecb4ab 100644
--- a/src/metrics/constant_density_star.F77
+++ b/src/metrics/constant_density_star.F77
@@ -15,7 +15,8 @@ c $Header$
      $     gdtt, gdtx, gdty, gdtz, 
      $     gdxx, gdyy, gdzz, gdxy, gdyz, gdzx,
      $     gutt, gutx, guty, gutz, 
-     $     guxx, guyy, guzz, guxy, guyz, guzx)
+     $     guxx, guyy, guzz, guxy, guyz, guzx,
+     $     psi)
 
 c
 c     The metric is given as a conformally flat metric.
@@ -39,7 +40,8 @@ c     Output.
       CCTK_REAL gdtt, gdtx, gdty, gdtz, 
      $       gdxx, gdyy, gdzz, gdxy, gdyz, gdzx,
      $       gutt, gutx, guty, gutz, 
-     $       guxx, guyy, guzz, guxy, guyz, guzx
+     $       guxx, guyy, guzz, guxy, guyz, guzx,
+     $       psi
 
 c     Internal.
 
diff --git a/src/metrics/de_Sitter.F77 b/src/metrics/de_Sitter.F77
index 2ced3e5..f073d73 100644
--- a/src/metrics/de_Sitter.F77
+++ b/src/metrics/de_Sitter.F77
@@ -16,7 +16,8 @@ C $Header$
      $     gdtt, gdtx, gdty, gdtz, 
      $     gdxx, gdyy, gdzz, gdxy, gdyz, gdzx,
      $     gutt, gutx, guty, gutz, 
-     $     guxx, guyy, guzz, guxy, guyz, guzx)
+     $     guxx, guyy, guzz, guxy, guyz, guzx,
+     $     psi)
 
       implicit none
 
@@ -26,7 +27,8 @@ C $Header$
       CCTK_REAL gdtt, gdtx, gdty, gdtz, 
      $       gdxx, gdyy, gdzz, gdxy, gdyz, gdzx,
      $       gutt, gutx, guty, gutz, 
-     $       guxx, guyy, guzz, guxy, guyz, guzx
+     $       guxx, guyy, guzz, guxy, guyz, guzx,
+     $       psi
 
       logical firstcall
     
diff --git a/src/metrics/de_Sitter_Lambda.F77 b/src/metrics/de_Sitter_Lambda.F77
index 381159b..868557a 100644
--- a/src/metrics/de_Sitter_Lambda.F77
+++ b/src/metrics/de_Sitter_Lambda.F77
@@ -10,7 +10,8 @@ C $Header$
      $     gdtt, gdtx, gdty, gdtz, 
      $     gdxx, gdyy, gdzz, gdxy, gdyz, gdzx,
      $     gutt, gutx, guty, gutz, 
-     $     guxx, guyy, guzz, guxy, guyz, guzx)
+     $     guxx, guyy, guzz, guxy, guyz, guzx,
+     $     psi)
 
       implicit none
 
@@ -20,7 +21,8 @@ C $Header$
       CCTK_REAL gdtt, gdtx, gdty, gdtz, 
      $       gdxx, gdyy, gdzz, gdxy, gdyz, gdzx,
      $       gutt, gutx, guty, gutz, 
-     $       guxx, guyy, guzz, guxy, guyz, guzx
+     $       guxx, guyy, guzz, guxy, guyz, guzx,
+     $       psi
 
       logical firstcall
     
diff --git a/src/metrics/make.code.defn b/src/metrics/make.code.defn
index 9c33332..ccd943d 100644
--- a/src/metrics/make.code.defn
+++ b/src/metrics/make.code.defn
@@ -10,6 +10,7 @@ SRCS = Minkowski.F77			\
        Minkowski_funny.F77		\
        Minkowski_shift.F77		\
        Minkowski_gauge_wave.F77		\
+       Minkowski_conf_wave.F77		\
 					\
        Schwarzschild_EF.F77		\
        Schwarzschild_PG.F77		\
diff --git a/src/metrics/multi_BH.F77 b/src/metrics/multi_BH.F77
index a942c67..0068db0 100644
--- a/src/metrics/multi_BH.F77
+++ b/src/metrics/multi_BH.F77
@@ -24,7 +24,8 @@ c $Header$
      $     gdtt, gdtx, gdty, gdtz, 
      $     gdxx, gdyy, gdzz, gdxy, gdyz, gdzx,
      $     gutt, gutx, guty, gutz, 
-     $     guxx, guyy, guzz, guxy, guyz, guzx)
+     $     guxx, guyy, guzz, guxy, guyz, guzx,
+     $     psi)
 
       implicit none
 
@@ -37,7 +38,8 @@ c     Output.
       CCTK_REAL gdtt, gdtx, gdty, gdtz, 
      $       gdxx, gdyy, gdzz, gdxy, gdyz, gdzx,
      $       gutt, gutx, guty, gutz, 
-     $       guxx, guyy, guzz, guxy, guyz, guzx
+     $       guxx, guyy, guzz, guxy, guyz, guzx,
+     $       psi
 
       logical firstcall