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/EinsteinBase/ADMMacros/trunk@5 b1d164ef-f17a-46e7-89d4-021c7118ef4e

11 files changed, 168 insertions, 168 deletions

diff --git a/src/macro/CDXCDK_declare.h b/src/macro/CDXCDK_declare.h
index 6c9a4e7..bec5e34 100644
--- a/src/macro/CDXCDK_declare.h
+++ b/src/macro/CDXCDK_declare.h
@@ -18,17 +18,17 @@
 
 /* Input variables */
 #undef  CDXCDK_KXX 
-#define CDXCDK_KXX hxx(i,j,k)
+#define CDXCDK_KXX kxx(i,j,k)
 #undef  CDXCDK_KXY 
-#define CDXCDK_KXY hxy(i,j,k)
+#define CDXCDK_KXY kxy(i,j,k)
 #undef  CDXCDK_KXZ 
-#define CDXCDK_KXZ hxz(i,j,k)
+#define CDXCDK_KXZ kxz(i,j,k)
 #undef  CDXCDK_KYY 
-#define CDXCDK_KYY hyy(i,j,k)
+#define CDXCDK_KYY kyy(i,j,k)
 #undef  CDXCDK_KYZ 
-#define CDXCDK_KYZ hyz(i,j,k)
+#define CDXCDK_KYZ kyz(i,j,k)
 #undef  CDXCDK_KZZ 
-#define CDXCDK_KZZ hzz(i,j,k)
+#define CDXCDK_KZZ kzz(i,j,k)
 
 /* Output variables */ 
 #undef  CDXCDK_CDXCDKXX
@@ -59,17 +59,17 @@
 
 /* Input variables */
 #undef  CDXCDK_KXX 
-#define CDXCDK_KXX hxx[ijk]
+#define CDXCDK_KXX kxx[ijk]
 #undef  CDXCDK_KXY 
-#define CDXCDK_KXY hxy[ijk]
+#define CDXCDK_KXY kxy[ijk]
 #undef  CDXCDK_KXZ 
-#define CDXCDK_KXZ hxz[ijk]
+#define CDXCDK_KXZ kxz[ijk]
 #undef  CDXCDK_KYY 
-#define CDXCDK_KYY hyy[ijk]
+#define CDXCDK_KYY kyy[ijk]
 #undef  CDXCDK_KYZ 
-#define CDXCDK_KYZ hyz[ijk]
+#define CDXCDK_KYZ kyz[ijk]
 #undef  CDXCDK_KZZ 
-#define CDXCDK_KZZ hzz[ijk]
+#define CDXCDK_KZZ kzz[ijk]
 
 /* Output variables */ 
 #undef  CDXCDK_CDXCDKXX
diff --git a/src/macro/CDYCDK_declare.h b/src/macro/CDYCDK_declare.h
index 759e218..029b864 100644
--- a/src/macro/CDYCDK_declare.h
+++ b/src/macro/CDYCDK_declare.h
@@ -18,17 +18,17 @@
 
 /* Input variables */
 #undef  CDYCDK_KXX 
-#define CDYCDK_KXX hxx(i,j,k)
+#define CDYCDK_KXX kxx(i,j,k)
 #undef  CDYCDK_KXY 
-#define CDYCDK_KXY hxy(i,j,k)
+#define CDYCDK_KXY kxy(i,j,k)
 #undef  CDYCDK_KXZ 
-#define CDYCDK_KXZ hxz(i,j,k)
+#define CDYCDK_KXZ kxz(i,j,k)
 #undef  CDYCDK_KYY 
-#define CDYCDK_KYY hyy(i,j,k)
+#define CDYCDK_KYY kyy(i,j,k)
 #undef  CDYCDK_KYZ 
-#define CDYCDK_KYZ hyz(i,j,k)
+#define CDYCDK_KYZ kyz(i,j,k)
 #undef  CDYCDK_KZZ 
-#define CDYCDK_KZZ hzz(i,j,k)
+#define CDYCDK_KZZ kzz(i,j,k)
 
 /* Output variables */ 
 #undef  CDYCDK_CDYCDKXX
@@ -59,17 +59,17 @@
 
 /* Input variables */
 #undef  CDYCDK_KXX 
