Regenerate code

21 files changed, 266 insertions, 565 deletions

diff --git a/ML_BSSN_MP/configuration.ccl b/ML_BSSN_MP/configuration.ccl
index 006249a..c4e15c5 100644
--- a/ML_BSSN_MP/configuration.ccl
+++ b/ML_BSSN_MP/configuration.ccl
@@ -1,5 +1,5 @@
-# File produced by user diener
-# Produced with Mathematica Version 6.0 for Linux x86 (32-bit) (April 20, 2007)
+# File produced by user eschnett
+# Produced with Mathematica Version 6.0 for Mac OS X x86 (64-bit) (May 21, 2008)
 
 # Mathematica script written by Ian Hinder and Sascha Husa
 
diff --git a/ML_BSSN_MP/interface.ccl b/ML_BSSN_MP/interface.ccl
index 1d128e1..3776778 100644
--- a/ML_BSSN_MP/interface.ccl
+++ b/ML_BSSN_MP/interface.ccl
@@ -1,5 +1,5 @@
-# File produced by user diener
-# Produced with Mathematica Version 6.0 for Linux x86 (32-bit) (April 20, 2007)
+# File produced by user eschnett
+# Produced with Mathematica Version 6.0 for Mac OS X x86 (64-bit) (May 21, 2008)
 
 # Mathematica script written by Ian Hinder and Sascha Husa
 
diff --git a/ML_BSSN_MP/param.ccl b/ML_BSSN_MP/param.ccl
index 145d035..1c759c2 100644
--- a/ML_BSSN_MP/param.ccl
+++ b/ML_BSSN_MP/param.ccl
@@ -1,5 +1,5 @@
-# File produced by user diener
-# Produced with Mathematica Version 6.0 for Linux x86 (32-bit) (April 20, 2007)
+# File produced by user eschnett
+# Produced with Mathematica Version 6.0 for Mac OS X x86 (64-bit) (May 21, 2008)
 
 # Mathematica script written by Ian Hinder and Sascha Husa
 
diff --git a/ML_BSSN_MP/schedule.ccl b/ML_BSSN_MP/schedule.ccl
index ac22802..119877e 100644
--- a/ML_BSSN_MP/schedule.ccl
+++ b/ML_BSSN_MP/schedule.ccl
@@ -1,5 +1,5 @@
-# File produced by user diener
-# Produced with Mathematica Version 6.0 for Linux x86 (32-bit) (April 20, 2007)
+# File produced by user eschnett
+# Produced with Mathematica Version 6.0 for Mac OS X x86 (64-bit) (May 21, 2008)
 
 # Mathematica script written by Ian Hinder and Sascha Husa
 
diff --git a/ML_BSSN_MP/src/Boundaries.c b/ML_BSSN_MP/src/Boundaries.c
index 3861082..3199b54 100644
--- a/ML_BSSN_MP/src/Boundaries.c
+++ b/ML_BSSN_MP/src/Boundaries.c
@@ -1,5 +1,5 @@
-/*  File produced by user diener */
-/*  Produced with Mathematica Version 6.0 for Linux x86 (32-bit) (April 20, 2007) */
+/*  File produced by user eschnett */
+/*  Produced with Mathematica Version 6.0 for Mac OS X x86 (64-bit) (May 21, 2008) */
 
 /*  Mathematica script written by Ian Hinder and Sascha Husa */
 
