Fixing up macros for C

git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinBase/ADMMacros/trunk@13 b1d164ef-f17a-46e7-89d4-021c7118ef4e

38 files changed, 132 insertions, 120 deletions

diff --git a/src/macro/CHR1_declare.h b/src/macro/CHR1_declare.h
index 5ba296c..c25c90e 100644
--- a/src/macro/CHR1_declare.h
+++ b/src/macro/CHR1_declare.h
@@ -117,24 +117,24 @@
 #define CHR1_ZZZ gammado333
 
 /* Declare output variables */
-double CHR1_XXX;
-double CHR1_XXY;
-double CHR1_XXZ;
-double CHR1_XYY;
-double CHR1_XYZ;
-double CHR1_XZZ;
-double CHR1_YXX;
-double CHR1_YXY;
-double CHR1_YXZ;
-double CHR1_YYY;
-double CHRX_YYZ;
-double CHR1_YZZ;
-double CHR1_ZXX;
-double CHR1_ZXY;
-double CHR1_ZXZ;
-double CHR1_ZYY;
-double CHR1_ZYZ;
-double CHR1_ZZZ;
+CCTK_REAL CHR1_XXX;
+CCTK_REAL CHR1_XXY;
+CCTK_REAL CHR1_XXZ;
+CCTK_REAL CHR1_XYY;
+CCTK_REAL CHR1_XYZ;
+CCTK_REAL CHR1_XZZ;
+CCTK_REAL CHR1_YXX;
+CCTK_REAL CHR1_YXY;
+CCTK_REAL CHR1_YXZ;
+CCTK_REAL CHR1_YYY;
+CCTK_REAL CHR1_YYZ;
+CCTK_REAL CHR1_YZZ;
+CCTK_REAL CHR1_ZXX;
+CCTK_REAL CHR1_ZXY;
+CCTK_REAL CHR1_ZXZ;
+CCTK_REAL CHR1_ZYY;
+CCTK_REAL CHR1_ZYZ;
+CCTK_REAL CHR1_ZZZ;
 
 #endif
 
diff --git a/src/macro/CHR2_declare.h b/src/macro/CHR2_declare.h
index eeebc98..c27d1bc 100644
--- a/src/macro/CHR2_declare.h
+++ b/src/macro/CHR2_declare.h
@@ -128,24 +128,24 @@
 #define CHR2_ZZZ gamma333
 
 /* Declare output variables */
-double CHR2_XXX;
-double CHR2_XXY;
-double CHR2_XXZ;
-double CHR2_XYY;
-double CHR2_XYZ;
-double CHR2_XZZ;
-double CHR2_YXX;
-double CHR2_YXY;
-double CHR2_YXZ;
-double CHR2_YYY;
-double CHR2_Y2Z;
-double CHR2_YZZ;
-double CHR2_ZXX;
-double CHR2_ZXY;
-double CHR2_ZXZ;
-double CHR2_ZYY;
-double CHR2_ZYZ;
-double CHR2_ZZZ;
+CCTK_REAL CHR2_XXX;
+CCTK_REAL CHR2_XXY;
+CCTK_REAL CHR2_XXZ;
+CCTK_REAL CHR2_XYY;
+CCTK_REAL CHR2_XYZ;
+CCTK_REAL CHR2_XZZ;
+CCTK_REAL CHR2_YXX;
+CCTK_REAL CHR2_YXY;
+CCTK_REAL CHR2_YXZ;
+CCTK_REAL CHR2_YYY;
+CCTK_REAL CHR2_YYZ;
+CCTK_REAL CHR2_YZZ;
+CCTK_REAL CHR2_ZXX;
+CCTK_REAL CHR2_ZXY;
+CCTK_REAL CHR2_ZXZ;
+CCTK_REAL CHR2_ZYY;
+CCTK_REAL CHR2_ZYZ;
+CCTK_REAL CHR2_ZZZ;
 
 #endif
 
diff --git a/src/macro/DA_declare.h b/src/macro/DA_declare.h
index 3333c72..2dd14ba 100644
--- a/src/macro/DA_declare.h
+++ b/src/macro/DA_declare.h
@@ -93,6 +93,12 @@
 #define DA_OO2DY da_oo2dy
 #undef  DA_OO2DZ   
 #define DA_OO2DZ da_oo2dz
+#undef  DA_DX   
+#define DA_DX cctkGH->cctk_delta_space[0]
+#undef  DA_DY   
+#define DA_DY cctkGH->cctk_delta_space[1]
+#undef  DA_DZ   
+#define DA_DZ cctkGH->cctk_delta_space[2]
 
 /* Declare internal variables */
       double DA_OO2DX;
diff --git a/src/macro/DA_guts.h b/src/macro/DA_guts.h
index 2797294..2b3ea63 100644
--- a/src/macro/DA_guts.h
+++ b/src/macro/DA_guts.h
@@ -24,9 +24,9 @@
 
 #ifdef CCODE
 