-#define CDYCDK_KXX hxx[ijk]
+#define CDYCDK_KXX kxx[ijk]
 #undef  CDYCDK_KXY 
-#define CDYCDK_KXY hxy[ijk]
+#define CDYCDK_KXY kxy[ijk]
 #undef  CDYCDK_KXZ 
-#define CDYCDK_KXZ hxz[ijk]
+#define CDYCDK_KXZ kxz[ijk]
 #undef  CDYCDK_KYY 
-#define CDYCDK_KYY hyy[ijk]
+#define CDYCDK_KYY kyy[ijk]
 #undef  CDYCDK_KYZ 
-#define CDYCDK_KYZ hyz[ijk]
+#define CDYCDK_KYZ kyz[ijk]
 #undef  CDYCDK_KZZ 
-#define CDYCDK_KZZ hzz[ijk]
+#define CDYCDK_KZZ kzz[ijk]
 
 /* Output variables */ 
 #undef  CDYCDK_CDYCDKXX
diff --git a/src/macro/CDZCDK_declare.h b/src/macro/CDZCDK_declare.h
index 5f518aa..6f26a2f 100644
--- a/src/macro/CDZCDK_declare.h
+++ b/src/macro/CDZCDK_declare.h
@@ -18,17 +18,17 @@
 
 /* Input variables */
 #undef  CDZCDK_KXX 
-#define CDZCDK_KXX hxx(i,j,k)
+#define CDZCDK_KXX kxx(i,j,k)
 #undef  CDZCDK_KXY 
-#define CDZCDK_KXY hxy(i,j,k)
+#define CDZCDK_KXY kxy(i,j,k)
 #undef  CDZCDK_KXZ 
-#define CDZCDK_KXZ hxz(i,j,k)
+#define CDZCDK_KXZ kxz(i,j,k)
 #undef  CDZCDK_KYY 
-#define CDZCDK_KYY hyy(i,j,k)
+#define CDZCDK_KYY kyy(i,j,k)
 #undef  CDZCDK_KYZ 
-#define CDZCDK_KYZ hyz(i,j,k)
+#define CDZCDK_KYZ kyz(i,j,k)
 #undef  CDZCDK_KZZ 
-#define CDZCDK_KZZ hzz(i,j,k)
+#define CDZCDK_KZZ kzz(i,j,k)
 
 /* Output variables */ 
 #undef  CDZCDK_CDZCDKXX
@@ -59,17 +59,17 @@
 
 /* Input variables */
 #undef  CDZCDK_KXX 
-#define CDZCDK_KXX hxx[ijk]
+#define CDZCDK_KXX kxx[ijk]
 #undef  CDZCDK_KXY 
-#define CDZCDK_KXY hxy[ijk]
+#define CDZCDK_KXY kxy[ijk]
 #undef  CDZCDK_KXZ 
-#define CDZCDK_KXZ hxz[ijk]
+#define CDZCDK_KXZ kxz[ijk]
 #undef  CDZCDK_KYY 
-#define CDZCDK_KYY hyy[ijk]
+#define CDZCDK_KYY kyy[ijk]
 #undef  CDZCDK_KYZ 
-#define CDZCDK_KYZ hyz[ijk]
+#define CDZCDK_KYZ kyz[ijk]
 #undef  CDZCDK_KZZ 
-#define CDZCDK_KZZ hzz[ijk]
+#define CDZCDK_KZZ kzz[ijk]
 
 /* Output variables */ 
 #undef  CDZCDK_CDZCDKXX
diff --git a/src/macro/DCGDT_declare.h b/src/macro/DCGDT_declare.h
index 3208a76..219e21c 100644
--- a/src/macro/DCGDT_declare.h
+++ b/src/macro/DCGDT_declare.h
@@ -23,17 +23,17 @@
 #undef  DCGDT_A
 #define DCGDT_A alp(i,j,k)
 #undef  DCGDT_KXX 
-#define DCGDT_KXX hxx(i,j,k)
+#define DCGDT_KXX kxx(i,j,k)
 #undef  DCGDT_KXY 
-#define DCGDT_KXY hxy(i,j,k)
+#define DCGDT_KXY kxy(i,j,k)
 #undef  DCGDT_KXZ 
