Resolve merge commits

16 files changed, 474 insertions, 372 deletions

diff --git a/ML_ADM/configuration.ccl b/ML_ADM/configuration.ccl
index 006249a..c4e15c5 100644
--- a/ML_ADM/configuration.ccl
+++ b/ML_ADM/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_ADM/interface.ccl b/ML_ADM/interface.ccl
index cdbd29e..49172b8 100644
--- a/ML_ADM/interface.ccl
+++ b/ML_ADM/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
 
@@ -18,9 +18,6 @@ USES INCLUDE: loopcontrol.h
 CCTK_INT FUNCTION MoLRegisterEvolved(CCTK_INT IN EvolvedIndex, CCTK_INT IN RHSIndex)
 USES FUNCTION MoLRegisterEvolved
 
-CCTK_INT FUNCTION MoLRegisterConstrained(CCTK_INT IN ConstrainedIndex)
-USES FUNCTION MoLRegisterConstrained
-
 SUBROUTINE Diff_coeff(CCTK_POINTER_TO_CONST IN cctkGH, CCTK_INT IN dir, CCTK_INT IN nsize, CCTK_INT OUT ARRAY imin, CCTK_INT OUT ARRAY imax, CCTK_REAL OUT ARRAY q, CCTK_INT IN table_handle)
 USES FUNCTION Diff_coeff
 
diff --git a/ML_ADM/param.ccl b/ML_ADM/param.ccl
index b22e4ba..91ffeb8 100644
--- a/ML_ADM/param.ccl
+++ b/ML_ADM/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
 
@@ -16,7 +16,6 @@ USES CCTK_INT boundary_width
 shares: MethodOfLines
 
 USES CCTK_INT MoL_Num_Evolved_Vars
-USES CCTK_INT MoL_Num_Constrained_Vars
 
 restricted:
 CCTK_INT verbose "verbose"
@@ -45,12 +44,6 @@ CCTK_INT ML_ADM_MaxNumEvolvedVars "Number of evolved variables used by this thor
 } 16
 
 restricted:
-CCTK_INT ML_ADM_MaxNumConstrainedVars "Number of constrained variables used by this thorn" ACCUMULATOR-BASE=MethodofLines::MoL_Num_Constrained_Vars
-{
-  65:65 :: "Number of constrained variables used by this thorn"
-} 65
-
-restricted:
 CCTK_INT timelevels "Number of active timelevels"
 {
   0:3 :: ""
diff --git a/ML_ADM/schedule.ccl b/ML_ADM/schedule.ccl
index 88c07e5..4f18f49 100644
--- a/ML_ADM/schedule.ccl
+++ b/ML_ADM/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
 
@@ -80,7 +80,7 @@ schedule ML_ADM_RegisterVars in MoL_Register
   OPTIONS: meta
 } "Register Variables for MoL"
 
