Changed h?? to k?? everywhere (apart from parameter files)

Changed CCTK_Warn to the new macro CCTK_WARN which takes the
same arguments as CCTK_Warn used to take


git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinInitialData/IDLinearWaves/trunk@13 5c0f84ea-6048-4d6e-bfa4-55cd5f2e0dd7

2 files changed, 13 insertions, 13 deletions

diff --git a/src/planewaves.F b/src/planewaves.F
index feba82d..4582e55 100644
--- a/src/planewaves.F
+++ b/src/planewaves.F
@@ -151,7 +151,7 @@ c       Joan: I removed the division by alp as the initialization
 c       of the lapse may take place later. This data is consistent
 c       for initial lapse equal one.
 	
-	hxx(i,j,k) = amplitude*
+	kxx(i,j,k) = amplitude*
      &  (cos(the)**2*cos(phi)**2*
      &  (iin*(-w*sin(plus)*exp(-(plusp)**2) -
      &  2.d0*wp*plusp*cos(plus)*exp(-(plusp)**2)) + 
@@ -164,7 +164,7 @@ c       for initial lapse equal one.
      &  2.d0*wp*minusp*cos(minus)*exp(-(minusp)**2))))/(-2.d0)
 
 	
-	hxy(i,j,k) = amplitude*
+	kxy(i,j,k) = amplitude*
      &  (cos(the)**2*sin(phi)*cos(phi)*
      &  (iin*(-w*sin(plus)*exp(-(plusp)**2) -
      &  2.d0*wp*plusp*cos(plus)*exp(-(plusp)**2)) + 
@@ -177,7 +177,7 @@ c       for initial lapse equal one.
      &  2.d0*wp*minusp*cos(minus)*exp(-(minusp)**2))))/(-2.d0)
 
 	
-	hxz(i,j,k) = amplitude*
+	kxz(i,j,k) = amplitude*
      &  (sin(the)*cos(the)*cos(phi)*
      &  (iin*(-w*sin(plus)*exp(-(plusp)**2) -
      &  2.d0*wp*plusp*cos(plus)*exp(-(plusp)**2)) + 
@@ -185,7 +185,7 @@ c       for initial lapse equal one.
      &  2.d0*wp*minusp*cos(minus)*exp(-(minusp)**2))))/(-2.d0)
 
 	
-	hyy(i,j,k) = amplitude*
+	kyy(i,j,k) = amplitude*
      &  (cos(the)**2*sin(phi)**2*
      &  (iin*(-w*sin(plus)*exp(-(plusp)**2) -
      &  2.d0*wp*plusp*cos(plus)*exp(-(plusp)**2)) + 
@@ -198,7 +198,7 @@ c       for initial lapse equal one.
      &  2.d0*wp*minusp*cos(minus)*exp(-(minusp)**2))))/(-2.d0)
 
 	
-	hyz(i,j,k) = amplitude*
+	kyz(i,j,k) = amplitude*
      &  (-sin(the)*cos(the)*sin(phi)*
      &  (iin*(-w*sin(plus)*exp(-(plusp)**2) -
      &  2.d0*wp*plusp*cos(plus)*exp(-(plusp)**2)) + 
@@ -206,7 +206,7 @@ c       for initial lapse equal one.
      &  2.d0*wp*minusp*cos(minus)*exp(-(minusp)**2))))/(-2.d0)
 
 	 
-	hzz(i,j,k) = amplitude*
+	kzz(i,j,k) = amplitude*
      &  (sin(the)**2*
      &  (iin*(-w*sin(plus)*exp(-(plusp)**2) -
      &  2.d0*wp*plusp*cos(plus)*exp(-(plusp)**2)) + 
diff --git a/src/teukwaves.F b/src/teukwaves.F
index 50cbd36..72c146d 100644
--- a/src/teukwaves.F
+++ b/src/teukwaves.F
@@ -72,7 +72,7 @@ cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc
       kappa = sqrt(143.0d0/pi)/12288.0d0
       
       if (wavecenter.ne.0.) then
-         call CCTK_Warn(0,"Teukwaves: wavecenter must be 
+         call CCTK_WARN(0,"Teukwaves: wavecenter must be 
      &   zero for time symmetry")
       endif
  
@@ -534,29 +534,29 @@ c     parity
                endif
                
 c     time symmetry
-               hxx(i,j,k) = drx**2*teuk_hrr+2.*drx*dtx*teuk_hrt
+               kxx(i,j,k) = drx**2*teuk_hrr+2.*drx*dtx*teuk_hrt
      &              +2.*drx*dpx*teuk_hrp+dtx**2*teuk_htt
      &              +2.*dtx*dpx*teuk_htp+dpx**2*teuk_hpp
                
-               hyy(i,j,k) = dry**2*teuk_hrr+2.*dry*dty*teuk_hrt
+               kyy(i,j,k) = dry**2*teuk_hrr+2.*dry*dty*teuk_hrt
      &              +2.*dry*dpy*teuk_hrp+dty**2*teuk_htt
      &              +2.*dty*dpy*teuk_htp+dpy**2*teuk_hpp
                
-               hzz(i,j,k) = drz**2*teuk_hrr+2.*drz*dtz*teuk_hrt
+               kzz(i,j,k) = drz**2*teuk_hrr+2.*drz*dtz*teuk_hrt
      &              +2.*drz*dpz*teuk_hrp+dtz**2*teuk_htt
      &              +2.*dtz*dpz*teuk_htp+dpz**2*teuk_hpp
                
-               hxy(i,j,k) = drx*dry*teuk_hrr+(drx*dty+dtx*dry)*teuk_hrt
+               kxy(i,j,k) = drx*dry*teuk_hrr+(drx*dty+dtx*dry)*teuk_hrt
      &              +(drx*dpy+dpx*dry)*teuk_hrp
      &              +dtx*dty*teuk_htt+(dtx*dpy+dpx*dty)*teuk_htp+
      &              dpx*dpy*teuk_hpp
                
-               hxz(i,j,k) = drx*drz*teuk_hrr+(drx*dtz+dtx*drz)*teuk_hrt
+               kxz(i,j,k) = drx*drz*teuk_hrr+(drx*dtz+dtx*drz)*teuk_hrt
      &              +(drx*dpz+dpx*drz)*teuk_hrp
      &              +dtx*dtz*teuk_htt+(dtx*dpz+dpx*dtz)*teuk_htp+
      &              dpx*dpz*teuk_hpp
                
-               hyz(i,j,k) = dry*drz*teuk_hrr+(dry*dtz+dty*drz)*teuk_hrt
+               kyz(i,j,k) = dry*drz*teuk_hrr+(dry*dtz+dty*drz)*teuk_hrt
      &              +(dry*dpz+dpy*drz)*teuk_hrp
      &              +dty*dtz*teuk_htt+(dty*dpz+dpy*dtz)*teuk_htp+
      &              dpy*dpz*teuk_hpp