-#define DCGDT_KXZ hxz(i,j,k)
+#define DCGDT_KXZ kxz(i,j,k)
 #undef  DCGDT_KYY 
-#define DCGDT_KYY hyy(i,j,k)
+#define DCGDT_KYY kyy(i,j,k)
 #undef  DCGDT_KYZ 
-#define DCGDT_KYZ hyz(i,j,k)
+#define DCGDT_KYZ kyz(i,j,k)
 #undef  DCGDT_KZZ 
-#define DCGDT_KZZ hzz(i,j,k)
+#define DCGDT_KZZ kzz(i,j,k)
 #undef  DCGDT_PSI 
 #define DCGDT_PSI psi(i,j,k)
 
@@ -75,17 +75,17 @@
 #undef  DCGDT_A
 #define DCGDT_A alp[ijk]
 #undef  DCGDT_KXX 
-#define DCGDT_KXX hxx[ijk]
+#define DCGDT_KXX kxx[ijk]
 #undef  DCGDT_KXY 
-#define DCGDT_KXY hxy[ijk]
+#define DCGDT_KXY kxy[ijk]
 #undef  DCGDT_KXZ 
-#define DCGDT_KXZ hxz[ijk]
+#define DCGDT_KXZ kxz[ijk]
 #undef  DCGDT_KYY 
-#define DCGDT_KYY hyy[ijk]
+#define DCGDT_KYY kyy[ijk]
 #undef  DCGDT_KYZ 
-#define DCGDT_KYZ hyz[ijk]
+#define DCGDT_KYZ kyz[ijk]
 #undef  DCGDT_KZZ 
-#define DCGDT_KZZ hzz[ijk]
+#define DCGDT_KZZ kzz[ijk]
 #undef  DCGDT_PSI 
 #define DCGDT_PSI psi[ijk]
 
diff --git a/src/macro/DKDT_declare.h b/src/macro/DKDT_declare.h
index b03ad4c..7ac8932 100644
--- a/src/macro/DKDT_declare.h
+++ b/src/macro/DKDT_declare.h
@@ -29,17 +29,17 @@
 #undef  DKDT_A
 #define DKDT_A alp(i,j,k)
 #undef  DKDT_KXX 
-#define DKDT_KXX hxx(i,j,k)
+#define DKDT_KXX kxx(i,j,k)
 #undef  DKDT_KXY 
-#define DKDT_KXY hxy(i,j,k)
+#define DKDT_KXY kxy(i,j,k)
 #undef  DKDT_KXZ 
-#define DKDT_KXZ hxz(i,j,k)
+#define DKDT_KXZ kxz(i,j,k)
 #undef  DKDT_KYY 
-#define DKDT_KYY hyy(i,j,k)
+#define DKDT_KYY kyy(i,j,k)
 #undef  DKDT_KYZ 
-#define DKDT_KYZ hyz(i,j,k)
+#define DKDT_KYZ kyz(i,j,k)
 #undef  DKDT_KZZ 
-#define DKDT_KZZ hzz(i,j,k)
+#define DKDT_KZZ kzz(i,j,k)
 
 /* Output variables */ 
 #undef  DKDT_DKXXDT
@@ -72,17 +72,17 @@
 #undef  DKDT_A
 #define DKDT_A alp[ijk]
 #undef  DKDT_KXX 
-#define DKDT_KXX hxx[ijk]
+#define DKDT_KXX kxx[ijk]
 #undef  DKDT_KXY 
-#define DKDT_KXY hxy[ijk]
+#define DKDT_KXY kxy[ijk]
 #undef  DKDT_KXZ 
-#define DKDT_KXZ hxz[ijk]
+#define DKDT_KXZ kxz[ijk]
 #undef  DKDT_KYY 
-#define DKDT_KYY hyy[ijk]
+#define DKDT_KYY kyy[ijk]
 #undef  DKDT_KYZ 
-#define DKDT_KYZ hyz[ijk]
+#define DKDT_KYZ kyz[ijk]
 #undef  DKDT_KZZ 
-#define DKDT_KZZ hzz[ijk]
+#define DKDT_KZZ kzz[ijk]
 
 /* Output variables */ 
 #undef  DKDT_DKXXDT