-schedule ML_ADM_RegisterSymmetries at BASEGRID
+schedule ML_ADM_RegisterSymmetries in SymmetryRegister
 {
   LANG: C
   OPTIONS: meta
diff --git a/ML_ADM/src/Boundaries.c b/ML_ADM/src/Boundaries.c
index de39fc6..68ddc66 100644
--- a/ML_ADM/src/Boundaries.c
+++ b/ML_ADM/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_ADM_CheckBoundaries(CCTK_ARGUMENTS)
 {
-  DECLARE_CCTK_ARGUMENTS
-  DECLARE_CCTK_PARAMETERS
+  DECLARE_CCTK_ARGUMENTS;
+  DECLARE_CCTK_PARAMETERS;
   
   return;
 }
 
 void ML_ADM_ApplyBoundConds(CCTK_ARGUMENTS)
 {
-  DECLARE_CCTK_ARGUMENTS
-  DECLARE_CCTK_PARAMETERS
+  DECLARE_CCTK_ARGUMENTS;
+  DECLARE_CCTK_PARAMETERS;
   
   CCTK_INT ierr = 0;
   
diff --git a/ML_ADM/src/ML_ADM_Minkowski.c b/ML_ADM/src/ML_ADM_Minkowski.c
index 9e57386..3d64a9a 100644
--- a/ML_ADM/src/ML_ADM_Minkowski.c
+++ b/ML_ADM/src/ML_ADM_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_ADM_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 */
@@ -90,7 +90,7 @@ void ML_ADM_Minkowski_Body(cGH const * const cctkGH, CCTK_INT const dir, CCTK_IN
   #pragma omp parallel
   LC_LOOP3 (ML_ADM_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;
@@ -177,8 +177,8 @@ void ML_ADM_Minkowski_Body(cGH const * const cctkGH, CCTK_INT const dir, CCTK_IN
 
 void ML_ADM_Minkowski(CCTK_ARGUMENTS)
 {
-  DECLARE_CCTK_ARGUMENTS
-  DECLARE_CCTK_PARAMETERS
+  DECLARE_CCTK_ARGUMENTS;
+  DECLARE_CCTK_PARAMETERS;
   
   GenericFD_LoopOverEverything(cctkGH, &ML_ADM_Minkowski_Body);
 }
diff --git a/ML_ADM/src/ML_ADM_RHS.c b/ML_ADM/src/ML_ADM_RHS.c
index 854f9c7..586551f 100644
--- a/ML_ADM/src/ML_ADM_RHS.c
+++ b/ML_ADM/src/ML_ADM_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_ADM_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 */
@@ -90,7 +90,7 @@ void ML_ADM_RHS_Body(cGH const * const cctkGH, CCTK_INT const dir, CCTK_INT cons
   #pragma omp parallel
   LC_LOOP3 (ML_ADM_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;
@@ -142,64 +142,40 @@ void ML_ADM_RHS_Body(cGH const * const cctkGH, CCTK_INT const dir, CCTK_INT cons
     CCTK_REAL PDstandardNth3g11 = INITVALUE;
     CCTK_REAL PDstandardNth22g11 = INITVALUE;
     CCTK_REAL PDstandardNth33g11 = INITVALUE;
-    CCTK_REAL PDstandardNth12g11 = INITVALUE;
-    CCTK_REAL PDstandardNth13g11 = INITVALUE;
-    CCTK_REAL PDstandardNth21g11 = INITVALUE;
     CCTK_REAL PDstandardNth23g11 = INITVALUE;
-    CCTK_REAL PDstandardNth31g11 = INITVALUE;
-    CCTK_REAL PDstandardNth32g11 = INITVALUE;
     CCTK_REAL PDstandardNth1g12 = INITVALUE;
     CCTK_REAL PDstandardNth2g12 = INITVALUE;
     CCTK_REAL PDstandardNth3g12 = INITVALUE;
     CCTK_REAL PDstandardNth33g12 = INITVALUE;
     CCTK_REAL PDstandardNth12g12 = INITVALUE;
     CCTK_REAL PDstandardNth13g12 = INITVALUE;
-    CCTK_REAL PDstandardNth21g12 = INITVALUE;
     CCTK_REAL PDstandardNth23g12 = INITVALUE;
-    CCTK_REAL PDstandardNth31g12 = INITVALUE;
-    CCTK_REAL PDstandardNth32g12 = INITVALUE;
     CCTK_REAL PDstandardNth1g13 = INITVALUE;
     CCTK_REAL PDstandardNth2g13 = INITVALUE;
     CCTK_REAL PDstandardNth3g13 = INITVALUE;
     CCTK_REAL PDstandardNth22g13 = INITVALUE;
     CCTK_REAL PDstandardNth12g13 = INITVALUE;
     CCTK_REAL PDstandardNth13g13 = INITVALUE;
-    CCTK_REAL PDstandardNth21g13 = INITVALUE;
     CCTK_REAL PDstandardNth23g13 = INITVALUE;
-    CCTK_REAL PDstandardNth31g13 = INITVALUE;
-    CCTK_REAL PDstandardNth32g13 = INITVALUE;
     CCTK_REAL PDstandardNth1g22 = INITVALUE;
     CCTK_REAL PDstandardNth2g22 = INITVALUE;
     CCTK_REAL PDstandardNth3g22 = INITVALUE;
     CCTK_REAL PDstandardNth11g22 = INITVALUE;
     CCTK_REAL PDstandardNth33g22 = INITVALUE;
-    CCTK_REAL PDstandardNth12g22 = INITVALUE;
     CCTK_REAL PDstandardNth13g22 = INITVALUE;
-    CCTK_REAL PDstandardNth21g22 = INITVALUE;
-    CCTK_REAL PDstandardNth23g22 = INITVALUE;
-    CCTK_REAL PDstandardNth31g22 = INITVALUE;
-    CCTK_REAL PDstandardNth32g22 = INITVALUE;
     CCTK_REAL PDstandardNth1g23 = INITVALUE;
     CCTK_REAL PDstandardNth2g23 = INITVALUE;
     CCTK_REAL PDstandardNth3g23 = INITVALUE;
     CCTK_REAL PDstandardNth11g23 = INITVALUE;
     CCTK_REAL PDstandardNth12g23 = INITVALUE;
     CCTK_REAL PDstandardNth13g23 = INITVALUE;
-    CCTK_REAL PDstandardNth21g23 = INITVALUE;
     CCTK_REAL PDstandardNth23g23 = INITVALUE;
-    CCTK_REAL PDstandardNth31g23 = INITVALUE;
-    CCTK_REAL PDstandardNth32g23 = INITVALUE;
     CCTK_REAL PDstandardNth1g33 = INITVALUE;
     CCTK_REAL PDstandardNth2g33 = INITVALUE;
     CCTK_REAL PDstandardNth3g33 = INITVALUE;
     CCTK_REAL PDstandardNth11g33 = INITVALUE;
     CCTK_REAL PDstandardNth22g33 = INITVALUE;
     CCTK_REAL PDstandardNth12g33 = INITVALUE;
-    CCTK_REAL PDstandardNth13g33 = INITVALUE;
-    CCTK_REAL PDstandardNth21g33 = INITVALUE;
-    CCTK_REAL PDstandardNth23g33 = INITVALUE;
-    CCTK_REAL PDstandardNth31g33 = INITVALUE;
-    CCTK_REAL PDstandardNth32g33 = INITVALUE;
     CCTK_REAL PDstandardNth1K11 = INITVALUE;
     CCTK_REAL PDstandardNth2K11 = INITVALUE;
     CCTK_REAL PDstandardNth3K11 = INITVALUE;
@@ -321,26 +297,144 @@ void ML_ADM_RHS_Body(cGH const * const cctkGH, CCTK_INT const dir, CCTK_INT cons
     /* Precompute derivatives (old style) */
     
     /* Calculate temporaries and grid functions */
-    detg  =  2*g12L*g13L*g23L + g33L*(g11L*g22L - SQR(g12L)) - g22L*SQR(g13L) - 
-        g11L*SQR(g23L);
+    CCTK_REAL const T1000001  =  SQR(g23L);
     
-    gu11  =  INV(detg)*(g22L*g33L - SQR(g23L));
+    CCTK_REAL const T1000003  =  g13L*g23L;
     
-    gu12  =  (g13L*g23L - g12L*g33L)*INV(detg);
+    CCTK_REAL const T1000004  =  -(g12L*g33L);
     
-    gu13  =  (-(g13L*g22L) + g12L*g23L)*INV(detg);
+    CCTK_REAL const T1000007  =  SQR(g13L);
     
-    gu21  =  (g13L*g23L - g12L*g33L)*INV(detg);
+    CCTK_REAL const T1000008  =  -(g13L*g22L);
     
-    gu22  =  INV(detg)*(g11L*g33L - SQR(g13L));
+    CCTK_REAL const T1000009  =  g12L*g23L;
     
-    gu23  =  (g12L*g13L - g11L*g23L)*INV(detg);
+    CCTK_REAL const T1000012  =  g12L*g13L;
     
-    gu31  =  (-(g13L*g22L) + g12L*g23L)*INV(detg);
+    CCTK_REAL const T1000013  =  -(g11L*g23L);
     
-    gu32  =  (g12L*g13L - g11L*g23L)*INV(detg);
+    CCTK_REAL const T1000016  =  SQR(g12L);
     
-    gu33  =  INV(detg)*(g11L*g22L - SQR(g12L));
+    CCTK_REAL const T1000017  =  -PDstandardNth3g12;
+    
+    CCTK_REAL const T1000019  =  -PDstandardNth2g13;
+    
+    CCTK_REAL const T1000021  =  -PDstandardNth1g23;
+    
+    CCTK_REAL const T1000023  =  -PDstandardNth11g23;
+    
+    CCTK_REAL const T1000024  =  -PDstandardNth23g11;
+    
+    CCTK_REAL const T1000029  =  -2*PDstandardNth12g12;
+    
+    CCTK_REAL const T1000031  =  -PDstandardNth13g22;
+    
+    CCTK_REAL const T1000032  =  -PDstandardNth22g13;
+    
+    CCTK_REAL const T1000034  =  -2*PDstandardNth13g13;
+    
+    CCTK_REAL const T1000036  =  -PDstandardNth12g33;
+    
+    CCTK_REAL const T1000037  =  -PDstandardNth33g12;
+    
+    CCTK_REAL const T1000039  =  -2*PDstandardNth23g23;
+    
+    g11rhsL  =  -2*alphaL*K11L + 2*(g11L*PDstandardNth1beta1 + 
+           g12L*PDstandardNth1beta2 + g13L*PDstandardNth1beta3) + 
+        beta1L*PDstandardNth1g11 + beta2L*PDstandardNth2g11 + 
+        beta3L*PDstandardNth3g11;
+    
+    g12rhsL  =  -2*alphaL*K12L + g22L*PDstandardNth1beta2 + 
+        g23L*PDstandardNth1beta3 + beta1L*PDstandardNth1g12 + 
+        g11L*PDstandardNth2beta1 + g12L*
+         (PDstandardNth1beta1 + PDstandardNth2beta2) + g13L*PDstandardNth2beta3 + 
+        beta2L*PDstandardNth2g12 + beta3L*PDstandardNth3g12;
+    
+    g13rhsL  =  -2*alphaL*K13L + g23L*PDstandardNth1beta2 + 
+        g33L*PDstandardNth1beta3 + beta1L*PDstandardNth1g13 + 
+        beta2L*PDstandardNth2g13 + g11L*PDstandardNth3beta1 + 
+        g12L*PDstandardNth3beta2 + g13L*
+         (PDstandardNth1beta1 + PDstandardNth3beta3) + beta3L*PDstandardNth3g13;
+    
+    g22rhsL  =  -2*alphaL*K22L + beta1L*PDstandardNth1g22 + 
+        2*(g12L*PDstandardNth2beta1 + g22L*PDstandardNth2beta2 + 
+           g23L*PDstandardNth2beta3) + beta2L*PDstandardNth2g22 + 
+        beta3L*PDstandardNth3g22;
+    
+    g23rhsL  =  -2*alphaL*K23L + beta1L*PDstandardNth1g23 + 
+        g13L*PDstandardNth2beta1 + g33L*PDstandardNth2beta3 + 
+        beta2L*PDstandardNth2g23 + g12L*PDstandardNth3beta1 + 
+        g22L*PDstandardNth3beta2 + g23L*
+         (PDstandardNth2beta2 + PDstandardNth3beta3) + beta3L*PDstandardNth3g23;
+    
+    g33rhsL  =  -2*alphaL*K33L + beta1L*PDstandardNth1g33 + 
+        beta2L*PDstandardNth2g33 + 2*
+         (g13L*PDstandardNth3beta1 + g23L*PDstandardNth3beta2 + 
+           g33L*PDstandardNth3beta3) + beta3L*PDstandardNth3g33;
+    
+    alpharhsL  =  0;
+    
+    beta1rhsL  =  0;
+    
+    beta2rhsL  =  0;
+    
+    beta3rhsL  =  0;
+    
+    CCTK_REAL const T1000005  =  T1000003 + T1000004;
+    
+    CCTK_REAL const T1000010  =  T1000008 + T1000009;
+    
+    CCTK_REAL const T1000014  =  T1000012 + T1000013;
+    
+    CCTK_REAL const T1000018  =  PDstandardNth1g23 + PDstandardNth2g13 + T1000017;
+    
+    CCTK_REAL const T1000020  =  PDstandardNth1g23 + PDstandardNth3g12 + T1000019;
+    
+    CCTK_REAL const T1000022  =  PDstandardNth2g13 + PDstandardNth3g12 + T1000021;
+    
+    CCTK_REAL const T1000025  =  
+       PDstandardNth12g13 + PDstandardNth13g12 + T1000023 + T1000024;
+    
+    CCTK_REAL const T1000030  =  PDstandardNth11g22 + PDstandardNth22g11 + T1000029;
+    
+    CCTK_REAL const T1000033  =  
+       PDstandardNth12g23 + PDstandardNth23g12 + T1000031 + T1000032;
+    
+    CCTK_REAL const T1000035  =  PDstandardNth11g33 + PDstandardNth33g11 + T1000034;
+    
+    CCTK_REAL const T1000038  =  
+       PDstandardNth13g23 + PDstandardNth23g13 + T1000036 + T1000037;
+    
+    CCTK_REAL const T1000040  =  PDstandardNth22g33 + PDstandardNth33g22 + T1000039;
+    
+    detg  =  2*g12L*g13L*g23L + g11L*(g22L*g33L - T1000001) - g22L*T1000007 - 
+        g33L*T1000016;
+    
+    CCTK_REAL const T1000002  =  INV(detg);
+    
+    CCTK_REAL const T1000006  =  T1000002*T1000005;
+    
+    CCTK_REAL const T1000011  =  T1000002*T1000010;
+    
+    CCTK_REAL const T1000015  =  T1000002*T1000014;
+    
+    gu11  =  (g22L*g33L - T1000001)*T1000002;
+    
+    gu22  =  T1000002*(g11L*g33L - T1000007);
+    
+    gu33  =  T1000002*(g11L*g22L - T1000016);
+    
+    gu12  =  T1000006;
+    
+    gu13  =  T1000011;
+    
+    gu21  =  T1000006;
+    
+    gu23  =  T1000015;
+    
+    gu31  =  T1000011;
+    
+    gu32  =  T1000015;
     
     G111  =  khalf*(gu11*PDstandardNth1g11 + 
           2*(gu12*PDstandardNth1g12 + gu13*PDstandardNth1g13) - 
@@ -354,23 +448,17 @@ void ML_ADM_RHS_Body(cGH const * const cctkGH, CCTK_INT const dir, CCTK_INT cons
           2*(gu32*PDstandardNth1g12 + gu33*PDstandardNth1g13) - 
           gu32*PDstandardNth2g11 - gu33*PDstandardNth3g11);
     
-    G112  =  khalf*(gu12*PDstandardNth1g22 + gu11*PDstandardNth2g11 + 
-          gu13*(PDstandardNth1g23 + PDstandardNth2g13 - PDstandardNth3g12));
+    G112  =  khalf*(gu12*PDstandardNth1g22 + gu11*PDstandardNth2g11 + gu13*T1000018);
     
-    G212  =  khalf*(gu22*PDstandardNth1g22 + gu21*PDstandardNth2g11 + 
-          gu23*(PDstandardNth1g23 + PDstandardNth2g13 - PDstandardNth3g12));
+    G212  =  khalf*(gu22*PDstandardNth1g22 + gu21*PDstandardNth2g11 + gu23*T1000018);
     
-    G312  =  khalf*(gu32*PDstandardNth1g22 + gu31*PDstandardNth2g11 + 
-          gu33*(PDstandardNth1g23 + PDstandardNth2g13 - PDstandardNth3g12));
+    G312  =  khalf*(gu32*PDstandardNth1g22 + gu31*PDstandardNth2g11 + gu33*T1000018);
     
-    G113  =  khalf*(gu13*PDstandardNth1g33 + gu11*PDstandardNth3g11 + 
-          gu12*(PDstandardNth1g23 - PDstandardNth2g13 + PDstandardNth3g12));
+    G113  =  khalf*(gu13*PDstandardNth1g33 + gu11*PDstandardNth3g11 + gu12*T1000020);
     
-    G213  =  khalf*(gu23*PDstandardNth1g33 + gu21*PDstandardNth3g11 + 
-          gu22*(PDstandardNth1g23 - PDstandardNth2g13 + PDstandardNth3g12));
+    G213  =  khalf*(gu23*PDstandardNth1g33 + gu21*PDstandardNth3g11 + gu22*T1000020);
     
-    G313  =  khalf*(gu33*PDstandardNth1g33 + gu31*PDstandardNth3g11 + 
-          gu32*(PDstandardNth1g23 - PDstandardNth2g13 + PDstandardNth3g12));
+    G313  =  khalf*(gu33*PDstandardNth1g33 + gu31*PDstandardNth3g11 + gu32*T1000020);
     
     G122  =  khalf*(gu11*(-PDstandardNth1g22 + 2*PDstandardNth2g12) + 
           gu12*PDstandardNth2g22 + gu13*(2*PDstandardNth2g23 - PDstandardNth3g22));
@@ -381,17 +469,11 @@ void ML_ADM_RHS_Body(cGH const * const cctkGH, CCTK_INT const dir, CCTK_INT cons
     G322  =  khalf*(gu31*(-PDstandardNth1g22 + 2*PDstandardNth2g12) + 
           gu32*PDstandardNth2g22 + gu33*(2*PDstandardNth2g23 - PDstandardNth3g22));
     
-    G123  =  khalf*(gu13*PDstandardNth2g33 + 
-          gu11*(-PDstandardNth1g23 + PDstandardNth2g13 + PDstandardNth3g12) + 
-          gu12*PDstandardNth3g22);
+    G123  =  khalf*(gu13*PDstandardNth2g33 + gu12*PDstandardNth3g22 + gu11*T1000022);
     
-    G223  =  khalf*(gu23*PDstandardNth2g33 + 
-          gu21*(-PDstandardNth1g23 + PDstandardNth2g13 + PDstandardNth3g12) + 
-          gu22*PDstandardNth3g22);
+    G223  =  khalf*(gu23*PDstandardNth2g33 + gu22*PDstandardNth3g22 + gu21*T1000022);
     
-    G323  =  khalf*(gu33*PDstandardNth2g33 + 
-          gu31*(-PDstandardNth1g23 + PDstandardNth2g13 + PDstandardNth3g12) + 
-          gu32*PDstandardNth3g22);
+    G323  =  khalf*(gu33*PDstandardNth2g33 + gu32*PDstandardNth3g22 + gu31*T1000022);
     
     G133  =  khalf*(-(gu11*PDstandardNth1g33) - gu12*PDstandardNth2g33 + 
           2*gu11*PDstandardNth3g13 + 2*gu12*PDstandardNth3g23 + 
@@ -405,16 +487,29 @@ void ML_ADM_RHS_Body(cGH const * const cctkGH, CCTK_INT const dir, CCTK_INT cons
           2*gu31*PDstandardNth3g13 + 2*gu32*PDstandardNth3g23 + 
           gu33*PDstandardNth3g33);
     
-    R11  =  2*(G112*G211 + G113*G311 + G213*G312) - G111*(G111 + G212 + G313) - 
-        G211*(G112 + G222 + G323) - G311*(G113 + G223 + G333) + 
-        khalf*(-(gu22*(PDstandardNth11g22 - 2*PDstandardNth12g12 + 
-                PDstandardNth22g11)) + 
-           gu23*(-PDstandardNth11g23 + PDstandardNth12g13 + PDstandardNth13g12 - 
-              PDstandardNth23g11) + gu32*
-            (-PDstandardNth11g23 + PDstandardNth12g13 + PDstandardNth13g12 - 
-              PDstandardNth23g11) - gu33*
-            (PDstandardNth11g33 - 2*PDstandardNth13g13 + PDstandardNth33g11)) + 
-        SQR(G111) + SQR(G212) + SQR(G313);
+    Km11  =  gu11*K11L + gu12*K12L + gu13*K13L;
+    
+    Km21  =  gu21*K11L + gu22*K12L + gu23*K13L;
+    
+    Km31  =  gu31*K11L + gu32*K12L + gu33*K13L;
+    
+    Km12  =  gu11*K12L + gu12*K22L + gu13*K23L;
+    
+    Km22  =  gu21*K12L + gu22*K22L + gu23*K23L;
+    
+    Km32  =  gu31*K12L + gu32*K22L + gu33*K23L;
+    
+    Km13  =  gu11*K13L + gu12*K23L + gu13*K33L;
+    
+    Km23  =  gu21*K13L + gu22*K23L + gu23*K33L;
+    
+    Km33  =  gu31*K13L + gu32*K23L + gu33*K33L;
+    
+    CCTK_REAL const T1000026  =  G111 + G212 + G313;
+    
+    CCTK_REAL const T1000027  =  G112 + G222 + G323;
+    
+    CCTK_REAL const T1000028  =  G113 + G223 + G333;
     
     R12  =  khalf*(2*(G122*G211 + G123*G311 + G213*G322 + G313*G323) - 
           2*(G112*G212 + G112*G313 + G212*G323 + G312*G333 + 
@@ -437,17 +532,6 @@ void ML_ADM_RHS_Body(cGH const * const cctkGH, CCTK_INT const dir, CCTK_INT cons
           gu23*(PDstandardNth12g33 - PDstandardNth13g23 - PDstandardNth23g13 + 
              PDstandardNth33g12));
     
-    R22  =  -(G122*(G111 + G212 + G313)) + 2*(G122*G212 + G123*G312 + G223*G322) - 
-        G222*(G112 + G222 + G323) - G322*(G113 + G223 + G333) + 
-        khalf*(-(gu11*(PDstandardNth11g22 - 2*PDstandardNth12g12 + 
-                PDstandardNth22g11)) + 
-           gu13*(PDstandardNth12g23 - PDstandardNth13g22 - PDstandardNth22g13 + 
-              PDstandardNth23g12) + gu31*
-            (PDstandardNth12g23 - PDstandardNth13g22 - PDstandardNth22g13 + 
-              PDstandardNth23g12) - gu33*
-            (PDstandardNth22g33 - 2*PDstandardNth23g23 + PDstandardNth33g22)) + 
-        SQR(G112) + SQR(G222) + SQR(G323);
-    
     R23  =  khalf*(2*(G112*G113 + G122*G213 + G133*G312 + G233*G322) + 
           gu11*(-PDstandardNth11g23 + PDstandardNth12g13 + PDstandardNth13g12 - 
              PDstandardNth23g11) + gu21*
@@ -457,76 +541,19 @@ void ML_ADM_RHS_Body(cGH const * const cctkGH, CCTK_INT const dir, CCTK_INT cons
           gu13*(PDstandardNth12g33 - PDstandardNth13g23 - PDstandardNth23g13 + 
              PDstandardNth33g12) + gu23*(PDstandardNth22g33 + PDstandardNth33g22));
     
-    R33  =  -(G133*(G111 + G212 + G313)) + 2*(G123*G213 + G133*G313) + 2*G233*G323 - 
-        G233*(G112 + G222 + G323) - G333*(G113 + G223 + G333) + 
-        khalf*(-(gu11*(PDstandardNth11g33 - 2*PDstandardNth13g13 + 
-                PDstandardNth33g11)) + 
-           gu12*(-PDstandardNth12g33 + PDstandardNth13g23 + PDstandardNth23g13 - 
-              PDstandardNth33g12) + gu21*
-            (-PDstandardNth12g33 + PDstandardNth13g23 + PDstandardNth23g13 - 
-              PDstandardNth33g12) - gu22*
-            (PDstandardNth22g33 - 2*PDstandardNth23g23 + PDstandardNth33g22)) + 
-        SQR(G113) + SQR(G223) + SQR(G333);
-    
-    Km11  =  gu11*K11L + gu12*K12L + gu13*K13L;
-    
-    Km21  =  gu21*K11L + gu22*K12L + gu23*K13L;
-    
-    Km31  =  gu31*K11L + gu32*K12L + gu33*K13L;
-    
-    Km12  =  gu11*K12L + gu12*K22L + gu13*K23L;
-    
-    Km22  =  gu21*K12L + gu22*K22L + gu23*K23L;
-    
-    Km32  =  gu31*K12L + gu32*K22L + gu33*K23L;
-    
-    Km13  =  gu11*K13L + gu12*K23L + gu13*K33L;
-    
-    Km23  =  gu21*K13L + gu22*K23L + gu23*K33L;
-    
-    Km33  =  gu31*K13L + gu32*K23L + gu33*K33L;
-    
     trK  =  Km11 + Km22 + Km33;
     
-    g11rhsL  =  -2*alphaL*K11L + 2*(g11L*PDstandardNth1beta1 + 
-           g12L*PDstandardNth1beta2 + g13L*PDstandardNth1beta3) + 
-        beta1L*PDstandardNth1g11 + beta2L*PDstandardNth2g11 + 
-        beta3L*PDstandardNth3g11;
-    
-    g12rhsL  =  -2*alphaL*K12L + g22L*PDstandardNth1beta2 + 
-        g23L*PDstandardNth1beta3 + beta1L*PDstandardNth1g12 + 
-        g11L*PDstandardNth2beta1 + g12L*
-         (PDstandardNth1beta1 + PDstandardNth2beta2) + g13L*PDstandardNth2beta3 + 
-        beta2L*PDstandardNth2g12 + beta3L*PDstandardNth3g12;
-    
-    g13rhsL  =  -2*alphaL*K13L + g23L*PDstandardNth1beta2 + 
-        g33L*PDstandardNth1beta3 + beta1L*PDstandardNth1g13 + 
-        beta2L*PDstandardNth2g13 + g11L*PDstandardNth3beta1 + 
-        g12L*PDstandardNth3beta2 + g13L*
-         (PDstandardNth1beta1 + PDstandardNth3beta3) + beta3L*PDstandardNth3g13;
-    
-    g22rhsL  =  -2*alphaL*K22L + beta1L*PDstandardNth1g22 + 
-        2*(g12L*PDstandardNth2beta1 + g22L*PDstandardNth2beta2 + 
-           g23L*PDstandardNth2beta3) + beta2L*PDstandardNth2g22 + 
-        beta3L*PDstandardNth3g22;
-    
-    g23rhsL  =  -2*alphaL*K23L + beta1L*PDstandardNth1g23 + 
-        g13L*PDstandardNth2beta1 + g33L*PDstandardNth2beta3 + 
-        beta2L*PDstandardNth2g23 + g12L*PDstandardNth3beta1 + 
-        g22L*PDstandardNth3beta2 + g23L*
-         (PDstandardNth2beta2 + PDstandardNth3beta3) + beta3L*PDstandardNth3g23;
+    R11  =  2*(G112*G211 + G113*G311 + G213*G312) - G111*T1000026 - G211*T1000027 - 
+        G311*T1000028 + khalf*(gu23*T1000025 + gu32*T1000025 - gu22*T1000030 - 
+           gu33*T1000035) + SQR(G111) + SQR(G212) + SQR(G313);
     
-    g33rhsL  =  -2*alphaL*K33L + beta1L*PDstandardNth1g33 + 
-        beta2L*PDstandardNth2g33 + 2*
-         (g13L*PDstandardNth3beta1 + g23L*PDstandardNth3beta2 + 
-           g33L*PDstandardNth3beta3) + beta3L*PDstandardNth3g33;
+    R22  =  2*(G122*G212 + G123*G312 + G223*G322) - G122*T1000026 - G222*T1000027 - 
+        G322*T1000028 + khalf*(-(gu11*T1000030) + gu13*T1000033 + gu31*T1000033 - 
+           gu33*T1000040) + SQR(G112) + SQR(G222) + SQR(G323);
     
-    K11rhsL  =  -PDstandardNth11alpha + G111*PDstandardNth1alpha + 
-        2*(K11L*PDstandardNth1beta1 + K12L*PDstandardNth1beta2 + 
-           K13L*PDstandardNth1beta3) + beta1L*PDstandardNth1K11 + 
-        G211*PDstandardNth2alpha + beta2L*PDstandardNth2K11 + 
-        G311*PDstandardNth3alpha + beta3L*PDstandardNth3K11 + 
-        alphaL*(-2*(K11L*Km11 + K12L*Km21 + K13L*Km31) + R11 + K11L*trK);
+    R33  =  2*(G123*G213 + G133*G313 + G233*G323) - G133*T1000026 - G233*T1000027 - 
+        G333*T1000028 + khalf*(-(gu11*T1000035) + gu12*T1000038 + gu21*T1000038 - 
+           gu22*T1000040) + SQR(G113) + SQR(G223) + SQR(G333);
     
     K12rhsL  =  -PDstandardNth12alpha + G112*PDstandardNth1alpha + 
         K22L*PDstandardNth1beta2 + K23L*PDstandardNth1beta3 + 
@@ -546,13 +573,6 @@ void ML_ADM_RHS_Body(cGH const * const cctkGH, CCTK_INT const dir, CCTK_INT cons
         beta3L*PDstandardNth3K13 + alphaL*
          (-2*(K11L*Km13 + K12L*Km23 + K13L*Km33) + R13 + K13L*trK);
     
-    K22rhsL  =  G122*PDstandardNth1alpha + beta1L*PDstandardNth1K22 - 
-        PDstandardNth22alpha + G222*PDstandardNth2alpha + 
-        2*(K12L*PDstandardNth2beta1 + K22L*PDstandardNth2beta2 + 
-           K23L*PDstandardNth2beta3) + beta2L*PDstandardNth2K22 + 
-        G322*PDstandardNth3alpha + beta3L*PDstandardNth3K22 + 
-        alphaL*(-2*(K12L*Km12 + K22L*Km22 + K23L*Km32) + R22 + K22L*trK);
-    
     K23rhsL  =  G123*PDstandardNth1alpha + beta1L*PDstandardNth1K23 - 
         PDstandardNth23alpha + G223*PDstandardNth2alpha + 
         K13L*PDstandardNth2beta1 + K33L*PDstandardNth2beta3 + 
@@ -562,6 +582,20 @@ void ML_ADM_RHS_Body(cGH const * const cctkGH, CCTK_INT const dir, CCTK_INT cons
         beta3L*PDstandardNth3K23 + alphaL*
          (-2*(K12L*Km13 + K22L*Km23 + K23L*Km33) + R23 + K23L*trK);
     
+    K11rhsL  =  -PDstandardNth11alpha + G111*PDstandardNth1alpha + 
+        2*(K11L*PDstandardNth1beta1 + K12L*PDstandardNth1beta2 + 
+           K13L*PDstandardNth1beta3) + beta1L*PDstandardNth1K11 + 
+        G211*PDstandardNth2alpha + beta2L*PDstandardNth2K11 + 
+        G311*PDstandardNth3alpha + beta3L*PDstandardNth3K11 + 
+        alphaL*(-2*(K11L*Km11 + K12L*Km21 + K13L*Km31) + R11 + K11L*trK);
+    
+    K22rhsL  =  G122*PDstandardNth1alpha + beta1L*PDstandardNth1K22 - 
+        PDstandardNth22alpha + G222*PDstandardNth2alpha + 
+        2*(K12L*PDstandardNth2beta1 + K22L*PDstandardNth2beta2 + 
+           K23L*PDstandardNth2beta3) + beta2L*PDstandardNth2K22 + 
+        G322*PDstandardNth3alpha + beta3L*PDstandardNth3K22 + 
+        alphaL*(-2*(K12L*Km12 + K22L*Km22 + K23L*Km32) + R22 + K22L*trK);
+    
     K33rhsL  =  G133*PDstandardNth1alpha + beta1L*PDstandardNth1K33 + 
         G233*PDstandardNth2alpha + beta2L*PDstandardNth2K33 - 
         PDstandardNth33alpha + G333*PDstandardNth3alpha + 
@@ -569,14 +603,6 @@ void ML_ADM_RHS_Body(cGH const * const cctkGH, CCTK_INT const dir, CCTK_INT cons
            K33L*PDstandardNth3beta3) + beta3L*PDstandardNth3K33 + 
         alphaL*(-2*(K13L*Km13 + K23L*Km23 + K33L*Km33) + R33 + K33L*trK);
     
-    alpharhsL  =  0;
-    
-    beta1rhsL  =  0;
-    
-    beta2rhsL  =  0;
-    
-    beta3rhsL  =  0;
-    
     
     /* Copy local copies back to grid functions */
     alpharhs[index] = alpharhsL;
@@ -603,8 +629,8 @@ void ML_ADM_RHS_Body(cGH const * const cctkGH, CCTK_INT const dir, CCTK_INT cons
 
 void ML_ADM_RHS(CCTK_ARGUMENTS)
 {
-  DECLARE_CCTK_ARGUMENTS
-  DECLARE_CCTK_PARAMETERS
+  DECLARE_CCTK_ARGUMENTS;
+  DECLARE_CCTK_PARAMETERS;
   
   GenericFD_LoopOverInterior(cctkGH, &ML_ADM_RHS_Body);
 }
diff --git a/ML_ADM/src/ML_ADM_boundary.c b/ML_ADM/src/ML_ADM_boundary.c
index 672168a..d2ee732 100644
--- a/ML_ADM/src/ML_ADM_boundary.c
+++ b/ML_ADM/src/ML_ADM_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_ADM_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 */
@@ -90,7 +90,7 @@ void ML_ADM_boundary_Body(cGH const * const cctkGH, CCTK_INT const dir, CCTK_INT
   #pragma omp parallel
   LC_LOOP3 (ML_ADM_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;
@@ -177,8 +177,8 @@ void ML_ADM_boundary_Body(cGH const * const cctkGH, CCTK_INT const dir, CCTK_INT
 
 void ML_ADM_boundary(CCTK_ARGUMENTS)
 {
-  DECLARE_CCTK_ARGUMENTS
-  DECLARE_CCTK_PARAMETERS
+  DECLARE_CCTK_ARGUMENTS;
+  DECLARE_CCTK_PARAMETERS;
   
   GenericFD_LoopOverBoundaryWithGhosts(cctkGH, &ML_ADM_boundary_Body);
 }
diff --git a/ML_ADM/src/ML_ADM_constraints.c b/ML_ADM/src/ML_ADM_constraints.c
index ffbd568..17f24d7 100644
--- a/ML_ADM/src/ML_ADM_constraints.c
+++ b/ML_ADM/src/ML_ADM_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_ADM_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 */
@@ -90,7 +90,7 @@ void ML_ADM_constraints_Body(cGH const * const cctkGH, CCTK_INT const dir, CCTK_
   #pragma omp parallel
   LC_LOOP3 (ML_ADM_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;
@@ -123,64 +123,40 @@ void ML_ADM_constraints_Body(cGH const * const cctkGH, CCTK_INT const dir, CCTK_
     CCTK_REAL PDstandardNth3g11 = INITVALUE;
     CCTK_REAL PDstandardNth22g11 = INITVALUE;
     CCTK_REAL PDstandardNth33g11 = INITVALUE;
-    CCTK_REAL PDstandardNth12g11 = INITVALUE;
-    CCTK_REAL PDstandardNth13g11 = INITVALUE;
-    CCTK_REAL PDstandardNth21g11 = INITVALUE;
     CCTK_REAL PDstandardNth23g11 = INITVALUE;
-    CCTK_REAL PDstandardNth31g11 = INITVALUE;
-    CCTK_REAL PDstandardNth32g11 = INITVALUE;
     CCTK_REAL PDstandardNth1g12 = INITVALUE;
     CCTK_REAL PDstandardNth2g12 = INITVALUE;
     CCTK_REAL PDstandardNth3g12 = INITVALUE;
     CCTK_REAL PDstandardNth33g12 = INITVALUE;
     CCTK_REAL PDstandardNth12g12 = INITVALUE;
     CCTK_REAL PDstandardNth13g12 = INITVALUE;
-    CCTK_REAL PDstandardNth21g12 = INITVALUE;
     CCTK_REAL PDstandardNth23g12 = INITVALUE;
-    CCTK_REAL PDstandardNth31g12 = INITVALUE;
-    CCTK_REAL PDstandardNth32g12 = INITVALUE;
     CCTK_REAL PDstandardNth1g13 = INITVALUE;
     CCTK_REAL PDstandardNth2g13 = INITVALUE;
     CCTK_REAL PDstandardNth3g13 = INITVALUE;
     CCTK_REAL PDstandardNth22g13 = INITVALUE;
     CCTK_REAL PDstandardNth12g13 = INITVALUE;
     CCTK_REAL PDstandardNth13g13 = INITVALUE;
-    CCTK_REAL PDstandardNth21g13 = INITVALUE;
     CCTK_REAL PDstandardNth23g13 = INITVALUE;
-    CCTK_REAL PDstandardNth31g13 = INITVALUE;
-    CCTK_REAL PDstandardNth32g13 = INITVALUE;
     CCTK_REAL PDstandardNth1g22 = INITVALUE;
     CCTK_REAL PDstandardNth2g22 = INITVALUE;
     CCTK_REAL PDstandardNth3g22 = INITVALUE;
     CCTK_REAL PDstandardNth11g22 = INITVALUE;
     CCTK_REAL PDstandardNth33g22 = INITVALUE;
-    CCTK_REAL PDstandardNth12g22 = INITVALUE;
     CCTK_REAL PDstandardNth13g22 = INITVALUE;
-    CCTK_REAL PDstandardNth21g22 = INITVALUE;
-    CCTK_REAL PDstandardNth23g22 = INITVALUE;
-    CCTK_REAL PDstandardNth31g22 = INITVALUE;
-    CCTK_REAL PDstandardNth32g22 = INITVALUE;
     CCTK_REAL PDstandardNth1g23 = INITVALUE;
     CCTK_REAL PDstandardNth2g23 = INITVALUE;
     CCTK_REAL PDstandardNth3g23 = INITVALUE;
     CCTK_REAL PDstandardNth11g23 = INITVALUE;
     CCTK_REAL PDstandardNth12g23 = INITVALUE;
     CCTK_REAL PDstandardNth13g23 = INITVALUE;
-    CCTK_REAL PDstandardNth21g23 = INITVALUE;
     CCTK_REAL PDstandardNth23g23 = INITVALUE;
-    CCTK_REAL PDstandardNth31g23 = INITVALUE;
-    CCTK_REAL PDstandardNth32g23 = INITVALUE;
     CCTK_REAL PDstandardNth1g33 = INITVALUE;
     CCTK_REAL PDstandardNth2g33 = INITVALUE;
     CCTK_REAL PDstandardNth3g33 = INITVALUE;
     CCTK_REAL PDstandardNth11g33 = INITVALUE;
     CCTK_REAL PDstandardNth22g33 = INITVALUE;
     CCTK_REAL PDstandardNth12g33 = INITVALUE;
-    CCTK_REAL PDstandardNth13g33 = INITVALUE;
-    CCTK_REAL PDstandardNth21g33 = INITVALUE;
-    CCTK_REAL PDstandardNth23g33 = INITVALUE;
-    CCTK_REAL PDstandardNth31g33 = INITVALUE;
-    CCTK_REAL PDstandardNth32g33 = INITVALUE;
     CCTK_REAL PDstandardNth2K11 = INITVALUE;
     CCTK_REAL PDstandardNth3K11 = INITVALUE;
     CCTK_REAL PDstandardNth1K12 = INITVALUE;
@@ -274,26 +250,109 @@ void ML_ADM_constraints_Body(cGH const * const cctkGH, CCTK_INT const dir, CCTK_
     /* Precompute derivatives (old style) */
     
     /* Calculate temporaries and grid functions */
-    detg  =  2*g12L*g13L*g23L + g33L*(g11L*g22L - SQR(g12L)) - g22L*SQR(g13L) - 
-        g11L*SQR(g23L);
+    CCTK_REAL const T1000001  =  SQR(g23L);
     
-    gu11  =  INV(detg)*(g22L*g33L - SQR(g23L));
+    CCTK_REAL const T1000003  =  g13L*g23L;
     
-    gu12  =  (g13L*g23L - g12L*g33L)*INV(detg);
+    CCTK_REAL const T1000004  =  -(g12L*g33L);
     
-    gu13  =  (-(g13L*g22L) + g12L*g23L)*INV(detg);
+    CCTK_REAL const T1000007  =  SQR(g13L);
     
-    gu21  =  (g13L*g23L - g12L*g33L)*INV(detg);
+    CCTK_REAL const T1000008  =  -(g13L*g22L);
     
-    gu22  =  INV(detg)*(g11L*g33L - SQR(g13L));
+    CCTK_REAL const T1000009  =  g12L*g23L;
     
-    gu23  =  (g12L*g13L - g11L*g23L)*INV(detg);
+    CCTK_REAL const T1000012  =  g12L*g13L;
     
-    gu31  =  (-(g13L*g22L) + g12L*g23L)*INV(detg);
+    CCTK_REAL const T1000013  =  -(g11L*g23L);
     
-    gu32  =  (g12L*g13L - g11L*g23L)*INV(detg);
+    CCTK_REAL const T1000016  =  SQR(g12L);
     
-    gu33  =  INV(detg)*(g11L*g22L - SQR(g12L));
+    CCTK_REAL const T1000017  =  -PDstandardNth3g12;
+    
+    CCTK_REAL const T1000019  =  -PDstandardNth2g13;
+    
+    CCTK_REAL const T1000021  =  -PDstandardNth1g23;
+    
+    CCTK_REAL const T1000023  =  -PDstandardNth11g23;
+    
+    CCTK_REAL const T1000024  =  -PDstandardNth23g11;
+    
+    CCTK_REAL const T1000032  =  -2*PDstandardNth12g12;
+    
+    CCTK_REAL const T1000034  =  -PDstandardNth13g22;
+    
+    CCTK_REAL const T1000035  =  -PDstandardNth22g13;
+    
+    CCTK_REAL const T1000043  =  -2*PDstandardNth13g13;
+    
+    CCTK_REAL const T1000045  =  -PDstandardNth12g33;
+    
+    CCTK_REAL const T1000046  =  -PDstandardNth33g12;
+    
+    CCTK_REAL const T1000048  =  -2*PDstandardNth23g23;
+    
+    CCTK_REAL const T1000053  =  -PDstandardNth1K23;
+    
+    CCTK_REAL const T1000060  =  -PDstandardNth2K13;
+    
+    CCTK_REAL const T1000070  =  -PDstandardNth3K12;
+    
+    CCTK_REAL const T1000005  =  T1000003 + T1000004;
+    
+    CCTK_REAL const T1000010  =  T1000008 + T1000009;
+    
+    CCTK_REAL const T1000014  =  T1000012 + T1000013;
+    
+    CCTK_REAL const T1000018  =  PDstandardNth1g23 + PDstandardNth2g13 + T1000017;
+    
+    CCTK_REAL const T1000020  =  PDstandardNth1g23 + PDstandardNth3g12 + T1000019;
+    
+    CCTK_REAL const T1000022  =  PDstandardNth2g13 + PDstandardNth3g12 + T1000021;
+    
+    CCTK_REAL const T1000025  =  
+       PDstandardNth12g13 + PDstandardNth13g12 + T1000023 + T1000024;
+    
+    CCTK_REAL const T1000033  =  PDstandardNth11g22 + PDstandardNth22g11 + T1000032;
+    
+    CCTK_REAL const T1000036  =  
+       PDstandardNth12g23 + PDstandardNth23g12 + T1000034 + T1000035;
+    
+    CCTK_REAL const T1000044  =  PDstandardNth11g33 + PDstandardNth33g11 + T1000043;
+    
+    CCTK_REAL const T1000047  =  
+       PDstandardNth13g23 + PDstandardNth23g13 + T1000045 + T1000046;
+    
+    CCTK_REAL const T1000049  =  PDstandardNth22g33 + PDstandardNth33g22 + T1000048;
+    
+    detg  =  2*g12L*g13L*g23L + g11L*(g22L*g33L - T1000001) - g22L*T1000007 - 
+        g33L*T1000016;
+    
+    CCTK_REAL const T1000002  =  INV(detg);
+    
+    CCTK_REAL const T1000006  =  T1000002*T1000005;
+    
+    CCTK_REAL const T1000011  =  T1000002*T1000010;
+    
+    CCTK_REAL const T1000015  =  T1000002*T1000014;
+    
+    gu11  =  (g22L*g33L - T1000001)*T1000002;
+    
+    gu22  =  T1000002*(g11L*g33L - T1000007);
+    
+    gu33  =  T1000002*(g11L*g22L - T1000016);
+    
+    gu12  =  T1000006;
+    
+    gu13  =  T1000011;
+    
+    gu21  =  T1000006;
+    
+    gu23  =  T1000015;
+    
+    gu31  =  T1000011;
+    
+    gu32  =  T1000015;
     
     G111  =  khalf*(gu11*PDstandardNth1g11 + 
           2*(gu12*PDstandardNth1g12 + gu13*PDstandardNth1g13) - 
@@ -307,23 +366,17 @@ void ML_ADM_constraints_Body(cGH const * const cctkGH, CCTK_INT const dir, CCTK_
           2*(gu32*PDstandardNth1g12 + gu33*PDstandardNth1g13) - 
           gu32*PDstandardNth2g11 - gu33*PDstandardNth3g11);
     
-    G112  =  khalf*(gu12*PDstandardNth1g22 + gu11*PDstandardNth2g11 + 
-          gu13*(PDstandardNth1g23 + PDstandardNth2g13 - PDstandardNth3g12));
+    G112  =  khalf*(gu12*PDstandardNth1g22 + gu11*PDstandardNth2g11 + gu13*T1000018);
     
-    G212  =  khalf*(gu22*PDstandardNth1g22 + gu21*PDstandardNth2g11 + 
-          gu23*(PDstandardNth1g23 + PDstandardNth2g13 - PDstandardNth3g12));
+    G212  =  khalf*(gu22*PDstandardNth1g22 + gu21*PDstandardNth2g11 + gu23*T1000018);
     
-    G312  =  khalf*(gu32*PDstandardNth1g22 + gu31*PDstandardNth2g11 + 
-          gu33*(PDstandardNth1g23 + PDstandardNth2g13 - PDstandardNth3g12));
+    G312  =  khalf*(gu32*PDstandardNth1g22 + gu31*PDstandardNth2g11 + gu33*T1000018);
     
-    G113  =  khalf*(gu13*PDstandardNth1g33 + gu11*PDstandardNth3g11 + 
-          gu12*(PDstandardNth1g23 - PDstandardNth2g13 + PDstandardNth3g12));
+    G113  =  khalf*(gu13*PDstandardNth1g33 + gu11*PDstandardNth3g11 + gu12*T1000020);
     
-    G213  =  khalf*(gu23*PDstandardNth1g33 + gu21*PDstandardNth3g11 + 
-          gu22*(PDstandardNth1g23 - PDstandardNth2g13 + PDstandardNth3g12));
+    G213  =  khalf*(gu23*PDstandardNth1g33 + gu21*PDstandardNth3g11 + gu22*T1000020);
     
-    G313  =  khalf*(gu33*PDstandardNth1g33 + gu31*PDstandardNth3g11 + 
-          gu32*(PDstandardNth1g23 - PDstandardNth2g13 + PDstandardNth3g12));
+    G313  =  khalf*(gu33*PDstandardNth1g33 + gu31*PDstandardNth3g11 + gu32*T1000020);
     
     G122  =  khalf*(gu11*(-PDstandardNth1g22 + 2*PDstandardNth2g12) + 
           gu12*PDstandardNth2g22 + gu13*(2*PDstandardNth2g23 - PDstandardNth3g22));
@@ -334,17 +387,11 @@ void ML_ADM_constraints_Body(cGH const * const cctkGH, CCTK_INT const dir, CCTK_
     G322  =  khalf*(gu31*(-PDstandardNth1g22 + 2*PDstandardNth2g12) + 
           gu32*PDstandardNth2g22 + gu33*(2*PDstandardNth2g23 - PDstandardNth3g22));
     
-    G123  =  khalf*(gu13*PDstandardNth2g33 + 
-          gu11*(-PDstandardNth1g23 + PDstandardNth2g13 + PDstandardNth3g12) + 
-          gu12*PDstandardNth3g22);
+    G123  =  khalf*(gu13*PDstandardNth2g33 + gu12*PDstandardNth3g22 + gu11*T1000022);
     
-    G223  =  khalf*(gu23*PDstandardNth2g33 + 
-          gu21*(-PDstandardNth1g23 + PDstandardNth2g13 + PDstandardNth3g12) + 
-          gu22*PDstandardNth3g22);
+    G223  =  khalf*(gu23*PDstandardNth2g33 + gu22*PDstandardNth3g22 + gu21*T1000022);
     
-    G323  =  khalf*(gu33*PDstandardNth2g33 + 
-          gu31*(-PDstandardNth1g23 + PDstandardNth2g13 + PDstandardNth3g12) + 
-          gu32*PDstandardNth3g22);
+    G323  =  khalf*(gu33*PDstandardNth2g33 + gu32*PDstandardNth3g22 + gu31*T1000022);
     
     G133  =  khalf*(-(gu11*PDstandardNth1g33) - gu12*PDstandardNth2g33 + 
           2*gu11*PDstandardNth3g13 + 2*gu12*PDstandardNth3g23 + 
@@ -358,17 +405,83 @@ void ML_ADM_constraints_Body(cGH const * const cctkGH, CCTK_INT const dir, CCTK_
           2*gu31*PDstandardNth3g13 + 2*gu32*PDstandardNth3g23 + 
           gu33*PDstandardNth3g33);
     
-    R11  =  -(G111*(G111 + G122 + G133)) - G211*(G211 + G222 + G233) - 
-        G311*(G311 + G322 + G333) + khalf*
-         (-(gu22*(PDstandardNth11g22 - 2*PDstandardNth12g12 + 
-                PDstandardNth22g11)) + 
-           gu23*(-PDstandardNth11g23 + PDstandardNth12g13 + PDstandardNth13g12 - 
-              PDstandardNth23g11) + gu32*
-            (-PDstandardNth11g23 + PDstandardNth12g13 + PDstandardNth13g12 - 
-              PDstandardNth23g11) - gu33*
-            (PDstandardNth11g33 - 2*PDstandardNth13g13 + PDstandardNth33g11)) + 
-        SQR(G111) + SQR(G112) + SQR(G113) + SQR(G211) + SQR(G212) + SQR(G213) + 
-        SQR(G311) + SQR(G312) + SQR(G313);
+    Km11  =  gu11*K11L + gu12*K12L + gu13*K13L;
+    
+    Km21  =  gu21*K11L + gu22*K12L + gu23*K13L;
+    
+    Km31  =  gu31*K11L + gu32*K12L + gu33*K13L;
+    
+    Km12  =  gu11*K12L + gu12*K22L + gu13*K23L;
+    
+    Km22  =  gu21*K12L + gu22*K22L + gu23*K23L;
+    
+    Km32  =  gu31*K12L + gu32*K22L + gu33*K23L;
+    
+    Km13  =  gu11*K13L + gu12*K23L + gu13*K33L;
+    
+    Km23  =  gu21*K13L + gu22*K23L + gu23*K33L;
+    
+    Km33  =  gu31*K13L + gu32*K23L + gu33*K33L;
+    
+    CCTK_REAL const T1000026  =  SQR(G112);
+    
+    CCTK_REAL const T1000027  =  G111 + G122 + G133;
+    
+    CCTK_REAL const T1000028  =  SQR(G212);
+    
+    CCTK_REAL const T1000029  =  G211 + G222 + G233;
+    
+    CCTK_REAL const T1000030  =  SQR(G312);
+    
+    CCTK_REAL const T1000031  =  G311 + G322 + G333;
+    
+    CCTK_REAL const T1000037  =  SQR(G113);
+    
+    CCTK_REAL const T1000038  =  SQR(G123);
+    
+    CCTK_REAL const T1000039  =  SQR(G213);
+    
+    CCTK_REAL const T1000040  =  SQR(G223);
+    
+    CCTK_REAL const T1000041  =  SQR(G313);
+    
+    CCTK_REAL const T1000042  =  SQR(G323);
+    
+    CCTK_REAL const T1000050  =  -(G123*K11L);
+    
+    CCTK_REAL const T1000051  =  -(G223*K12L);
+    
+    CCTK_REAL const T1000052  =  -(G323*K13L);
+    
+    CCTK_REAL const T1000054  =  -(G113*K12L);
+    
+    CCTK_REAL const T1000055  =  G112*K13L;
+    
+    CCTK_REAL const T1000056  =  -(G213*K22L);
+    
+    CCTK_REAL const T1000057  =  G212*K23L;
+    
+    CCTK_REAL const T1000058  =  -(G313*K23L);
+    
+    CCTK_REAL const T1000059  =  G312*K33L;
+    
+    CCTK_REAL const T1000061  =  G123*K11L;
+    
+    CCTK_REAL const T1000062  =  G223*K12L;
+    
+    CCTK_REAL const T1000063  =  G323*K13L;
+    
+    CCTK_REAL const T1000064  =  G113*K12L;
+    
+    CCTK_REAL const T1000065  =  -(G112*K13L);
+    
+    CCTK_REAL const T1000066  =  G213*K22L;
+    
+    CCTK_REAL const T1000067  =  -(G212*K23L);
+    
+    CCTK_REAL const T1000068  =  G313*K23L;
+    
+    CCTK_REAL const T1000069  =  -(G312*K33L);
     
     R12  =  khalf*(2*(G113*G123 + G213*G223 + G313*G323) - 
           2*(G112*G133 + G212*G233 + G312*G333 + gu12*PDstandardNth12g12) - 
@@ -389,18 +502,6 @@ void ML_ADM_constraints_Body(cGH const * const cctkGH, CCTK_INT const dir, CCTK_
           gu23*(PDstandardNth12g33 - PDstandardNth13g23 - PDstandardNth23g13 + 
              PDstandardNth33g12));
     
-    R22  =  -(G122*(G111 + G122 + G133)) - G222*(G211 + G222 + G233) - 
-        G322*(G311 + G322 + G333) + khalf*
-         (-(gu11*(PDstandardNth11g22 - 2*PDstandardNth12g12 + 
-                PDstandardNth22g11)) + 
-           gu13*(PDstandardNth12g23 - PDstandardNth13g22 - PDstandardNth22g13 + 
-              PDstandardNth23g12) + gu31*
-            (PDstandardNth12g23 - PDstandardNth13g22 - PDstandardNth22g13 + 
-              PDstandardNth23g12) - gu33*
-            (PDstandardNth22g33 - 2*PDstandardNth23g23 + PDstandardNth33g22)) + 
-        SQR(G112) + SQR(G122) + SQR(G123) + SQR(G212) + SQR(G222) + SQR(G223) + 
-        SQR(G312) + SQR(G322) + SQR(G323);
-    
     R23  =  khalf*(2*(G112*G113 + G212*G213 + G312*G313) + 
           gu11*(-PDstandardNth11g23 + PDstandardNth12g13 + PDstandardNth13g12 - 
              PDstandardNth23g11) + gu21*
@@ -410,82 +511,67 @@ void ML_ADM_constraints_Body(cGH const * const cctkGH, CCTK_INT const dir, CCTK_
           gu13*(PDstandardNth12g33 - PDstandardNth13g23 - PDstandardNth23g13 + 
              PDstandardNth33g12) + gu23*(PDstandardNth22g33 + PDstandardNth33g22));
     
-    R33  =  -(G133*(G111 + G122 + G133)) - G233*(G211 + G222 + G233) - 
-        G333*(G311 + G322 + G333) + khalf*
-         (-(gu11*(PDstandardNth11g33 - 2*PDstandardNth13g13 + 
-                PDstandardNth33g11)) + 
-           gu12*(-PDstandardNth12g33 + PDstandardNth13g23 + PDstandardNth23g13 - 
-              PDstandardNth33g12) + gu21*
-            (-PDstandardNth12g33 + PDstandardNth13g23 + PDstandardNth23g13 - 
-              PDstandardNth33g12) - gu22*
-            (PDstandardNth22g33 - 2*PDstandardNth23g23 + PDstandardNth33g22)) + 
-        SQR(G113) + SQR(G123) + SQR(G133) + SQR(G213) + SQR(G223) + SQR(G233) + 
-        SQR(G313) + SQR(G323) + SQR(G333);
-    
-    trR  =  gu11*R11 + (gu12 + gu21)*R12 + (gu13 + gu31)*R13 + gu22*R22 + 
-        (gu23 + gu32)*R23 + gu33*R33;
-    
-    Km11  =  gu11*K11L + gu12*K12L + gu13*K13L;
-    
-    Km21  =  gu21*K11L + gu22*K12L + gu23*K13L;
-    
-    Km31  =  gu31*K11L + gu32*K12L + gu33*K13L;
-    
-    Km12  =  gu11*K12L + gu12*K22L + gu13*K23L;
-    
-    Km22  =  gu21*K12L + gu22*K22L + gu23*K23L;
-    
-    Km32  =  gu31*K12L + gu32*K22L + gu33*K23L;
-    
-    Km13  =  gu11*K13L + gu12*K23L + gu13*K33L;
+    trK  =  Km11 + Km22 + Km33;
     
-    Km23  =  gu21*K13L + gu22*K23L + gu23*K33L;
+    R11  =  T1000026 - G111*T1000027 + T1000028 - G211*T1000029 + T1000030 - 
+        G311*T1000031 + T1000037 + T1000039 + T1000041 + 
+        khalf*(gu23*T1000025 + gu32*T1000025 - gu22*T1000033 - gu33*T1000044) + 
+        SQR(G111) + SQR(G211) + SQR(G311);
     
-    Km33  =  gu31*K13L + gu32*K23L + gu33*K33L;
+    R22  =  T1000026 - G122*T1000027 + T1000028 - G222*T1000029 + T1000030 - 
+        G322*T1000031 + T1000038 + T1000040 + T1000042 + 
+        khalf*(-(gu11*T1000033) + gu13*T1000036 + gu31*T1000036 - gu33*T1000049) + 
+        SQR(G122) + SQR(G222) + SQR(G322);
     
-    trK  =  Km11 + Km22 + Km33;
-    
-    HL  =  -2*(Km12*Km21 + Km13*Km31 + Km23*Km32) + trR - SQR(Km11) - SQR(Km22) - 
-        SQR(Km33) + SQR(trK);
+    R33  =  -(G133*T1000027) - G233*T1000029 - G333*T1000031 + T1000037 + T1000038 + 
+        T1000039 + T1000040 + T1000041 + T1000042 + 
+        khalf*(-(gu11*T1000044) + gu12*T1000047 + gu21*T1000047 - gu22*T1000049) + 
+        SQR(G133) + SQR(G233) + SQR(G333);
     
     M1L  =  gu21*(-(G112*K11L) + G111*K12L - G212*K12L - G312*K13L + G211*K22L + 
            G311*K23L - PDstandardNth1K12 + PDstandardNth2K11) + 
         gu22*(-(G122*K11L) + G112*K12L - G222*K12L - G322*K13L + G212*K22L + 
            G312*K23L - PDstandardNth1K22 + PDstandardNth2K12) + 
-        gu23*(-(G123*K11L) + G113*K12L - G223*K12L - G323*K13L + G213*K22L + 
-           G313*K23L - PDstandardNth1K23 + PDstandardNth2K13) + 
         gu31*(-(G113*K11L) - G213*K12L + G111*K13L - G313*K13L + G211*K23L + 
            G311*K33L - PDstandardNth1K13 + PDstandardNth3K11) + 
-        gu32*(-(G123*K11L) - G223*K12L + G112*K13L - G323*K13L + G212*K23L + 
-           G312*K33L - PDstandardNth1K23 + PDstandardNth3K12) + 
         gu33*(-(G133*K11L) - G233*K12L + G113*K13L - G333*K13L + G213*K23L + 
-           G313*K33L - PDstandardNth1K33 + PDstandardNth3K13);
+           G313*K33L - PDstandardNth1K33 + PDstandardNth3K13) + 
+        gu32*(PDstandardNth3K12 + T1000050 + T1000051 + T1000052 + T1000053 + 
+           T1000055 + T1000057 + T1000059) + 
+        gu23*(PDstandardNth2K13 + T1000050 + T1000051 + T1000052 + T1000053 + 
+           T1000064 + T1000066 + T1000068);
     
     M2L  =  gu11*(G112*K11L + (-G111 + G212)*K12L + G312*K13L - G211*K22L - 
            G311*K23L + PDstandardNth1K12 - PDstandardNth2K11) + 
         gu12*(G122*K11L + (-G112 + G222)*K12L + G322*K13L - G212*K22L - G312*K23L + 
            PDstandardNth1K22 - PDstandardNth2K12) + 
-        gu13*(G123*K11L + (-G113 + G223)*K12L + G323*K13L - G213*K22L - G313*K23L + 
-           PDstandardNth1K23 - PDstandardNth2K13) + 
-        gu31*(-(G113*K12L) + G112*K13L - G213*K22L + G212*K23L - G313*K23L + 
-           G312*K33L - PDstandardNth2K13 + PDstandardNth3K12) + 
         gu32*(-(G123*K12L) + G122*K13L - G223*K22L + G222*K23L - G323*K23L + 
            G322*K33L - PDstandardNth2K23 + PDstandardNth3K22) + 
         gu33*(-(G133*K12L) + G123*K13L - G233*K22L + G223*K23L - G333*K23L + 
-           G323*K33L - PDstandardNth2K33 + PDstandardNth3K23);
+           G323*K33L - PDstandardNth2K33 + PDstandardNth3K23) + 
+        gu31*(PDstandardNth3K12 + T1000054 + T1000055 + T1000056 + T1000057 + 
+           T1000058 + T1000059 + T1000060) + 
+        gu13*(PDstandardNth1K23 + T1000054 + T1000056 + T1000058 + T1000060 + 
+           T1000061 + T1000062 + T1000063);
     
     M3L  =  gu11*(G113*K11L + G213*K12L + (-G111 + G313)*K13L - G211*K23L - 
            G311*K33L + PDstandardNth1K13 - PDstandardNth3K11) + 
-        gu12*(G123*K11L + G223*K12L + (-G112 + G323)*K13L - G212*K23L - G312*K33L + 
-           PDstandardNth1K23 - PDstandardNth3K12) + 
-        gu21*(G113*K12L - G112*K13L + G213*K22L - G212*K23L + G313*K23L - 
-           G312*K33L + PDstandardNth2K13 - PDstandardNth3K12) + 
         gu13*(G133*K11L + G233*K12L + (-G113 + G333)*K13L - G213*K23L - G313*K33L + 
            PDstandardNth1K33 - PDstandardNth3K13) + 
         gu22*(G123*K12L - G122*K13L + G223*K22L - G222*K23L + G323*K23L - 
            G322*K33L + PDstandardNth2K23 - PDstandardNth3K22) + 
         gu23*(G133*K12L - G123*K13L + G233*K22L - G223*K23L + G333*K23L - 
-           G323*K33L + PDstandardNth2K33 - PDstandardNth3K23);
+           G323*K33L + PDstandardNth2K33 - PDstandardNth3K23) + 
+        gu12*(PDstandardNth1K23 + T1000061 + T1000062 + T1000063 + T1000065 + 
+           T1000067 + T1000069 + T1000070) + 
+        gu21*(PDstandardNth2K13 + T1000064 + T1000065 + T1000066 + T1000067 + 
+           T1000068 + T1000069 + T1000070);
+    
+    trR  =  gu11*R11 + (gu12 + gu21)*R12 + (gu13 + gu31)*R13 + gu22*R22 + 
+        (gu23 + gu32)*R23 + gu33*R33;
+    
+    HL  =  -2*(Km12*Km21 + Km13*Km31 + Km23*Km32) + trR - SQR(Km11) - SQR(Km22) - 
+        SQR(Km33) + SQR(trK);
     
     
     /* Copy local copies back to grid functions */
@@ -501,8 +587,8 @@ void ML_ADM_constraints_Body(cGH const * const cctkGH, CCTK_INT const dir, CCTK_
 
 void ML_ADM_constraints(CCTK_ARGUMENTS)
 {
-  DECLARE_CCTK_ARGUMENTS
-  DECLARE_CCTK_PARAMETERS
+  DECLARE_CCTK_ARGUMENTS;
+  DECLARE_CCTK_PARAMETERS;
   
   GenericFD_LoopOverInterior(cctkGH, &ML_ADM_constraints_Body);
 }
diff --git a/ML_ADM/src/ML_ADM_constraints_boundary.c b/ML_ADM/src/ML_ADM_constraints_boundary.c
index 9a9a86a..565667e 100644
--- a/ML_ADM/src/ML_ADM_constraints_boundary.c
+++ b/ML_ADM/src/ML_ADM_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_ADM_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 */
@@ -90,7 +90,7 @@ void ML_ADM_constraints_boundary_Body(cGH const * const cctkGH, CCTK_INT const d
   #pragma omp parallel
   LC_LOOP3 (ML_ADM_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;
@@ -139,8 +139,8 @@ void ML_ADM_constraints_boundary_Body(cGH const * const cctkGH, CCTK_INT const d
 
 void ML_ADM_constraints_boundary(CCTK_ARGUMENTS)
 {
-  DECLARE_CCTK_ARGUMENTS
-  DECLARE_CCTK_PARAMETERS
+  DECLARE_CCTK_ARGUMENTS;
+  DECLARE_CCTK_PARAMETERS;
   
   GenericFD_LoopOverBoundaryWithGhosts(cctkGH, &ML_ADM_constraints_boundary_Body);
 }
diff --git a/ML_ADM/src/ML_ADM_convertFromADMBase.c b/ML_ADM/src/ML_ADM_convertFromADMBase.c
index ba44280..84fc4eb 100644
--- a/ML_ADM/src/ML_ADM_convertFromADMBase.c
+++ b/ML_ADM/src/ML_ADM_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_ADM_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 */
@@ -90,7 +90,7 @@ void ML_ADM_convertFromADMBase_Body(cGH const * const cctkGH, CCTK_INT const dir
   #pragma omp parallel
   LC_LOOP3 (ML_ADM_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;
@@ -209,8 +209,8 @@ void ML_ADM_convertFromADMBase_Body(cGH const * const cctkGH, CCTK_INT const dir
 
 void ML_ADM_convertFromADMBase(CCTK_ARGUMENTS)
 {
-  DECLARE_CCTK_ARGUMENTS
-  DECLARE_CCTK_PARAMETERS
+  DECLARE_CCTK_ARGUMENTS;
+  DECLARE_CCTK_PARAMETERS;
   
   GenericFD_LoopOverEverything(cctkGH, &ML_ADM_convertFromADMBase_Body);
 }
diff --git a/ML_ADM/src/ML_ADM_convertToADMBase.c b/ML_ADM/src/ML_ADM_convertToADMBase.c
index d46ffef..360dc7b 100644
--- a/ML_ADM/src/ML_ADM_convertToADMBase.c
+++ b/ML_ADM/src/ML_ADM_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_ADM_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 */
@@ -90,7 +90,7 @@ void ML_ADM_convertToADMBase_Body(cGH const * const cctkGH, CCTK_INT const dir,
   #pragma omp parallel
   LC_LOOP3 (ML_ADM_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;
@@ -225,8 +225,8 @@ void ML_ADM_convertToADMBase_Body(cGH const * const cctkGH, CCTK_INT const dir,
 
 void ML_ADM_convertToADMBase(CCTK_ARGUMENTS)
 {
-  DECLARE_CCTK_ARGUMENTS
-  DECLARE_CCTK_PARAMETERS
+  DECLARE_CCTK_ARGUMENTS;
+  DECLARE_CCTK_PARAMETERS;
   
   GenericFD_LoopOverEverything(cctkGH, &ML_ADM_convertToADMBase_Body);
 }
diff --git a/ML_ADM/src/RegisterMoL.c b/ML_ADM/src/RegisterMoL.c
index e65c17e..5921f17 100644
--- a/ML_ADM/src/RegisterMoL.c
+++ b/ML_ADM/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_ADM_RegisterVars(CCTK_ARGUMENTS)
 {
-  DECLARE_CCTK_ARGUMENTS
-  DECLARE_CCTK_PARAMETERS
+  DECLARE_CCTK_ARGUMENTS;
+  DECLARE_CCTK_PARAMETERS;
   
   CCTK_INT ierr = 0;
   
diff --git a/ML_ADM/src/RegisterSymmetries.c b/ML_ADM/src/RegisterSymmetries.c
index 457279f..bb35307 100644
--- a/ML_ADM/src/RegisterSymmetries.c
+++ b/ML_ADM/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_ADM_RegisterSymmetries(CCTK_ARGUMENTS)
 {
-  DECLARE_CCTK_ARGUMENTS
-  DECLARE_CCTK_PARAMETERS
+  DECLARE_CCTK_ARGUMENTS;
+  DECLARE_CCTK_PARAMETERS;
   
   
   /* array holding symmetry definitions */
diff --git a/ML_ADM/src/Startup.c b/ML_ADM/src/Startup.c
index 644d208..f2fc60b 100644
--- a/ML_ADM/src/Startup.c
+++ b/ML_ADM/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_ADM/src/make.code.defn b/ML_ADM/src/make.code.defn
index 00bec0f..5143870 100644
--- a/ML_ADM/src/make.code.defn
+++ b/ML_ADM/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