@@ -22,16 +22,16 @@
 
 void ML_BSSN_MP_CheckBoundaries(CCTK_ARGUMENTS)
 {
-  DECLARE_CCTK_ARGUMENTS
-  DECLARE_CCTK_PARAMETERS
+  DECLARE_CCTK_ARGUMENTS;
+  DECLARE_CCTK_PARAMETERS;
   
   return;
 }
 
 void ML_BSSN_MP_ApplyBoundConds(CCTK_ARGUMENTS)
 {
-  DECLARE_CCTK_ARGUMENTS
-  DECLARE_CCTK_PARAMETERS
+  DECLARE_CCTK_ARGUMENTS;
+  DECLARE_CCTK_PARAMETERS;
   
   CCTK_INT ierr = 0;
   
diff --git a/ML_BSSN_MP/src/Differencing.h b/ML_BSSN_MP/src/Differencing.h
index 0abddd1..067bd79 100644
--- a/ML_BSSN_MP/src/Differencing.h
+++ b/ML_BSSN_MP/src/Differencing.h
@@ -13,9 +13,6 @@
 #define PDupwindNth1(u,i,j,k) (p1o12dx*(-6*(u)[CCTK_GFINDEX3D(cctkGH,i + 2*dir1,j,k)] + (u)[CCTK_GFINDEX3D(cctkGH,i + 3*dir1,j,k)] - 3*(u)[CCTK_GFINDEX3D(cctkGH,i - dir1,j,k)] + 18*(u)[CCTK_GFINDEX3D(cctkGH,i + dir1,j,k)] - 10*(u)[CCTK_GFINDEX3D(cctkGH,i,j,k)])*dir1)
 #define PDupwindNth2(u,i,j,k) (p1o12dy*(-6*(u)[CCTK_GFINDEX3D(cctkGH,i,j + 2*dir2,k)] + (u)[CCTK_GFINDEX3D(cctkGH,i,j + 3*dir2,k)] - 3*(u)[CCTK_GFINDEX3D(cctkGH,i,j - dir2,k)] + 18*(u)[CCTK_GFINDEX3D(cctkGH,i,j + dir2,k)] - 10*(u)[CCTK_GFINDEX3D(cctkGH,i,j,k)])*dir2)
 #define PDupwindNth3(u,i,j,k) (p1o12dz*(-10*(u)[CCTK_GFINDEX3D(cctkGH,i,j,k)] - 6*(u)[CCTK_GFINDEX3D(cctkGH,i,j,k + 2*dir3)] + (u)[CCTK_GFINDEX3D(cctkGH,i,j,k + 3*dir3)] - 3*(u)[CCTK_GFINDEX3D(cctkGH,i,j,k - dir3)] + 18*(u)[CCTK_GFINDEX3D(cctkGH,i,j,k + dir3)])*dir3)
-#define PDPlus1(u,i,j,k) (pm1o2dx*(-4*(u)[CCTK_GFINDEX3D(cctkGH,1 + i,j,k)] + (u)[CCTK_GFINDEX3D(cctkGH,2 + i,j,k)] + 3*(u)[CCTK_GFINDEX3D(cctkGH,i,j,k)]))
-#define PDPlus2(u,i,j,k) (pm1o2dy*(-4*(u)[CCTK_GFINDEX3D(cctkGH,i,1 + j,k)] + (u)[CCTK_GFINDEX3D(cctkGH,i,2 + j,k)] + 3*(u)[CCTK_GFINDEX3D(cctkGH,i,j,k)]))
-#define PDPlus3(u,i,j,k) (pm1o2dz*(-4*(u)[CCTK_GFINDEX3D(cctkGH,i,j,1 + k)] + (u)[CCTK_GFINDEX3D(cctkGH,i,j,2 + k)] + 3*(u)[CCTK_GFINDEX3D(cctkGH,i,j,k)]))
-#define PDMinus1(u,i,j,k) (p1o2dx*(-4*(u)[CCTK_GFINDEX3D(cctkGH,-1 + i,j,k)] + (u)[CCTK_GFINDEX3D(cctkGH,-2 + i,j,k)] + 3*(u)[CCTK_GFINDEX3D(cctkGH,i,j,k)]))
-#define PDMinus2(u,i,j,k) (p1o2dy*(-4*(u)[CCTK_GFINDEX3D(cctkGH,i,-1 + j,k)] + (u)[CCTK_GFINDEX3D(cctkGH,i,-2 + j,k)] + 3*(u)[CCTK_GFINDEX3D(cctkGH,i,j,k)]))
-#define PDMinus3(u,i,j,k) (p1o2dz*(-4*(u)[CCTK_GFINDEX3D(cctkGH,i,j,-1 + k)] + (u)[CCTK_GFINDEX3D(cctkGH,i,j,-2 + k)] + 3*(u)[CCTK_GFINDEX3D(cctkGH,i,j,k)]))
+#define PDonesided1(u,i,j,k) (p1odx*((u)[CCTK_GFINDEX3D(cctkGH,i + dir1,j,k)] - (u)[CCTK_GFINDEX3D(cctkGH,i,j,k)])*dir1)
+#define PDonesided2(u,i,j,k) (p1ody*((u)[CCTK_GFINDEX3D(cctkGH,i,j + dir2,k)] - (u)[CCTK_GFINDEX3D(cctkGH,i,j,k)])*dir2)
+#define PDonesided3(u,i,j,k) (p1odz*(-(u)[CCTK_GFINDEX3D(cctkGH,i,j,k)] + (u)[CCTK_GFINDEX3D(cctkGH,i,j,k + dir3)])*dir3)
diff --git a/ML_BSSN_MP/src/ML_BSSN_MP_ADMBaseBoundary.c b/ML_BSSN_MP/src/ML_BSSN_MP_ADMBaseBoundary.c
index 0c14b52..9fdab3c 100644
--- a/ML_BSSN_MP/src/ML_BSSN_MP_ADMBaseBoundary.c
+++ b/ML_BSSN_MP/src/ML_BSSN_MP_ADMBaseBoundary.c
@@ -1,5 +1,5 @@
-/*  File produced by user diener */
-/*  Produced with Mathematica Version 6.0 for Linux x86 (32-bit) (April 20, 2007) */
+/*  File produced by user eschnett */
+/*  Produced with Mathematica Version 6.0 for Mac OS X x86 (64-bit) (May 21, 2008) */
 
 /*  Mathematica script written by Ian Hinder and Sascha Husa */
 
@@ -25,8 +25,8 @@
 
 void ML_BSSN_MP_ADMBaseBoundary_Body(cGH const * const cctkGH, CCTK_INT const dir, CCTK_INT const face, CCTK_REAL const normal[3], CCTK_REAL const tangentA[3], CCTK_REAL const tangentB[3], CCTK_INT const min[3], CCTK_INT const max[3], CCTK_INT const n_subblock_gfs, CCTK_REAL * const subblock_gfs[])
 {
-  DECLARE_CCTK_ARGUMENTS
-  DECLARE_CCTK_PARAMETERS
+  DECLARE_CCTK_ARGUMENTS;
+  DECLARE_CCTK_PARAMETERS;
   
   
   /* Declare finite differencing variables */
@@ -43,15 +43,12 @@ void ML_BSSN_MP_ADMBaseBoundary_Body(cGH const * const cctkGH, CCTK_INT const di
   CCTK_REAL p1o144dxdy = INITVALUE;
   CCTK_REAL p1o144dxdz = INITVALUE;
   CCTK_REAL p1o144dydz = INITVALUE;
-  CCTK_REAL p1o2dx = INITVALUE;
-  CCTK_REAL p1o2dy = INITVALUE;
-  CCTK_REAL p1o2dz = INITVALUE;
+  CCTK_REAL p1odx = INITVALUE;
+  CCTK_REAL p1ody = INITVALUE;
+  CCTK_REAL p1odz = INITVALUE;
   CCTK_REAL pm1o12dx2 = INITVALUE;
   CCTK_REAL pm1o12dy2 = INITVALUE;
   CCTK_REAL pm1o12dz2 = INITVALUE;
-  CCTK_REAL pm1o2dx = INITVALUE;
-  CCTK_REAL pm1o2dy = INITVALUE;
-  CCTK_REAL pm1o2dz = INITVALUE;
   
   if (verbose > 1)
   {
@@ -88,21 +85,18 @@ void ML_BSSN_MP_ADMBaseBoundary_Body(cGH const * const cctkGH, CCTK_INT const di
   p1o144dxdy = (INV(dx)*INV(dy))/144.;
   p1o144dxdz = (INV(dx)*INV(dz))/144.;
   p1o144dydz = (INV(dy)*INV(dz))/144.;
-  p1o2dx = khalf*INV(dx);
-  p1o2dy = khalf*INV(dy);
-  p1o2dz = khalf*INV(dz);
+  p1odx = INV(dx);
+  p1ody = INV(dy);
+  p1odz = INV(dz);
   pm1o12dx2 = -pow(dx,-2)/12.;
   pm1o12dy2 = -pow(dy,-2)/12.;
   pm1o12dz2 = -pow(dz,-2)/12.;
-  pm1o2dx = -(khalf*INV(dx));
-  pm1o2dy = -(khalf*INV(dy));
-  pm1o2dz = -(khalf*INV(dz));
   
   /* Loop over the grid points */
   #pragma omp parallel
   LC_LOOP3 (ML_BSSN_MP_ADMBaseBoundary,
             i,j,k, min[0],min[1],min[2], max[0],max[1],max[2],
-            cctk_lsh[0],cctk_lsh[1],cctk_lsh[2])
+            cctk_lssh[CCTK_LSSH_IDX(0,0)],cctk_lssh[CCTK_LSSH_IDX(0,1)],cctk_lssh[CCTK_LSSH_IDX(0,2)])
   {
     int index = INITVALUE;
     int subblock_index = INITVALUE;
@@ -238,8 +232,7 @@ void ML_BSSN_MP_ADMBaseBoundary_Body(cGH const * const cctkGH, CCTK_INT const di
     
     betazL  =  beta3L;
     
-    dtalpL  =  harmonicF*(AL*(-1 + LapseAdvectionCoeff) - LapseAdvectionCoeff*trKL)*
-        pow(alphaL,harmonicN);
+    dtalpL  =  harmonicF*(AL*(-1 + LapseAdvectionCoeff) - LapseAdvectionCoeff*trKL)*pow(alphaL,harmonicN);
     
     dtbetaxL  =  B1L*ShiftGammaCoeff;
     
@@ -277,8 +270,8 @@ void ML_BSSN_MP_ADMBaseBoundary_Body(cGH const * const cctkGH, CCTK_INT const di
 
 void ML_BSSN_MP_ADMBaseBoundary(CCTK_ARGUMENTS)
 {
-  DECLARE_CCTK_ARGUMENTS
-  DECLARE_CCTK_PARAMETERS
+  DECLARE_CCTK_ARGUMENTS;
+  DECLARE_CCTK_PARAMETERS;
   
   GenericFD_LoopOverBoundaryWithGhosts(cctkGH, &ML_BSSN_MP_ADMBaseBoundary_Body);
 }
diff --git a/ML_BSSN_MP/src/ML_BSSN_MP_Minkowski.c b/ML_BSSN_MP/src/ML_BSSN_MP_Minkowski.c
index 89254fd..1dcbad3 100644
--- a/ML_BSSN_MP/src/ML_BSSN_MP_Minkowski.c
+++ b/ML_BSSN_MP/src/ML_BSSN_MP_Minkowski.c
@@ -1,5 +1,5 @@
-/*  File produced by user diener */
-/*  Produced with Mathematica Version 6.0 for Linux x86 (32-bit) (April 20, 2007) */
+/*  File produced by user eschnett */
+/*  Produced with Mathematica Version 6.0 for Mac OS X x86 (64-bit) (May 21, 2008) */
 
 /*  Mathematica script written by Ian Hinder and Sascha Husa */
 
@@ -25,8 +25,8 @@
 
 void ML_BSSN_MP_Minkowski_Body(cGH const * const cctkGH, CCTK_INT const dir, CCTK_INT const face, CCTK_REAL const normal[3], CCTK_REAL const tangentA[3], CCTK_REAL const tangentB[3], CCTK_INT const min[3], CCTK_INT const max[3], CCTK_INT const n_subblock_gfs, CCTK_REAL * const subblock_gfs[])
 {
-  DECLARE_CCTK_ARGUMENTS
-  DECLARE_CCTK_PARAMETERS
+  DECLARE_CCTK_ARGUMENTS;
+  DECLARE_CCTK_PARAMETERS;
   
   
   /* Declare finite differencing variables */
@@ -43,15 +43,12 @@ void ML_BSSN_MP_Minkowski_Body(cGH const * const cctkGH, CCTK_INT const dir, CCT
   CCTK_REAL p1o144dxdy = INITVALUE;
   CCTK_REAL p1o144dxdz = INITVALUE;
   CCTK_REAL p1o144dydz = INITVALUE;
-  CCTK_REAL p1o2dx = INITVALUE;
-  CCTK_REAL p1o2dy = INITVALUE;
-  CCTK_REAL p1o2dz = INITVALUE;
+  CCTK_REAL p1odx = INITVALUE;
+  CCTK_REAL p1ody = INITVALUE;
+  CCTK_REAL p1odz = INITVALUE;
   CCTK_REAL pm1o12dx2 = INITVALUE;
   CCTK_REAL pm1o12dy2 = INITVALUE;
   CCTK_REAL pm1o12dz2 = INITVALUE;
-  CCTK_REAL pm1o2dx = INITVALUE;
-  CCTK_REAL pm1o2dy = INITVALUE;
-  CCTK_REAL pm1o2dz = INITVALUE;
   
   if (verbose > 1)
   {
@@ -88,21 +85,18 @@ void ML_BSSN_MP_Minkowski_Body(cGH const * const cctkGH, CCTK_INT const dir, CCT
   p1o144dxdy = (INV(dx)*INV(dy))/144.;
   p1o144dxdz = (INV(dx)*INV(dz))/144.;
   p1o144dydz = (INV(dy)*INV(dz))/144.;
-  p1o2dx = khalf*INV(dx);
-  p1o2dy = khalf*INV(dy);
-  p1o2dz = khalf*INV(dz);
+  p1odx = INV(dx);
+  p1ody = INV(dy);
+  p1odz = INV(dz);
   pm1o12dx2 = -pow(dx,-2)/12.;
   pm1o12dy2 = -pow(dy,-2)/12.;
   pm1o12dz2 = -pow(dz,-2)/12.;
-  pm1o2dx = -(khalf*INV(dx));
-  pm1o2dy = -(khalf*INV(dy));
-  pm1o2dz = -(khalf*INV(dz));
   
   /* Loop over the grid points */
   #pragma omp parallel
   LC_LOOP3 (ML_BSSN_MP_Minkowski,
             i,j,k, min[0],min[1],min[2], max[0],max[1],max[2],
-            cctk_lsh[0],cctk_lsh[1],cctk_lsh[2])
+            cctk_lssh[CCTK_LSSH_IDX(0,0)],cctk_lssh[CCTK_LSSH_IDX(0,1)],cctk_lssh[CCTK_LSSH_IDX(0,2)])
   {
     int index = INITVALUE;
     int subblock_index = INITVALUE;
@@ -221,8 +215,8 @@ void ML_BSSN_MP_Minkowski_Body(cGH const * const cctkGH, CCTK_INT const dir, CCT
 
 void ML_BSSN_MP_Minkowski(CCTK_ARGUMENTS)
 {
-  DECLARE_CCTK_ARGUMENTS
-  DECLARE_CCTK_PARAMETERS
+  DECLARE_CCTK_ARGUMENTS;
+  DECLARE_CCTK_PARAMETERS;
   
   GenericFD_LoopOverEverything(cctkGH, &ML_BSSN_MP_Minkowski_Body);
 }
diff --git a/ML_BSSN_MP/src/ML_BSSN_MP_RHS.c b/ML_BSSN_MP/src/ML_BSSN_MP_RHS.c
index dd3a75a..925c7a8 100644
--- a/ML_BSSN_MP/src/ML_BSSN_MP_RHS.c
+++ b/ML_BSSN_MP/src/ML_BSSN_MP_RHS.c
@@ -1,5 +1,5 @@
-/*  File produced by user diener */
-/*  Produced with Mathematica Version 6.0 for Linux x86 (32-bit) (April 20, 2007) */
+/*  File produced by user eschnett */
+/*  Produced with Mathematica Version 6.0 for Mac OS X x86 (64-bit) (May 21, 2008) */
 
 /*  Mathematica script written by Ian Hinder and Sascha Husa */
 
@@ -25,8 +25,8 @@
 
 void ML_BSSN_MP_RHS_Body(cGH const * const cctkGH, CCTK_INT const dir, CCTK_INT const face, CCTK_REAL const normal[3], CCTK_REAL const tangentA[3], CCTK_REAL const tangentB[3], CCTK_INT const min[3], CCTK_INT const max[3], CCTK_INT const n_subblock_gfs, CCTK_REAL * const subblock_gfs[])
 {
-  DECLARE_CCTK_ARGUMENTS
-  DECLARE_CCTK_PARAMETERS
+  DECLARE_CCTK_ARGUMENTS;
+  DECLARE_CCTK_PARAMETERS;
   
   
   /* Declare finite differencing variables */
@@ -43,15 +43,12 @@ void ML_BSSN_MP_RHS_Body(cGH const * const cctkGH, CCTK_INT const dir, CCTK_INT
   CCTK_REAL p1o144dxdy = INITVALUE;
   CCTK_REAL p1o144dxdz = INITVALUE;
   CCTK_REAL p1o144dydz = INITVALUE;
-  CCTK_REAL p1o2dx = INITVALUE;
-  CCTK_REAL p1o2dy = INITVALUE;
-  CCTK_REAL p1o2dz = INITVALUE;
+  CCTK_REAL p1odx = INITVALUE;
+  CCTK_REAL p1ody = INITVALUE;
+  CCTK_REAL p1odz = INITVALUE;
   CCTK_REAL pm1o12dx2 = INITVALUE;
   CCTK_REAL pm1o12dy2 = INITVALUE;
   CCTK_REAL pm1o12dz2 = INITVALUE;
-  CCTK_REAL pm1o2dx = INITVALUE;
-  CCTK_REAL pm1o2dy = INITVALUE;
-  CCTK_REAL pm1o2dz = INITVALUE;
   
   if (verbose > 1)
   {
@@ -88,21 +85,18 @@ void ML_BSSN_MP_RHS_Body(cGH const * const cctkGH, CCTK_INT const dir, CCTK_INT
   p1o144dxdy = (INV(dx)*INV(dy))/144.;
   p1o144dxdz = (INV(dx)*INV(dz))/144.;
   p1o144dydz = (INV(dy)*INV(dz))/144.;
-  p1o2dx = khalf*INV(dx);
-  p1o2dy = khalf*INV(dy);
-  p1o2dz = khalf*INV(dz);
+  p1odx = INV(dx);
+  p1ody = INV(dy);
+  p1odz = INV(dz);
   pm1o12dx2 = -pow(dx,-2)/12.;
   pm1o12dy2 = -pow(dy,-2)/12.;
   pm1o12dz2 = -pow(dz,-2)/12.;
-  pm1o2dx = -(khalf*INV(dx));
-  pm1o2dy = -(khalf*INV(dy));
-  pm1o2dz = -(khalf*INV(dz));
   
   /* Loop over the grid points */
   #pragma omp parallel
   LC_LOOP3 (ML_BSSN_MP_RHS,
             i,j,k, min[0],min[1],min[2], max[0],max[1],max[2],
-            cctk_lsh[0],cctk_lsh[1],cctk_lsh[2])
+            cctk_lssh[CCTK_LSSH_IDX(0,0)],cctk_lssh[CCTK_LSSH_IDX(0,1)],cctk_lssh[CCTK_LSSH_IDX(0,2)])
   {
     int index = INITVALUE;
     int subblock_index = INITVALUE;
@@ -170,40 +164,7 @@ void ML_BSSN_MP_RHS_Body(cGH const * const cctkGH, CCTK_INT const dir, CCTK_INT
     CCTK_REAL PDstandardNth33alpha = INITVALUE;
     CCTK_REAL PDstandardNth12alpha = INITVALUE;
     CCTK_REAL PDstandardNth13alpha = INITVALUE;
-    CCTK_REAL PDstandardNth21alpha = INITVALUE;
     CCTK_REAL PDstandardNth23alpha = INITVALUE;
-    CCTK_REAL PDstandardNth31alpha = INITVALUE;
-    CCTK_REAL PDstandardNth32alpha = INITVALUE;
-    CCTK_REAL PDupwindNth1alpha = INITVALUE;
-    CCTK_REAL PDupwindNth2alpha = INITVALUE;
-    CCTK_REAL PDupwindNth3alpha = INITVALUE;
-    CCTK_REAL PDupwindNth1At11 = INITVALUE;
-    CCTK_REAL PDupwindNth2At11 = INITVALUE;
-    CCTK_REAL PDupwindNth3At11 = INITVALUE;
-    CCTK_REAL PDupwindNth1At12 = INITVALUE;
-    CCTK_REAL PDupwindNth2At12 = INITVALUE;
-    CCTK_REAL PDupwindNth3At12 = INITVALUE;
-    CCTK_REAL PDupwindNth1At13 = INITVALUE;
-    CCTK_REAL PDupwindNth2At13 = INITVALUE;
-    CCTK_REAL PDupwindNth3At13 = INITVALUE;
-    CCTK_REAL PDupwindNth1At22 = INITVALUE;
-    CCTK_REAL PDupwindNth2At22 = INITVALUE;
-    CCTK_REAL PDupwindNth3At22 = INITVALUE;
-    CCTK_REAL PDupwindNth1At23 = INITVALUE;
-    CCTK_REAL PDupwindNth2At23 = INITVALUE;
-    CCTK_REAL PDupwindNth3At23 = INITVALUE;
-    CCTK_REAL PDupwindNth1At33 = INITVALUE;
-    CCTK_REAL PDupwindNth2At33 = INITVALUE;
-    CCTK_REAL PDupwindNth3At33 = INITVALUE;
-    CCTK_REAL PDupwindNth1B1 = INITVALUE;
-    CCTK_REAL PDupwindNth2B1 = INITVALUE;
-    CCTK_REAL PDupwindNth3B1 = INITVALUE;
-    CCTK_REAL PDupwindNth1B2 = INITVALUE;
-    CCTK_REAL PDupwindNth2B2 = INITVALUE;
-    CCTK_REAL PDupwindNth3B2 = INITVALUE;
-    CCTK_REAL PDupwindNth1B3 = INITVALUE;
-    CCTK_REAL PDupwindNth2B3 = INITVALUE;
-    CCTK_REAL PDupwindNth3B3 = INITVALUE;
     CCTK_REAL PDstandardNth1beta1 = INITVALUE;
     CCTK_REAL PDstandardNth2beta1 = INITVALUE;
     CCTK_REAL PDstandardNth3beta1 = INITVALUE;
@@ -212,13 +173,7 @@ void ML_BSSN_MP_RHS_Body(cGH const * const cctkGH, CCTK_INT const dir, CCTK_INT
     CCTK_REAL PDstandardNth33beta1 = INITVALUE;
     CCTK_REAL PDstandardNth12beta1 = INITVALUE;
     CCTK_REAL PDstandardNth13beta1 = INITVALUE;
-    CCTK_REAL PDstandardNth21beta1 = INITVALUE;
     CCTK_REAL PDstandardNth23beta1 = INITVALUE;
-    CCTK_REAL PDstandardNth31beta1 = INITVALUE;
-    CCTK_REAL PDstandardNth32beta1 = INITVALUE;
-    CCTK_REAL PDupwindNth1beta1 = INITVALUE;
-    CCTK_REAL PDupwindNth2beta1 = INITVALUE;
-    CCTK_REAL PDupwindNth3beta1 = INITVALUE;
     CCTK_REAL PDstandardNth1beta2 = INITVALUE;
     CCTK_REAL PDstandardNth2beta2 = INITVALUE;
     CCTK_REAL PDstandardNth3beta2 = INITVALUE;
@@ -227,13 +182,7 @@ void ML_BSSN_MP_RHS_Body(cGH const * const cctkGH, CCTK_INT const dir, CCTK_INT
     CCTK_REAL PDstandardNth33beta2 = INITVALUE;
     CCTK_REAL PDstandardNth12beta2 = INITVALUE;
     CCTK_REAL PDstandardNth13beta2 = INITVALUE;
-    CCTK_REAL PDstandardNth21beta2 = INITVALUE;
     CCTK_REAL PDstandardNth23beta2 = INITVALUE;
-    CCTK_REAL PDstandardNth31beta2 = INITVALUE;
-    CCTK_REAL PDstandardNth32beta2 = INITVALUE;
-    CCTK_REAL PDupwindNth1beta2 = INITVALUE;
-    CCTK_REAL PDupwindNth2beta2 = INITVALUE;
-    CCTK_REAL PDupwindNth3beta2 = INITVALUE;
     CCTK_REAL PDstandardNth1beta3 = INITVALUE;
     CCTK_REAL PDstandardNth2beta3 = INITVALUE;
     CCTK_REAL PDstandardNth3beta3 = INITVALUE;
@@ -242,13 +191,7 @@ void ML_BSSN_MP_RHS_Body(cGH const * const cctkGH, CCTK_INT const dir, CCTK_INT
     CCTK_REAL PDstandardNth33beta3 = INITVALUE;
     CCTK_REAL PDstandardNth12beta3 = INITVALUE;
     CCTK_REAL PDstandardNth13beta3 = INITVALUE;
-    CCTK_REAL PDstandardNth21beta3 = INITVALUE;
     CCTK_REAL PDstandardNth23beta3 = INITVALUE;
-    CCTK_REAL PDstandardNth31beta3 = INITVALUE;
-    CCTK_REAL PDstandardNth32beta3 = INITVALUE;
-    CCTK_REAL PDupwindNth1beta3 = INITVALUE;
-    CCTK_REAL PDupwindNth2beta3 = INITVALUE;
-    CCTK_REAL PDupwindNth3beta3 = INITVALUE;
     CCTK_REAL PDstandardNth1gt11 = INITVALUE;
     CCTK_REAL PDstandardNth2gt11 = INITVALUE;
     CCTK_REAL PDstandardNth3gt11 = INITVALUE;
@@ -257,13 +200,7 @@ void ML_BSSN_MP_RHS_Body(cGH const * const cctkGH, CCTK_INT const dir, CCTK_INT
     CCTK_REAL PDstandardNth33gt11 = INITVALUE;
     CCTK_REAL PDstandardNth12gt11 = INITVALUE;
     CCTK_REAL PDstandardNth13gt11 = INITVALUE;
-    CCTK_REAL PDstandardNth21gt11 = INITVALUE;
     CCTK_REAL PDstandardNth23gt11 = INITVALUE;
-    CCTK_REAL PDstandardNth31gt11 = INITVALUE;
-    CCTK_REAL PDstandardNth32gt11 = INITVALUE;
-    CCTK_REAL PDupwindNth1gt11 = INITVALUE;
-    CCTK_REAL PDupwindNth2gt11 = INITVALUE;
-    CCTK_REAL PDupwindNth3gt11 = INITVALUE;
     CCTK_REAL PDstandardNth1gt12 = INITVALUE;
     CCTK_REAL PDstandardNth2gt12 = INITVALUE;
     CCTK_REAL PDstandardNth3gt12 = INITVALUE;
@@ -272,13 +209,7 @@ void ML_BSSN_MP_RHS_Body(cGH const * const cctkGH, CCTK_INT const dir, CCTK_INT
     CCTK_REAL PDstandardNth33gt12 = INITVALUE;
     CCTK_REAL PDstandardNth12gt12 = INITVALUE;
     CCTK_REAL PDstandardNth13gt12 = INITVALUE;
-    CCTK_REAL PDstandardNth21gt12 = INITVALUE;
     CCTK_REAL PDstandardNth23gt12 = INITVALUE;
-    CCTK_REAL PDstandardNth31gt12 = INITVALUE;
-    CCTK_REAL PDstandardNth32gt12 = INITVALUE;
-    CCTK_REAL PDupwindNth1gt12 = INITVALUE;
-    CCTK_REAL PDupwindNth2gt12 = INITVALUE;
-    CCTK_REAL PDupwindNth3gt12 = INITVALUE;
     CCTK_REAL PDstandardNth1gt13 = INITVALUE;
     CCTK_REAL PDstandardNth2gt13 = INITVALUE;
     CCTK_REAL PDstandardNth3gt13 = INITVALUE;
@@ -287,13 +218,7 @@ void ML_BSSN_MP_RHS_Body(cGH const * const cctkGH, CCTK_INT const dir, CCTK_INT
     CCTK_REAL PDstandardNth33gt13 = INITVALUE;
     CCTK_REAL PDstandardNth12gt13 = INITVALUE;
     CCTK_REAL PDstandardNth13gt13 = INITVALUE;
-    CCTK_REAL PDstandardNth21gt13 = INITVALUE;
     CCTK_REAL PDstandardNth23gt13 = INITVALUE;
-    CCTK_REAL PDstandardNth31gt13 = INITVALUE;
-    CCTK_REAL PDstandardNth32gt13 = INITVALUE;
-    CCTK_REAL PDupwindNth1gt13 = INITVALUE;
-    CCTK_REAL PDupwindNth2gt13 = INITVALUE;
-    CCTK_REAL PDupwindNth3gt13 = INITVALUE;
     CCTK_REAL PDstandardNth1gt22 = INITVALUE;
     CCTK_REAL PDstandardNth2gt22 = INITVALUE;
     CCTK_REAL PDstandardNth3gt22 = INITVALUE;
@@ -302,13 +227,7 @@ void ML_BSSN_MP_RHS_Body(cGH const * const cctkGH, CCTK_INT const dir, CCTK_INT
     CCTK_REAL PDstandardNth33gt22 = INITVALUE;
     CCTK_REAL PDstandardNth12gt22 = INITVALUE;
     CCTK_REAL PDstandardNth13gt22 = INITVALUE;
-    CCTK_REAL PDstandardNth21gt22 = INITVALUE;
     CCTK_REAL PDstandardNth23gt22 = INITVALUE;
-    CCTK_REAL PDstandardNth31gt22 = INITVALUE;
-    CCTK_REAL PDstandardNth32gt22 = INITVALUE;
-    CCTK_REAL PDupwindNth1gt22 = INITVALUE;
-    CCTK_REAL PDupwindNth2gt22 = INITVALUE;
-    CCTK_REAL PDupwindNth3gt22 = INITVALUE;
     CCTK_REAL PDstandardNth1gt23 = INITVALUE;
     CCTK_REAL PDstandardNth2gt23 = INITVALUE;
     CCTK_REAL PDstandardNth3gt23 = INITVALUE;
@@ -317,13 +236,7 @@ void ML_BSSN_MP_RHS_Body(cGH const * const cctkGH, CCTK_INT const dir, CCTK_INT
     CCTK_REAL PDstandardNth33gt23 = INITVALUE;
     CCTK_REAL PDstandardNth12gt23 = INITVALUE;
     CCTK_REAL PDstandardNth13gt23 = INITVALUE;
-    CCTK_REAL PDstandardNth21gt23 = INITVALUE;
     CCTK_REAL PDstandardNth23gt23 = INITVALUE;
-    CCTK_REAL PDstandardNth31gt23 = INITVALUE;
-    CCTK_REAL PDstandardNth32gt23 = INITVALUE;
-    CCTK_REAL PDupwindNth1gt23 = INITVALUE;
-    CCTK_REAL PDupwindNth2gt23 = INITVALUE;
-    CCTK_REAL PDupwindNth3gt23 = INITVALUE;
     CCTK_REAL PDstandardNth1gt33 = INITVALUE;
     CCTK_REAL PDstandardNth2gt33 = INITVALUE;
     CCTK_REAL PDstandardNth3gt33 = INITVALUE;
@@ -332,13 +245,7 @@ void ML_BSSN_MP_RHS_Body(cGH const * const cctkGH, CCTK_INT const dir, CCTK_INT
     CCTK_REAL PDstandardNth33gt33 = INITVALUE;
     CCTK_REAL PDstandardNth12gt33 = INITVALUE;
     CCTK_REAL PDstandardNth13gt33 = INITVALUE;
-    CCTK_REAL PDstandardNth21gt33 = INITVALUE;
     CCTK_REAL PDstandardNth23gt33 = INITVALUE;
-    CCTK_REAL PDstandardNth31gt33 = INITVALUE;
-    CCTK_REAL PDstandardNth32gt33 = INITVALUE;
-    CCTK_REAL PDupwindNth1gt33 = INITVALUE;
-    CCTK_REAL PDupwindNth2gt33 = INITVALUE;
-    CCTK_REAL PDupwindNth3gt33 = INITVALUE;
     CCTK_REAL PDstandardNth1phi = INITVALUE;
     CCTK_REAL PDstandardNth2phi = INITVALUE;
     CCTK_REAL PDstandardNth3phi = INITVALUE;
@@ -347,37 +254,19 @@ void ML_BSSN_MP_RHS_Body(cGH const * const cctkGH, CCTK_INT const dir, CCTK_INT
     CCTK_REAL PDstandardNth33phi = INITVALUE;
     CCTK_REAL PDstandardNth12phi = INITVALUE;
     CCTK_REAL PDstandardNth13phi = INITVALUE;
-    CCTK_REAL PDstandardNth21phi = INITVALUE;
     CCTK_REAL PDstandardNth23phi = INITVALUE;
-    CCTK_REAL PDstandardNth31phi = INITVALUE;
-    CCTK_REAL PDstandardNth32phi = INITVALUE;
-    CCTK_REAL PDupwindNth1phi = INITVALUE;
-    CCTK_REAL PDupwindNth2phi = INITVALUE;
-    CCTK_REAL PDupwindNth3phi = INITVALUE;
     CCTK_REAL PDstandardNth1trK = INITVALUE;
     CCTK_REAL PDstandardNth2trK = INITVALUE;
     CCTK_REAL PDstandardNth3trK = INITVALUE;
-    CCTK_REAL PDupwindNth1trK = INITVALUE;
-    CCTK_REAL PDupwindNth2trK = INITVALUE;
-    CCTK_REAL PDupwindNth3trK = INITVALUE;
     CCTK_REAL PDstandardNth1Xt1 = INITVALUE;
     CCTK_REAL PDstandardNth2Xt1 = INITVALUE;
     CCTK_REAL PDstandardNth3Xt1 = INITVALUE;
-    CCTK_REAL PDupwindNth1Xt1 = INITVALUE;
-    CCTK_REAL PDupwindNth2Xt1 = INITVALUE;
-    CCTK_REAL PDupwindNth3Xt1 = INITVALUE;
     CCTK_REAL PDstandardNth1Xt2 = INITVALUE;
     CCTK_REAL PDstandardNth2Xt2 = INITVALUE;
     CCTK_REAL PDstandardNth3Xt2 = INITVALUE;
-    CCTK_REAL PDupwindNth1Xt2 = INITVALUE;
-    CCTK_REAL PDupwindNth2Xt2 = INITVALUE;
-    CCTK_REAL PDupwindNth3Xt2 = INITVALUE;
     CCTK_REAL PDstandardNth1Xt3 = INITVALUE;
     CCTK_REAL PDstandardNth2Xt3 = INITVALUE;
     CCTK_REAL PDstandardNth3Xt3 = INITVALUE;
-    CCTK_REAL PDupwindNth1Xt3 = INITVALUE;
-    CCTK_REAL PDupwindNth2Xt3 = INITVALUE;
-    CCTK_REAL PDupwindNth3Xt3 = INITVALUE;
     
     /* Assign local copies of grid functions */
     AL = A[index];
@@ -2024,8 +1913,8 @@ void ML_BSSN_MP_RHS_Body(cGH const * const cctkGH, CCTK_INT const dir, CCTK_INT
 
 void ML_BSSN_MP_RHS(CCTK_ARGUMENTS)
 {
-  DECLARE_CCTK_ARGUMENTS
-  DECLARE_CCTK_PARAMETERS
+  DECLARE_CCTK_ARGUMENTS;
+  DECLARE_CCTK_PARAMETERS;
   
   GenericFD_LoopOverInterior(cctkGH, &ML_BSSN_MP_RHS_Body);
 }
diff --git a/ML_BSSN_MP/src/ML_BSSN_MP_RHSBoundary.c b/ML_BSSN_MP/src/ML_BSSN_MP_RHSBoundary.c
index 0307fef..36961f3 100644
--- a/ML_BSSN_MP/src/ML_BSSN_MP_RHSBoundary.c
+++ b/ML_BSSN_MP/src/ML_BSSN_MP_RHSBoundary.c
@@ -1,5 +1,5 @@
-/*  File produced by user diener */
-/*  Produced with Mathematica Version 6.0 for Linux x86 (32-bit) (April 20, 2007) */
+/*  File produced by user eschnett */
+/*  Produced with Mathematica Version 6.0 for Mac OS X x86 (64-bit) (May 21, 2008) */
 
 /*  Mathematica script written by Ian Hinder and Sascha Husa */
 
@@ -25,8 +25,8 @@
 
 void ML_BSSN_MP_RHSBoundary_Body(cGH const * const cctkGH, CCTK_INT const dir, CCTK_INT const face, CCTK_REAL const normal[3], CCTK_REAL const tangentA[3], CCTK_REAL const tangentB[3], CCTK_INT const min[3], CCTK_INT const max[3], CCTK_INT const n_subblock_gfs, CCTK_REAL * const subblock_gfs[])
 {
-  DECLARE_CCTK_ARGUMENTS
-  DECLARE_CCTK_PARAMETERS
+  DECLARE_CCTK_ARGUMENTS;
+  DECLARE_CCTK_PARAMETERS;
   
   
   /* Declare finite differencing variables */
@@ -43,15 +43,12 @@ void ML_BSSN_MP_RHSBoundary_Body(cGH const * const cctkGH, CCTK_INT const dir, C
   CCTK_REAL p1o144dxdy = INITVALUE;
   CCTK_REAL p1o144dxdz = INITVALUE;
   CCTK_REAL p1o144dydz = INITVALUE;
-  CCTK_REAL p1o2dx = INITVALUE;
-  CCTK_REAL p1o2dy = INITVALUE;
-  CCTK_REAL p1o2dz = INITVALUE;
+  CCTK_REAL p1odx = INITVALUE;
+  CCTK_REAL p1ody = INITVALUE;
+  CCTK_REAL p1odz = INITVALUE;
   CCTK_REAL pm1o12dx2 = INITVALUE;
   CCTK_REAL pm1o12dy2 = INITVALUE;
   CCTK_REAL pm1o12dz2 = INITVALUE;
-  CCTK_REAL pm1o2dx = INITVALUE;
-  CCTK_REAL pm1o2dy = INITVALUE;
-  CCTK_REAL pm1o2dz = INITVALUE;
   
   if (verbose > 1)
   {
@@ -88,21 +85,18 @@ void ML_BSSN_MP_RHSBoundary_Body(cGH const * const cctkGH, CCTK_INT const dir, C
   p1o144dxdy = (INV(dx)*INV(dy))/144.;
   p1o144dxdz = (INV(dx)*INV(dz))/144.;
   p1o144dydz = (INV(dy)*INV(dz))/144.;
-  p1o2dx = khalf*INV(dx);
-  p1o2dy = khalf*INV(dy);
-  p1o2dz = khalf*INV(dz);
+  p1odx = INV(dx);
+  p1ody = INV(dy);
+  p1odz = INV(dz);
   pm1o12dx2 = -pow(dx,-2)/12.;
   pm1o12dy2 = -pow(dy,-2)/12.;
   pm1o12dz2 = -pow(dz,-2)/12.;
-  pm1o2dx = -(khalf*INV(dx));
-  pm1o2dy = -(khalf*INV(dy));
-  pm1o2dz = -(khalf*INV(dz));
   
   /* Loop over the grid points */
   #pragma omp parallel
   LC_LOOP3 (ML_BSSN_MP_RHSBoundary,
             i,j,k, min[0],min[1],min[2], max[0],max[1],max[2],
-            cctk_lsh[0],cctk_lsh[1],cctk_lsh[2])
+            cctk_lssh[CCTK_LSSH_IDX(0,0)],cctk_lssh[CCTK_LSSH_IDX(0,1)],cctk_lssh[CCTK_LSSH_IDX(0,2)])
   {
     int index = INITVALUE;
     int subblock_index = INITVALUE;
@@ -111,6 +105,7 @@ void ML_BSSN_MP_RHSBoundary_Body(cGH const * const cctkGH, CCTK_INT const dir, C
     
     /* Declare shorthands */
     CCTK_REAL detgt = INITVALUE;
+    CCTK_REAL dir1 = INITVALUE, dir2 = INITVALUE, dir3 = INITVALUE;
     CCTK_REAL em4phi = INITVALUE;
     CCTK_REAL gtu11 = INITVALUE, gtu21 = INITVALUE, gtu22 = INITVALUE, gtu31 = INITVALUE, gtu32 = INITVALUE, gtu33 = INITVALUE;
     CCTK_REAL gu11 = INITVALUE, gu21 = INITVALUE, gu22 = INITVALUE, gu31 = INITVALUE, gu32 = INITVALUE, gu33 = INITVALUE;
@@ -130,87 +125,14 @@ void ML_BSSN_MP_RHSBoundary_Body(cGH const * const cctkGH, CCTK_INT const dir, C
     CCTK_REAL beta1L = INITVALUE, beta1rhsL = INITVALUE, beta2L = INITVALUE, beta2rhsL = INITVALUE, beta3L = INITVALUE, beta3rhsL = INITVALUE;
     CCTK_REAL gt11L = INITVALUE, gt11rhsL = INITVALUE, gt12L = INITVALUE, gt12rhsL = INITVALUE, gt13L = INITVALUE, gt13rhsL = INITVALUE;
     CCTK_REAL gt22L = INITVALUE, gt22rhsL = INITVALUE, gt23L = INITVALUE, gt23rhsL = INITVALUE, gt33L = INITVALUE, gt33rhsL = INITVALUE;
+    CCTK_REAL J11L = INITVALUE, J12L = INITVALUE, J13L = INITVALUE, J21L = INITVALUE, J22L = INITVALUE, J23L = INITVALUE;
+    CCTK_REAL J31L = INITVALUE, J32L = INITVALUE, J33L = INITVALUE;
     CCTK_REAL phiL = INITVALUE, phirhsL = INITVALUE;
     CCTK_REAL trKL = INITVALUE, trKrhsL = INITVALUE;
     CCTK_REAL Xt1L = INITVALUE, Xt1rhsL = INITVALUE, Xt2L = INITVALUE, Xt2rhsL = INITVALUE, Xt3L = INITVALUE, Xt3rhsL = INITVALUE;
     /* Declare precomputed derivatives*/
     
     /* Declare derivatives */
-    CCTK_REAL PDMinus1A = INITVALUE;
-    CCTK_REAL PDMinus2A = INITVALUE;
-    CCTK_REAL PDMinus3A = INITVALUE;
-    CCTK_REAL PDMinus1alpha = INITVALUE;
-    CCTK_REAL PDMinus2alpha = INITVALUE;
-    CCTK_REAL PDMinus3alpha = INITVALUE;
-    CCTK_REAL PDMinus1At11 = INITVALUE;
-    CCTK_REAL PDMinus2At11 = INITVALUE;
-    CCTK_REAL PDMinus3At11 = INITVALUE;
-    CCTK_REAL PDMinus1At12 = INITVALUE;
-    CCTK_REAL PDMinus2At12 = INITVALUE;
-    CCTK_REAL PDMinus3At12 = INITVALUE;
-    CCTK_REAL PDMinus1At13 = INITVALUE;
-    CCTK_REAL PDMinus2At13 = INITVALUE;
-    CCTK_REAL PDMinus3At13 = INITVALUE;
-    CCTK_REAL PDMinus1At22 = INITVALUE;
-    CCTK_REAL PDMinus2At22 = INITVALUE;
-    CCTK_REAL PDMinus3At22 = INITVALUE;
-    CCTK_REAL PDMinus1At23 = INITVALUE;
-    CCTK_REAL PDMinus2At23 = INITVALUE;
-    CCTK_REAL PDMinus3At23 = INITVALUE;
-    CCTK_REAL PDMinus1At33 = INITVALUE;
-    CCTK_REAL PDMinus2At33 = INITVALUE;
-    CCTK_REAL PDMinus3At33 = INITVALUE;
-    CCTK_REAL PDMinus1B1 = INITVALUE;
-    CCTK_REAL PDMinus2B1 = INITVALUE;
-    CCTK_REAL PDMinus3B1 = INITVALUE;
-    CCTK_REAL PDMinus1B2 = INITVALUE;
-    CCTK_REAL PDMinus2B2 = INITVALUE;
-    CCTK_REAL PDMinus3B2 = INITVALUE;
-    CCTK_REAL PDMinus1B3 = INITVALUE;
-    CCTK_REAL PDMinus2B3 = INITVALUE;
-    CCTK_REAL PDMinus3B3 = INITVALUE;
-    CCTK_REAL PDMinus1beta1 = INITVALUE;
-    CCTK_REAL PDMinus2beta1 = INITVALUE;
-    CCTK_REAL PDMinus3beta1 = INITVALUE;
-    CCTK_REAL PDMinus1beta2 = INITVALUE;
-    CCTK_REAL PDMinus2beta2 = INITVALUE;
-    CCTK_REAL PDMinus3beta2 = INITVALUE;
-    CCTK_REAL PDMinus1beta3 = INITVALUE;
-    CCTK_REAL PDMinus2beta3 = INITVALUE;
-    CCTK_REAL PDMinus3beta3 = INITVALUE;
-    CCTK_REAL PDMinus1gt11 = INITVALUE;
-    CCTK_REAL PDMinus2gt11 = INITVALUE;
-    CCTK_REAL PDMinus3gt11 = INITVALUE;
-    CCTK_REAL PDMinus1gt12 = INITVALUE;
-    CCTK_REAL PDMinus2gt12 = INITVALUE;
-    CCTK_REAL PDMinus3gt12 = INITVALUE;
-    CCTK_REAL PDMinus1gt13 = INITVALUE;
-    CCTK_REAL PDMinus2gt13 = INITVALUE;
-    CCTK_REAL PDMinus3gt13 = INITVALUE;
-    CCTK_REAL PDMinus1gt22 = INITVALUE;
-    CCTK_REAL PDMinus2gt22 = INITVALUE;
-    CCTK_REAL PDMinus3gt22 = INITVALUE;
-    CCTK_REAL PDMinus1gt23 = INITVALUE;
-    CCTK_REAL PDMinus2gt23 = INITVALUE;
-    CCTK_REAL PDMinus3gt23 = INITVALUE;
-    CCTK_REAL PDMinus1gt33 = INITVALUE;
-    CCTK_REAL PDMinus2gt33 = INITVALUE;
-    CCTK_REAL PDMinus3gt33 = INITVALUE;
-    CCTK_REAL PDMinus1phi = INITVALUE;
-    CCTK_REAL PDMinus2phi = INITVALUE;
-    CCTK_REAL PDMinus3phi = INITVALUE;
-    CCTK_REAL PDMinus1trK = INITVALUE;
-    CCTK_REAL PDMinus2trK = INITVALUE;
-    CCTK_REAL PDMinus3trK = INITVALUE;
-    CCTK_REAL PDMinus1Xt1 = INITVALUE;
-    CCTK_REAL PDMinus2Xt1 = INITVALUE;
-    CCTK_REAL PDMinus3Xt1 = INITVALUE;
-    CCTK_REAL PDMinus1Xt2 = INITVALUE;
-    CCTK_REAL PDMinus2Xt2 = INITVALUE;
-    CCTK_REAL PDMinus3Xt2 = INITVALUE;
-    CCTK_REAL PDMinus1Xt3 = INITVALUE;
-    CCTK_REAL PDMinus2Xt3 = INITVALUE;
-    CCTK_REAL PDMinus3Xt3 = INITVALUE;
     
     /* Assign local copies of grid functions */
     AL = A[index];
@@ -233,6 +155,15 @@ void ML_BSSN_MP_RHSBoundary_Body(cGH const * const cctkGH, CCTK_INT const dir, C
     gt22L = gt22[index];
     gt23L = gt23[index];
     gt33L = gt33[index];
+    J11L = J11[index];
+    J12L = J12[index];
+    J13L = J13[index];
+    J21L = J21[index];
+    J22L = J22[index];
+    J23L = J23[index];
+    J31L = J31[index];
+    J32L = J32[index];
+    J33L = J33[index];
     phiL = phi[index];
     trKL = trK[index];
     Xt1L = Xt1[index];
@@ -244,85 +175,16 @@ void ML_BSSN_MP_RHSBoundary_Body(cGH const * const cctkGH, CCTK_INT const dir, C
     /* Include user supplied include files */
     
     /* Precompute derivatives (new style) */
-    PDMinus1A = PDMinus1(A, i, j, k);
-    PDMinus2A = PDMinus2(A, i, j, k);
-    PDMinus3A = PDMinus3(A, i, j, k);
-    PDMinus1alpha = PDMinus1(alpha, i, j, k);
-    PDMinus2alpha = PDMinus2(alpha, i, j, k);
-    PDMinus3alpha = PDMinus3(alpha, i, j, k);
-    PDMinus1At11 = PDMinus1(At11, i, j, k);
-    PDMinus2At11 = PDMinus2(At11, i, j, k);
-    PDMinus3At11 = PDMinus3(At11, i, j, k);
-    PDMinus1At12 = PDMinus1(At12, i, j, k);
-    PDMinus2At12 = PDMinus2(At12, i, j, k);
-    PDMinus3At12 = PDMinus3(At12, i, j, k);
-    PDMinus1At13 = PDMinus1(At13, i, j, k);
-    PDMinus2At13 = PDMinus2(At13, i, j, k);
-    PDMinus3At13 = PDMinus3(At13, i, j, k);
-    PDMinus1At22 = PDMinus1(At22, i, j, k);
-    PDMinus2At22 = PDMinus2(At22, i, j, k);
-    PDMinus3At22 = PDMinus3(At22, i, j, k);
-    PDMinus1At23 = PDMinus1(At23, i, j, k);
-    PDMinus2At23 = PDMinus2(At23, i, j, k);
-    PDMinus3At23 = PDMinus3(At23, i, j, k);
-    PDMinus1At33 = PDMinus1(At33, i, j, k);
-    PDMinus2At33 = PDMinus2(At33, i, j, k);
-    PDMinus3At33 = PDMinus3(At33, i, j, k);
-    PDMinus1B1 = PDMinus1(B1, i, j, k);
-    PDMinus2B1 = PDMinus2(B1, i, j, k);
-    PDMinus3B1 = PDMinus3(B1, i, j, k);
-    PDMinus1B2 = PDMinus1(B2, i, j, k);
-    PDMinus2B2 = PDMinus2(B2, i, j, k);
-    PDMinus3B2 = PDMinus3(B2, i, j, k);
-    PDMinus1B3 = PDMinus1(B3, i, j, k);
-    PDMinus2B3 = PDMinus2(B3, i, j, k);
-    PDMinus3B3 = PDMinus3(B3, i, j, k);
-    PDMinus1beta1 = PDMinus1(beta1, i, j, k);
-    PDMinus2beta1 = PDMinus2(beta1, i, j, k);
-    PDMinus3beta1 = PDMinus3(beta1, i, j, k);
-    PDMinus1beta2 = PDMinus1(beta2, i, j, k);
-    PDMinus2beta2 = PDMinus2(beta2, i, j, k);
-    PDMinus3beta2 = PDMinus3(beta2, i, j, k);
-    PDMinus1beta3 = PDMinus1(beta3, i, j, k);
-    PDMinus2beta3 = PDMinus2(beta3, i, j, k);
-    PDMinus3beta3 = PDMinus3(beta3, i, j, k);
-    PDMinus1gt11 = PDMinus1(gt11, i, j, k);
-    PDMinus2gt11 = PDMinus2(gt11, i, j, k);
-    PDMinus3gt11 = PDMinus3(gt11, i, j, k);
-    PDMinus1gt12 = PDMinus1(gt12, i, j, k);
-    PDMinus2gt12 = PDMinus2(gt12, i, j, k);
-    PDMinus3gt12 = PDMinus3(gt12, i, j, k);
-    PDMinus1gt13 = PDMinus1(gt13, i, j, k);
-    PDMinus2gt13 = PDMinus2(gt13, i, j, k);
-    PDMinus3gt13 = PDMinus3(gt13, i, j, k);
-    PDMinus1gt22 = PDMinus1(gt22, i, j, k);
-    PDMinus2gt22 = PDMinus2(gt22, i, j, k);
-    PDMinus3gt22 = PDMinus3(gt22, i, j, k);
-    PDMinus1gt23 = PDMinus1(gt23, i, j, k);
-    PDMinus2gt23 = PDMinus2(gt23, i, j, k);
-    PDMinus3gt23 = PDMinus3(gt23, i, j, k);
-    PDMinus1gt33 = PDMinus1(gt33, i, j, k);
-    PDMinus2gt33 = PDMinus2(gt33, i, j, k);
-    PDMinus3gt33 = PDMinus3(gt33, i, j, k);
-    PDMinus1phi = PDMinus1(phi, i, j, k);
-    PDMinus2phi = PDMinus2(phi, i, j, k);
-    PDMinus3phi = PDMinus3(phi, i, j, k);
-    PDMinus1trK = PDMinus1(trK, i, j, k);
-    PDMinus2trK = PDMinus2(trK, i, j, k);
-    PDMinus3trK = PDMinus3(trK, i, j, k);
-    PDMinus1Xt1 = PDMinus1(Xt1, i, j, k);
-    PDMinus2Xt1 = PDMinus2(Xt1, i, j, k);
-    PDMinus3Xt1 = PDMinus3(Xt1, i, j, k);
-    PDMinus1Xt2 = PDMinus1(Xt2, i, j, k);
-    PDMinus2Xt2 = PDMinus2(Xt2, i, j, k);
-    PDMinus3Xt2 = PDMinus3(Xt2, i, j, k);
-    PDMinus1Xt3 = PDMinus1(Xt3, i, j, k);
-    PDMinus2Xt3 = PDMinus2(Xt3, i, j, k);
-    PDMinus3Xt3 = PDMinus3(Xt3, i, j, k);
     
     /* Precompute derivatives (old style) */
     
     /* Calculate temporaries and grid functions */
+    dir1  =  Sign(normal[0]);
+    
+    dir2  =  Sign(normal[1]);
+    
+    dir3  =  Sign(normal[2]);
+    
     detgt  =  1;
     
     gtu11  =  INV(detgt)*(gt22L*gt33L - SQR(gt23L));
@@ -375,55 +237,105 @@ void ML_BSSN_MP_RHSBoundary_Body(cGH const * const cctkGH, CCTK_INT const dir, C
     
     vg  =  pow(harmonicF,0.5);
     
-    phirhsL  =  -((PDMinus1phi*su1 + PDMinus2phi*su2 + PDMinus3phi*su3)*vg);
+    phirhsL  =  -((PDonesided1(phi, i, j, k)*(J11L*su1 + J12L*su2 + J13L*su3) + 
+            PDonesided2(phi, i, j, k)*(J21L*su1 + J22L*su2 + J23L*su3) + 
+            PDonesided3(phi, i, j, k)*(J31L*su1 + J32L*su2 + J33L*su3))*vg);
     
-    gt11rhsL  =  -(PDMinus1gt11*su1) - PDMinus2gt11*su2 - PDMinus3gt11*su3;
+    gt11rhsL  =  -(PDonesided1(gt11, i, j, k)*(J11L*su1 + J12L*su2 + J13L*su3)) - 
+        PDonesided2(gt11, i, j, k)*(J21L*su1 + J22L*su2 + J23L*su3) - 
+        PDonesided3(gt11, i, j, k)*(J31L*su1 + J32L*su2 + J33L*su3);
     
-    gt12rhsL  =  -(PDMinus1gt12*su1) - PDMinus2gt12*su2 - PDMinus3gt12*su3;
+    gt12rhsL  =  -(PDonesided1(gt12, i, j, k)*(J11L*su1 + J12L*su2 + J13L*su3)) - 
+        PDonesided2(gt12, i, j, k)*(J21L*su1 + J22L*su2 + J23L*su3) - 
+        PDonesided3(gt12, i, j, k)*(J31L*su1 + J32L*su2 + J33L*su3);
     
-    gt13rhsL  =  -(PDMinus1gt13*su1) - PDMinus2gt13*su2 - PDMinus3gt13*su3;
+    gt13rhsL  =  -(PDonesided1(gt13, i, j, k)*(J11L*su1 + J12L*su2 + J13L*su3)) - 
+        PDonesided2(gt13, i, j, k)*(J21L*su1 + J22L*su2 + J23L*su3) - 
+        PDonesided3(gt13, i, j, k)*(J31L*su1 + J32L*su2 + J33L*su3);
     
-    gt22rhsL  =  -(PDMinus1gt22*su1) - PDMinus2gt22*su2 - PDMinus3gt22*su3;
+    gt22rhsL  =  -(PDonesided1(gt22, i, j, k)*(J11L*su1 + J12L*su2 + J13L*su3)) - 
+        PDonesided2(gt22, i, j, k)*(J21L*su1 + J22L*su2 + J23L*su3) - 
+        PDonesided3(gt22, i, j, k)*(J31L*su1 + J32L*su2 + J33L*su3);
     
-    gt23rhsL  =  -(PDMinus1gt23*su1) - PDMinus2gt23*su2 - PDMinus3gt23*su3;
+    gt23rhsL  =  -(PDonesided1(gt23, i, j, k)*(J11L*su1 + J12L*su2 + J13L*su3)) - 
+        PDonesided2(gt23, i, j, k)*(J21L*su1 + J22L*su2 + J23L*su3) - 
+        PDonesided3(gt23, i, j, k)*(J31L*su1 + J32L*su2 + J33L*su3);
     
-    gt33rhsL  =  -(PDMinus1gt33*su1) - PDMinus2gt33*su2 - PDMinus3gt33*su3;
+    gt33rhsL  =  -(PDonesided1(gt33, i, j, k)*(J11L*su1 + J12L*su2 + J13L*su3)) - 
+        PDonesided2(gt33, i, j, k)*(J21L*su1 + J22L*su2 + J23L*su3) - 
+        PDonesided3(gt33, i, j, k)*(J31L*su1 + J32L*su2 + J33L*su3);
     
-    trKrhsL  =  -((PDMinus1trK*su1 + PDMinus2trK*su2 + PDMinus3trK*su3)*vg);
+    trKrhsL  =  -((PDonesided1(trK, i, j, k)*(J11L*su1 + J12L*su2 + J13L*su3) + 
+            PDonesided2(trK, i, j, k)*(J21L*su1 + J22L*su2 + J23L*su3) + 
+            PDonesided3(trK, i, j, k)*(J31L*su1 + J32L*su2 + J33L*su3))*vg);
     
-    At11rhsL  =  -(PDMinus1At11*su1) - PDMinus2At11*su2 - PDMinus3At11*su3;
+    At11rhsL  =  -(PDonesided1(At11, i, j, k)*(J11L*su1 + J12L*su2 + J13L*su3)) - 
+        PDonesided2(At11, i, j, k)*(J21L*su1 + J22L*su2 + J23L*su3) - 
+        PDonesided3(At11, i, j, k)*(J31L*su1 + J32L*su2 + J33L*su3);
     
-    At12rhsL  =  -(PDMinus1At12*su1) - PDMinus2At12*su2 - PDMinus3At12*su3;
+    At12rhsL  =  -(PDonesided1(At12, i, j, k)*(J11L*su1 + J12L*su2 + J13L*su3)) - 
+        PDonesided2(At12, i, j, k)*(J21L*su1 + J22L*su2 + J23L*su3) - 
+        PDonesided3(At12, i, j, k)*(J31L*su1 + J32L*su2 + J33L*su3);
     
-    At13rhsL  =  -(PDMinus1At13*su1) - PDMinus2At13*su2 - PDMinus3At13*su3;
+    At13rhsL  =  -(PDonesided1(At13, i, j, k)*(J11L*su1 + J12L*su2 + J13L*su3)) - 
+        PDonesided2(At13, i, j, k)*(J21L*su1 + J22L*su2 + J23L*su3) - 
+        PDonesided3(At13, i, j, k)*(J31L*su1 + J32L*su2 + J33L*su3);
     
-    At22rhsL  =  -(PDMinus1At22*su1) - PDMinus2At22*su2 - PDMinus3At22*su3;
+    At22rhsL  =  -(PDonesided1(At22, i, j, k)*(J11L*su1 + J12L*su2 + J13L*su3)) - 
+        PDonesided2(At22, i, j, k)*(J21L*su1 + J22L*su2 + J23L*su3) - 
+        PDonesided3(At22, i, j, k)*(J31L*su1 + J32L*su2 + J33L*su3);
     
-    At23rhsL  =  -(PDMinus1At23*su1) - PDMinus2At23*su2 - PDMinus3At23*su3;
+    At23rhsL  =  -(PDonesided1(At23, i, j, k)*(J11L*su1 + J12L*su2 + J13L*su3)) - 
+        PDonesided2(At23, i, j, k)*(J21L*su1 + J22L*su2 + J23L*su3) - 
+        PDonesided3(At23, i, j, k)*(J31L*su1 + J32L*su2 + J33L*su3);
     
-    At33rhsL  =  -(PDMinus1At33*su1) - PDMinus2At33*su2 - PDMinus3At33*su3;
+    At33rhsL  =  -(PDonesided1(At33, i, j, k)*(J11L*su1 + J12L*su2 + J13L*su3)) - 
+        PDonesided2(At33, i, j, k)*(J21L*su1 + J22L*su2 + J23L*su3) - 
+        PDonesided3(At33, i, j, k)*(J31L*su1 + J32L*su2 + J33L*su3);
     
-    Xt1rhsL  =  -(PDMinus1Xt1*su1) - PDMinus2Xt1*su2 - PDMinus3Xt1*su3;
+    Xt1rhsL  =  -(PDonesided1(Xt1, i, j, k)*(J11L*su1 + J12L*su2 + J13L*su3)) - 
+        PDonesided2(Xt1, i, j, k)*(J21L*su1 + J22L*su2 + J23L*su3) - 
+        PDonesided3(Xt1, i, j, k)*(J31L*su1 + J32L*su2 + J33L*su3);
     
-    Xt2rhsL  =  -(PDMinus1Xt2*su1) - PDMinus2Xt2*su2 - PDMinus3Xt2*su3;
+    Xt2rhsL  =  -(PDonesided1(Xt2, i, j, k)*(J11L*su1 + J12L*su2 + J13L*su3)) - 
+        PDonesided2(Xt2, i, j, k)*(J21L*su1 + J22L*su2 + J23L*su3) - 
+        PDonesided3(Xt2, i, j, k)*(J31L*su1 + J32L*su2 + J33L*su3);
     
-    Xt3rhsL  =  -(PDMinus1Xt3*su1) - PDMinus2Xt3*su2 - PDMinus3Xt3*su3;
+    Xt3rhsL  =  -(PDonesided1(Xt3, i, j, k)*(J11L*su1 + J12L*su2 + J13L*su3)) - 
+        PDonesided2(Xt3, i, j, k)*(J21L*su1 + J22L*su2 + J23L*su3) - 
+        PDonesided3(Xt3, i, j, k)*(J31L*su1 + J32L*su2 + J33L*su3);
     
-    alpharhsL  =  -((PDMinus1alpha*su1 + PDMinus2alpha*su2 + PDMinus3alpha*su3)*vg);
+    alpharhsL  =  -((PDonesided1(alpha, i, j, k)*(J11L*su1 + J12L*su2 + J13L*su3) + 
+            PDonesided2(alpha, i, j, k)*(J21L*su1 + J22L*su2 + J23L*su3) + 
+            PDonesided3(alpha, i, j, k)*(J31L*su1 + J32L*su2 + J33L*su3))*vg);
     
-    ArhsL  =  -((PDMinus1A*su1 + PDMinus2A*su2 + PDMinus3A*su3)*vg);
+    ArhsL  =  -((PDonesided1(A, i, j, k)*(J11L*su1 + J12L*su2 + J13L*su3) + 
+            PDonesided2(A, i, j, k)*(J21L*su1 + J22L*su2 + J23L*su3) + 
+            PDonesided3(A, i, j, k)*(J31L*su1 + J32L*su2 + J33L*su3))*vg);
     
-    beta1rhsL  =  -(PDMinus1beta1*su1) - PDMinus2beta1*su2 - PDMinus3beta1*su3;
+    beta1rhsL  =  -(PDonesided1(beta1, i, j, k)*(J11L*su1 + J12L*su2 + J13L*su3)) - 
+        PDonesided2(beta1, i, j, k)*(J21L*su1 + J22L*su2 + J23L*su3) - 
+        PDonesided3(beta1, i, j, k)*(J31L*su1 + J32L*su2 + J33L*su3);
     
-    beta2rhsL  =  -(PDMinus1beta2*su1) - PDMinus2beta2*su2 - PDMinus3beta2*su3;
+    beta2rhsL  =  -(PDonesided1(beta2, i, j, k)*(J11L*su1 + J12L*su2 + J13L*su3)) - 
+        PDonesided2(beta2, i, j, k)*(J21L*su1 + J22L*su2 + J23L*su3) - 
+        PDonesided3(beta2, i, j, k)*(J31L*su1 + J32L*su2 + J33L*su3);
     
-    beta3rhsL  =  -(PDMinus1beta3*su1) - PDMinus2beta3*su2 - PDMinus3beta3*su3;
+    beta3rhsL  =  -(PDonesided1(beta3, i, j, k)*(J11L*su1 + J12L*su2 + J13L*su3)) - 
+        PDonesided2(beta3, i, j, k)*(J21L*su1 + J22L*su2 + J23L*su3) - 
+        PDonesided3(beta3, i, j, k)*(J31L*su1 + J32L*su2 + J33L*su3);
     
-    B1rhsL  =  -(PDMinus1B1*su1) - PDMinus2B1*su2 - PDMinus3B1*su3;
+    B1rhsL  =  -(PDonesided1(B1, i, j, k)*(J11L*su1 + J12L*su2 + J13L*su3)) - 
+        PDonesided2(B1, i, j, k)*(J21L*su1 + J22L*su2 + J23L*su3) - 
+        PDonesided3(B1, i, j, k)*(J31L*su1 + J32L*su2 + J33L*su3);
     
-    B2rhsL  =  -(PDMinus1B2*su1) - PDMinus2B2*su2 - PDMinus3B2*su3;
+    B2rhsL  =  -(PDonesided1(B2, i, j, k)*(J11L*su1 + J12L*su2 + J13L*su3)) - 
+        PDonesided2(B2, i, j, k)*(J21L*su1 + J22L*su2 + J23L*su3) - 
+        PDonesided3(B2, i, j, k)*(J31L*su1 + J32L*su2 + J33L*su3);
     
-    B3rhsL  =  -(PDMinus1B3*su1) - PDMinus2B3*su2 - PDMinus3B3*su3;
+    B3rhsL  =  -(PDonesided1(B3, i, j, k)*(J11L*su1 + J12L*su2 + J13L*su3)) - 
+        PDonesided2(B3, i, j, k)*(J21L*su1 + J22L*su2 + J23L*su3) - 
+        PDonesided3(B3, i, j, k)*(J31L*su1 + J32L*su2 + J33L*su3);
     
     
     /* Copy local copies back to grid functions */
@@ -460,8 +372,8 @@ void ML_BSSN_MP_RHSBoundary_Body(cGH const * const cctkGH, CCTK_INT const dir, C
 
 void ML_BSSN_MP_RHSBoundary(CCTK_ARGUMENTS)
 {
-  DECLARE_CCTK_ARGUMENTS
-  DECLARE_CCTK_PARAMETERS
+  DECLARE_CCTK_ARGUMENTS;
+  DECLARE_CCTK_PARAMETERS;
   
   GenericFD_LoopOverBoundary(cctkGH, &ML_BSSN_MP_RHSBoundary_Body);
 }
diff --git a/ML_BSSN_MP/src/ML_BSSN_MP_boundary.c b/ML_BSSN_MP/src/ML_BSSN_MP_boundary.c
index 3c591e6..818b730 100644
--- a/ML_BSSN_MP/src/ML_BSSN_MP_boundary.c
+++ b/ML_BSSN_MP/src/ML_BSSN_MP_boundary.c
@@ -1,5 +1,5 @@
-/*  File produced by user diener */
-/*  Produced with Mathematica Version 6.0 for Linux x86 (32-bit) (April 20, 2007) */
+/*  File produced by user eschnett */
+/*  Produced with Mathematica Version 6.0 for Mac OS X x86 (64-bit) (May 21, 2008) */
 
 /*  Mathematica script written by Ian Hinder and Sascha Husa */
 
@@ -25,8 +25,8 @@
 
 void ML_BSSN_MP_boundary_Body(cGH const * const cctkGH, CCTK_INT const dir, CCTK_INT const face, CCTK_REAL const normal[3], CCTK_REAL const tangentA[3], CCTK_REAL const tangentB[3], CCTK_INT const min[3], CCTK_INT const max[3], CCTK_INT const n_subblock_gfs, CCTK_REAL * const subblock_gfs[])
 {
-  DECLARE_CCTK_ARGUMENTS
-  DECLARE_CCTK_PARAMETERS
+  DECLARE_CCTK_ARGUMENTS;
+  DECLARE_CCTK_PARAMETERS;
   
   
   /* Declare finite differencing variables */
@@ -43,15 +43,12 @@ void ML_BSSN_MP_boundary_Body(cGH const * const cctkGH, CCTK_INT const dir, CCTK
   CCTK_REAL p1o144dxdy = INITVALUE;
   CCTK_REAL p1o144dxdz = INITVALUE;
   CCTK_REAL p1o144dydz = INITVALUE;
-  CCTK_REAL p1o2dx = INITVALUE;
-  CCTK_REAL p1o2dy = INITVALUE;
-  CCTK_REAL p1o2dz = INITVALUE;
+  CCTK_REAL p1odx = INITVALUE;
+  CCTK_REAL p1ody = INITVALUE;
+  CCTK_REAL p1odz = INITVALUE;
   CCTK_REAL pm1o12dx2 = INITVALUE;
   CCTK_REAL pm1o12dy2 = INITVALUE;
   CCTK_REAL pm1o12dz2 = INITVALUE;
-  CCTK_REAL pm1o2dx = INITVALUE;
-  CCTK_REAL pm1o2dy = INITVALUE;
-  CCTK_REAL pm1o2dz = INITVALUE;
   
   if (verbose > 1)
   {
@@ -88,21 +85,18 @@ void ML_BSSN_MP_boundary_Body(cGH const * const cctkGH, CCTK_INT const dir, CCTK
   p1o144dxdy = (INV(dx)*INV(dy))/144.;
   p1o144dxdz = (INV(dx)*INV(dz))/144.;
   p1o144dydz = (INV(dy)*INV(dz))/144.;
-  p1o2dx = khalf*INV(dx);
-  p1o2dy = khalf*INV(dy);
-  p1o2dz = khalf*INV(dz);
+  p1odx = INV(dx);
+  p1ody = INV(dy);
+  p1odz = INV(dz);
   pm1o12dx2 = -pow(dx,-2)/12.;
   pm1o12dy2 = -pow(dy,-2)/12.;
   pm1o12dz2 = -pow(dz,-2)/12.;
-  pm1o2dx = -(khalf*INV(dx));
-  pm1o2dy = -(khalf*INV(dy));
-  pm1o2dz = -(khalf*INV(dz));
   
   /* Loop over the grid points */
   #pragma omp parallel
   LC_LOOP3 (ML_BSSN_MP_boundary,
             i,j,k, min[0],min[1],min[2], max[0],max[1],max[2],
-            cctk_lsh[0],cctk_lsh[1],cctk_lsh[2])
+            cctk_lssh[CCTK_LSSH_IDX(0,0)],cctk_lssh[CCTK_LSSH_IDX(0,1)],cctk_lssh[CCTK_LSSH_IDX(0,2)])
   {
     int index = INITVALUE;
     int subblock_index = INITVALUE;
@@ -221,8 +215,8 @@ void ML_BSSN_MP_boundary_Body(cGH const * const cctkGH, CCTK_INT const dir, CCTK
 
 void ML_BSSN_MP_boundary(CCTK_ARGUMENTS)
 {
-  DECLARE_CCTK_ARGUMENTS
-  DECLARE_CCTK_PARAMETERS
+  DECLARE_CCTK_ARGUMENTS;
+  DECLARE_CCTK_PARAMETERS;
   
   GenericFD_LoopOverBoundaryWithGhosts(cctkGH, &ML_BSSN_MP_boundary_Body);
 }
diff --git a/ML_BSSN_MP/src/ML_BSSN_MP_constraints.c b/ML_BSSN_MP/src/ML_BSSN_MP_constraints.c
index ec061f0..9ae9a43 100644
--- a/ML_BSSN_MP/src/ML_BSSN_MP_constraints.c
+++ b/ML_BSSN_MP/src/ML_BSSN_MP_constraints.c
@@ -1,5 +1,5 @@
-/*  File produced by user diener */
-/*  Produced with Mathematica Version 6.0 for Linux x86 (32-bit) (April 20, 2007) */
+/*  File produced by user eschnett */
+/*  Produced with Mathematica Version 6.0 for Mac OS X x86 (64-bit) (May 21, 2008) */
 
 /*  Mathematica script written by Ian Hinder and Sascha Husa */
 
@@ -25,8 +25,8 @@
 
 void ML_BSSN_MP_constraints_Body(cGH const * const cctkGH, CCTK_INT const dir, CCTK_INT const face, CCTK_REAL const normal[3], CCTK_REAL const tangentA[3], CCTK_REAL const tangentB[3], CCTK_INT const min[3], CCTK_INT const max[3], CCTK_INT const n_subblock_gfs, CCTK_REAL * const subblock_gfs[])
 {
-  DECLARE_CCTK_ARGUMENTS
-  DECLARE_CCTK_PARAMETERS
+  DECLARE_CCTK_ARGUMENTS;
+  DECLARE_CCTK_PARAMETERS;
   
   
   /* Declare finite differencing variables */
@@ -43,15 +43,12 @@ void ML_BSSN_MP_constraints_Body(cGH const * const cctkGH, CCTK_INT const dir, C
   CCTK_REAL p1o144dxdy = INITVALUE;
   CCTK_REAL p1o144dxdz = INITVALUE;
   CCTK_REAL p1o144dydz = INITVALUE;
-  CCTK_REAL p1o2dx = INITVALUE;
-  CCTK_REAL p1o2dy = INITVALUE;
-  CCTK_REAL p1o2dz = INITVALUE;
+  CCTK_REAL p1odx = INITVALUE;
+  CCTK_REAL p1ody = INITVALUE;
+  CCTK_REAL p1odz = INITVALUE;
   CCTK_REAL pm1o12dx2 = INITVALUE;
   CCTK_REAL pm1o12dy2 = INITVALUE;
   CCTK_REAL pm1o12dz2 = INITVALUE;
-  CCTK_REAL pm1o2dx = INITVALUE;
-  CCTK_REAL pm1o2dy = INITVALUE;
-  CCTK_REAL pm1o2dz = INITVALUE;
   
   if (verbose > 1)
   {
@@ -88,21 +85,18 @@ void ML_BSSN_MP_constraints_Body(cGH const * const cctkGH, CCTK_INT const dir, C
   p1o144dxdy = (INV(dx)*INV(dy))/144.;
   p1o144dxdz = (INV(dx)*INV(dz))/144.;
   p1o144dydz = (INV(dy)*INV(dz))/144.;
-  p1o2dx = khalf*INV(dx);
-  p1o2dy = khalf*INV(dy);
-  p1o2dz = khalf*INV(dz);
+  p1odx = INV(dx);
+  p1ody = INV(dy);
+  p1odz = INV(dz);
   pm1o12dx2 = -pow(dx,-2)/12.;
   pm1o12dy2 = -pow(dy,-2)/12.;
   pm1o12dz2 = -pow(dz,-2)/12.;
-  pm1o2dx = -(khalf*INV(dx));
-  pm1o2dy = -(khalf*INV(dy));
-  pm1o2dz = -(khalf*INV(dz));
   
   /* Loop over the grid points */
   #pragma omp parallel
   LC_LOOP3 (ML_BSSN_MP_constraints,
             i,j,k, min[0],min[1],min[2], max[0],max[1],max[2],
-            cctk_lsh[0],cctk_lsh[1],cctk_lsh[2])
+            cctk_lssh[CCTK_LSSH_IDX(0,0)],cctk_lssh[CCTK_LSSH_IDX(0,1)],cctk_lssh[CCTK_LSSH_IDX(0,2)])
   {
     int index = INITVALUE;
     int subblock_index = INITVALUE;
@@ -170,10 +164,7 @@ void ML_BSSN_MP_constraints_Body(cGH const * const cctkGH, CCTK_INT const dir, C
     CCTK_REAL PDstandardNth33gt11 = INITVALUE;
     CCTK_REAL PDstandardNth12gt11 = INITVALUE;
     CCTK_REAL PDstandardNth13gt11 = INITVALUE;
-    CCTK_REAL PDstandardNth21gt11 = INITVALUE;
     CCTK_REAL PDstandardNth23gt11 = INITVALUE;
-    CCTK_REAL PDstandardNth31gt11 = INITVALUE;
-    CCTK_REAL PDstandardNth32gt11 = INITVALUE;
     CCTK_REAL PDstandardNth1gt12 = INITVALUE;
     CCTK_REAL PDstandardNth2gt12 = INITVALUE;
     CCTK_REAL PDstandardNth3gt12 = INITVALUE;
@@ -182,10 +173,7 @@ void ML_BSSN_MP_constraints_Body(cGH const * const cctkGH, CCTK_INT const dir, C
     CCTK_REAL PDstandardNth33gt12 = INITVALUE;
     CCTK_REAL PDstandardNth12gt12 = INITVALUE;
     CCTK_REAL PDstandardNth13gt12 = INITVALUE;
-    CCTK_REAL PDstandardNth21gt12 = INITVALUE;
     CCTK_REAL PDstandardNth23gt12 = INITVALUE;
-    CCTK_REAL PDstandardNth31gt12 = INITVALUE;
-    CCTK_REAL PDstandardNth32gt12 = INITVALUE;
     CCTK_REAL PDstandardNth1gt13 = INITVALUE;
     CCTK_REAL PDstandardNth2gt13 = INITVALUE;
     CCTK_REAL PDstandardNth3gt13 = INITVALUE;
@@ -194,10 +182,7 @@ void ML_BSSN_MP_constraints_Body(cGH const * const cctkGH, CCTK_INT const dir, C
     CCTK_REAL PDstandardNth33gt13 = INITVALUE;
     CCTK_REAL PDstandardNth12gt13 = INITVALUE;
     CCTK_REAL PDstandardNth13gt13 = INITVALUE;
-    CCTK_REAL PDstandardNth21gt13 = INITVALUE;
     CCTK_REAL PDstandardNth23gt13 = INITVALUE;
-    CCTK_REAL PDstandardNth31gt13 = INITVALUE;
-    CCTK_REAL PDstandardNth32gt13 = INITVALUE;
     CCTK_REAL PDstandardNth1gt22 = INITVALUE;
     CCTK_REAL PDstandardNth2gt22 = INITVALUE;
     CCTK_REAL PDstandardNth3gt22 = INITVALUE;
@@ -206,10 +191,7 @@ void ML_BSSN_MP_constraints_Body(cGH const * const cctkGH, CCTK_INT const dir, C
     CCTK_REAL PDstandardNth33gt22 = INITVALUE;
     CCTK_REAL PDstandardNth12gt22 = INITVALUE;
     CCTK_REAL PDstandardNth13gt22 = INITVALUE;
-    CCTK_REAL PDstandardNth21gt22 = INITVALUE;
     CCTK_REAL PDstandardNth23gt22 = INITVALUE;
-    CCTK_REAL PDstandardNth31gt22 = INITVALUE;
-    CCTK_REAL PDstandardNth32gt22 = INITVALUE;
     CCTK_REAL PDstandardNth1gt23 = INITVALUE;
     CCTK_REAL PDstandardNth2gt23 = INITVALUE;
     CCTK_REAL PDstandardNth3gt23 = INITVALUE;
@@ -218,10 +200,7 @@ void ML_BSSN_MP_constraints_Body(cGH const * const cctkGH, CCTK_INT const dir, C
     CCTK_REAL PDstandardNth33gt23 = INITVALUE;
     CCTK_REAL PDstandardNth12gt23 = INITVALUE;
     CCTK_REAL PDstandardNth13gt23 = INITVALUE;
-    CCTK_REAL PDstandardNth21gt23 = INITVALUE;
     CCTK_REAL PDstandardNth23gt23 = INITVALUE;
-    CCTK_REAL PDstandardNth31gt23 = INITVALUE;
-    CCTK_REAL PDstandardNth32gt23 = INITVALUE;
     CCTK_REAL PDstandardNth1gt33 = INITVALUE;
     CCTK_REAL PDstandardNth2gt33 = INITVALUE;
     CCTK_REAL PDstandardNth3gt33 = INITVALUE;
@@ -230,10 +209,7 @@ void ML_BSSN_MP_constraints_Body(cGH const * const cctkGH, CCTK_INT const dir, C
     CCTK_REAL PDstandardNth33gt33 = INITVALUE;
     CCTK_REAL PDstandardNth12gt33 = INITVALUE;
     CCTK_REAL PDstandardNth13gt33 = INITVALUE;
-    CCTK_REAL PDstandardNth21gt33 = INITVALUE;
     CCTK_REAL PDstandardNth23gt33 = INITVALUE;
-    CCTK_REAL PDstandardNth31gt33 = INITVALUE;
-    CCTK_REAL PDstandardNth32gt33 = INITVALUE;
     CCTK_REAL PDstandardNth1phi = INITVALUE;
     CCTK_REAL PDstandardNth2phi = INITVALUE;
     CCTK_REAL PDstandardNth3phi = INITVALUE;
@@ -242,10 +218,7 @@ void ML_BSSN_MP_constraints_Body(cGH const * const cctkGH, CCTK_INT const dir, C
     CCTK_REAL PDstandardNth33phi = INITVALUE;
     CCTK_REAL PDstandardNth12phi = INITVALUE;
     CCTK_REAL PDstandardNth13phi = INITVALUE;
-    CCTK_REAL PDstandardNth21phi = INITVALUE;
     CCTK_REAL PDstandardNth23phi = INITVALUE;
-    CCTK_REAL PDstandardNth31phi = INITVALUE;
-    CCTK_REAL PDstandardNth32phi = INITVALUE;
     CCTK_REAL PDstandardNth1trK = INITVALUE;
     CCTK_REAL PDstandardNth2trK = INITVALUE;
     CCTK_REAL PDstandardNth3trK = INITVALUE;
@@ -1367,8 +1340,8 @@ void ML_BSSN_MP_constraints_Body(cGH const * const cctkGH, CCTK_INT const dir, C
 
 void ML_BSSN_MP_constraints(CCTK_ARGUMENTS)
 {
-  DECLARE_CCTK_ARGUMENTS
-  DECLARE_CCTK_PARAMETERS
+  DECLARE_CCTK_ARGUMENTS;
+  DECLARE_CCTK_PARAMETERS;
   
   GenericFD_LoopOverInterior(cctkGH, &ML_BSSN_MP_constraints_Body);
 }
diff --git a/ML_BSSN_MP/src/ML_BSSN_MP_constraints_boundary.c b/ML_BSSN_MP/src/ML_BSSN_MP_constraints_boundary.c
index d074866..e711cc4 100644
--- a/ML_BSSN_MP/src/ML_BSSN_MP_constraints_boundary.c
+++ b/ML_BSSN_MP/src/ML_BSSN_MP_constraints_boundary.c
@@ -1,5 +1,5 @@
-/*  File produced by user diener */
-/*  Produced with Mathematica Version 6.0 for Linux x86 (32-bit) (April 20, 2007) */
+/*  File produced by user eschnett */
+/*  Produced with Mathematica Version 6.0 for Mac OS X x86 (64-bit) (May 21, 2008) */
 
 /*  Mathematica script written by Ian Hinder and Sascha Husa */
 
@@ -25,8 +25,8 @@
 
 void ML_BSSN_MP_constraints_boundary_Body(cGH const * const cctkGH, CCTK_INT const dir, CCTK_INT const face, CCTK_REAL const normal[3], CCTK_REAL const tangentA[3], CCTK_REAL const tangentB[3], CCTK_INT const min[3], CCTK_INT const max[3], CCTK_INT const n_subblock_gfs, CCTK_REAL * const subblock_gfs[])
 {
-  DECLARE_CCTK_ARGUMENTS
-  DECLARE_CCTK_PARAMETERS
+  DECLARE_CCTK_ARGUMENTS;
+  DECLARE_CCTK_PARAMETERS;
   
   
   /* Declare finite differencing variables */
@@ -43,15 +43,12 @@ void ML_BSSN_MP_constraints_boundary_Body(cGH const * const cctkGH, CCTK_INT con
   CCTK_REAL p1o144dxdy = INITVALUE;
   CCTK_REAL p1o144dxdz = INITVALUE;
   CCTK_REAL p1o144dydz = INITVALUE;
-  CCTK_REAL p1o2dx = INITVALUE;
-  CCTK_REAL p1o2dy = INITVALUE;
-  CCTK_REAL p1o2dz = INITVALUE;
+  CCTK_REAL p1odx = INITVALUE;
+  CCTK_REAL p1ody = INITVALUE;
+  CCTK_REAL p1odz = INITVALUE;
   CCTK_REAL pm1o12dx2 = INITVALUE;
   CCTK_REAL pm1o12dy2 = INITVALUE;
   CCTK_REAL pm1o12dz2 = INITVALUE;
-  CCTK_REAL pm1o2dx = INITVALUE;
-  CCTK_REAL pm1o2dy = INITVALUE;
-  CCTK_REAL pm1o2dz = INITVALUE;
   
   if (verbose > 1)
   {
@@ -88,21 +85,18 @@ void ML_BSSN_MP_constraints_boundary_Body(cGH const * const cctkGH, CCTK_INT con
   p1o144dxdy = (INV(dx)*INV(dy))/144.;
   p1o144dxdz = (INV(dx)*INV(dz))/144.;
   p1o144dydz = (INV(dy)*INV(dz))/144.;
-  p1o2dx = khalf*INV(dx);
-  p1o2dy = khalf*INV(dy);
-  p1o2dz = khalf*INV(dz);
+  p1odx = INV(dx);
+  p1ody = INV(dy);
+  p1odz = INV(dz);
   pm1o12dx2 = -pow(dx,-2)/12.;
   pm1o12dy2 = -pow(dy,-2)/12.;
   pm1o12dz2 = -pow(dz,-2)/12.;
-  pm1o2dx = -(khalf*INV(dx));
-  pm1o2dy = -(khalf*INV(dy));
-  pm1o2dz = -(khalf*INV(dz));
   
   /* Loop over the grid points */
   #pragma omp parallel
   LC_LOOP3 (ML_BSSN_MP_constraints_boundary,
             i,j,k, min[0],min[1],min[2], max[0],max[1],max[2],
-            cctk_lsh[0],cctk_lsh[1],cctk_lsh[2])
+            cctk_lssh[CCTK_LSSH_IDX(0,0)],cctk_lssh[CCTK_LSSH_IDX(0,1)],cctk_lssh[CCTK_LSSH_IDX(0,2)])
   {
     int index = INITVALUE;
     int subblock_index = INITVALUE;
@@ -151,8 +145,8 @@ void ML_BSSN_MP_constraints_boundary_Body(cGH const * const cctkGH, CCTK_INT con
 
 void ML_BSSN_MP_constraints_boundary(CCTK_ARGUMENTS)
 {
-  DECLARE_CCTK_ARGUMENTS
-  DECLARE_CCTK_PARAMETERS
+  DECLARE_CCTK_ARGUMENTS;
+  DECLARE_CCTK_PARAMETERS;
   
   GenericFD_LoopOverBoundaryWithGhosts(cctkGH, &ML_BSSN_MP_constraints_boundary_Body);
 }
diff --git a/ML_BSSN_MP/src/ML_BSSN_MP_convertFromADMBase.c b/ML_BSSN_MP/src/ML_BSSN_MP_convertFromADMBase.c
index 51ceb9d..3ad0930 100644
--- a/ML_BSSN_MP/src/ML_BSSN_MP_convertFromADMBase.c
+++ b/ML_BSSN_MP/src/ML_BSSN_MP_convertFromADMBase.c
@@ -1,5 +1,5 @@
-/*  File produced by user diener */
-/*  Produced with Mathematica Version 6.0 for Linux x86 (32-bit) (April 20, 2007) */
+/*  File produced by user eschnett */
+/*  Produced with Mathematica Version 6.0 for Mac OS X x86 (64-bit) (May 21, 2008) */
 
 /*  Mathematica script written by Ian Hinder and Sascha Husa */
 
@@ -25,8 +25,8 @@
 
 void ML_BSSN_MP_convertFromADMBase_Body(cGH const * const cctkGH, CCTK_INT const dir, CCTK_INT const face, CCTK_REAL const normal[3], CCTK_REAL const tangentA[3], CCTK_REAL const tangentB[3], CCTK_INT const min[3], CCTK_INT const max[3], CCTK_INT const n_subblock_gfs, CCTK_REAL * const subblock_gfs[])
 {
-  DECLARE_CCTK_ARGUMENTS
-  DECLARE_CCTK_PARAMETERS
+  DECLARE_CCTK_ARGUMENTS;
+  DECLARE_CCTK_PARAMETERS;
   
   
   /* Declare finite differencing variables */
@@ -43,15 +43,12 @@ void ML_BSSN_MP_convertFromADMBase_Body(cGH const * const cctkGH, CCTK_INT const
   CCTK_REAL p1o144dxdy = INITVALUE;
   CCTK_REAL p1o144dxdz = INITVALUE;
   CCTK_REAL p1o144dydz = INITVALUE;
-  CCTK_REAL p1o2dx = INITVALUE;
-  CCTK_REAL p1o2dy = INITVALUE;
-  CCTK_REAL p1o2dz = INITVALUE;
+  CCTK_REAL p1odx = INITVALUE;
+  CCTK_REAL p1ody = INITVALUE;
+  CCTK_REAL p1odz = INITVALUE;
   CCTK_REAL pm1o12dx2 = INITVALUE;
   CCTK_REAL pm1o12dy2 = INITVALUE;
   CCTK_REAL pm1o12dz2 = INITVALUE;
-  CCTK_REAL pm1o2dx = INITVALUE;
-  CCTK_REAL pm1o2dy = INITVALUE;
-  CCTK_REAL pm1o2dz = INITVALUE;
   
   if (verbose > 1)
   {
@@ -88,21 +85,18 @@ void ML_BSSN_MP_convertFromADMBase_Body(cGH const * const cctkGH, CCTK_INT const
   p1o144dxdy = (INV(dx)*INV(dy))/144.;
   p1o144dxdz = (INV(dx)*INV(dz))/144.;
   p1o144dydz = (INV(dy)*INV(dz))/144.;
-  p1o2dx = khalf*INV(dx);
-  p1o2dy = khalf*INV(dy);
-  p1o2dz = khalf*INV(dz);
+  p1odx = INV(dx);
+  p1ody = INV(dy);
+  p1odz = INV(dz);
   pm1o12dx2 = -pow(dx,-2)/12.;
   pm1o12dy2 = -pow(dy,-2)/12.;
   pm1o12dz2 = -pow(dz,-2)/12.;
-  pm1o2dx = -(khalf*INV(dx));
-  pm1o2dy = -(khalf*INV(dy));
-  pm1o2dz = -(khalf*INV(dz));
   
   /* Loop over the grid points */
   #pragma omp parallel
   LC_LOOP3 (ML_BSSN_MP_convertFromADMBase,
             i,j,k, min[0],min[1],min[2], max[0],max[1],max[2],
-            cctk_lsh[0],cctk_lsh[1],cctk_lsh[2])
+            cctk_lssh[CCTK_LSSH_IDX(0,0)],cctk_lssh[CCTK_LSSH_IDX(0,1)],cctk_lssh[CCTK_LSSH_IDX(0,2)])
   {
     int index = INITVALUE;
     int subblock_index = INITVALUE;
@@ -276,8 +270,8 @@ void ML_BSSN_MP_convertFromADMBase_Body(cGH const * const cctkGH, CCTK_INT const
 
 void ML_BSSN_MP_convertFromADMBase(CCTK_ARGUMENTS)
 {
-  DECLARE_CCTK_ARGUMENTS
-  DECLARE_CCTK_PARAMETERS
+  DECLARE_CCTK_ARGUMENTS;
+  DECLARE_CCTK_PARAMETERS;
   
   GenericFD_LoopOverEverything(cctkGH, &ML_BSSN_MP_convertFromADMBase_Body);
 }
diff --git a/ML_BSSN_MP/src/ML_BSSN_MP_convertFromADMBaseGamma.c b/ML_BSSN_MP/src/ML_BSSN_MP_convertFromADMBaseGamma.c
index d79c287..d409256 100644
--- a/ML_BSSN_MP/src/ML_BSSN_MP_convertFromADMBaseGamma.c
+++ b/ML_BSSN_MP/src/ML_BSSN_MP_convertFromADMBaseGamma.c
@@ -1,5 +1,5 @@
-/*  File produced by user diener */
-/*  Produced with Mathematica Version 6.0 for Linux x86 (32-bit) (April 20, 2007) */
+/*  File produced by user eschnett */
+/*  Produced with Mathematica Version 6.0 for Mac OS X x86 (64-bit) (May 21, 2008) */
 
 /*  Mathematica script written by Ian Hinder and Sascha Husa */
 
@@ -25,8 +25,8 @@
 
 void ML_BSSN_MP_convertFromADMBaseGamma_Body(cGH const * const cctkGH, CCTK_INT const dir, CCTK_INT const face, CCTK_REAL const normal[3], CCTK_REAL const tangentA[3], CCTK_REAL const tangentB[3], CCTK_INT const min[3], CCTK_INT const max[3], CCTK_INT const n_subblock_gfs, CCTK_REAL * const subblock_gfs[])
 {
-  DECLARE_CCTK_ARGUMENTS
-  DECLARE_CCTK_PARAMETERS
+  DECLARE_CCTK_ARGUMENTS;
+  DECLARE_CCTK_PARAMETERS;
   
   
   /* Declare finite differencing variables */
@@ -43,15 +43,12 @@ void ML_BSSN_MP_convertFromADMBaseGamma_Body(cGH const * const cctkGH, CCTK_INT
   CCTK_REAL p1o144dxdy = INITVALUE;
   CCTK_REAL p1o144dxdz = INITVALUE;
   CCTK_REAL p1o144dydz = INITVALUE;
-  CCTK_REAL p1o2dx = INITVALUE;
-  CCTK_REAL p1o2dy = INITVALUE;
-  CCTK_REAL p1o2dz = INITVALUE;
+  CCTK_REAL p1odx = INITVALUE;
+  CCTK_REAL p1ody = INITVALUE;
+  CCTK_REAL p1odz = INITVALUE;
   CCTK_REAL pm1o12dx2 = INITVALUE;
   CCTK_REAL pm1o12dy2 = INITVALUE;
   CCTK_REAL pm1o12dz2 = INITVALUE;
-  CCTK_REAL pm1o2dx = INITVALUE;
-  CCTK_REAL pm1o2dy = INITVALUE;
-  CCTK_REAL pm1o2dz = INITVALUE;
   
   if (verbose > 1)
   {
@@ -88,21 +85,18 @@ void ML_BSSN_MP_convertFromADMBaseGamma_Body(cGH const * const cctkGH, CCTK_INT
   p1o144dxdy = (INV(dx)*INV(dy))/144.;
   p1o144dxdz = (INV(dx)*INV(dz))/144.;
   p1o144dydz = (INV(dy)*INV(dz))/144.;
-  p1o2dx = khalf*INV(dx);
-  p1o2dy = khalf*INV(dy);
-  p1o2dz = khalf*INV(dz);
+  p1odx = INV(dx);
+  p1ody = INV(dy);
+  p1odz = INV(dz);
   pm1o12dx2 = -pow(dx,-2)/12.;
   pm1o12dy2 = -pow(dy,-2)/12.;
   pm1o12dz2 = -pow(dz,-2)/12.;
-  pm1o2dx = -(khalf*INV(dx));
-  pm1o2dy = -(khalf*INV(dy));
-  pm1o2dz = -(khalf*INV(dz));
   
   /* Loop over the grid points */
   #pragma omp parallel
   LC_LOOP3 (ML_BSSN_MP_convertFromADMBaseGamma,
             i,j,k, min[0],min[1],min[2], max[0],max[1],max[2],
-            cctk_lsh[0],cctk_lsh[1],cctk_lsh[2])
+            cctk_lssh[CCTK_LSSH_IDX(0,0)],cctk_lssh[CCTK_LSSH_IDX(0,1)],cctk_lssh[CCTK_LSSH_IDX(0,2)])
   {
     int index = INITVALUE;
     int subblock_index = INITVALUE;
@@ -133,15 +127,6 @@ void ML_BSSN_MP_convertFromADMBaseGamma_Body(cGH const * const cctkGH, CCTK_INT
     /* Declare precomputed derivatives*/
     
     /* Declare derivatives */
-    CCTK_REAL PDupwindNth1beta1 = INITVALUE;
-    CCTK_REAL PDupwindNth2beta1 = INITVALUE;
-    CCTK_REAL PDupwindNth3beta1 = INITVALUE;
-    CCTK_REAL PDupwindNth1beta2 = INITVALUE;
-    CCTK_REAL PDupwindNth2beta2 = INITVALUE;
-    CCTK_REAL PDupwindNth3beta2 = INITVALUE;
-    CCTK_REAL PDupwindNth1beta3 = INITVALUE;
-    CCTK_REAL PDupwindNth2beta3 = INITVALUE;
-    CCTK_REAL PDupwindNth3beta3 = INITVALUE;
     CCTK_REAL PDstandardNth1gt11 = INITVALUE;
     CCTK_REAL PDstandardNth2gt11 = INITVALUE;
     CCTK_REAL PDstandardNth3gt11 = INITVALUE;
@@ -378,8 +363,8 @@ void ML_BSSN_MP_convertFromADMBaseGamma_Body(cGH const * const cctkGH, CCTK_INT
 
 void ML_BSSN_MP_convertFromADMBaseGamma(CCTK_ARGUMENTS)
 {
-  DECLARE_CCTK_ARGUMENTS
-  DECLARE_CCTK_PARAMETERS
+  DECLARE_CCTK_ARGUMENTS;
+  DECLARE_CCTK_PARAMETERS;
   
   GenericFD_LoopOverInterior(cctkGH, &ML_BSSN_MP_convertFromADMBaseGamma_Body);
 }
diff --git a/ML_BSSN_MP/src/ML_BSSN_MP_convertToADMBase.c b/ML_BSSN_MP/src/ML_BSSN_MP_convertToADMBase.c
index d7a4ace..5de207a 100644
--- a/ML_BSSN_MP/src/ML_BSSN_MP_convertToADMBase.c
+++ b/ML_BSSN_MP/src/ML_BSSN_MP_convertToADMBase.c
@@ -1,5 +1,5 @@
-/*  File produced by user diener */
-/*  Produced with Mathematica Version 6.0 for Linux x86 (32-bit) (April 20, 2007) */
+/*  File produced by user eschnett */
+/*  Produced with Mathematica Version 6.0 for Mac OS X x86 (64-bit) (May 21, 2008) */
 
 /*  Mathematica script written by Ian Hinder and Sascha Husa */
 
@@ -25,8 +25,8 @@
 
 void ML_BSSN_MP_convertToADMBase_Body(cGH const * const cctkGH, CCTK_INT const dir, CCTK_INT const face, CCTK_REAL const normal[3], CCTK_REAL const tangentA[3], CCTK_REAL const tangentB[3], CCTK_INT const min[3], CCTK_INT const max[3], CCTK_INT const n_subblock_gfs, CCTK_REAL * const subblock_gfs[])
 {
-  DECLARE_CCTK_ARGUMENTS
-  DECLARE_CCTK_PARAMETERS
+  DECLARE_CCTK_ARGUMENTS;
+  DECLARE_CCTK_PARAMETERS;
   
   
   /* Declare finite differencing variables */
@@ -43,15 +43,12 @@ void ML_BSSN_MP_convertToADMBase_Body(cGH const * const cctkGH, CCTK_INT const d
   CCTK_REAL p1o144dxdy = INITVALUE;
   CCTK_REAL p1o144dxdz = INITVALUE;
   CCTK_REAL p1o144dydz = INITVALUE;
-  CCTK_REAL p1o2dx = INITVALUE;
-  CCTK_REAL p1o2dy = INITVALUE;
-  CCTK_REAL p1o2dz = INITVALUE;
+  CCTK_REAL p1odx = INITVALUE;
+  CCTK_REAL p1ody = INITVALUE;
+  CCTK_REAL p1odz = INITVALUE;
   CCTK_REAL pm1o12dx2 = INITVALUE;
   CCTK_REAL pm1o12dy2 = INITVALUE;
   CCTK_REAL pm1o12dz2 = INITVALUE;
-  CCTK_REAL pm1o2dx = INITVALUE;
-  CCTK_REAL pm1o2dy = INITVALUE;
-  CCTK_REAL pm1o2dz = INITVALUE;
   
   if (verbose > 1)
   {
@@ -88,21 +85,18 @@ void ML_BSSN_MP_convertToADMBase_Body(cGH const * const cctkGH, CCTK_INT const d
   p1o144dxdy = (INV(dx)*INV(dy))/144.;
   p1o144dxdz = (INV(dx)*INV(dz))/144.;
   p1o144dydz = (INV(dy)*INV(dz))/144.;
-  p1o2dx = khalf*INV(dx);
-  p1o2dy = khalf*INV(dy);
-  p1o2dz = khalf*INV(dz);
+  p1odx = INV(dx);
+  p1ody = INV(dy);
+  p1odz = INV(dz);
   pm1o12dx2 = -pow(dx,-2)/12.;
   pm1o12dy2 = -pow(dy,-2)/12.;
   pm1o12dz2 = -pow(dz,-2)/12.;
-  pm1o2dx = -(khalf*INV(dx));
-  pm1o2dy = -(khalf*INV(dy));
-  pm1o2dz = -(khalf*INV(dz));
   
   /* Loop over the grid points */
   #pragma omp parallel
   LC_LOOP3 (ML_BSSN_MP_convertToADMBase,
             i,j,k, min[0],min[1],min[2], max[0],max[1],max[2],
-            cctk_lsh[0],cctk_lsh[1],cctk_lsh[2])
+            cctk_lssh[CCTK_LSSH_IDX(0,0)],cctk_lssh[CCTK_LSSH_IDX(0,1)],cctk_lssh[CCTK_LSSH_IDX(0,2)])
   {
     int index = INITVALUE;
     int subblock_index = INITVALUE;
@@ -149,18 +143,6 @@ void ML_BSSN_MP_convertToADMBase_Body(cGH const * const cctkGH, CCTK_INT const d
     /* Declare precomputed derivatives*/
     
     /* Declare derivatives */
-    CCTK_REAL PDupwindNth1alpha = INITVALUE;
-    CCTK_REAL PDupwindNth2alpha = INITVALUE;
-    CCTK_REAL PDupwindNth3alpha = INITVALUE;
-    CCTK_REAL PDupwindNth1beta1 = INITVALUE;
-    CCTK_REAL PDupwindNth2beta1 = INITVALUE;
-    CCTK_REAL PDupwindNth3beta1 = INITVALUE;
-    CCTK_REAL PDupwindNth1beta2 = INITVALUE;
-    CCTK_REAL PDupwindNth2beta2 = INITVALUE;
-    CCTK_REAL PDupwindNth3beta2 = INITVALUE;
-    CCTK_REAL PDupwindNth1beta3 = INITVALUE;
-    CCTK_REAL PDupwindNth2beta3 = INITVALUE;
-    CCTK_REAL PDupwindNth3beta3 = INITVALUE;
     
     /* Assign local copies of grid functions */
     AL = A[index];
@@ -318,8 +300,8 @@ void ML_BSSN_MP_convertToADMBase_Body(cGH const * const cctkGH, CCTK_INT const d
 
 void ML_BSSN_MP_convertToADMBase(CCTK_ARGUMENTS)
 {
-  DECLARE_CCTK_ARGUMENTS
-  DECLARE_CCTK_PARAMETERS
+  DECLARE_CCTK_ARGUMENTS;
+  DECLARE_CCTK_PARAMETERS;
   
   GenericFD_LoopOverInterior(cctkGH, &ML_BSSN_MP_convertToADMBase_Body);
 }
diff --git a/ML_BSSN_MP/src/ML_BSSN_MP_enforce.c b/ML_BSSN_MP/src/ML_BSSN_MP_enforce.c
index 75b8421..86975b2 100644
--- a/ML_BSSN_MP/src/ML_BSSN_MP_enforce.c
+++ b/ML_BSSN_MP/src/ML_BSSN_MP_enforce.c
@@ -1,5 +1,5 @@
-/*  File produced by user diener */
-/*  Produced with Mathematica Version 6.0 for Linux x86 (32-bit) (April 20, 2007) */
+/*  File produced by user eschnett */
+/*  Produced with Mathematica Version 6.0 for Mac OS X x86 (64-bit) (May 21, 2008) */
 
 /*  Mathematica script written by Ian Hinder and Sascha Husa */
 
@@ -25,8 +25,8 @@
 
 void ML_BSSN_MP_enforce_Body(cGH const * const cctkGH, CCTK_INT const dir, CCTK_INT const face, CCTK_REAL const normal[3], CCTK_REAL const tangentA[3], CCTK_REAL const tangentB[3], CCTK_INT const min[3], CCTK_INT const max[3], CCTK_INT const n_subblock_gfs, CCTK_REAL * const subblock_gfs[])
 {
-  DECLARE_CCTK_ARGUMENTS
-  DECLARE_CCTK_PARAMETERS
+  DECLARE_CCTK_ARGUMENTS;
+  DECLARE_CCTK_PARAMETERS;
   
   
   /* Declare finite differencing variables */
@@ -43,15 +43,12 @@ void ML_BSSN_MP_enforce_Body(cGH const * const cctkGH, CCTK_INT const dir, CCTK_
   CCTK_REAL p1o144dxdy = INITVALUE;
   CCTK_REAL p1o144dxdz = INITVALUE;
   CCTK_REAL p1o144dydz = INITVALUE;
-  CCTK_REAL p1o2dx = INITVALUE;
-  CCTK_REAL p1o2dy = INITVALUE;
-  CCTK_REAL p1o2dz = INITVALUE;
+  CCTK_REAL p1odx = INITVALUE;
+  CCTK_REAL p1ody = INITVALUE;
+  CCTK_REAL p1odz = INITVALUE;
   CCTK_REAL pm1o12dx2 = INITVALUE;
   CCTK_REAL pm1o12dy2 = INITVALUE;
   CCTK_REAL pm1o12dz2 = INITVALUE;
-  CCTK_REAL pm1o2dx = INITVALUE;
-  CCTK_REAL pm1o2dy = INITVALUE;
-  CCTK_REAL pm1o2dz = INITVALUE;
   
   if (verbose > 1)
   {
@@ -88,21 +85,18 @@ void ML_BSSN_MP_enforce_Body(cGH const * const cctkGH, CCTK_INT const dir, CCTK_
   p1o144dxdy = (INV(dx)*INV(dy))/144.;
   p1o144dxdz = (INV(dx)*INV(dz))/144.;
   p1o144dydz = (INV(dy)*INV(dz))/144.;
-  p1o2dx = khalf*INV(dx);
-  p1o2dy = khalf*INV(dy);
-  p1o2dz = khalf*INV(dz);
+  p1odx = INV(dx);
+  p1ody = INV(dy);
+  p1odz = INV(dz);
   pm1o12dx2 = -pow(dx,-2)/12.;
   pm1o12dy2 = -pow(dy,-2)/12.;
   pm1o12dz2 = -pow(dz,-2)/12.;
-  pm1o2dx = -(khalf*INV(dx));
-  pm1o2dy = -(khalf*INV(dy));
-  pm1o2dz = -(khalf*INV(dz));
   
   /* Loop over the grid points */
   #pragma omp parallel
   LC_LOOP3 (ML_BSSN_MP_enforce,
             i,j,k, min[0],min[1],min[2], max[0],max[1],max[2],
-            cctk_lsh[0],cctk_lsh[1],cctk_lsh[2])
+            cctk_lssh[CCTK_LSSH_IDX(0,0)],cctk_lssh[CCTK_LSSH_IDX(0,1)],cctk_lssh[CCTK_LSSH_IDX(0,2)])
   {
     int index = INITVALUE;
     int subblock_index = INITVALUE;
@@ -188,8 +182,8 @@ void ML_BSSN_MP_enforce_Body(cGH const * const cctkGH, CCTK_INT const dir, CCTK_
 
 void ML_BSSN_MP_enforce(CCTK_ARGUMENTS)
 {
-  DECLARE_CCTK_ARGUMENTS
-  DECLARE_CCTK_PARAMETERS
+  DECLARE_CCTK_ARGUMENTS;
+  DECLARE_CCTK_PARAMETERS;
   
   GenericFD_LoopOverEverything(cctkGH, &ML_BSSN_MP_enforce_Body);
 }
diff --git a/ML_BSSN_MP/src/RegisterMoL.c b/ML_BSSN_MP/src/RegisterMoL.c
index 24655c1..915ae54 100644
--- a/ML_BSSN_MP/src/RegisterMoL.c
+++ b/ML_BSSN_MP/src/RegisterMoL.c
@@ -1,5 +1,5 @@
-/*  File produced by user diener */
-/*  Produced with Mathematica Version 6.0 for Linux x86 (32-bit) (April 20, 2007) */
+/*  File produced by user eschnett */
+/*  Produced with Mathematica Version 6.0 for Mac OS X x86 (64-bit) (May 21, 2008) */
 
 /*  Mathematica script written by Ian Hinder and Sascha Husa */
 
@@ -9,8 +9,8 @@
 
 void ML_BSSN_MP_RegisterVars(CCTK_ARGUMENTS)
 {
-  DECLARE_CCTK_ARGUMENTS
-  DECLARE_CCTK_PARAMETERS
+  DECLARE_CCTK_ARGUMENTS;
+  DECLARE_CCTK_PARAMETERS;
   
   CCTK_INT ierr = 0;
   
diff --git a/ML_BSSN_MP/src/RegisterSymmetries.c b/ML_BSSN_MP/src/RegisterSymmetries.c
index b39a248..aa221f0 100644
--- a/ML_BSSN_MP/src/RegisterSymmetries.c
+++ b/ML_BSSN_MP/src/RegisterSymmetries.c
@@ -1,5 +1,5 @@
-/*  File produced by user diener */
-/*  Produced with Mathematica Version 6.0 for Linux x86 (32-bit) (April 20, 2007) */
+/*  File produced by user eschnett */
+/*  Produced with Mathematica Version 6.0 for Mac OS X x86 (64-bit) (May 21, 2008) */
 
 /*  Mathematica script written by Ian Hinder and Sascha Husa */
 
@@ -10,8 +10,8 @@
 
 void ML_BSSN_MP_RegisterSymmetries(CCTK_ARGUMENTS)
 {
-  DECLARE_CCTK_ARGUMENTS
-  DECLARE_CCTK_PARAMETERS
+  DECLARE_CCTK_ARGUMENTS;
+  DECLARE_CCTK_PARAMETERS;
   
   
   /* array holding symmetry definitions */
diff --git a/ML_BSSN_MP/src/Startup.c b/ML_BSSN_MP/src/Startup.c
index 35734b2..fef3556 100644
--- a/ML_BSSN_MP/src/Startup.c
+++ b/ML_BSSN_MP/src/Startup.c
@@ -1,5 +1,5 @@
-/*  File produced by user diener */
-/*  Produced with Mathematica Version 6.0 for Linux x86 (32-bit) (April 20, 2007) */
+/*  File produced by user eschnett */
+/*  Produced with Mathematica Version 6.0 for Mac OS X x86 (64-bit) (May 21, 2008) */
 
 /*  Mathematica script written by Ian Hinder and Sascha Husa */
 
diff --git a/ML_BSSN_MP/src/make.code.defn b/ML_BSSN_MP/src/make.code.defn
index dda0199..4dfbdb8 100644
--- a/ML_BSSN_MP/src/make.code.defn
+++ b/ML_BSSN_MP/src/make.code.defn
@@ -1,5 +1,5 @@
-# File produced by user diener
-# Produced with Mathematica Version 6.0 for Linux x86 (32-bit) (April 20, 2007)
+# File produced by user eschnett
+# Produced with Mathematica Version 6.0 for Mac OS X x86 (64-bit) (May 21, 2008)
 
 # Mathematica script written by Ian Hinder and Sascha Husa