diff --git a/src/macro/DXDK_declare.h b/src/macro/DXDK_declare.h
index f31bb26..18ccb04 100644
--- a/src/macro/DXDK_declare.h
+++ b/src/macro/DXDK_declare.h
@@ -15,29 +15,29 @@
 
 /* Input variables */
 #undef  DXDK_KXX_IP 
-#define DXDK_KXX_IP hxx(i+1,j,k)
+#define DXDK_KXX_IP kxx(i+1,j,k)
 #undef  DXDK_KXX_IM
-#define DXDK_KXX_IM hxx(i-1,j,k)
+#define DXDK_KXX_IM kxx(i-1,j,k)
 #undef  DXDK_KXY_IP 
-#define DXDK_KXY_IP hxy(i+1,j,k)
+#define DXDK_KXY_IP kxy(i+1,j,k)
 #undef  DXDK_KXY_IM 
-#define DXDK_KXY_IM hxy(i-1,j,k)
+#define DXDK_KXY_IM kxy(i-1,j,k)
 #undef  DXDK_KXZ_IP 
-#define DXDK_KXZ_IP hxz(i+1,j,k)
+#define DXDK_KXZ_IP kxz(i+1,j,k)
 #undef  DXDK_KXZ_IM
-#define DXDK_KXZ_IM hxz(i-1,j,k)
+#define DXDK_KXZ_IM kxz(i-1,j,k)
 #undef  DXDK_KYY_IP 
-#define DXDK_KYY_IP hyy(i+1,j,k)
+#define DXDK_KYY_IP kyy(i+1,j,k)
 #undef  DXDK_KYY_IM 
-#define DXDK_KYY_IM hyy(i-1,j,k)
+#define DXDK_KYY_IM kyy(i-1,j,k)
 #undef  DXDK_KYZ_IP 
-#define DXDK_KYZ_IP hyz(i+1,j,k)
+#define DXDK_KYZ_IP kyz(i+1,j,k)
 #undef  DXDK_KYZ_IM 
-#define DXDK_KYZ_IM hyz(i-1,j,k)
+#define DXDK_KYZ_IM kyz(i-1,j,k)
 #undef  DXDK_KZZ_IP 
-#define DXDK_KZZ_IP hzz(i+1,j,k)
+#define DXDK_KZZ_IP kzz(i+1,j,k)
 #undef  DXDK_KZZ_IM
-#define DXDK_KZZ_IM hzz(i-1,j,k)
+#define DXDK_KZZ_IM kzz(i-1,j,k)
 
 /* Output variables */ 
 #undef  DXDK_DXDKXX
@@ -77,29 +77,29 @@
 
 /* Input variables */
 #undef  DXDK_KXX_IP 
-#define DXDK_KXX_IP hxx[ di+ijk]
+#define DXDK_KXX_IP kxx[ di+ijk]
 #undef  DXDK_KXX_IM
-#define DXDK_KXX_IM hxx[-di+ijk]
+#define DXDK_KXX_IM kxx[-di+ijk]
 #undef  DXDK_KXY_IP 
-#define DXDK_KXY_IP hxy[ di+ijk]
+#define DXDK_KXY_IP kxy[ di+ijk]
 #undef  DXDK_KXY_IM 
-#define DXDK_KXY_IM hxy[-di+ijk]
+#define DXDK_KXY_IM kxy[-di+ijk]
 #undef  DXDK_KXZ_IP 
-#define DXDK_KXZ_IP hxz[ di+ijk]
+#define DXDK_KXZ_IP kxz[ di+ijk]
 #undef  DXDK_KXZ_IM
-#define DXDK_KXZ_IM hxz[-di+ijk]
+#define DXDK_KXZ_IM kxz[-di+ijk]
 #undef  DXDK_KYY_IP 
-#define DXDK_KYY_IP hyy[ di+ijk]
+#define DXDK_KYY_IP kyy[ di+ijk]
 #undef  DXDK_KYY_IM 
-#define DXDK_KYY_IM hyy[-di+ijk]
+#define DXDK_KYY_IM kyy[-di+ijk]
 #undef  DXDK_KYZ_IP 
-#define DXDK_KYZ_IP hyz[ di+ijk]
+#define DXDK_KYZ_IP kyz[ di+ijk]
 #undef  DXDK_KYZ_IM 