-      DA_OO2DX = 1D0/(2D0*DA_DX);
-      DA_OO2DY = 1D0/(2D0*DA_DY);
-      DA_OO2DZ = 1D0/(2D0*DA_DZ);
+      DA_OO2DX = 1/(2*DA_DX);
+      DA_OO2DY = 1/(2*DA_DY);
+      DA_OO2DZ = 1/(2*DA_DZ);
 
       DA_DXDA = DA_OO2DX*(DA_A_IP - DA_A_IM);
       DA_DYDA = DA_OO2DY*(DA_A_JP - DA_A_JM);
diff --git a/src/macro/DCGDT_guts.h b/src/macro/DCGDT_guts.h
index a88a831..e950f3e 100644
--- a/src/macro/DCGDT_guts.h
+++ b/src/macro/DCGDT_guts.h
@@ -55,38 +55,38 @@
 
 #ifdef CCODE
 
-      DCGDT_DCGXXDT = - 2*DCGDT_A*DCGDT_KXX
-      DCGDT_DCGXYDT = - 2*DCGDT_A*DCGDT_KXY
-      DCGDT_DCGXZDT = - 2*DCGDT_A*DCGDT_KXZ
-      DCGDT_DCGYYDT = - 2*DCGDT_A*DCGDT_KYY
-      DCGDT_DCGYZDT = - 2*DCGDT_A*DCGDT_KYZ
-      DCGDT_DCGZZDT = - 2*DCGDT_A*DCGDT_KZZ
-
-      if (conformal_state == CONFORMAL_METRIC) 
+      DCGDT_DCGXXDT = - 2*DCGDT_A*DCGDT_KXX;
+      DCGDT_DCGXYDT = - 2*DCGDT_A*DCGDT_KXY;
+      DCGDT_DCGXZDT = - 2*DCGDT_A*DCGDT_KXZ;
+      DCGDT_DCGYYDT = - 2*DCGDT_A*DCGDT_KYY;
+      DCGDT_DCGYZDT = - 2*DCGDT_A*DCGDT_KYZ;
+      DCGDT_DCGZZDT = - 2*DCGDT_A*DCGDT_KZZ;
+
+      if (*conformal_state == CONFORMAL_METRIC) 
       {
 
-        DCGDT_IPSI4 = 1D0/(DCGDT_PSI**4)
+        DCGDT_IPSI4 = 1/(DCGDT_PSI*DCGDT_PSI*DCGDT_PSI*DCGDT_PSI);
         
-        DCGDT_DCGXXDT = DCGDT_DCGXXDT*DCGDT_IPSI4
-        DCGDT_DCGXYDT = DCGDT_DCGXYDT*DCGDT_IPSI4
-        DCGDT_DCGXZDT = DCGDT_DCGXZDT*DCGDT_IPSI4
-        DCGDT_DCGYYDT = DCGDT_DCGYYDT*DCGDT_IPSI4
-        DCGDT_DCGYZDT = DCGDT_DCGYZDT*DCGDT_IPSI4
-        DCGDT_DCGZZDT = DCGDT_DCGZZDT*DCGDT_IPSI4
+        DCGDT_DCGXXDT = DCGDT_DCGXXDT*DCGDT_IPSI4;
+        DCGDT_DCGXYDT = DCGDT_DCGXYDT*DCGDT_IPSI4;
+        DCGDT_DCGXZDT = DCGDT_DCGXZDT*DCGDT_IPSI4;
+        DCGDT_DCGYYDT = DCGDT_DCGYYDT*DCGDT_IPSI4;
+        DCGDT_DCGYZDT = DCGDT_DCGYZDT*DCGDT_IPSI4;
+        DCGDT_DCGZZDT = DCGDT_DCGZZDT*DCGDT_IPSI4;
 
       }
 
-      if (shift) 
+      if (*shift_state != SHIFT_INACTIVE)
       {
 
 #include "CactusEinstein/Einstein/src/macro/LIEG_guts.h"
 
-        DCGDT_DCGXXDT = DCGDT_DCGXXDT + LIEG_LGXX
-        DCGDT_DCGXYDT = DCGDT_DCGXYDT + LIEG_LGXY
-        DCGDT_DCGXZDT = DCGDT_DCGXZDT + LIEG_LGXZ
-        DCGDT_DCGYYDT = DCGDT_DCGYYDT + LIEG_LGYY
-        DCGDT_DCGYZDT = DCGDT_DCGYZDT + LIEG_LGYZ
-        DCGDT_DCGZZDT = DCGDT_DCGZZDT + LIEG_LGZZ
+        DCGDT_DCGXXDT = DCGDT_DCGXXDT + LIEG_LGXX;
+        DCGDT_DCGXYDT = DCGDT_DCGXYDT + LIEG_LGXY;
+        DCGDT_DCGXZDT = DCGDT_DCGXZDT + LIEG_LGXZ;
+        DCGDT_DCGYYDT = DCGDT_DCGYYDT + LIEG_LGYY;
+        DCGDT_DCGYZDT = DCGDT_DCGYZDT + LIEG_LGYZ;
+        DCGDT_DCGZZDT = DCGDT_DCGZZDT + LIEG_LGZZ;
 
       }
 