-#define DXDK_KYZ_IM hyz[-di+ijk]
+#define DXDK_KYZ_IM kyz[-di+ijk]
 #undef  DXDK_KZZ_IP 
-#define DXDK_KZZ_IP hzz[ di+ijk]
+#define DXDK_KZZ_IP kzz[ di+ijk]
 #undef  DXDK_KZZ_IM
-#define DXDK_KZZ_IM hzz[-di+ijk]
+#define DXDK_KZZ_IM kzz[-di+ijk]
 
 /* Output variables */ 
 #undef  DXDK_DXDKXX
diff --git a/src/macro/DYDK_declare.h b/src/macro/DYDK_declare.h
index 16f6d4e..9804e26 100644
--- a/src/macro/DYDK_declare.h
+++ b/src/macro/DYDK_declare.h
@@ -14,29 +14,29 @@
 
 /* Input variables */
 #undef  DYDK_KXX_JP 
-#define DYDK_KXX_JP hxx(i,j+1,k)
+#define DYDK_KXX_JP kxx(i,j+1,k)
 #undef  DYDK_KXX_JM
-#define DYDK_KXX_JM hxx(i,j-1,k)
+#define DYDK_KXX_JM kxx(i,j-1,k)
 #undef  DYDK_KXY_JP 
-#define DYDK_KXY_JP hxy(i,j+1,k)
+#define DYDK_KXY_JP kxy(i,j+1,k)
 #undef  DYDK_KXY_JM 
-#define DYDK_KXY_JM hxy(i,j-1,k)
+#define DYDK_KXY_JM kxy(i,j-1,k)
 #undef  DYDK_KXZ_JP 
-#define DYDK_KXZ_JP hxz(i,j+1,k)
+#define DYDK_KXZ_JP kxz(i,j+1,k)
 #undef  DYDK_KXZ_JM
-#define DYDK_KXZ_JM hxz(i,j-1,k)
+#define DYDK_KXZ_JM kxz(i,j-1,k)
 #undef  DYDK_KYY_JP 
-#define DYDK_KYY_JP hyy(i,j+1,k)
+#define DYDK_KYY_JP kyy(i,j+1,k)
 #undef  DYDK_KYY_JM 
-#define DYDK_KYY_JM hyy(i,j-1,k)
+#define DYDK_KYY_JM kyy(i,j-1,k)
 #undef  DYDK_KYZ_JP 
-#define DYDK_KYZ_JP hyz(i,j+1,k)
+#define DYDK_KYZ_JP kyz(i,j+1,k)
 #undef  DYDK_KYZ_JM 
-#define DYDK_KYZ_JM hyz(i,j-1,k)
+#define DYDK_KYZ_JM kyz(i,j-1,k)
 #undef  DYDK_KZZ_JP 
-#define DYDK_KZZ_JP hzz(i,j+1,k)
+#define DYDK_KZZ_JP kzz(i,j+1,k)
 #undef  DYDK_KZZ_JM
-#define DYDK_KZZ_JM hzz(i,j-1,k)
+#define DYDK_KZZ_JM kzz(i,j-1,k)
 
 /* Output variables */ 
 #undef  DYDK_DYDKXX
@@ -76,29 +76,29 @@
 
 /* Input variables */
 #undef  DYDK_KXX_JP 
-#define DYDK_KXX_JP hxx[ dj+ijk]
+#define DYDK_KXX_JP kxx[ dj+ijk]
 #undef  DYDK_KXX_JM
-#define DYDK_KXX_JM hxx[-dj+ijk]
+#define DYDK_KXX_JM kxx[-dj+ijk]
 #undef  DYDK_KXY_JP 
-#define DYDK_KXY_JP hxy[ dj+ijk]
+#define DYDK_KXY_JP kxy[ dj+ijk]
 #undef  DYDK_KXY_JM 
-#define DYDK_KXY_JM hxy[-dj+ijk]
+#define DYDK_KXY_JM kxy[-dj+ijk]
 #undef  DYDK_KXZ_JP 
-#define DYDK_KXZ_JP hxz[ dj+ijk]
+#define DYDK_KXZ_JP kxz[ dj+ijk]
 #undef  DYDK_KXZ_JM
-#define DYDK_KXZ_JM hxz[-dj+ijk]
+#define DYDK_KXZ_JM kxz[-dj+ijk]
 #undef  DYDK_KYY_JP 
-#define DYDK_KYY_JP hyy[ dj+ijk]
+#define DYDK_KYY_JP kyy[ dj+ijk]
 #undef  DYDK_KYY_JM 
-#define DYDK_KYY_JM hyy[-dj+ijk]
+#define DYDK_KYY_JM kyy[-dj+ijk]
 #undef  DYDK_KYZ_JP 
-#define DYDK_KYZ_JP hyz[ dj+ijk]
+#define DYDK_KYZ_JP kyz[ dj+ijk]
 #undef  DYDK_KYZ_JM 
-#define DYDK_KYZ_JM hyz[-dj+ijk]
+#define DYDK_KYZ_JM kyz[-dj+ijk]
 #undef  DYDK_KZZ_JP 
-#define DYDK_KZZ_JP hzz[ dj+ijk]
+#define DYDK_KZZ_JP kzz[ dj+ijk]
 #undef  DYDK_KZZ_JM
-#define DYDK_KZZ_JM hzz[-dj+ijk]
+#define DYDK_KZZ_JM kzz[-dj+ijk]
 
 /* Output variables */ 
 #undef  DYDK_DYDKXX
diff --git a/src/macro/DZDK_declare.h b/src/macro/DZDK_declare.h
index aba7c5e..2b99eca 100644
--- a/src/macro/DZDK_declare.h
+++ b/src/macro/DZDK_declare.h
@@ -15,29 +15,29 @@
 
 /* Input variables */
 #undef  DZDK_KXX_KP 
-#define DZDK_KXX_KP hxx(i,j,k+1)
+#define DZDK_KXX_KP kxx(i,j,k+1)
 #undef  DZDK_KXX_KM
-#define DZDK_KXX_KM hxx(i,j,k-1)
+#define DZDK_KXX_KM kxx(i,j,k-1)
 #undef  DZDK_KXY_KP 
-#define DZDK_KXY_KP hxy(i,j,k+1)
+#define DZDK_KXY_KP kxy(i,j,k+1)
 #undef  DZDK_KXY_KM 
-#define DZDK_KXY_KM hxy(i,j,k-1)
+#define DZDK_KXY_KM kxy(i,j,k-1)
 #undef  DZDK_KXZ_KP 
-#define DZDK_KXZ_KP hxz(i,j,k+1)
+#define DZDK_KXZ_KP kxz(i,j,k+1)
 #undef  DZDK_KXZ_KM
-#define DZDK_KXZ_KM hxz(i,j,k-1)
+#define DZDK_KXZ_KM kxz(i,j,k-1)
 #undef  DZDK_KYY_KP 
-#define DZDK_KYY_KP hyy(i,j,k+1)
+#define DZDK_KYY_KP kyy(i,j,k+1)
 #undef  DZDK_KYY_KM 
-#define DZDK_KYY_KM hyy(i,j,k-1)
+#define DZDK_KYY_KM kyy(i,j,k-1)
 #undef  DZDK_KYZ_KP 
-#define DZDK_KYZ_KP hyz(i,j,k+1)
+#define DZDK_KYZ_KP kyz(i,j,k+1)
 #undef  DZDK_KYZ_KM 
-#define DZDK_KYZ_KM hyz(i,j,k-1)
+#define DZDK_KYZ_KM kyz(i,j,k-1)
 #undef  DZDK_KZZ_KP 
-#define DZDK_KZZ_KP hzz(i,j,k+1)
+#define DZDK_KZZ_KP kzz(i,j,k+1)
 #undef  DZDK_KZZ_KM
-#define DZDK_KZZ_KM hzz(i,j,k-1)
+#define DZDK_KZZ_KM kzz(i,j,k-1)
 
 /* Output variables */ 
 #undef  DZDK_DZDKXX
@@ -77,29 +77,29 @@
 
 /* Input variables */
 #undef  DZDK_KXX_KP 
-#define DZDK_KXX_KP hxx[ dk+ijk]
+#define DZDK_KXX_KP kxx[ dk+ijk]
 #undef  DZDK_KXX_KM