diff --git a/src/macro/DDA_declare.h b/src/macro/DDA_declare.h
index 84e7ca2..2799abf 100644
--- a/src/macro/DDA_declare.h
+++ b/src/macro/DDA_declare.h
@@ -175,22 +175,28 @@
 #define DDA_OO4DXDZ dda_oo4dxdz
 #undef  DDA_OO4DYDZ
 #define DDA_OO4DYDZ dda_oo4dydz
+#undef  DDA_DX   
+#define DDA_DX cctkGH->cctk_delta_space[0]
+#undef  DDA_DY   
+#define DDA_DY cctkGH->cctk_delta_space[1]
+#undef  DDA_DZ   
+#define DDA_DZ cctkGH->cctk_delta_space[2]
 
 /* Declare internal variables */
-      double DDA_OODX2;
-      double DDA_OODY2;
-      double DDA_OODZ2;
-      double DDA_OO4DXDY;
-      double DDA_OO4DXDZ;
-      double DDA_OO4DYDZ;
+      CCTK_REAL DDA_OODX2;
+      CCTK_REAL DDA_OODY2;
+      CCTK_REAL DDA_OODZ2;
+      CCTK_REAL DDA_OO4DXDY;
+      CCTK_REAL DDA_OO4DXDZ;
+      CCTK_REAL DDA_OO4DYDZ;
 
 /* Declare output variables */
-      double DDA_DXXDA;
-      double DDA_DXYDA;
-      double DDA_DXZDA;
-      double DDA_DYYDA;
-      double DDA_DYZDA;
-      double DDA_DZZDA;
+      CCTK_REAL DDA_DXXDA;
+      CCTK_REAL DDA_DXYDA;
+      CCTK_REAL DDA_DXZDA;
+      CCTK_REAL DDA_DYYDA;
+      CCTK_REAL DDA_DYZDA;
+      CCTK_REAL DDA_DZZDA;
 
 #endif
 
diff --git a/src/macro/DETG_declare.h b/src/macro/DETG_declare.h
index 7467eef..640515c 100644
--- a/src/macro/DETG_declare.h
+++ b/src/macro/DETG_declare.h
@@ -120,7 +120,7 @@ double DETG_TEMPZZ;
 
 /* Declare output variables */
 double DETG_DETG;
-double DETG_DETCG
+double DETG_DETCG;
 
 #endif
 
diff --git a/src/macro/DETG_guts.h b/src/macro/DETG_guts.h
index 12b187a..dfa0fca 100644
--- a/src/macro/DETG_guts.h
+++ b/src/macro/DETG_guts.h
@@ -38,9 +38,9 @@ Gabrielle Allen, 5th November 1998
 #ifdef CCODE
 
 #define Cal(x,y,z) ((x)?(y):(z))
-#define Power(x,y) (pow((double) (x), (double) (y)))
+#define Power(x,y) (pow((CCTK_REAL) (x), (CCTK_REAL) (y)))
 
-DET_PSI4 = ((conformal_state != CONFORMAL_METRIC)?1:Power(DETG_PSI,4));
+DETG_PSI4 = ((*conformal_state != CONFORMAL_METRIC)?1:DETG_PSI*DETG_PSI*DETG_PSI*DETG_PSI);
 
 DETG_TEMPXX =  DETG_GYY*DETG_GZZ - DETG_GYZ*DETG_GYZ;
 DETG_TEMPXY =  DETG_GXZ*DETG_GYZ - DETG_GXY*DETG_GZZ;
@@ -54,7 +54,7 @@ DETG_DETCG = (DETG_TEMPXX*DETG_GXX +
        DETG_TEMPXY*DETG_GXY + DETG_TEMPXZ*DETG_GXZ);
 
 /* This is the physical determinat */
-DETG_DETG = DET_PSI4*DET_PSI4*DET_PSI4*DETG_DETCG
+DETG_DETG = DETG_PSI4*DETG_PSI4*DETG_PSI4*DETG_DETCG;
 
 #endif
 
diff --git a/src/macro/DKDT_guts.h b/src/macro/DKDT_guts.h
index 5e6ca42..ca363a6 100644
--- a/src/macro/DKDT_guts.h
+++ b/src/macro/DKDT_guts.h
@@ -55,7 +55,7 @@
       DKDT_DKYZDT = DKDT_A*(RICCI_RYZ-2*KK_KKYZ+DKDT_KYZ*TRK_TRK)-CDCDA_CDYZDA;
       DKDT_DKZZDT = DKDT_A*(RICCI_RZZ-2*KK_KKZZ+DKDT_KZZ*TRK_TRK)-CDCDA_CDZZDA;
 