-#define DZDK_KXX_KM hxx[-dk+ijk]
+#define DZDK_KXX_KM kxx[-dk+ijk]
 #undef  DZDK_KXY_KP 
-#define DZDK_KXY_KP hxy[ dk+ijk]
+#define DZDK_KXY_KP kxy[ dk+ijk]
 #undef  DZDK_KXY_KM 
-#define DZDK_KXY_KM hxy[-dk+ijk]
+#define DZDK_KXY_KM kxy[-dk+ijk]
 #undef  DZDK_KXZ_KP 
-#define DZDK_KXZ_KP hxz[ dk+ijk]
+#define DZDK_KXZ_KP kxz[ dk+ijk]
 #undef  DZDK_KXZ_KM
-#define DZDK_KXZ_KM hxz[-dk+ijk]
+#define DZDK_KXZ_KM kxz[-dk+ijk]
 #undef  DZDK_KYY_KP 
-#define DZDK_KYY_KP hyy[ dk+ijk]
+#define DZDK_KYY_KP kyy[ dk+ijk]
 #undef  DZDK_KYY_KM 
-#define DZDK_KYY_KM hyy[-dk+ijk]
+#define DZDK_KYY_KM kyy[-dk+ijk]
 #undef  DZDK_KYZ_KP 
-#define DZDK_KYZ_KP hyz[ dk+ijk]
+#define DZDK_KYZ_KP kyz[ dk+ijk]
 #undef  DZDK_KYZ_KM 
-#define DZDK_KYZ_KM hyz[-dk+ijk]
+#define DZDK_KYZ_KM kyz[-dk+ijk]
 #undef  DZDK_KZZ_KP 
-#define DZDK_KZZ_KP hzz[ dk+ijk]
+#define DZDK_KZZ_KP kzz[ dk+ijk]
 #undef  DZDK_KZZ_KM
-#define DZDK_KZZ_KM hzz[-dk+ijk]
+#define DZDK_KZZ_KM kzz[-dk+ijk]
 
 /* Output variables */ 
 #undef  DZDK_DZDKXX
diff --git a/src/macro/KK_declare.h b/src/macro/KK_declare.h
index 84699b6..af16926 100644
--- a/src/macro/KK_declare.h
+++ b/src/macro/KK_declare.h
@@ -22,17 +22,17 @@
 
 /* Input variables */
 #undef  KK_HXX
-#define KK_HXX hxx(i,j,k)
+#define KK_HXX kxx(i,j,k)
 #undef  KK_HXY
-#define KK_HXY hxy(i,j,k)
+#define KK_HXY kxy(i,j,k)
 #undef  KK_HXZ
-#define KK_HXZ hxz(i,j,k)
+#define KK_HXZ kxz(i,j,k)
 #undef  KK_HYY
-#define KK_HYY hyy(i,j,k)
+#define KK_HYY kyy(i,j,k)
 #undef  KK_HYZ
-#define KK_HYZ hyz(i,j,k)
+#define KK_HYZ kyz(i,j,k)
 #undef  KK_HZZ
-#define KK_HZZ hzz(i,j,k)
+#define KK_HZZ kzz(i,j,k)
 
 /* Output variables */
 #undef  KK_KKXX
@@ -62,17 +62,17 @@
 
 /* Input variables */
 #undef  KK_HXX
-#define KK_HXX hxx[ijk]
+#define KK_HXX kxx[ijk]
 #undef  KK_HXY
-#define KK_HXY hxy[ijk]
+#define KK_HXY kxy[ijk]
 #undef  KK_HXZ
-#define KK_HXZ hxz[ijk]
+#define KK_HXZ kxz[ijk]
 #undef  KK_HYY
-#define KK_HYY hyy[ijk]
+#define KK_HYY kyy[ijk]
 #undef  KK_HYZ
-#define KK_HYZ hyz[ijk]
+#define KK_HYZ kyz[ijk]
 #undef  KK_HZZ
-#define KK_HZZ hzz[ijk]
+#define KK_HZZ kzz[ijk]
 
 /* Output variables */
 #undef  KK_KKXX
diff --git a/src/macro/LIEK_declare.h b/src/macro/LIEK_declare.h
index 7733658..c89138c 100644
--- a/src/macro/LIEK_declare.h
+++ b/src/macro/LIEK_declare.h
@@ -25,17 +25,17 @@
 #undef  LIEK_BZ
 #define LIEK_BZ betaz(i,j,k)
 #undef  LIEK_KXX