-      if (shift) 
+      if (*shift_state != SHIFT_INACTIVE) 
       {
 
 #include "CactusEinstein/Einstein/src/macro/LIEK_guts.h"
diff --git a/src/macro/DXDB_guts.h b/src/macro/DXDB_guts.h
index 7d76ddc..46a7f9f 100644
--- a/src/macro/DXDB_guts.h
+++ b/src/macro/DXDB_guts.h
@@ -27,7 +27,7 @@
 
 #ifdef CCODE
 
-      DXDB_OO2DX = 1/(2*GH->dx0);
+      DXDB_OO2DX = 1/(2*cctkGH->cctk_delta_space[0]);
     
       DXDB_DXDBX = DXDB_OO2DX*(DXDB_BX_IP - DXDB_BX_IM);
       DXDB_DXDBY = DXDB_OO2DX*(DXDB_BY_IP - DXDB_BY_IM);
diff --git a/src/macro/DXDCG_guts.h b/src/macro/DXDCG_guts.h
index 8647d4f..464fdb7 100644
--- a/src/macro/DXDCG_guts.h
+++ b/src/macro/DXDCG_guts.h
@@ -33,8 +33,8 @@
 #endif
 
 #ifdef CCODE
-
-      DXDCG_OO2DX = 1/(2*GH->dx0);
+ 
+      DXDCG_OO2DX = 1/(2*cctkGH->cctk_delta_space[0]);
     
       DXDCG_DXDCGXX = DXDCG_OO2DX*(DXDCG_GXX_IP - DXDCG_GXX_IM);
       DXDCG_DXDCGXY = DXDCG_OO2DX*(DXDCG_GXY_IP - DXDCG_GXY_IM);
diff --git a/src/macro/DXDG_guts.h b/src/macro/DXDG_guts.h
index 9ebaec9..7716841 100644
--- a/src/macro/DXDG_guts.h
+++ b/src/macro/DXDG_guts.h
@@ -37,9 +37,9 @@
 
 #ifdef CCODE
 
-      DXDG_PSI4 = ((conformal_state != CONFORMAL_METRIC)?1:Power(DXDG_PSI,4));
+      DXDG_PSI4 = ((*conformal_state != CONFORMAL_METRIC)?1:DXDG_PSI*DXDG_PSI*DXDG_PSI*DXDG_PSI);
 
-      DXDG_FAC  = ((conformal_state != CONFORMAL_METRIC)?0:4*DXDG_PSI4*DXDG_DXDPSI_O_PSI);
+      DXDG_FAC  = ((*conformal_state != CONFORMAL_METRIC)?0:4*DXDG_PSI4*DXDG_DXDPSI_O_PSI);
 
       DXDG_DXDGXX = DXDCG_DXDCGXX*DXDG_PSI4 + DXDG_FAC*DXDG_GXX;
       DXDG_DXDGXY = DXDCG_DXDCGXY*DXDG_PSI4 + DXDG_FAC*DXDG_GXY;
diff --git a/src/macro/DXDK_guts.h b/src/macro/DXDK_guts.h
index c547dae..6a6df3f 100644
--- a/src/macro/DXDK_guts.h
+++ b/src/macro/DXDK_guts.h
@@ -26,7 +26,7 @@
 
 #ifdef CCODE
 
-      DXDK_OO2DX = 1/(2*GH->dx0);
+      DXDK_OO2DX = 1/(2*cctkGH->cctk_delta_space[0]);
     
       DXDK_DXDKXX = DXDK_OO2DX*(DXDK_KXX_IP - DXDK_KXX_IM);
       DXDK_DXDKXY = DXDK_OO2DX*(DXDK_KXY_IP - DXDK_KXY_IM);
diff --git a/src/macro/DXXDG_declare.h b/src/macro/DXXDG_declare.h
index f2328e3..2a87c7f 100644
--- a/src/macro/DXXDG_declare.h
+++ b/src/macro/DXXDG_declare.h
@@ -80,7 +80,7 @@
 
 /* Declare internal variables */
 double DXXDG_FAC;
-double DXXDG_OODX2 = 1/(GH->dx0*GH->dx0);
+double DXXDG_OODX2 = 1/(cctkGH->cctk_delta_space[0]*cctkGH->cctk_delta_space[0]);
 /*double DXXDG_DXXDPSI_O_PSI;*/
 
 /* Declare output variables */
diff --git a/src/macro/DXXDG_guts.h b/src/macro/DXXDG_guts.h
index 21eda88..6e34a24 100644
--- a/src/macro/DXXDG_guts.h
+++ b/src/macro/DXXDG_guts.h
@@ -20,7 +20,7 @@
 
 #ifdef FCODE 
 
-      DXXDG_OODX2 = 1D0/(dx*dx)
+      DXXDG_OODX2 = 1D0/(cctk_delta_space(1)*cctk_delta_space(1))
 
       /* Factor involving 2nd derivative of conformal factor */ 
       IF (conformal_state /= CONFORMAL_METRIC) THEN
@@ -53,7 +53,7 @@
 #ifdef CCODE
 
 /* Factor involving 2nd derivative of conformal factor */ 
-DXXDG_FAC   = ((conformal_state != CONFORMAL_METRIC)?0:
+DXXDG_FAC   = ((*conformal_state != CONFORMAL_METRIC)?0:
               DXDG_PSI4*(4*DXXDG_DXXDPSI_O_PSI + 12*DXDG_DXDPSI_O_PSI*DXDG_DXDPSI_O_PSI));
 
 /* Now calculate the second derivatives */
diff --git a/src/macro/DXYDG_declare.h b/src/macro/DXYDG_declare.h
index bc3a345..19e3178 100644
--- a/src/macro/DXYDG_declare.h
+++ b/src/macro/DXYDG_declare.h
@@ -191,7 +191,7 @@
 
 /* Declare internal variables */
 double DXYDG_FAC;
-double DXYDG_OO4DXDY = 1/(4*GH->dx0*GH->dy0);
+double DXYDG_OO4DXDY = 1/(4*cctkGH->cctk_delta_space[0]*cctkGH->cctk_delta_space[1]);
 
 /* Declare output variables */
 double DXYDG_DXYDGXX;
diff --git a/src/macro/DXYDG_guts.h b/src/macro/DXYDG_guts.h
index 65dd06b..084c4a9 100644
--- a/src/macro/DXYDG_guts.h
+++ b/src/macro/DXYDG_guts.h
@@ -61,7 +61,7 @@
 #ifdef CCODE
 
 /* Factor involving 2nd derivative of conformal factor */ 
-      DXYDG_FAC   = ((conformal_state != CONFORMAL_METRIC)?0:
+      DXYDG_FAC   = ((*conformal_state != CONFORMAL_METRIC)?0:
               DXDG_PSI4*(4*DXYDG_DXYDPSI_O_PSI + 12*DXDG_DXDPSI_O_PSI*DYDG_DYDPSI_O_PSI));
 
 /* Now calculate the second deriatives */
diff --git a/src/macro/DXZDG_declare.h b/src/macro/DXZDG_declare.h
index 2e9c562..68874f7 100644
--- a/src/macro/DXZDG_declare.h
+++ b/src/macro/DXZDG_declare.h
@@ -191,7 +191,7 @@
 
 /* Declare internal variables */
 double DXZDG_FAC;
-double DXZDG_OO4DXDZ = 1/(4*GH->dx0*GH->dz0);
+double DXZDG_OO4DXDZ = 1/(4*cctkGH->cctk_delta_space[0]*cctkGH->cctk_delta_space[2]);
 
 /* Declare output variables */
 double DXZDG_DXZDGXX;
diff --git a/src/macro/DXZDG_guts.h b/src/macro/DXZDG_guts.h
index 6ad02b1..d301847 100644
--- a/src/macro/DXZDG_guts.h
+++ b/src/macro/DXZDG_guts.h
@@ -62,7 +62,7 @@
 #ifdef CCODE
 
       /* Factor involving 2nd derivative of conformal factor */ 
-      DXZDG_FAC   = ((conformal_state != CONFORMAL_METRIC)?0:
+      DXZDG_FAC   = ((*conformal_state != CONFORMAL_METRIC)?0:
               DXDG_PSI4*(4*DXZDG_DXZDPSI_O_PSI + 12*DXDG_DXDPSI_O_PSI*DZDG_DZDPSI_O_PSI));
 
       /* Now calculate the second deriatives */
diff --git a/src/macro/DYDB_guts.h b/src/macro/DYDB_guts.h
index eafdcfa..24013d3 100644
--- a/src/macro/DYDB_guts.h
+++ b/src/macro/DYDB_guts.h
@@ -27,7 +27,7 @@
 
 #ifdef CCODE
 
-      DYDB_OO2DY = 1/(2*GH->dy0);
+      DYDB_OO2DY = 1/(2*cctkGH->cctk_delta_space[1]);
     
       DYDB_DYDBX = DYDB_OO2DY*(DYDB_BX_JP - DYDB_BX_JM);
       DYDB_DYDBY = DYDB_OO2DY*(DYDB_BY_JP - DYDB_BY_JM);
diff --git a/src/macro/DYDCG_guts.h b/src/macro/DYDCG_guts.h
index a9777d5..01bced2 100644
--- a/src/macro/DYDCG_guts.h
+++ b/src/macro/DYDCG_guts.h
@@ -35,7 +35,7 @@
 
 #ifdef CCODE
 
-      DYDCG_OO2DY = 1/(2*GH->dy0);
+      DYDCG_OO2DY = 1/(2*cctkGH->cctk_delta_space[1]);
     
       DYDCG_DYDCGXX = DYDCG_OO2DY*(DYDCG_GXX_JP - DYDCG_GXX_JM);
       DYDCG_DYDCGXY = DYDCG_OO2DY*(DYDCG_GXY_JP - DYDCG_GXY_JM);
diff --git a/src/macro/DYDG_guts.h b/src/macro/DYDG_guts.h
index 2dea9f3..3aaae66 100644
--- a/src/macro/DYDG_guts.h
+++ b/src/macro/DYDG_guts.h
@@ -37,9 +37,9 @@
 
 #ifdef CCODE
 
-      DYDG_PSI4 = ((conformal_state != CONFORMAL_METRIC)?1:Power(DYDG_PSI,4));
+      DYDG_PSI4 = ((*conformal_state != CONFORMAL_METRIC)?1:DYDG_PSI*DYDG_PSI*DYDG_PSI*DYDG_PSI);
 
-      DYDG_FAC  = ((conformal_state != CONFORMAL_METRIC)?0:4*DYDG_PSI4*DYDG_DYDPSI_O_PSI);
+      DYDG_FAC  = ((*conformal_state != CONFORMAL_METRIC)?0:4*DYDG_PSI4*DYDG_DYDPSI_O_PSI);
 
       DYDG_DYDGXX = DYDCG_DYDCGXX*DYDG_PSI4 + DYDG_FAC*DYDG_GXX;
       DYDG_DYDGXY = DYDCG_DYDCGXY*DYDG_PSI4 + DYDG_FAC*DYDG_GXY;
diff --git a/src/macro/DYDK_guts.h b/src/macro/DYDK_guts.h
index 0eba500..26364b3 100644
--- a/src/macro/DYDK_guts.h
+++ b/src/macro/DYDK_guts.h
@@ -27,7 +27,7 @@
 
 #ifdef CCODE
 
-      DYDK_OO2DY = 1/(2*GH->dy0);
+      DYDK_OO2DY = 1/(2*cctkGH->cctk_delta_space[1]);
     
       DYDK_DYDKXX = DYDK_OO2DY*(DYDK_KXX_JP - DYDK_KXX_JM);
       DYDK_DYDKXY = DYDK_OO2DY*(DYDK_KXY_JP - DYDK_KXY_JM);
diff --git a/src/macro/DYYDG_declare.h b/src/macro/DYYDG_declare.h
index ceefedf..e2421ed 100644
--- a/src/macro/DYYDG_declare.h
+++ b/src/macro/DYYDG_declare.h
@@ -79,7 +79,7 @@
 
 /* Declare internal variables */
 double DYYDG_FAC;
-double DYYDG_OODY2 = 1/(GH->dy0*GH->dy0);
+double DYYDG_OODY2 = 1/(cctkGH->cctk_delta_space[1]*cctkGH->cctk_delta_space[1]);
 
 /* Declare output variables */
 double DYYDG_DYYDGXX;
diff --git a/src/macro/DYYDG_guts.h b/src/macro/DYYDG_guts.h
index 3766b25..f969866 100644
--- a/src/macro/DYYDG_guts.h
+++ b/src/macro/DYYDG_guts.h
@@ -53,7 +53,7 @@
 #ifdef CCODE
 
       /* Factor involving 2nd derivative of conformal factor */ 
-      DYYDG_FAC   = ((conformal_state != CONFORMAL_METRIC)?0:
+      DYYDG_FAC   = ((*conformal_state != CONFORMAL_METRIC)?0:
               DYDG_PSI4*(4*DYYDG_DYYDPSI_O_PSI + 12*DYDG_DYDPSI_O_PSI*DYDG_DYDPSI_O_PSI));
 
       /* Now calculate the second deriatives */
diff --git a/src/macro/DYZDG_declare.h b/src/macro/DYZDG_declare.h
index c9614ef..f599f22 100644
--- a/src/macro/DYZDG_declare.h
+++ b/src/macro/DYZDG_declare.h
@@ -191,7 +191,7 @@
 
 /* Declare internal variables */
 double DYZDG_FAC;
-double DYZDG_OO4DYDZ = 1/(4*GH->dy0*GH->dz0);
+double DYZDG_OO4DYDZ = 1/(4*cctkGH->cctk_delta_space[1]*cctkGH->cctk_delta_space[2]);
 
 /* Declare output variables */
 double DYZDG_DYZDGXX;
diff --git a/src/macro/DYZDG_guts.h b/src/macro/DYZDG_guts.h
index 3303fb5..d380626 100644
--- a/src/macro/DYZDG_guts.h
+++ b/src/macro/DYZDG_guts.h
@@ -61,7 +61,7 @@
 #ifdef CCODE
 
       /* Factor involving 2nd derivative of conformal factor */ 
-      DYZDG_FAC   = ((conformal_state != CONFORMAL_METRIC)?0:
+      DYZDG_FAC   = ((*conformal_state != CONFORMAL_METRIC)?0:
               DYDG_PSI4*(4*DYZDG_DYZDPSI_O_PSI + 12*DYDG_DYDPSI_O_PSI*DZDG_DZDPSI_O_PSI));
 
       /* Now calculate the second deriatives */
diff --git a/src/macro/DZDB_guts.h b/src/macro/DZDB_guts.h
index 757ae1a..fbc1240 100644
--- a/src/macro/DZDB_guts.h
+++ b/src/macro/DZDB_guts.h
@@ -27,7 +27,7 @@
 
 #ifdef CCODE
 
-      DZDB_OO2DZ = 1/(2*GH->dz0);
+      DZDB_OO2DZ = 1/(2*cctkGH->cctk_delta_space[2]);
     
       DZDB_DZDBX = DZDB_OO2DZ*(DZDB_BX_KP - DZDB_BX_KM);
       DZDB_DZDBY = DZDB_OO2DZ*(DZDB_BY_KP - DZDB_BY_KM);
diff --git a/src/macro/DZDCG_guts.h b/src/macro/DZDCG_guts.h
index 6f4858a..82f3a09 100644
--- a/src/macro/DZDCG_guts.h
+++ b/src/macro/DZDCG_guts.h
@@ -34,7 +34,7 @@
 
 #ifdef CCODE
 
-      DZDCG_OO2DZ = 1/(2*GH->dz0);
+      DZDCG_OO2DZ = 1/(2*cctkGH->cctk_delta_space[2]);
     
       DZDCG_DZDCGXX = DZDCG_OO2DZ*(DZDCG_GXX_KP - DZDCG_GXX_KM);
       DZDCG_DZDCGXY = DZDCG_OO2DZ*(DZDCG_GXY_KP - DZDCG_GXY_KM);
diff --git a/src/macro/DZDG_guts.h b/src/macro/DZDG_guts.h
index 2c87eac..f1ef272 100644
--- a/src/macro/DZDG_guts.h
+++ b/src/macro/DZDG_guts.h
@@ -37,9 +37,9 @@
 
 #ifdef CCODE
 
-      DZDG_PSI4 = ((conformal_state != CONFORMAL_METRIC)?1:Power(DZDG_PSI,4));
+      DZDG_PSI4 = ((*conformal_state != CONFORMAL_METRIC)?1:DZDG_PSI*DZDG_PSI*DZDG_PSI*DZDG_PSI);
 
-      DZDG_FAC  = ((conformal_state != CONFORMAL_METRIC)?0:4*DZDG_PSI4*DZDG_DZDPSI_O_PSI);
+      DZDG_FAC  = ((*conformal_state != CONFORMAL_METRIC)?0:4*DZDG_PSI4*DZDG_DZDPSI_O_PSI);
 
       DZDG_DZDGXX = DZDCG_DZDCGXX*DZDG_PSI4 + DZDG_FAC*DZDG_GXX;
       DZDG_DZDGXY = DZDCG_DZDCGXY*DZDG_PSI4 + DZDG_FAC*DZDG_GXY;
diff --git a/src/macro/DZDK_guts.h b/src/macro/DZDK_guts.h
index f388e37..1e205ab 100644
--- a/src/macro/DZDK_guts.h
+++ b/src/macro/DZDK_guts.h
@@ -26,7 +26,7 @@
 
 #ifdef CCODE
 
-      DZDK_OO2DZ = 1/(2*GH->dz0);
+      DZDK_OO2DZ = 1/(2*cctkGH->cctk_delta_space[2]);
     
       DZDK_DZDKXX = DZDK_OO2DZ*(DZDK_KXX_KP - DZDK_KXX_KM);
       DZDK_DZDKXY = DZDK_OO2DZ*(DZDK_KXY_KP - DZDK_KXY_KM);
diff --git a/src/macro/DZZDG_declare.h b/src/macro/DZZDG_declare.h
index cbb8bcf..ff67ef2 100644
--- a/src/macro/DZZDG_declare.h
+++ b/src/macro/DZZDG_declare.h
@@ -77,7 +77,7 @@
 
 /* Declare internal variables */
 double DZZDG_FAC;
-double DZZDG_OODZ2 = 1/(GH->dz0*GH->dz0);
+double DZZDG_OODZ2 = 1/(cctkGH->cctk_delta_space[2]*cctkGH->cctk_delta_space[2]);
 
 /* Declare output variables */
 double DZZDG_DZZDGXX;
diff --git a/src/macro/DZZDG_guts.h b/src/macro/DZZDG_guts.h
index 57abce1..55098d3 100644
--- a/src/macro/DZZDG_guts.h
+++ b/src/macro/DZZDG_guts.h
@@ -52,7 +52,7 @@
 #ifdef CCODE
 
       /* Factor involving 2nd derivative of conformal factor */ 
-      DZZDG_FAC   = ((conformal_state != CONFORMAL_METRIC)?0:
+      DZZDG_FAC   = ((*conformal_state != CONFORMAL_METRIC)?0:
               DZDG_PSI4*(4*DZZDG_DZZDPSI_O_PSI + 12*DZDG_DZDPSI_O_PSI*DZDG_DZDPSI_O_PSI));
 
       /* Now calculate the second deriatives */
diff --git a/src/macro/LIEG_guts.h b/src/macro/LIEG_guts.h
index 5f16f02..d188c3d 100644
--- a/src/macro/LIEG_guts.h
+++ b/src/macro/LIEG_guts.h
@@ -50,10 +50,10 @@
 
       LIEG_LGXX = DXDCG_DXDCGXX*LIEG_BX + DYDCG_DYDCGXX*LIEG_BY +
       DZDCG_DZDCGXX*LIEG_BZ + 2*(DXDB_DXDBX*LIEG_GXX + DXDB_DXDBY*LIEG_GXY +
-      DXDB_DXDBZ*LIEG_GZ) ;
+      DXDB_DXDBZ*LIEG_GXZ) ;
 
       LIEG_LGXY = DXDCG_DXDCGXY*LIEG_BX + DYDCG_DYDCGXY*LIEG_BY +
-      DZDCG_DZDCGXY*LIEG_BZ + CDYDB_CDYDBX*LIEG_GXX + (DXDB_DXDBX +
+      DZDCG_DZDCGXY*LIEG_BZ + DYDB_DYDBX*LIEG_GXX + (DXDB_DXDBX +
       DYDB_DYDBY)*LIEG_GXY + DYDB_DYDBZ*LIEG_GXZ+ DXDB_DXDBY*LIEG_GYY +
       DXDB_DXDBZ*LIEG_GYZ ;
 
diff --git a/src/macro/LIEK_guts.h b/src/macro/LIEK_guts.h
index 9641df3..2c66513 100644
--- a/src/macro/LIEK_guts.h
+++ b/src/macro/LIEK_guts.h
@@ -67,7 +67,7 @@
       DYDB_DYDBZ*LIEK_KYZ) ;
 
       LIEK_LKYZ = DXDK_DXDKYZ*LIEK_BX + DYDK_DYDKYZ*LIEK_BY +
-      DZDK_DZDKYZ*LIEK_BZ + DZDB_DZDB1*LIEK_KXY + DYDB_DYDBX*LIEK_KXZ +
+      DZDK_DZDKYZ*LIEK_BZ + DZDB_DZDBX*LIEK_KXY + DYDB_DYDBX*LIEK_KXZ +
       DZDB_DZDBY*LIEK_KYY + (DYDB_DYDBY + DZDB_DZDBZ)*LIEK_KYZ +
       DYDB_DYDBZ*LIEK_KZZ ;
 
diff --git a/src/macro/RICCI_guts.h b/src/macro/RICCI_guts.h
index e43caff..7c54b36 100644
--- a/src/macro/RICCI_guts.h
+++ b/src/macro/RICCI_guts.h
@@ -106,7 +106,7 @@
 
 #ifdef CCODE 
 
-      RICCI_RXX = (DXYDG_DXYDGXY+(-DXXDG_DXXDGYY-DYYDG_DYYDGXX)/2 -
+      RICCI_RXX =  (DXYDG_DXYDGXY+(-DXXDG_DXXDGYY-DYYDG_DYYDGXX)/2 -
       CHR1_XYY*CHR2_XXX +CHR1_XXY*CHR2_XXY-CHR1_YYY*CHR2_YXX +
       CHR1_YXY*CHR2_YXY - CHR1_ZYY*CHR2_ZXX +
       CHR1_ZXY*CHR2_ZXY)*UPPERMET_UYY + (-DXXDG_DXXDGYZ + DXYDG_DXYDGXZ +
diff --git a/src/macro/TRK_declare.h b/src/macro/TRK_declare.h
index 07589da..ec0f5bf 100644
--- a/src/macro/TRK_declare.h
+++ b/src/macro/TRK_declare.h
@@ -58,10 +58,10 @@
 
 /* Output variables */
 #undef  TRK_TRK
-#define TRK_TRK K
+#define TRK_TRK trk_trK
 
 /* Declare output variables */
-double TRK_TRK;
+CCTK_REAL TRK_TRK;
 
 #endif
 
diff --git a/src/macro/UPPERMET_declare.h b/src/macro/UPPERMET_declare.h
index 7985c99..5253abf 100644
--- a/src/macro/UPPERMET_declare.h
+++ b/src/macro/UPPERMET_declare.h
@@ -67,15 +67,15 @@
 #define UPPERMET_PSI4DET uppermet_psi4detg
 
 /* Declare internal variables */
-double UPPERMET_PSI4DET;
+CCTK_REAL UPPERMET_PSI4DET;
 
 /* Declare output variables */
-double UPPERMET_UXX;
-double UPPERMET_UXY;
-double UPPERMET_UXZ;
-double UPPERMET_UYY;
-double UPPERMET_UYZ;
-double UPPERMET_UZZ;
+CCTK_REAL UPPERMET_UXX;
+CCTK_REAL UPPERMET_UXY;
+CCTK_REAL UPPERMET_UXZ;
+CCTK_REAL UPPERMET_UYY;
+CCTK_REAL UPPERMET_UYZ;
+CCTK_REAL UPPERMET_UZZ;
 
 #endif