-#define LIEK_KXX hxx(i,j,k)
+#define LIEK_KXX kxx(i,j,k)
 #undef  LIEK_KXY
-#define LIEK_KXY hxy(i,j,k)
+#define LIEK_KXY kxy(i,j,k)
 #undef  LIEK_KXZ
-#define LIEK_KXZ hxz(i,j,k)
+#define LIEK_KXZ kxz(i,j,k)
 #undef  LIEK_KYY
-#define LIEK_KYY hyy(i,j,k)
+#define LIEK_KYY kyy(i,j,k)
 #undef  LIEK_KYZ
-#define LIEK_KYZ hyz(i,j,k)
+#define LIEK_KYZ kyz(i,j,k)
 #undef  LIEK_KZZ
-#define LIEK_KZZ hzz(i,j,k)
+#define LIEK_KZZ kzz(i,j,k)
 
 /* Output variables */
 #undef  LIEK_LKXX
@@ -71,17 +71,17 @@
 #undef  LIEK_BZ
 #define LIEK_BZ betaz[ijk]
 #undef  LIEK_KXX
-#define LIEK_KXX hxx[ijk]
+#define LIEK_KXX kxx[ijk]
 #undef  LIEK_KXY
-#define LIEK_KXY hxy[ijk]
+#define LIEK_KXY kxy[ijk]
 #undef  LIEK_KXZ
-#define LIEK_KXZ hxz[ijk]
+#define LIEK_KXZ kxz[ijk]
 #undef  LIEK_KYY
-#define LIEK_KYY hyy[ijk]
+#define LIEK_KYY kyy[ijk]
 #undef  LIEK_KYZ
-#define LIEK_KYZ hyz[ijk]
+#define LIEK_KYZ kyz[ijk]
 #undef  LIEK_KZZ
-#define LIEK_KZZ hzz[ijk]
+#define LIEK_KZZ kzz[ijk]
 
 /* Output variables */
 #undef  LIEK_LKXX
diff --git a/src/macro/TRK_declare.h b/src/macro/TRK_declare.h
index 693df7c..c4c7882 100644
--- a/src/macro/TRK_declare.h
+++ b/src/macro/TRK_declare.h
@@ -19,17 +19,17 @@
 
 /* Input variables */
 #undef  TRK_HXX
-#define TRK_HXX hxx(i,j,k)
+#define TRK_HXX kxx(i,j,k)
 #undef  TRK_HXY
-#define TRK_HXY hxy(i,j,k)
+#define TRK_HXY kxy(i,j,k)
 #undef  TRK_HXZ
-#define TRK_HXZ hxz(i,j,k)
+#define TRK_HXZ kxz(i,j,k)
 #undef  TRK_HYY
-#define TRK_HYY hyy(i,j,k)
+#define TRK_HYY kyy(i,j,k)
 #undef  TRK_HYZ
-#define TRK_HYZ hyz(i,j,k)
+#define TRK_HYZ kyz(i,j,k)
 #undef  TRK_HZZ
-#define TRK_HZZ hzz(i,j,k)
+#define TRK_HZZ kzz(i,j,k)
 
 /* Output variables */
 #undef  TRK_TRK
@@ -44,17 +44,17 @@
 
 /* Input variables */
 #undef  TRK_HXX
-#define TRK_HXX hxx[ijk]
+#define TRK_HXX kxx[ijk]
 #undef  TRK_HXY
-#define TRK_HXY hxy[ijk]
+#define TRK_HXY kxy[ijk]
 #undef  TRK_HXZ
-#define TRK_HXZ hxz[ijk]
+#define TRK_HXZ kxz[ijk]
 #undef  TRK_HYY
-#define TRK_HYY hyy[ijk]
+#define TRK_HYY kyy[ijk]
 #undef  TRK_HYZ
-#define TRK_HYZ hyz[ijk]
+#define TRK_HYZ kyz[ijk]
 #undef  TRK_HZZ
-#define TRK_HZZ hzz[ijk]
+#define TRK_HZZ kzz[ijk]
 
 /* Output variables */
 #undef  TRK_TRK