Regenerate code

Testsuite passes

6 files changed, 630 insertions, 322 deletions

diff --git a/ML_BSSN_O2/param.ccl b/ML_BSSN_O2/param.ccl
index 936327f..b83b791 100644
--- a/ML_BSSN_O2/param.ccl
+++ b/ML_BSSN_O2/param.ccl
@@ -251,6 +251,12 @@ CCTK_INT ML_BSSN_O2_Dissipation_calc_every "ML_BSSN_O2_Dissipation_calc_every" S
 } 1
 
 restricted:
+CCTK_INT ML_BSSN_O2_Advect_calc_every "ML_BSSN_O2_Advect_calc_every" STEERABLE=ALWAYS
+{
+  *:* :: ""
+} 1
+
+restricted:
 CCTK_INT ML_BSSN_O2_RHSStaticBoundary_calc_every "ML_BSSN_O2_RHSStaticBoundary_calc_every" STEERABLE=ALWAYS
 {
   *:* :: ""
@@ -341,6 +347,12 @@ CCTK_INT ML_BSSN_O2_Dissipation_calc_offset "ML_BSSN_O2_Dissipation_calc_offset"
 } 0
 
 restricted:
+CCTK_INT ML_BSSN_O2_Advect_calc_offset "ML_BSSN_O2_Advect_calc_offset" STEERABLE=ALWAYS
+{
+  *:* :: ""
+} 0
+
+restricted:
 CCTK_INT ML_BSSN_O2_RHSStaticBoundary_calc_offset "ML_BSSN_O2_RHSStaticBoundary_calc_offset" STEERABLE=ALWAYS
 {
   *:* :: ""
diff --git a/ML_BSSN_O2/schedule.ccl b/ML_BSSN_O2/schedule.ccl
index e8a7e67..be24cf9 100644
--- a/ML_BSSN_O2/schedule.ccl
+++ b/ML_BSSN_O2/schedule.ccl
@@ -312,6 +312,11 @@ if (CCTK_EQUALS(apply_dissipation, "always"))
   } "ML_BSSN_O2_Dissipation"
 }
 
+schedule ML_BSSN_O2_Advect IN ML_BSSN_O2_evolCalcGroup after ML_BSSN_O2_RHS2
+{
+  LANG: C
+} "ML_BSSN_O2_Advect"
+
 
 if (CCTK_EQUALS(my_rhs_boundary_condition, "static"))
 {
diff --git a/ML_BSSN_O2/src/ML_BSSN_O2_Advect.cc b/ML_BSSN_O2/src/ML_BSSN_O2_Advect.cc
new file mode 100644
index 0000000..8c77ac7
--- /dev/null
+++ b/ML_BSSN_O2/src/ML_BSSN_O2_Advect.cc
@@ -0,0 +1,531 @@
+/*  File produced by Kranc */
+
+#define KRANC_C
+
+#include <assert.h>
+#include <math.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "cctk.h"
+#include "cctk_Arguments.h"
+#include "cctk_Parameters.h"
+#include "GenericFD.h"
+#include "Differencing.h"
+#include "loopcontrol.h"
+
+/* Define macros used in calculations */
+#define INITVALUE (42)
+#define QAD(x) (SQR(SQR(x)))
+#define INV(x) ((1.0) / (x))
+#define SQR(x) ((x) * (x))
+#define CUB(x) ((x) * (x) * (x))
+
+extern "C" void ML_BSSN_O2_Advect_SelectBCs(CCTK_ARGUMENTS)
+{
+  DECLARE_CCTK_ARGUMENTS;
+  DECLARE_CCTK_PARAMETERS;
+  
+  CCTK_INT ierr = 0;
+  ierr = Boundary_SelectGroupForBC(cctkGH, CCTK_ALL_FACES, GenericFD_GetBoundaryWidth(cctkGH), -1 /* no table */, "ML_BSSN_O2::ML_curvrhs","flat");
+  if (ierr < 0)
+    CCTK_WARN(1, "Failed to register flat BC for ML_BSSN_O2::ML_curvrhs.");
+  ierr = Boundary_SelectGroupForBC(cctkGH, CCTK_ALL_FACES, GenericFD_GetBoundaryWidth(cctkGH), -1 /* no table */, "ML_BSSN_O2::ML_dtlapserhs","flat");
+  if (ierr < 0)
+    CCTK_WARN(1, "Failed to register flat BC for ML_BSSN_O2::ML_dtlapserhs.");
+  ierr = Boundary_SelectGroupForBC(cctkGH, CCTK_ALL_FACES, GenericFD_GetBoundaryWidth(cctkGH), -1 /* no table */, "ML_BSSN_O2::ML_dtshiftrhs","flat");
+  if (ierr < 0)
+    CCTK_WARN(1, "Failed to register flat BC for ML_BSSN_O2::ML_dtshiftrhs.");
+  ierr = Boundary_SelectGroupForBC(cctkGH, CCTK_ALL_FACES, GenericFD_GetBoundaryWidth(cctkGH), -1 /* no table */, "ML_BSSN_O2::ML_Gammarhs","flat");
+  if (ierr < 0)
+    CCTK_WARN(1, "Failed to register flat BC for ML_BSSN_O2::ML_Gammarhs.");
+  ierr = Boundary_SelectGroupForBC(cctkGH, CCTK_ALL_FACES, GenericFD_GetBoundaryWidth(cctkGH), -1 /* no table */, "ML_BSSN_O2::ML_lapserhs","flat");
+  if (ierr < 0)
+    CCTK_WARN(1, "Failed to register flat BC for ML_BSSN_O2::ML_lapserhs.");
+  ierr = Boundary_SelectGroupForBC(cctkGH, CCTK_ALL_FACES, GenericFD_GetBoundaryWidth(cctkGH), -1 /* no table */, "ML_BSSN_O2::ML_log_confacrhs","flat");
+  if (ierr < 0)
+    CCTK_WARN(1, "Failed to register flat BC for ML_BSSN_O2::ML_log_confacrhs.");
+  ierr = Boundary_SelectGroupForBC(cctkGH, CCTK_ALL_FACES, GenericFD_GetBoundaryWidth(cctkGH), -1 /* no table */, "ML_BSSN_O2::ML_metricrhs","flat");
+  if (ierr < 0)
+    CCTK_WARN(1, "Failed to register flat BC for ML_BSSN_O2::ML_metricrhs.");
+  ierr = Boundary_SelectGroupForBC(cctkGH, CCTK_ALL_FACES, GenericFD_GetBoundaryWidth(cctkGH), -1 /* no table */, "ML_BSSN_O2::ML_shiftrhs","flat");
+  if (ierr < 0)
+    CCTK_WARN(1, "Failed to register flat BC for ML_BSSN_O2::ML_shiftrhs.");
+  ierr = Boundary_SelectGroupForBC(cctkGH, CCTK_ALL_FACES, GenericFD_GetBoundaryWidth(cctkGH), -1 /* no table */, "ML_BSSN_O2::ML_trace_curvrhs","flat");
+  if (ierr < 0)
+    CCTK_WARN(1, "Failed to register flat BC for ML_BSSN_O2::ML_trace_curvrhs.");
+  return;
+}
+
+static void ML_BSSN_O2_Advect_Body(cGH const * restrict const cctkGH, int const dir, int const face, CCTK_REAL const normal[3], CCTK_REAL const tangentA[3], CCTK_REAL const tangentB[3], int const min[3], int const max[3], int const n_subblock_gfs, CCTK_REAL * restrict const subblock_gfs[])
+{
+  DECLARE_CCTK_ARGUMENTS;
+  DECLARE_CCTK_PARAMETERS;
+  
+  
+  /* Declare finite differencing variables */
+  
+  if (verbose > 1)
+  {
+    CCTK_VInfo(CCTK_THORNSTRING,"Entering ML_BSSN_O2_Advect_Body");
+  }
+  
+  if (cctk_iteration % ML_BSSN_O2_Advect_calc_every != ML_BSSN_O2_Advect_calc_offset)
+  {
+    return;
+  }
+  
+  const char *groups[] = {"ML_BSSN_O2::ML_curv","ML_BSSN_O2::ML_curvrhs","ML_BSSN_O2::ML_dtlapse","ML_BSSN_O2::ML_dtlapserhs","ML_BSSN_O2::ML_dtshift","ML_BSSN_O2::ML_dtshiftrhs","ML_BSSN_O2::ML_Gamma","ML_BSSN_O2::ML_Gammarhs","ML_BSSN_O2::ML_lapse","ML_BSSN_O2::ML_lapserhs","ML_BSSN_O2::ML_log_confac","ML_BSSN_O2::ML_log_confacrhs","ML_BSSN_O2::ML_metric","ML_BSSN_O2::ML_metricrhs","ML_BSSN_O2::ML_shift","ML_BSSN_O2::ML_shiftrhs","ML_BSSN_O2::ML_trace_curv","ML_BSSN_O2::ML_trace_curvrhs"};
+  GenericFD_AssertGroupStorage(cctkGH, "ML_BSSN_O2_Advect", 18, groups);
+  
+  GenericFD_EnsureStencilFits(cctkGH, "ML_BSSN_O2_Advect", 2, 2, 2);
+  
+  /* Include user-supplied include files */
+  
+  /* Initialise finite differencing variables */
+  ptrdiff_t const di = 1;
+  ptrdiff_t const dj = CCTK_GFINDEX3D(cctkGH,0,1,0) - CCTK_GFINDEX3D(cctkGH,0,0,0);
+  ptrdiff_t const dk = CCTK_GFINDEX3D(cctkGH,0,0,1) - CCTK_GFINDEX3D(cctkGH,0,0,0);
+  ptrdiff_t const cdi = sizeof(CCTK_REAL) * di;
+  ptrdiff_t const cdj = sizeof(CCTK_REAL) * dj;
+  ptrdiff_t const cdk = sizeof(CCTK_REAL) * dk;
+  CCTK_REAL const dx = ToReal(CCTK_DELTA_SPACE(0));
+  CCTK_REAL const dy = ToReal(CCTK_DELTA_SPACE(1));
+  CCTK_REAL const dz = ToReal(CCTK_DELTA_SPACE(2));
+  CCTK_REAL const dt = ToReal(CCTK_DELTA_TIME);
+  CCTK_REAL const dxi = INV(dx);
+  CCTK_REAL const dyi = INV(dy);
+  CCTK_REAL const dzi = INV(dz);
+  CCTK_REAL const khalf = 0.5;
+  CCTK_REAL const kthird = 1/3.0;
+  CCTK_REAL const ktwothird = 2.0/3.0;
+  CCTK_REAL const kfourthird = 4.0/3.0;
+  CCTK_REAL const keightthird = 8.0/3.0;
+  CCTK_REAL const hdxi = 0.5 * dxi;
+  CCTK_REAL const hdyi = 0.5 * dyi;
+  CCTK_REAL const hdzi = 0.5 * dzi;
+  
+  /* Initialize predefined quantities */
+  CCTK_REAL const p1o16dx = 0.0625*INV(dx);
+  CCTK_REAL const p1o16dy = 0.0625*INV(dy);
+  CCTK_REAL const p1o16dz = 0.0625*INV(dz);
+  CCTK_REAL const p1o2dx = 0.5*INV(dx);
+  CCTK_REAL const p1o2dy = 0.5*INV(dy);
+  CCTK_REAL const p1o2dz = 0.5*INV(dz);
+  CCTK_REAL const p1o4dx = 0.25*INV(dx);
+  CCTK_REAL const p1o4dxdy = 0.25*INV(dx)*INV(dy);
+  CCTK_REAL const p1o4dxdz = 0.25*INV(dx)*INV(dz);
+  CCTK_REAL const p1o4dy = 0.25*INV(dy);
+  CCTK_REAL const p1o4dydz = 0.25*INV(dy)*INV(dz);
+  CCTK_REAL const p1o4dz = 0.25*INV(dz);
+  CCTK_REAL const p1odx = INV(dx);
+  CCTK_REAL const p1odx2 = INV(SQR(dx));
+  CCTK_REAL const p1ody = INV(dy);
+  CCTK_REAL const p1ody2 = INV(SQR(dy));
+  CCTK_REAL const p1odz = INV(dz);
+  CCTK_REAL const p1odz2 = INV(SQR(dz));
+  CCTK_REAL const pm1o2dx = -0.5*INV(dx);
+  CCTK_REAL const pm1o2dy = -0.5*INV(dy);
+  CCTK_REAL const pm1o2dz = -0.5*INV(dz);
+  CCTK_REAL const pm1o4dx = -0.25*INV(dx);
+  CCTK_REAL const pm1o4dy = -0.25*INV(dy);
+  CCTK_REAL const pm1o4dz = -0.25*INV(dz);
+  
+  /* Loop over the grid points */
+  #pragma omp parallel
+  LC_LOOP3 (ML_BSSN_O2_Advect,
+    i,j,k, min[0],min[1],min[2], max[0],max[1],max[2],
+    cctk_lsh[0],cctk_lsh[1],cctk_lsh[2])
+  {
+    ptrdiff_t const index = di*i + dj*j + dk*k;
+    
+    /* Assign local copies of grid functions */
+    
+    CCTK_REAL AL = A[index];
+    CCTK_REAL alphaL = alpha[index];
+    CCTK_REAL alpharhsL = alpharhs[index];
+    CCTK_REAL ArhsL = Arhs[index];
+    CCTK_REAL At11L = At11[index];
+    CCTK_REAL At11rhsL = At11rhs[index];
+    CCTK_REAL At12L = At12[index];
+    CCTK_REAL At12rhsL = At12rhs[index];
+    CCTK_REAL At13L = At13[index];
+    CCTK_REAL At13rhsL = At13rhs[index];
+    CCTK_REAL At22L = At22[index];
+    CCTK_REAL At22rhsL = At22rhs[index];
+    CCTK_REAL At23L = At23[index];
+    CCTK_REAL At23rhsL = At23rhs[index];
+    CCTK_REAL At33L = At33[index];
+    CCTK_REAL At33rhsL = At33rhs[index];
+    CCTK_REAL B1L = B1[index];
+    CCTK_REAL B1rhsL = B1rhs[index];
+    CCTK_REAL B2L = B2[index];
+    CCTK_REAL B2rhsL = B2rhs[index];
+    CCTK_REAL B3L = B3[index];
+    CCTK_REAL B3rhsL = B3rhs[index];
+    CCTK_REAL beta1L = beta1[index];
+    CCTK_REAL beta1rhsL = beta1rhs[index];
+    CCTK_REAL beta2L = beta2[index];
+    CCTK_REAL beta2rhsL = beta2rhs[index];
+    CCTK_REAL beta3L = beta3[index];
+    CCTK_REAL beta3rhsL = beta3rhs[index];
+    CCTK_REAL gt11L = gt11[index];
+    CCTK_REAL gt11rhsL = gt11rhs[index];
+    CCTK_REAL gt12L = gt12[index];
+    CCTK_REAL gt12rhsL = gt12rhs[index];
+    CCTK_REAL gt13L = gt13[index];
+    CCTK_REAL gt13rhsL = gt13rhs[index];
+    CCTK_REAL gt22L = gt22[index];
+    CCTK_REAL gt22rhsL = gt22rhs[index];
+    CCTK_REAL gt23L = gt23[index];
+    CCTK_REAL gt23rhsL = gt23rhs[index];
+    CCTK_REAL gt33L = gt33[index];
+    CCTK_REAL gt33rhsL = gt33rhs[index];
+    CCTK_REAL phiL = phi[index];
+    CCTK_REAL phirhsL = phirhs[index];
+    CCTK_REAL trKL = trK[index];
+    CCTK_REAL trKrhsL = trKrhs[index];
+    CCTK_REAL Xt1L = Xt1[index];
+    CCTK_REAL Xt1rhsL = Xt1rhs[index];
+    CCTK_REAL Xt2L = Xt2[index];
+    CCTK_REAL Xt2rhsL = Xt2rhs[index];
+    CCTK_REAL Xt3L = Xt3[index];
+    CCTK_REAL Xt3rhsL = Xt3rhs[index];
+    
+    
+    /* Include user supplied include files */
+    
+    /* Precompute derivatives */
+    CCTK_REAL const PDupwindNthAnti1A = PDupwindNthAnti1(&A[index]);
+    CCTK_REAL const PDupwindNthSymm1A = PDupwindNthSymm1(&A[index]);
+    CCTK_REAL const PDupwindNthAnti2A = PDupwindNthAnti2(&A[index]);
+    CCTK_REAL const PDupwindNthSymm2A = PDupwindNthSymm2(&A[index]);
+    CCTK_REAL const PDupwindNthAnti3A = PDupwindNthAnti3(&A[index]);
+    CCTK_REAL const PDupwindNthSymm3A = PDupwindNthSymm3(&A[index]);
+    CCTK_REAL const PDupwindNthAnti1alpha = PDupwindNthAnti1(&alpha[index]);
+    CCTK_REAL const PDupwindNthSymm1alpha = PDupwindNthSymm1(&alpha[index]);
+    CCTK_REAL const PDupwindNthAnti2alpha = PDupwindNthAnti2(&alpha[index]);
+    CCTK_REAL const PDupwindNthSymm2alpha = PDupwindNthSymm2(&alpha[index]);
+    CCTK_REAL const PDupwindNthAnti3alpha = PDupwindNthAnti3(&alpha[index]);
+    CCTK_REAL const PDupwindNthSymm3alpha = PDupwindNthSymm3(&alpha[index]);
+    CCTK_REAL const PDupwindNthAnti1At11 = PDupwindNthAnti1(&At11[index]);
+    CCTK_REAL const PDupwindNthSymm1At11 = PDupwindNthSymm1(&At11[index]);
+    CCTK_REAL const PDupwindNthAnti2At11 = PDupwindNthAnti2(&At11[index]);
+    CCTK_REAL const PDupwindNthSymm2At11 = PDupwindNthSymm2(&At11[index]);
+    CCTK_REAL const PDupwindNthAnti3At11 = PDupwindNthAnti3(&At11[index]);
+    CCTK_REAL const PDupwindNthSymm3At11 = PDupwindNthSymm3(&At11[index]);
+    CCTK_REAL const PDupwindNthAnti1At12 = PDupwindNthAnti1(&At12[index]);
+    CCTK_REAL const PDupwindNthSymm1At12 = PDupwindNthSymm1(&At12[index]);
+    CCTK_REAL const PDupwindNthAnti2At12 = PDupwindNthAnti2(&At12[index]);
+    CCTK_REAL const PDupwindNthSymm2At12 = PDupwindNthSymm2(&At12[index]);
+    CCTK_REAL const PDupwindNthAnti3At12 = PDupwindNthAnti3(&At12[index]);
+    CCTK_REAL const PDupwindNthSymm3At12 = PDupwindNthSymm3(&At12[index]);
+    CCTK_REAL const PDupwindNthAnti1At13 = PDupwindNthAnti1(&At13[index]);
+    CCTK_REAL const PDupwindNthSymm1At13 = PDupwindNthSymm1(&At13[index]);
+    CCTK_REAL const PDupwindNthAnti2At13 = PDupwindNthAnti2(&At13[index]);
+    CCTK_REAL const PDupwindNthSymm2At13 = PDupwindNthSymm2(&At13[index]);
+    CCTK_REAL const PDupwindNthAnti3At13 = PDupwindNthAnti3(&At13[index]);
+    CCTK_REAL const PDupwindNthSymm3At13 = PDupwindNthSymm3(&At13[index]);
+    CCTK_REAL const PDupwindNthAnti1At22 = PDupwindNthAnti1(&At22[index]);
+    CCTK_REAL const PDupwindNthSymm1At22 = PDupwindNthSymm1(&At22[index]);
+    CCTK_REAL const PDupwindNthAnti2At22 = PDupwindNthAnti2(&At22[index]);
+    CCTK_REAL const PDupwindNthSymm2At22 = PDupwindNthSymm2(&At22[index]);
+    CCTK_REAL const PDupwindNthAnti3At22 = PDupwindNthAnti3(&At22[index]);
+    CCTK_REAL const PDupwindNthSymm3At22 = PDupwindNthSymm3(&At22[index]);
+    CCTK_REAL const PDupwindNthAnti1At23 = PDupwindNthAnti1(&At23[index]);
+    CCTK_REAL const PDupwindNthSymm1At23 = PDupwindNthSymm1(&At23[index]);
+    CCTK_REAL const PDupwindNthAnti2At23 = PDupwindNthAnti2(&At23[index]);
+    CCTK_REAL const PDupwindNthSymm2At23 = PDupwindNthSymm2(&At23[index]);
+    CCTK_REAL const PDupwindNthAnti3At23 = PDupwindNthAnti3(&At23[index]);
+    CCTK_REAL const PDupwindNthSymm3At23 = PDupwindNthSymm3(&At23[index]);
+    CCTK_REAL const PDupwindNthAnti1At33 = PDupwindNthAnti1(&At33[index]);
+    CCTK_REAL const PDupwindNthSymm1At33 = PDupwindNthSymm1(&At33[index]);
+    CCTK_REAL const PDupwindNthAnti2At33 = PDupwindNthAnti2(&At33[index]);
+    CCTK_REAL const PDupwindNthSymm2At33 = PDupwindNthSymm2(&At33[index]);
+    CCTK_REAL const PDupwindNthAnti3At33 = PDupwindNthAnti3(&At33[index]);
+    CCTK_REAL const PDupwindNthSymm3At33 = PDupwindNthSymm3(&At33[index]);
+    CCTK_REAL const PDupwindNthAnti1B1 = PDupwindNthAnti1(&B1[index]);
+    CCTK_REAL const PDupwindNthSymm1B1 = PDupwindNthSymm1(&B1[index]);
+    CCTK_REAL const PDupwindNthAnti2B1 = PDupwindNthAnti2(&B1[index]);
+    CCTK_REAL const PDupwindNthSymm2B1 = PDupwindNthSymm2(&B1[index]);
+    CCTK_REAL const PDupwindNthAnti3B1 = PDupwindNthAnti3(&B1[index]);
+    CCTK_REAL const PDupwindNthSymm3B1 = PDupwindNthSymm3(&B1[index]);
+    CCTK_REAL const PDupwindNthAnti1B2 = PDupwindNthAnti1(&B2[index]);
+    CCTK_REAL const PDupwindNthSymm1B2 = PDupwindNthSymm1(&B2[index]);
+    CCTK_REAL const PDupwindNthAnti2B2 = PDupwindNthAnti2(&B2[index]);
+    CCTK_REAL const PDupwindNthSymm2B2 = PDupwindNthSymm2(&B2[index]);
+    CCTK_REAL const PDupwindNthAnti3B2 = PDupwindNthAnti3(&B2[index]);
+    CCTK_REAL const PDupwindNthSymm3B2 = PDupwindNthSymm3(&B2[index]);
+    CCTK_REAL const PDupwindNthAnti1B3 = PDupwindNthAnti1(&B3[index]);
+    CCTK_REAL const PDupwindNthSymm1B3 = PDupwindNthSymm1(&B3[index]);
+    CCTK_REAL const PDupwindNthAnti2B3 = PDupwindNthAnti2(&B3[index]);
+    CCTK_REAL const PDupwindNthSymm2B3 = PDupwindNthSymm2(&B3[index]);
+    CCTK_REAL const PDupwindNthAnti3B3 = PDupwindNthAnti3(&B3[index]);
+    CCTK_REAL const PDupwindNthSymm3B3 = PDupwindNthSymm3(&B3[index]);
+    CCTK_REAL const PDupwindNthAnti1beta1 = PDupwindNthAnti1(&beta1[index]);
+    CCTK_REAL const PDupwindNthSymm1beta1 = PDupwindNthSymm1(&beta1[index]);
+    CCTK_REAL const PDupwindNthAnti2beta1 = PDupwindNthAnti2(&beta1[index]);
+    CCTK_REAL const PDupwindNthSymm2beta1 = PDupwindNthSymm2(&beta1[index]);
+    CCTK_REAL const PDupwindNthAnti3beta1 = PDupwindNthAnti3(&beta1[index]);
+    CCTK_REAL const PDupwindNthSymm3beta1 = PDupwindNthSymm3(&beta1[index]);
+    CCTK_REAL const PDupwindNthAnti1beta2 = PDupwindNthAnti1(&beta2[index]);
+    CCTK_REAL const PDupwindNthSymm1beta2 = PDupwindNthSymm1(&beta2[index]);
+    CCTK_REAL const PDupwindNthAnti2beta2 = PDupwindNthAnti2(&beta2[index]);
+    CCTK_REAL const PDupwindNthSymm2beta2 = PDupwindNthSymm2(&beta2[index]);
+    CCTK_REAL const PDupwindNthAnti3beta2 = PDupwindNthAnti3(&beta2[index]);
+    CCTK_REAL const PDupwindNthSymm3beta2 = PDupwindNthSymm3(&beta2[index]);
+    CCTK_REAL const PDupwindNthAnti1beta3 = PDupwindNthAnti1(&beta3[index]);
+    CCTK_REAL const PDupwindNthSymm1beta3 = PDupwindNthSymm1(&beta3[index]);
+    CCTK_REAL const PDupwindNthAnti2beta3 = PDupwindNthAnti2(&beta3[index]);
+    CCTK_REAL const PDupwindNthSymm2beta3 = PDupwindNthSymm2(&beta3[index]);
+    CCTK_REAL const PDupwindNthAnti3beta3 = PDupwindNthAnti3(&beta3[index]);
+    CCTK_REAL const PDupwindNthSymm3beta3 = PDupwindNthSymm3(&beta3[index]);
+    CCTK_REAL const PDupwindNthAnti1gt11 = PDupwindNthAnti1(&gt11[index]);
+    CCTK_REAL const PDupwindNthSymm1gt11 = PDupwindNthSymm1(&gt11[index]);
+    CCTK_REAL const PDupwindNthAnti2gt11 = PDupwindNthAnti2(&gt11[index]);
+    CCTK_REAL const PDupwindNthSymm2gt11 = PDupwindNthSymm2(&gt11[index]);
+    CCTK_REAL const PDupwindNthAnti3gt11 = PDupwindNthAnti3(&gt11[index]);
+    CCTK_REAL const PDupwindNthSymm3gt11 = PDupwindNthSymm3(&gt11[index]);
+    CCTK_REAL const PDupwindNthAnti1gt12 = PDupwindNthAnti1(&gt12[index]);
+    CCTK_REAL const PDupwindNthSymm1gt12 = PDupwindNthSymm1(&gt12[index]);
+    CCTK_REAL const PDupwindNthAnti2gt12 = PDupwindNthAnti2(&gt12[index]);
+    CCTK_REAL const PDupwindNthSymm2gt12 = PDupwindNthSymm2(&gt12[index]);
+    CCTK_REAL const PDupwindNthAnti3gt12 = PDupwindNthAnti3(&gt12[index]);
+    CCTK_REAL const PDupwindNthSymm3gt12 = PDupwindNthSymm3(&gt12[index]);
+    CCTK_REAL const PDupwindNthAnti1gt13 = PDupwindNthAnti1(&gt13[index]);
+    CCTK_REAL const PDupwindNthSymm1gt13 = PDupwindNthSymm1(&gt13[index]);
+    CCTK_REAL const PDupwindNthAnti2gt13 = PDupwindNthAnti2(&gt13[index]);
+    CCTK_REAL const PDupwindNthSymm2gt13 = PDupwindNthSymm2(&gt13[index]);
+    CCTK_REAL const PDupwindNthAnti3gt13 = PDupwindNthAnti3(&gt13[index]);
+    CCTK_REAL const PDupwindNthSymm3gt13 = PDupwindNthSymm3(&gt13[index]);
+    CCTK_REAL const PDupwindNthAnti1gt22 = PDupwindNthAnti1(&gt22[index]);
+    CCTK_REAL const PDupwindNthSymm1gt22 = PDupwindNthSymm1(&gt22[index]);
+    CCTK_REAL const PDupwindNthAnti2gt22 = PDupwindNthAnti2(&gt22[index]);
+    CCTK_REAL const PDupwindNthSymm2gt22 = PDupwindNthSymm2(&gt22[index]);
+    CCTK_REAL const PDupwindNthAnti3gt22 = PDupwindNthAnti3(&gt22[index]);
+    CCTK_REAL const PDupwindNthSymm3gt22 = PDupwindNthSymm3(&gt22[index]);
+    CCTK_REAL const PDupwindNthAnti1gt23 = PDupwindNthAnti1(&gt23[index]);
+    CCTK_REAL const PDupwindNthSymm1gt23 = PDupwindNthSymm1(&gt23[index]);
+    CCTK_REAL const PDupwindNthAnti2gt23 = PDupwindNthAnti2(&gt23[index]);
+    CCTK_REAL const PDupwindNthSymm2gt23 = PDupwindNthSymm2(&gt23[index]);
+    CCTK_REAL const PDupwindNthAnti3gt23 = PDupwindNthAnti3(&gt23[index]);
+    CCTK_REAL const PDupwindNthSymm3gt23 = PDupwindNthSymm3(&gt23[index]);
+    CCTK_REAL const PDupwindNthAnti1gt33 = PDupwindNthAnti1(&gt33[index]);
+    CCTK_REAL const PDupwindNthSymm1gt33 = PDupwindNthSymm1(&gt33[index]);
+    CCTK_REAL const PDupwindNthAnti2gt33 = PDupwindNthAnti2(&gt33[index]);
+    CCTK_REAL const PDupwindNthSymm2gt33 = PDupwindNthSymm2(&gt33[index]);
+    CCTK_REAL const PDupwindNthAnti3gt33 = PDupwindNthAnti3(&gt33[index]);
+    CCTK_REAL const PDupwindNthSymm3gt33 = PDupwindNthSymm3(&gt33[index]);
+    CCTK_REAL const PDupwindNthAnti1phi = PDupwindNthAnti1(&phi[index]);
+    CCTK_REAL const PDupwindNthSymm1phi = PDupwindNthSymm1(&phi[index]);
+    CCTK_REAL const PDupwindNthAnti2phi = PDupwindNthAnti2(&phi[index]);
+    CCTK_REAL const PDupwindNthSymm2phi = PDupwindNthSymm2(&phi[index]);
+    CCTK_REAL const PDupwindNthAnti3phi = PDupwindNthAnti3(&phi[index]);
+    CCTK_REAL const PDupwindNthSymm3phi = PDupwindNthSymm3(&phi[index]);
+    CCTK_REAL const PDupwindNthAnti1trK = PDupwindNthAnti1(&trK[index]);
+    CCTK_REAL const PDupwindNthSymm1trK = PDupwindNthSymm1(&trK[index]);
+    CCTK_REAL const PDupwindNthAnti2trK = PDupwindNthAnti2(&trK[index]);
+    CCTK_REAL const PDupwindNthSymm2trK = PDupwindNthSymm2(&trK[index]);
+    CCTK_REAL const PDupwindNthAnti3trK = PDupwindNthAnti3(&trK[index]);
+    CCTK_REAL const PDupwindNthSymm3trK = PDupwindNthSymm3(&trK[index]);
+    CCTK_REAL const PDupwindNthAnti1Xt1 = PDupwindNthAnti1(&Xt1[index]);
+    CCTK_REAL const PDupwindNthSymm1Xt1 = PDupwindNthSymm1(&Xt1[index]);
+    CCTK_REAL const PDupwindNthAnti2Xt1 = PDupwindNthAnti2(&Xt1[index]);
+    CCTK_REAL const PDupwindNthSymm2Xt1 = PDupwindNthSymm2(&Xt1[index]);
+    CCTK_REAL const PDupwindNthAnti3Xt1 = PDupwindNthAnti3(&Xt1[index]);
+    CCTK_REAL const PDupwindNthSymm3Xt1 = PDupwindNthSymm3(&Xt1[index]);
+    CCTK_REAL const PDupwindNthAnti1Xt2 = PDupwindNthAnti1(&Xt2[index]);
+    CCTK_REAL const PDupwindNthSymm1Xt2 = PDupwindNthSymm1(&Xt2[index]);
+    CCTK_REAL const PDupwindNthAnti2Xt2 = PDupwindNthAnti2(&Xt2[index]);
+    CCTK_REAL const PDupwindNthSymm2Xt2 = PDupwindNthSymm2(&Xt2[index]);
+    CCTK_REAL const PDupwindNthAnti3Xt2 = PDupwindNthAnti3(&Xt2[index]);
+    CCTK_REAL const PDupwindNthSymm3Xt2 = PDupwindNthSymm3(&Xt2[index]);
+    CCTK_REAL const PDupwindNthAnti1Xt3 = PDupwindNthAnti1(&Xt3[index]);
+    CCTK_REAL const PDupwindNthSymm1Xt3 = PDupwindNthSymm1(&Xt3[index]);
+    CCTK_REAL const PDupwindNthAnti2Xt3 = PDupwindNthAnti2(&Xt3[index]);
+    CCTK_REAL const PDupwindNthSymm2Xt3 = PDupwindNthSymm2(&Xt3[index]);
+    CCTK_REAL const PDupwindNthAnti3Xt3 = PDupwindNthAnti3(&Xt3[index]);
+    CCTK_REAL const PDupwindNthSymm3Xt3 = PDupwindNthSymm3(&Xt3[index]);
+    
+    /* Calculate temporaries and grid functions */
+    ptrdiff_t dir1 = Sign(beta1L);
+    
+    ptrdiff_t dir2 = Sign(beta2L);
+    
+    ptrdiff_t dir3 = Sign(beta3L);
+    
+    phirhsL = beta1L*PDupwindNthAnti1phi + beta2L*PDupwindNthAnti2phi + 
+      beta3L*PDupwindNthAnti3phi + phirhsL + PDupwindNthSymm1phi*Abs(beta1L) 
+      + PDupwindNthSymm2phi*Abs(beta2L) + PDupwindNthSymm3phi*Abs(beta3L);
+    
+    gt11rhsL = gt11rhsL + beta1L*PDupwindNthAnti1gt11 + 
+      beta2L*PDupwindNthAnti2gt11 + beta3L*PDupwindNthAnti3gt11 + 
+      PDupwindNthSymm1gt11*Abs(beta1L) + PDupwindNthSymm2gt11*Abs(beta2L) + 
+      PDupwindNthSymm3gt11*Abs(beta3L);
+    
+    gt12rhsL = gt12rhsL + beta1L*PDupwindNthAnti1gt12 + 
+      beta2L*PDupwindNthAnti2gt12 + beta3L*PDupwindNthAnti3gt12 + 
+      PDupwindNthSymm1gt12*Abs(beta1L) + PDupwindNthSymm2gt12*Abs(beta2L) + 
+      PDupwindNthSymm3gt12*Abs(beta3L);
+    
+    gt13rhsL = gt13rhsL + beta1L*PDupwindNthAnti1gt13 + 
+      beta2L*PDupwindNthAnti2gt13 + beta3L*PDupwindNthAnti3gt13 + 
+      PDupwindNthSymm1gt13*Abs(beta1L) + PDupwindNthSymm2gt13*Abs(beta2L) + 
+      PDupwindNthSymm3gt13*Abs(beta3L);
+    
+    gt22rhsL = gt22rhsL + beta1L*PDupwindNthAnti1gt22 + 
+      beta2L*PDupwindNthAnti2gt22 + beta3L*PDupwindNthAnti3gt22 + 
+      PDupwindNthSymm1gt22*Abs(beta1L) + PDupwindNthSymm2gt22*Abs(beta2L) + 
+      PDupwindNthSymm3gt22*Abs(beta3L);
+    
+    gt23rhsL = gt23rhsL + beta1L*PDupwindNthAnti1gt23 + 
+      beta2L*PDupwindNthAnti2gt23 + beta3L*PDupwindNthAnti3gt23 + 
+      PDupwindNthSymm1gt23*Abs(beta1L) + PDupwindNthSymm2gt23*Abs(beta2L) + 
+      PDupwindNthSymm3gt23*Abs(beta3L);
+    
+    gt33rhsL = gt33rhsL + beta1L*PDupwindNthAnti1gt33 + 
+      beta2L*PDupwindNthAnti2gt33 + beta3L*PDupwindNthAnti3gt33 + 
+      PDupwindNthSymm1gt33*Abs(beta1L) + PDupwindNthSymm2gt33*Abs(beta2L) + 
+      PDupwindNthSymm3gt33*Abs(beta3L);
+    
+    Xt1rhsL = beta1L*PDupwindNthAnti1Xt1 + beta2L*PDupwindNthAnti2Xt1 + 
+      beta3L*PDupwindNthAnti3Xt1 + Xt1rhsL + PDupwindNthSymm1Xt1*Abs(beta1L) 
+      + PDupwindNthSymm2Xt1*Abs(beta2L) + PDupwindNthSymm3Xt1*Abs(beta3L);
+    
+    Xt2rhsL = beta1L*PDupwindNthAnti1Xt2 + beta2L*PDupwindNthAnti2Xt2 + 
+      beta3L*PDupwindNthAnti3Xt2 + Xt2rhsL + PDupwindNthSymm1Xt2*Abs(beta1L) 
+      + PDupwindNthSymm2Xt2*Abs(beta2L) + PDupwindNthSymm3Xt2*Abs(beta3L);
+    
+    Xt3rhsL = beta1L*PDupwindNthAnti1Xt3 + beta2L*PDupwindNthAnti2Xt3 + 
+      beta3L*PDupwindNthAnti3Xt3 + Xt3rhsL + PDupwindNthSymm1Xt3*Abs(beta1L) 
+      + PDupwindNthSymm2Xt3*Abs(beta2L) + PDupwindNthSymm3Xt3*Abs(beta3L);
+    
+    trKrhsL = beta1L*PDupwindNthAnti1trK + beta2L*PDupwindNthAnti2trK + 
+      beta3L*PDupwindNthAnti3trK + trKrhsL + PDupwindNthSymm1trK*Abs(beta1L) 
+      + PDupwindNthSymm2trK*Abs(beta2L) + PDupwindNthSymm3trK*Abs(beta3L);
+    
+    At11rhsL = At11rhsL + beta1L*PDupwindNthAnti1At11 + 
+      beta2L*PDupwindNthAnti2At11 + beta3L*PDupwindNthAnti3At11 + 
+      PDupwindNthSymm1At11*Abs(beta1L) + PDupwindNthSymm2At11*Abs(beta2L) + 
+      PDupwindNthSymm3At11*Abs(beta3L);
+    
+    At12rhsL = At12rhsL + beta1L*PDupwindNthAnti1At12 + 
+      beta2L*PDupwindNthAnti2At12 + beta3L*PDupwindNthAnti3At12 + 
+      PDupwindNthSymm1At12*Abs(beta1L) + PDupwindNthSymm2At12*Abs(beta2L) + 
+      PDupwindNthSymm3At12*Abs(beta3L);
+    
+    At13rhsL = At13rhsL + beta1L*PDupwindNthAnti1At13 + 
+      beta2L*PDupwindNthAnti2At13 + beta3L*PDupwindNthAnti3At13 + 
+      PDupwindNthSymm1At13*Abs(beta1L) + PDupwindNthSymm2At13*Abs(beta2L) + 
+      PDupwindNthSymm3At13*Abs(beta3L);
+    
+    At22rhsL = At22rhsL + beta1L*PDupwindNthAnti1At22 + 
+      beta2L*PDupwindNthAnti2At22 + beta3L*PDupwindNthAnti3At22 + 
+      PDupwindNthSymm1At22*Abs(beta1L) + PDupwindNthSymm2At22*Abs(beta2L) + 
+      PDupwindNthSymm3At22*Abs(beta3L);
+    
+    At23rhsL = At23rhsL + beta1L*PDupwindNthAnti1At23 + 
+      beta2L*PDupwindNthAnti2At23 + beta3L*PDupwindNthAnti3At23 + 
+      PDupwindNthSymm1At23*Abs(beta1L) + PDupwindNthSymm2At23*Abs(beta2L) + 
+      PDupwindNthSymm3At23*Abs(beta3L);
+    
+    At33rhsL = At33rhsL + beta1L*PDupwindNthAnti1At33 + 
+      beta2L*PDupwindNthAnti2At33 + beta3L*PDupwindNthAnti3At33 + 
+      PDupwindNthSymm1At33*Abs(beta1L) + PDupwindNthSymm2At33*Abs(beta2L) + 
+      PDupwindNthSymm3At33*Abs(beta3L);
+    
+    alpharhsL = alpharhsL + (beta1L*PDupwindNthAnti1alpha + 
+      beta2L*PDupwindNthAnti2alpha + beta3L*PDupwindNthAnti3alpha + 
+      PDupwindNthSymm1alpha*Abs(beta1L) + PDupwindNthSymm2alpha*Abs(beta2L) + 
+      PDupwindNthSymm3alpha*Abs(beta3L))*ToReal(LapseAdvectionCoeff);
+    
+    ArhsL = ArhsL + (beta1L*PDupwindNthAnti1A + beta2L*PDupwindNthAnti2A + 
+      beta3L*PDupwindNthAnti3A + PDupwindNthSymm1A*Abs(beta1L) + 
+      PDupwindNthSymm2A*Abs(beta2L) + 
+      PDupwindNthSymm3A*Abs(beta3L))*ToReal(LapseAdvectionCoeff);
+    
+    beta1rhsL = beta1rhsL + (beta1L*PDupwindNthAnti1beta1 + 
+      beta2L*PDupwindNthAnti2beta1 + beta3L*PDupwindNthAnti3beta1 + 
+      PDupwindNthSymm1beta1*Abs(beta1L) + PDupwindNthSymm2beta1*Abs(beta2L) + 
+      PDupwindNthSymm3beta1*Abs(beta3L))*ToReal(ShiftAdvectionCoeff);
+    
+    beta2rhsL = beta2rhsL + (beta1L*PDupwindNthAnti1beta2 + 
+      beta2L*PDupwindNthAnti2beta2 + beta3L*PDupwindNthAnti3beta2 + 
+      PDupwindNthSymm1beta2*Abs(beta1L) + PDupwindNthSymm2beta2*Abs(beta2L) + 
+      PDupwindNthSymm3beta2*Abs(beta3L))*ToReal(ShiftAdvectionCoeff);
+    
+    beta3rhsL = beta3rhsL + (beta1L*PDupwindNthAnti1beta3 + 
+      beta2L*PDupwindNthAnti2beta3 + beta3L*PDupwindNthAnti3beta3 + 
+      PDupwindNthSymm1beta3*Abs(beta1L) + PDupwindNthSymm2beta3*Abs(beta2L) + 
+      PDupwindNthSymm3beta3*Abs(beta3L))*ToReal(ShiftAdvectionCoeff);
+    
+    B1rhsL = B1rhsL + (beta1L*(PDupwindNthAnti1B1 - PDupwindNthAnti1Xt1) + 
+      beta2L*(PDupwindNthAnti2B1 - PDupwindNthAnti2Xt1) + 
+      beta3L*(PDupwindNthAnti3B1 - PDupwindNthAnti3Xt1) + (PDupwindNthSymm1B1 
+      - PDupwindNthSymm1Xt1)*Abs(beta1L) + (PDupwindNthSymm2B1 - 
+      PDupwindNthSymm2Xt1)*Abs(beta2L) + (PDupwindNthSymm3B1 - 
+      PDupwindNthSymm3Xt1)*Abs(beta3L))*ToReal(ShiftAdvectionCoeff) + 
+      (beta1L*PDupwindNthAnti1Xt1 + beta2L*PDupwindNthAnti2Xt1 + 
+      beta3L*PDupwindNthAnti3Xt1 + PDupwindNthSymm1Xt1*Abs(beta1L) + 
+      PDupwindNthSymm2Xt1*Abs(beta2L) + 
+      PDupwindNthSymm3Xt1*Abs(beta3L))*ToReal(ShiftBCoeff);
+    
+    B2rhsL = B2rhsL + (beta1L*(PDupwindNthAnti1B2 - PDupwindNthAnti1Xt2) + 
+      beta2L*(PDupwindNthAnti2B2 - PDupwindNthAnti2Xt2) + 
+      beta3L*(PDupwindNthAnti3B2 - PDupwindNthAnti3Xt2) + (PDupwindNthSymm1B2 
+      - PDupwindNthSymm1Xt2)*Abs(beta1L) + (PDupwindNthSymm2B2 - 
+      PDupwindNthSymm2Xt2)*Abs(beta2L) + (PDupwindNthSymm3B2 - 
+      PDupwindNthSymm3Xt2)*Abs(beta3L))*ToReal(ShiftAdvectionCoeff) + 
+      (beta1L*PDupwindNthAnti1Xt2 + beta2L*PDupwindNthAnti2Xt2 + 
+      beta3L*PDupwindNthAnti3Xt2 + PDupwindNthSymm1Xt2*Abs(beta1L) + 
+      PDupwindNthSymm2Xt2*Abs(beta2L) + 
+      PDupwindNthSymm3Xt2*Abs(beta3L))*ToReal(ShiftBCoeff);
+    
+    B3rhsL = B3rhsL + (beta1L*(PDupwindNthAnti1B3 - PDupwindNthAnti1Xt3) + 
+      beta2L*(PDupwindNthAnti2B3 - PDupwindNthAnti2Xt3) + 
+      beta3L*(PDupwindNthAnti3B3 - PDupwindNthAnti3Xt3) + (PDupwindNthSymm1B3 
+      - PDupwindNthSymm1Xt3)*Abs(beta1L) + (PDupwindNthSymm2B3 - 
+      PDupwindNthSymm2Xt3)*Abs(beta2L) + (PDupwindNthSymm3B3 - 
+      PDupwindNthSymm3Xt3)*Abs(beta3L))*ToReal(ShiftAdvectionCoeff) + 
+      (beta1L*PDupwindNthAnti1Xt3 + beta2L*PDupwindNthAnti2Xt3 + 
+      beta3L*PDupwindNthAnti3Xt3 + PDupwindNthSymm1Xt3*Abs(beta1L) + 
+      PDupwindNthSymm2Xt3*Abs(beta2L) + 
+      PDupwindNthSymm3Xt3*Abs(beta3L))*ToReal(ShiftBCoeff);
+    
+    /* Copy local copies back to grid functions */
+    alpharhs[index] = alpharhsL;
+    Arhs[index] = ArhsL;
+    At11rhs[index] = At11rhsL;
+    At12rhs[index] = At12rhsL;
+    At13rhs[index] = At13rhsL;
+    At22rhs[index] = At22rhsL;
+    At23rhs[index] = At23rhsL;
+    At33rhs[index] = At33rhsL;
+    B1rhs[index] = B1rhsL;
+    B2rhs[index] = B2rhsL;
+    B3rhs[index] = B3rhsL;
+    beta1rhs[index] = beta1rhsL;
+    beta2rhs[index] = beta2rhsL;
+    beta3rhs[index] = beta3rhsL;
+    gt11rhs[index] = gt11rhsL;
+    gt12rhs[index] = gt12rhsL;
+    gt13rhs[index] = gt13rhsL;
+    gt22rhs[index] = gt22rhsL;
+    gt23rhs[index] = gt23rhsL;
+    gt33rhs[index] = gt33rhsL;
+    phirhs[index] = phirhsL;
+    trKrhs[index] = trKrhsL;
+    Xt1rhs[index] = Xt1rhsL;
+    Xt2rhs[index] = Xt2rhsL;
+    Xt3rhs[index] = Xt3rhsL;
+  }
+  LC_ENDLOOP3 (ML_BSSN_O2_Advect);
+}
+
+extern "C" void ML_BSSN_O2_Advect(CCTK_ARGUMENTS)
+{
+  DECLARE_CCTK_ARGUMENTS;
+  DECLARE_CCTK_PARAMETERS;
+  
+  GenericFD_LoopOverInterior(cctkGH, &ML_BSSN_O2_Advect_Body);
+}
diff --git a/ML_BSSN_O2/src/ML_BSSN_O2_RHS1.cc b/ML_BSSN_O2/src/ML_BSSN_O2_RHS1.cc
index 3427158..4bb00c0 100644
--- a/ML_BSSN_O2/src/ML_BSSN_O2_RHS1.cc
+++ b/ML_BSSN_O2/src/ML_BSSN_O2_RHS1.cc
@@ -75,7 +75,7 @@ static void ML_BSSN_O2_RHS1_Body(cGH const * restrict const cctkGH, int const di
   const char *groups[] = {"grid::coordinates","Grid::coordinates","ML_BSSN_O2::ML_curv","ML_BSSN_O2::ML_dtlapse","ML_BSSN_O2::ML_dtlapserhs","ML_BSSN_O2::ML_dtshift","ML_BSSN_O2::ML_dtshiftrhs","ML_BSSN_O2::ML_Gamma","ML_BSSN_O2::ML_Gammarhs","ML_BSSN_O2::ML_lapse","ML_BSSN_O2::ML_lapserhs","ML_BSSN_O2::ML_log_confac","ML_BSSN_O2::ML_log_confacrhs","ML_BSSN_O2::ML_metric","ML_BSSN_O2::ML_metricrhs","ML_BSSN_O2::ML_shift","ML_BSSN_O2::ML_shiftrhs","ML_BSSN_O2::ML_trace_curv","ML_BSSN_O2::ML_trace_curvrhs"};
   GenericFD_AssertGroupStorage(cctkGH, "ML_BSSN_O2_RHS1", 19, groups);
   
-  GenericFD_EnsureStencilFits(cctkGH, "ML_BSSN_O2_RHS1", 2, 2, 2);
+  GenericFD_EnsureStencilFits(cctkGH, "ML_BSSN_O2_RHS1", 1, 1, 1);
   
   /* Include user-supplied include files */
   
@@ -197,12 +197,6 @@ static void ML_BSSN_O2_RHS1_Body(cGH const * restrict const cctkGH, int const di
     /* Include user supplied include files */
     
     /* Precompute derivatives */
-    CCTK_REAL const PDupwindNthAnti1A = PDupwindNthAnti1(&A[index]);
-    CCTK_REAL const PDupwindNthSymm1A = PDupwindNthSymm1(&A[index]);
-    CCTK_REAL const PDupwindNthAnti2A = PDupwindNthAnti2(&A[index]);
-    CCTK_REAL const PDupwindNthSymm2A = PDupwindNthSymm2(&A[index]);
-    CCTK_REAL const PDupwindNthAnti3A = PDupwindNthAnti3(&A[index]);
-    CCTK_REAL const PDupwindNthSymm3A = PDupwindNthSymm3(&A[index]);
     CCTK_REAL const PDstandardNth1alpha = PDstandardNth1(&alpha[index]);
     CCTK_REAL const PDstandardNth2alpha = PDstandardNth2(&alpha[index]);
     CCTK_REAL const PDstandardNth3alpha = PDstandardNth3(&alpha[index]);
@@ -212,30 +206,6 @@ static void ML_BSSN_O2_RHS1_Body(cGH const * restrict const cctkGH, int const di
     CCTK_REAL const PDstandardNth12alpha = PDstandardNth12(&alpha[index]);
     CCTK_REAL const PDstandardNth13alpha = PDstandardNth13(&alpha[index]);
     CCTK_REAL const PDstandardNth23alpha = PDstandardNth23(&alpha[index]);
-    CCTK_REAL const PDupwindNthAnti1alpha = PDupwindNthAnti1(&alpha[index]);
-    CCTK_REAL const PDupwindNthSymm1alpha = PDupwindNthSymm1(&alpha[index]);
-    CCTK_REAL const PDupwindNthAnti2alpha = PDupwindNthAnti2(&alpha[index]);
-    CCTK_REAL const PDupwindNthSymm2alpha = PDupwindNthSymm2(&alpha[index]);
-    CCTK_REAL const PDupwindNthAnti3alpha = PDupwindNthAnti3(&alpha[index]);
-    CCTK_REAL const PDupwindNthSymm3alpha = PDupwindNthSymm3(&alpha[index]);
-    CCTK_REAL const PDupwindNthAnti1B1 = PDupwindNthAnti1(&B1[index]);
-    CCTK_REAL const PDupwindNthSymm1B1 = PDupwindNthSymm1(&B1[index]);
-    CCTK_REAL const PDupwindNthAnti2B1 = PDupwindNthAnti2(&B1[index]);
-    CCTK_REAL const PDupwindNthSymm2B1 = PDupwindNthSymm2(&B1[index]);
-    CCTK_REAL const PDupwindNthAnti3B1 = PDupwindNthAnti3(&B1[index]);
-    CCTK_REAL const PDupwindNthSymm3B1 = PDupwindNthSymm3(&B1[index]);
-    CCTK_REAL const PDupwindNthAnti1B2 = PDupwindNthAnti1(&B2[index]);
-    CCTK_REAL const PDupwindNthSymm1B2 = PDupwindNthSymm1(&B2[index]);
-    CCTK_REAL const PDupwindNthAnti2B2 = PDupwindNthAnti2(&B2[index]);
-    CCTK_REAL const PDupwindNthSymm2B2 = PDupwindNthSymm2(&B2[index]);
-    CCTK_REAL const PDupwindNthAnti3B2 = PDupwindNthAnti3(&B2[index]);
-    CCTK_REAL const PDupwindNthSymm3B2 = PDupwindNthSymm3(&B2[index]);
-    CCTK_REAL const PDupwindNthAnti1B3 = PDupwindNthAnti1(&B3[index]);
-    CCTK_REAL const PDupwindNthSymm1B3 = PDupwindNthSymm1(&B3[index]);
-    CCTK_REAL const PDupwindNthAnti2B3 = PDupwindNthAnti2(&B3[index]);
-    CCTK_REAL const PDupwindNthSymm2B3 = PDupwindNthSymm2(&B3[index]);
-    CCTK_REAL const PDupwindNthAnti3B3 = PDupwindNthAnti3(&B3[index]);
-    CCTK_REAL const PDupwindNthSymm3B3 = PDupwindNthSymm3(&B3[index]);
     CCTK_REAL const PDstandardNth1beta1 = PDstandardNth1(&beta1[index]);
     CCTK_REAL const PDstandardNth2beta1 = PDstandardNth2(&beta1[index]);
     CCTK_REAL const PDstandardNth3beta1 = PDstandardNth3(&beta1[index]);
@@ -245,12 +215,6 @@ static void ML_BSSN_O2_RHS1_Body(cGH const * restrict const cctkGH, int const di
     CCTK_REAL const PDstandardNth12beta1 = PDstandardNth12(&beta1[index]);
     CCTK_REAL const PDstandardNth13beta1 = PDstandardNth13(&beta1[index]);
     CCTK_REAL const PDstandardNth23beta1 = PDstandardNth23(&beta1[index]);
-    CCTK_REAL const PDupwindNthAnti1beta1 = PDupwindNthAnti1(&beta1[index]);
-    CCTK_REAL const PDupwindNthSymm1beta1 = PDupwindNthSymm1(&beta1[index]);
-    CCTK_REAL const PDupwindNthAnti2beta1 = PDupwindNthAnti2(&beta1[index]);
-    CCTK_REAL const PDupwindNthSymm2beta1 = PDupwindNthSymm2(&beta1[index]);
-    CCTK_REAL const PDupwindNthAnti3beta1 = PDupwindNthAnti3(&beta1[index]);
-    CCTK_REAL const PDupwindNthSymm3beta1 = PDupwindNthSymm3(&beta1[index]);
     CCTK_REAL const PDstandardNth1beta2 = PDstandardNth1(&beta2[index]);
     CCTK_REAL const PDstandardNth2beta2 = PDstandardNth2(&beta2[index]);
     CCTK_REAL const PDstandardNth3beta2 = PDstandardNth3(&beta2[index]);
@@ -260,12 +224,6 @@ static void ML_BSSN_O2_RHS1_Body(cGH const * restrict const cctkGH, int const di
     CCTK_REAL const PDstandardNth12beta2 = PDstandardNth12(&beta2[index]);
     CCTK_REAL const PDstandardNth13beta2 = PDstandardNth13(&beta2[index]);
     CCTK_REAL const PDstandardNth23beta2 = PDstandardNth23(&beta2[index]);
-    CCTK_REAL const PDupwindNthAnti1beta2 = PDupwindNthAnti1(&beta2[index]);
-    CCTK_REAL const PDupwindNthSymm1beta2 = PDupwindNthSymm1(&beta2[index]);
-    CCTK_REAL const PDupwindNthAnti2beta2 = PDupwindNthAnti2(&beta2[index]);
-    CCTK_REAL const PDupwindNthSymm2beta2 = PDupwindNthSymm2(&beta2[index]);
-    CCTK_REAL const PDupwindNthAnti3beta2 = PDupwindNthAnti3(&beta2[index]);
-    CCTK_REAL const PDupwindNthSymm3beta2 = PDupwindNthSymm3(&beta2[index]);
     CCTK_REAL const PDstandardNth1beta3 = PDstandardNth1(&beta3[index]);
     CCTK_REAL const PDstandardNth2beta3 = PDstandardNth2(&beta3[index]);
     CCTK_REAL const PDstandardNth3beta3 = PDstandardNth3(&beta3[index]);
@@ -275,102 +233,30 @@ static void ML_BSSN_O2_RHS1_Body(cGH const * restrict const cctkGH, int const di
     CCTK_REAL const PDstandardNth12beta3 = PDstandardNth12(&beta3[index]);
     CCTK_REAL const PDstandardNth13beta3 = PDstandardNth13(&beta3[index]);
     CCTK_REAL const PDstandardNth23beta3 = PDstandardNth23(&beta3[index]);
-    CCTK_REAL const PDupwindNthAnti1beta3 = PDupwindNthAnti1(&beta3[index]);
-    CCTK_REAL const PDupwindNthSymm1beta3 = PDupwindNthSymm1(&beta3[index]);
-    CCTK_REAL const PDupwindNthAnti2beta3 = PDupwindNthAnti2(&beta3[index]);
-    CCTK_REAL const PDupwindNthSymm2beta3 = PDupwindNthSymm2(&beta3[index]);
-    CCTK_REAL const PDupwindNthAnti3beta3 = PDupwindNthAnti3(&beta3[index]);
-    CCTK_REAL const PDupwindNthSymm3beta3 = PDupwindNthSymm3(&beta3[index]);
     CCTK_REAL const PDstandardNth1gt11 = PDstandardNth1(&gt11[index]);
     CCTK_REAL const PDstandardNth2gt11 = PDstandardNth2(&gt11[index]);
     CCTK_REAL const PDstandardNth3gt11 = PDstandardNth3(&gt11[index]);
-    CCTK_REAL const PDupwindNthAnti1gt11 = PDupwindNthAnti1(&gt11[index]);
-    CCTK_REAL const PDupwindNthSymm1gt11 = PDupwindNthSymm1(&gt11[index]);
-    CCTK_REAL const PDupwindNthAnti2gt11 = PDupwindNthAnti2(&gt11[index]);
-    CCTK_REAL const PDupwindNthSymm2gt11 = PDupwindNthSymm2(&gt11[index]);
-    CCTK_REAL const PDupwindNthAnti3gt11 = PDupwindNthAnti3(&gt11[index]);
-    CCTK_REAL const PDupwindNthSymm3gt11 = PDupwindNthSymm3(&gt11[index]);
     CCTK_REAL const PDstandardNth1gt12 = PDstandardNth1(&gt12[index]);
     CCTK_REAL const PDstandardNth2gt12 = PDstandardNth2(&gt12[index]);
     CCTK_REAL const PDstandardNth3gt12 = PDstandardNth3(&gt12[index]);
-    CCTK_REAL const PDupwindNthAnti1gt12 = PDupwindNthAnti1(&gt12[index]);
-    CCTK_REAL const PDupwindNthSymm1gt12 = PDupwindNthSymm1(&gt12[index]);
-    CCTK_REAL const PDupwindNthAnti2gt12 = PDupwindNthAnti2(&gt12[index]);
-    CCTK_REAL const PDupwindNthSymm2gt12 = PDupwindNthSymm2(&gt12[index]);
-    CCTK_REAL const PDupwindNthAnti3gt12 = PDupwindNthAnti3(&gt12[index]);
-    CCTK_REAL const PDupwindNthSymm3gt12 = PDupwindNthSymm3(&gt12[index]);
     CCTK_REAL const PDstandardNth1gt13 = PDstandardNth1(&gt13[index]);
     CCTK_REAL const PDstandardNth2gt13 = PDstandardNth2(&gt13[index]);
     CCTK_REAL const PDstandardNth3gt13 = PDstandardNth3(&gt13[index]);
-    CCTK_REAL const PDupwindNthAnti1gt13 = PDupwindNthAnti1(&gt13[index]);
-    CCTK_REAL const PDupwindNthSymm1gt13 = PDupwindNthSymm1(&gt13[index]);
-    CCTK_REAL const PDupwindNthAnti2gt13 = PDupwindNthAnti2(&gt13[index]);
-    CCTK_REAL const PDupwindNthSymm2gt13 = PDupwindNthSymm2(&gt13[index]);
-    CCTK_REAL const PDupwindNthAnti3gt13 = PDupwindNthAnti3(&gt13[index]);
-    CCTK_REAL const PDupwindNthSymm3gt13 = PDupwindNthSymm3(&gt13[index]);
     CCTK_REAL const PDstandardNth1gt22 = PDstandardNth1(&gt22[index]);
     CCTK_REAL const PDstandardNth2gt22 = PDstandardNth2(&gt22[index]);
     CCTK_REAL const PDstandardNth3gt22 = PDstandardNth3(&gt22[index]);
-    CCTK_REAL const PDupwindNthAnti1gt22 = PDupwindNthAnti1(&gt22[index]);
-    CCTK_REAL const PDupwindNthSymm1gt22 = PDupwindNthSymm1(&gt22[index]);
-    CCTK_REAL const PDupwindNthAnti2gt22 = PDupwindNthAnti2(&gt22[index]);
-    CCTK_REAL const PDupwindNthSymm2gt22 = PDupwindNthSymm2(&gt22[index]);
-    CCTK_REAL const PDupwindNthAnti3gt22 = PDupwindNthAnti3(&gt22[index]);
-    CCTK_REAL const PDupwindNthSymm3gt22 = PDupwindNthSymm3(&gt22[index]);
     CCTK_REAL const PDstandardNth1gt23 = PDstandardNth1(&gt23[index]);
     CCTK_REAL const PDstandardNth2gt23 = PDstandardNth2(&gt23[index]);
     CCTK_REAL const PDstandardNth3gt23 = PDstandardNth3(&gt23[index]);
-    CCTK_REAL const PDupwindNthAnti1gt23 = PDupwindNthAnti1(&gt23[index]);
-    CCTK_REAL const PDupwindNthSymm1gt23 = PDupwindNthSymm1(&gt23[index]);
-    CCTK_REAL const PDupwindNthAnti2gt23 = PDupwindNthAnti2(&gt23[index]);
-    CCTK_REAL const PDupwindNthSymm2gt23 = PDupwindNthSymm2(&gt23[index]);
-    CCTK_REAL const PDupwindNthAnti3gt23 = PDupwindNthAnti3(&gt23[index]);
-    CCTK_REAL const PDupwindNthSymm3gt23 = PDupwindNthSymm3(&gt23[index]);
     CCTK_REAL const PDstandardNth1gt33 = PDstandardNth1(&gt33[index]);
     CCTK_REAL const PDstandardNth2gt33 = PDstandardNth2(&gt33[index]);
     CCTK_REAL const PDstandardNth3gt33 = PDstandardNth3(&gt33[index]);
-    CCTK_REAL const PDupwindNthAnti1gt33 = PDupwindNthAnti1(&gt33[index]);
-    CCTK_REAL const PDupwindNthSymm1gt33 = PDupwindNthSymm1(&gt33[index]);
-    CCTK_REAL const PDupwindNthAnti2gt33 = PDupwindNthAnti2(&gt33[index]);
-    CCTK_REAL const PDupwindNthSymm2gt33 = PDupwindNthSymm2(&gt33[index]);
-    CCTK_REAL const PDupwindNthAnti3gt33 = PDupwindNthAnti3(&gt33[index]);
-    CCTK_REAL const PDupwindNthSymm3gt33 = PDupwindNthSymm3(&gt33[index]);
     CCTK_REAL const PDstandardNth1phi = PDstandardNth1(&phi[index]);
     CCTK_REAL const PDstandardNth2phi = PDstandardNth2(&phi[index]);
     CCTK_REAL const PDstandardNth3phi = PDstandardNth3(&phi[index]);
-    CCTK_REAL const PDupwindNthAnti1phi = PDupwindNthAnti1(&phi[index]);
-    CCTK_REAL const PDupwindNthSymm1phi = PDupwindNthSymm1(&phi[index]);
-    CCTK_REAL const PDupwindNthAnti2phi = PDupwindNthAnti2(&phi[index]);
-    CCTK_REAL const PDupwindNthSymm2phi = PDupwindNthSymm2(&phi[index]);
-    CCTK_REAL const PDupwindNthAnti3phi = PDupwindNthAnti3(&phi[index]);
-    CCTK_REAL const PDupwindNthSymm3phi = PDupwindNthSymm3(&phi[index]);
     CCTK_REAL const PDstandardNth1trK = PDstandardNth1(&trK[index]);
     CCTK_REAL const PDstandardNth2trK = PDstandardNth2(&trK[index]);
     CCTK_REAL const PDstandardNth3trK = PDstandardNth3(&trK[index]);
-    CCTK_REAL const PDupwindNthAnti1trK = PDupwindNthAnti1(&trK[index]);
-    CCTK_REAL const PDupwindNthSymm1trK = PDupwindNthSymm1(&trK[index]);
-    CCTK_REAL const PDupwindNthAnti2trK = PDupwindNthAnti2(&trK[index]);
-    CCTK_REAL const PDupwindNthSymm2trK = PDupwindNthSymm2(&trK[index]);
-    CCTK_REAL const PDupwindNthAnti3trK = PDupwindNthAnti3(&trK[index]);
-    CCTK_REAL const PDupwindNthSymm3trK = PDupwindNthSymm3(&trK[index]);
-    CCTK_REAL const PDupwindNthAnti1Xt1 = PDupwindNthAnti1(&Xt1[index]);
-    CCTK_REAL const PDupwindNthSymm1Xt1 = PDupwindNthSymm1(&Xt1[index]);
-    CCTK_REAL const PDupwindNthAnti2Xt1 = PDupwindNthAnti2(&Xt1[index]);
-    CCTK_REAL const PDupwindNthSymm2Xt1 = PDupwindNthSymm2(&Xt1[index]);
-    CCTK_REAL const PDupwindNthAnti3Xt1 = PDupwindNthAnti3(&Xt1[index]);
-    CCTK_REAL const PDupwindNthSymm3Xt1 = PDupwindNthSymm3(&Xt1[index]);
-    CCTK_REAL const PDupwindNthAnti1Xt2 = PDupwindNthAnti1(&Xt2[index]);
-    CCTK_REAL const PDupwindNthSymm1Xt2 = PDupwindNthSymm1(&Xt2[index]);
-    CCTK_REAL const PDupwindNthAnti2Xt2 = PDupwindNthAnti2(&Xt2[index]);
-    CCTK_REAL const PDupwindNthSymm2Xt2 = PDupwindNthSymm2(&Xt2[index]);
-    CCTK_REAL const PDupwindNthAnti3Xt2 = PDupwindNthAnti3(&Xt2[index]);
-    CCTK_REAL const PDupwindNthSymm3Xt2 = PDupwindNthSymm3(&Xt2[index]);
-    CCTK_REAL const PDupwindNthAnti1Xt3 = PDupwindNthAnti1(&Xt3[index]);
-    CCTK_REAL const PDupwindNthSymm1Xt3 = PDupwindNthSymm1(&Xt3[index]);
-    CCTK_REAL const PDupwindNthAnti2Xt3 = PDupwindNthAnti2(&Xt3[index]);
-    CCTK_REAL const PDupwindNthSymm2Xt3 = PDupwindNthSymm2(&Xt3[index]);
-    CCTK_REAL const PDupwindNthAnti3Xt3 = PDupwindNthAnti3(&Xt3[index]);
-    CCTK_REAL const PDupwindNthSymm3Xt3 = PDupwindNthSymm3(&Xt3[index]);
     
     /* Calculate temporaries and grid functions */
     ptrdiff_t dir1 = Sign(beta1L);
@@ -537,78 +423,52 @@ static void ML_BSSN_O2_RHS1_Body(cGH const * restrict const cctkGH, int const di
     CCTK_REAL trS = em4phi*(eTxxL*gtu11 + eTyyL*gtu22 + 2*(eTxyL*gtu12 + 
       eTxzL*gtu13 + eTyzL*gtu23) + eTzzL*gtu33);
     
-    CCTK_REAL phirhsL = beta1L*PDupwindNthAnti1phi + 
-      beta2L*PDupwindNthAnti2phi + beta3L*PDupwindNthAnti3phi + 
-      PDupwindNthSymm1phi*Abs(beta1L) + PDupwindNthSymm2phi*Abs(beta2L) + 
-      PDupwindNthSymm3phi*Abs(beta3L) + 
+    CCTK_REAL phirhsL = 
       IfThen(ToReal(conformalMethod),phiL*(-0.333333333333333333333333333333*(PDstandardNth1beta1 
       + PDstandardNth2beta2 + PDstandardNth3beta3) + 
       0.333333333333333333333333333333*alphaL*trKL),0.166666666666666666666666666667*(PDstandardNth1beta1 
       + PDstandardNth2beta2 + PDstandardNth3beta3) - 
       0.166666666666666666666666666667*alphaL*trKL);
     
-    CCTK_REAL gt11rhsL = -2*alphaL*At11L + 2*(gt12L*PDstandardNth1beta2 + 
-      gt13L*PDstandardNth1beta3) + 
-      gt11L*(1.33333333333333333333333333333*PDstandardNth1beta1 - 
-      0.666666666666666666666666666667*(PDstandardNth2beta2 + 
-      PDstandardNth3beta3)) + beta1L*PDupwindNthAnti1gt11 + 
-      beta2L*PDupwindNthAnti2gt11 + beta3L*PDupwindNthAnti3gt11 + 
-      PDupwindNthSymm1gt11*Abs(beta1L) + PDupwindNthSymm2gt11*Abs(beta2L) + 
-      PDupwindNthSymm3gt11*Abs(beta3L);
-    
-    CCTK_REAL gt12rhsL = -2*alphaL*At12L + gt22L*PDstandardNth1beta2 + 
-      gt23L*PDstandardNth1beta3 + gt11L*PDstandardNth2beta1 + 
-      gt13L*PDstandardNth2beta3 + 
-      gt12L*(0.333333333333333333333333333333*(PDstandardNth1beta1 + 
-      PDstandardNth2beta2) - 
-      0.666666666666666666666666666667*PDstandardNth3beta3) + 
-      beta1L*PDupwindNthAnti1gt12 + beta2L*PDupwindNthAnti2gt12 + 
-      beta3L*PDupwindNthAnti3gt12 + PDupwindNthSymm1gt12*Abs(beta1L) + 
-      PDupwindNthSymm2gt12*Abs(beta2L) + PDupwindNthSymm3gt12*Abs(beta3L);
-    
-    CCTK_REAL gt13rhsL = -2*alphaL*At13L + gt23L*PDstandardNth1beta2 + 
-      gt33L*PDstandardNth1beta3 + gt11L*PDstandardNth3beta1 + 
-      gt12L*PDstandardNth3beta2 + 
-      gt13L*(-0.666666666666666666666666666667*PDstandardNth2beta2 + 
-      0.333333333333333333333333333333*(PDstandardNth1beta1 + 
-      PDstandardNth3beta3)) + beta1L*PDupwindNthAnti1gt13 + 
-      beta2L*PDupwindNthAnti2gt13 + beta3L*PDupwindNthAnti3gt13 + 
-      PDupwindNthSymm1gt13*Abs(beta1L) + PDupwindNthSymm2gt13*Abs(beta2L) + 
-      PDupwindNthSymm3gt13*Abs(beta3L);
-    
-    CCTK_REAL gt22rhsL = -2*alphaL*At22L + 2*(gt12L*PDstandardNth2beta1 + 
-      gt23L*PDstandardNth2beta3) + 
-      gt22L*(1.33333333333333333333333333333*PDstandardNth2beta2 - 
-      0.666666666666666666666666666667*(PDstandardNth1beta1 + 
-      PDstandardNth3beta3)) + beta1L*PDupwindNthAnti1gt22 + 
-      beta2L*PDupwindNthAnti2gt22 + beta3L*PDupwindNthAnti3gt22 + 
-      PDupwindNthSymm1gt22*Abs(beta1L) + PDupwindNthSymm2gt22*Abs(beta2L) + 
-      PDupwindNthSymm3gt22*Abs(beta3L);
-    
-    CCTK_REAL gt23rhsL = -2*alphaL*At23L + gt13L*PDstandardNth2beta1 + 
-      gt33L*PDstandardNth2beta3 + gt12L*PDstandardNth3beta1 + 
-      gt22L*PDstandardNth3beta2 + 
-      gt23L*(-0.666666666666666666666666666667*PDstandardNth1beta1 + 
-      0.333333333333333333333333333333*(PDstandardNth2beta2 + 
-      PDstandardNth3beta3)) + beta1L*PDupwindNthAnti1gt23 + 
-      beta2L*PDupwindNthAnti2gt23 + beta3L*PDupwindNthAnti3gt23 + 
-      PDupwindNthSymm1gt23*Abs(beta1L) + PDupwindNthSymm2gt23*Abs(beta2L) + 
-      PDupwindNthSymm3gt23*Abs(beta3L);
-    
-    CCTK_REAL gt33rhsL = -2*alphaL*At33L + 2*(gt13L*PDstandardNth3beta1 + 
-      gt23L*PDstandardNth3beta2) + 
-      gt33L*(-0.666666666666666666666666666667*(PDstandardNth1beta1 + 
-      PDstandardNth2beta2) + 
-      1.33333333333333333333333333333*PDstandardNth3beta3) + 
-      beta1L*PDupwindNthAnti1gt33 + beta2L*PDupwindNthAnti2gt33 + 
-      beta3L*PDupwindNthAnti3gt33 + PDupwindNthSymm1gt33*Abs(beta1L) + 
-      PDupwindNthSymm2gt33*Abs(beta2L) + PDupwindNthSymm3gt33*Abs(beta3L);
+    CCTK_REAL gt11rhsL = -0.666666666666666666666666666667*(3*alphaL*At11L 
+      - 3*(gt12L*PDstandardNth1beta2 + gt13L*PDstandardNth1beta3) + 
+      gt11L*(-2*PDstandardNth1beta1 + PDstandardNth2beta2 + 
+      PDstandardNth3beta3));
+    
+    CCTK_REAL gt12rhsL = 0.333333333333333333333333333333*(-6*alphaL*At12L 
+      + 3*(gt22L*PDstandardNth1beta2 + gt23L*PDstandardNth1beta3 + 
+      gt11L*PDstandardNth2beta1 + gt13L*PDstandardNth2beta3) + 
+      gt12L*(PDstandardNth1beta1 + PDstandardNth2beta2 - 
+      2*PDstandardNth3beta3));
+    
+    CCTK_REAL gt13rhsL = 0.333333333333333333333333333333*(-6*alphaL*At13L 
+      + 3*(gt23L*PDstandardNth1beta2 + gt33L*PDstandardNth1beta3 + 
+      gt11L*PDstandardNth3beta1 + gt12L*PDstandardNth3beta2) + 
+      gt13L*(PDstandardNth1beta1 - 2*PDstandardNth2beta2 + 
+      PDstandardNth3beta3));
+    
+    CCTK_REAL gt22rhsL = -0.666666666666666666666666666667*(3*alphaL*At22L 
+      - 3*(gt12L*PDstandardNth2beta1 + gt23L*PDstandardNth2beta3) + 
+      gt22L*(PDstandardNth1beta1 - 2*PDstandardNth2beta2 + 
+      PDstandardNth3beta3));
+    
+    CCTK_REAL gt23rhsL = 0.333333333333333333333333333333*(-6*alphaL*At23L 
+      + 3*(gt13L*PDstandardNth2beta1 + gt33L*PDstandardNth2beta3 + 
+      gt12L*PDstandardNth3beta1 + gt22L*PDstandardNth3beta2) + 
+      gt23L*(-2*PDstandardNth1beta1 + PDstandardNth2beta2 + 
+      PDstandardNth3beta3));
+    
+    CCTK_REAL gt33rhsL = -0.666666666666666666666666666667*(3*alphaL*At33L 
+      - 3*(gt13L*PDstandardNth3beta1 + gt23L*PDstandardNth3beta2) + 
+      gt33L*(PDstandardNth1beta1 + PDstandardNth2beta2 - 
+      2*PDstandardNth3beta3));
     
     CCTK_REAL dotXt1 = 
       0.333333333333333333333333333333*(7*(gtu12*PDstandardNth12beta1 + 
       gtu13*PDstandardNth13beta1) + gtu11*(4*PDstandardNth11beta1 + 
       PDstandardNth12beta2 + PDstandardNth13beta3) + 
       gtu12*(PDstandardNth22beta2 + PDstandardNth23beta3) + 
+      3*(gtu22*PDstandardNth22beta1 + gtu33*PDstandardNth33beta1) + 
       gtu13*(PDstandardNth23beta2 + PDstandardNth33beta3) - 
       6*(Atu11*PDstandardNth1alpha + Atu12*PDstandardNth2alpha + 
       Atu13*PDstandardNth3alpha) + 6*(gtu23*PDstandardNth23beta1 + 
@@ -619,17 +479,14 @@ static void ML_BSSN_O2_RHS1_Body(cGH const * restrict const cctkGH, int const di
       150.7964473723100754462068823974161384415*alphaL*(gtu11*S1 + gtu12*S2 + 
       gtu13*S3) + (-3*PDstandardNth1beta1 + 2*(PDstandardNth1beta1 + 
       PDstandardNth2beta2 + PDstandardNth3beta3))*Xtn1 - 
-      3*(PDstandardNth2beta1*Xtn2 + PDstandardNth3beta1*Xtn3) + 
-      3*(gtu22*PDstandardNth22beta1 + gtu33*PDstandardNth33beta1 + 
-      beta1L*PDupwindNthAnti1Xt1 + beta2L*PDupwindNthAnti2Xt1 + 
-      beta3L*PDupwindNthAnti3Xt1 + PDupwindNthSymm1Xt1*Abs(beta1L) + 
-      PDupwindNthSymm2Xt1*Abs(beta2L) + PDupwindNthSymm3Xt1*Abs(beta3L)));
+      3*(PDstandardNth2beta1*Xtn2 + PDstandardNth3beta1*Xtn3));
     
     CCTK_REAL dotXt2 = 
       0.333333333333333333333333333333*(gtu12*(PDstandardNth11beta1 + 
       7*PDstandardNth12beta2 + PDstandardNth13beta3) + 
       gtu22*(PDstandardNth12beta1 + 4*PDstandardNth22beta2 + 
-      PDstandardNth23beta3) + gtu23*(PDstandardNth13beta1 + 
+      PDstandardNth23beta3) + 3*(gtu11*PDstandardNth11beta2 + 
+      gtu33*PDstandardNth33beta2) + gtu23*(PDstandardNth13beta1 + 
       7*PDstandardNth23beta2 + PDstandardNth33beta3) - 
       6*(Atu12*PDstandardNth1alpha + Atu22*PDstandardNth2alpha + 
       Atu23*PDstandardNth3alpha) + 6*(gtu13*PDstandardNth13beta2 + 
@@ -640,15 +497,12 @@ static void ML_BSSN_O2_RHS1_Body(cGH const * restrict const cctkGH, int const di
       150.7964473723100754462068823974161384415*alphaL*(gtu12*S1 + gtu22*S2 + 
       gtu23*S3) + 2*(PDstandardNth1beta1 + PDstandardNth2beta2 + 
       PDstandardNth3beta3)*Xtn2 - 3*(PDstandardNth1beta2*Xtn1 + 
-      PDstandardNth2beta2*Xtn2 + PDstandardNth3beta2*Xtn3) + 
-      3*(gtu11*PDstandardNth11beta2 + gtu33*PDstandardNth33beta2 + 
-      beta1L*PDupwindNthAnti1Xt2 + beta2L*PDupwindNthAnti2Xt2 + 
-      beta3L*PDupwindNthAnti3Xt2 + PDupwindNthSymm1Xt2*Abs(beta1L) + 
-      PDupwindNthSymm2Xt2*Abs(beta2L) + PDupwindNthSymm3Xt2*Abs(beta3L)));
+      PDstandardNth2beta2*Xtn2 + PDstandardNth3beta2*Xtn3));
     
     CCTK_REAL dotXt3 = 
       0.333333333333333333333333333333*(gtu13*(PDstandardNth11beta1 + 
       PDstandardNth12beta2 + 7*PDstandardNth13beta3) + 
+      3*(gtu11*PDstandardNth11beta3 + gtu22*PDstandardNth22beta3) + 
       gtu23*(PDstandardNth12beta1 + PDstandardNth22beta2 + 
       7*PDstandardNth23beta3) + gtu33*(PDstandardNth13beta1 + 
       PDstandardNth23beta2 + 4*PDstandardNth33beta3) - 
@@ -661,11 +515,7 @@ static void ML_BSSN_O2_RHS1_Body(cGH const * restrict const cctkGH, int const di
       150.7964473723100754462068823974161384415*alphaL*(gtu13*S1 + gtu23*S2 + 
       gtu33*S3) + 2*(PDstandardNth1beta1 + PDstandardNth2beta2 + 
       PDstandardNth3beta3)*Xtn3 - 3*(PDstandardNth1beta3*Xtn1 + 
-      PDstandardNth2beta3*Xtn2 + PDstandardNth3beta3*Xtn3) + 
-      3*(gtu11*PDstandardNth11beta3 + gtu22*PDstandardNth22beta3 + 
-      beta1L*PDupwindNthAnti1Xt3 + beta2L*PDupwindNthAnti2Xt3 + 
-      beta3L*PDupwindNthAnti3Xt3 + PDupwindNthSymm1Xt3*Abs(beta1L) + 
-      PDupwindNthSymm2Xt3*Abs(beta2L) + PDupwindNthSymm3Xt3*Abs(beta3L)));
+      PDstandardNth2beta3*Xtn2 + PDstandardNth3beta3*Xtn3));
     
     CCTK_REAL Xt1rhsL = dotXt1;
     
@@ -673,17 +523,14 @@ static void ML_BSSN_O2_RHS1_Body(cGH const * restrict const cctkGH, int const di
     
     CCTK_REAL Xt3rhsL = dotXt3;
     
-    CCTK_REAL dottrK = beta1L*PDupwindNthAnti1trK + 
-      beta2L*PDupwindNthAnti2trK + beta3L*PDupwindNthAnti3trK - 
-      em4phi*(gtu11*PDstandardNth11alpha + gtu22*PDstandardNth22alpha + 
-      gtu33*(PDstandardNth33alpha + 2*cdphi3*PDstandardNth3alpha) + 
-      2*(gtu12*PDstandardNth12alpha + gtu13*(PDstandardNth13alpha + 
-      cdphi1*PDstandardNth3alpha) + gtu23*(PDstandardNth23alpha + 
-      cdphi2*PDstandardNth3alpha)) + PDstandardNth1alpha*(2*(cdphi1*gtu11 + 
-      cdphi2*gtu12 + cdphi3*gtu13) - Xtn1) + 
-      PDstandardNth2alpha*(2*(cdphi1*gtu12 + cdphi2*gtu22 + cdphi3*gtu23) - 
-      Xtn2) - PDstandardNth3alpha*Xtn3) + PDupwindNthSymm1trK*Abs(beta1L) + 
-      PDupwindNthSymm2trK*Abs(beta2L) + PDupwindNthSymm3trK*Abs(beta3L) + 
+    CCTK_REAL dottrK = -(em4phi*(gtu11*PDstandardNth11alpha + 
+      gtu22*PDstandardNth22alpha + gtu33*(PDstandardNth33alpha + 
+      2*cdphi3*PDstandardNth3alpha) + 2*(gtu12*PDstandardNth12alpha + 
+      gtu13*(PDstandardNth13alpha + cdphi1*PDstandardNth3alpha) + 
+      gtu23*(PDstandardNth23alpha + cdphi2*PDstandardNth3alpha)) + 
+      PDstandardNth1alpha*(2*(cdphi1*gtu11 + cdphi2*gtu12 + cdphi3*gtu13) - 
+      Xtn1) + PDstandardNth2alpha*(2*(cdphi1*gtu12 + cdphi2*gtu22 + 
+      cdphi3*gtu23) - Xtn2) - PDstandardNth3alpha*Xtn3)) + 
       alphaL*(2*(Atm12*Atm21 + Atm13*Atm31 + Atm23*Atm32) + 
       12.56637061435917295385057353311801153679*(rho + trS) + SQR(Atm11) + 
       SQR(Atm22) + SQR(Atm33) + 0.333333333333333333333333333333*SQR(trKL));
@@ -692,66 +539,36 @@ static void ML_BSSN_O2_RHS1_Body(cGH const * restrict const cctkGH, int const di
     
     CCTK_REAL alpharhsL = 
       -(pow(alphaL,ToReal(harmonicN))*ToReal(harmonicF)*(trKL + (AL - 
-      trKL)*ToReal(LapseACoeff))) + (beta1L*PDupwindNthAnti1alpha + 
-      beta2L*PDupwindNthAnti2alpha + beta3L*PDupwindNthAnti3alpha + 
-      PDupwindNthSymm1alpha*Abs(beta1L) + PDupwindNthSymm2alpha*Abs(beta2L) + 
-      PDupwindNthSymm3alpha*Abs(beta3L))*ToReal(LapseAdvectionCoeff);
+      trKL)*ToReal(LapseACoeff)));
     
     CCTK_REAL ArhsL = (dottrK - 
-      AL*ToReal(AlphaDriver))*ToReal(LapseACoeff) + (beta1L*PDupwindNthAnti1A 
-      + beta2L*PDupwindNthAnti2A + beta3L*PDupwindNthAnti3A + 
-      PDupwindNthSymm1A*Abs(beta1L) + PDupwindNthSymm2A*Abs(beta2L) + 
-      PDupwindNthSymm3A*Abs(beta3L))*ToReal(LapseAdvectionCoeff);
+      AL*ToReal(AlphaDriver))*ToReal(LapseACoeff);
     
     CCTK_REAL eta = fmin(1,INV(rL)*ToReal(SpatialBetaDriverRadius));
     
     CCTK_REAL theta = fmin(1,exp(1 - 
       rL*INV(ToReal(SpatialShiftGammaCoeffRadius))));
     
-    CCTK_REAL beta1rhsL = (beta1L*PDupwindNthAnti1beta1 + 
-      beta2L*PDupwindNthAnti2beta1 + beta3L*PDupwindNthAnti3beta1 + 
-      PDupwindNthSymm1beta1*Abs(beta1L) + PDupwindNthSymm2beta1*Abs(beta2L) + 
-      PDupwindNthSymm3beta1*Abs(beta3L))*ToReal(ShiftAdvectionCoeff) + 
-      theta*(Xt1L + beta1L*eta*ToReal(BetaDriver)*(-1 + ToReal(ShiftBCoeff)) 
-      + (B1L - Xt1L)*ToReal(ShiftBCoeff))*ToReal(ShiftGammaCoeff);
-    
-    CCTK_REAL beta2rhsL = (beta1L*PDupwindNthAnti1beta2 + 
-      beta2L*PDupwindNthAnti2beta2 + beta3L*PDupwindNthAnti3beta2 + 
-      PDupwindNthSymm1beta2*Abs(beta1L) + PDupwindNthSymm2beta2*Abs(beta2L) + 
-      PDupwindNthSymm3beta2*Abs(beta3L))*ToReal(ShiftAdvectionCoeff) + 
-      theta*(Xt2L + beta2L*eta*ToReal(BetaDriver)*(-1 + ToReal(ShiftBCoeff)) 
-      + (B2L - Xt2L)*ToReal(ShiftBCoeff))*ToReal(ShiftGammaCoeff);
-    
-    CCTK_REAL beta3rhsL = (beta1L*PDupwindNthAnti1beta3 + 
-      beta2L*PDupwindNthAnti2beta3 + beta3L*PDupwindNthAnti3beta3 + 
-      PDupwindNthSymm1beta3*Abs(beta1L) + PDupwindNthSymm2beta3*Abs(beta2L) + 
-      PDupwindNthSymm3beta3*Abs(beta3L))*ToReal(ShiftAdvectionCoeff) + 
-      theta*(Xt3L + beta3L*eta*ToReal(BetaDriver)*(-1 + ToReal(ShiftBCoeff)) 
-      + (B3L - Xt3L)*ToReal(ShiftBCoeff))*ToReal(ShiftGammaCoeff);
-    
-    CCTK_REAL B1rhsL = (beta1L*(PDupwindNthAnti1B1 - PDupwindNthAnti1Xt1) 
-      + beta2L*(PDupwindNthAnti2B1 - PDupwindNthAnti2Xt1) + 
-      beta3L*(PDupwindNthAnti3B1 - PDupwindNthAnti3Xt1) + (PDupwindNthSymm1B1 
-      - PDupwindNthSymm1Xt1)*Abs(beta1L) + (PDupwindNthSymm2B1 - 
-      PDupwindNthSymm2Xt1)*Abs(beta2L) + (PDupwindNthSymm3B1 - 
-      PDupwindNthSymm3Xt1)*Abs(beta3L))*ToReal(ShiftAdvectionCoeff) + (dotXt1 
-      - B1L*eta*ToReal(BetaDriver))*ToReal(ShiftBCoeff);
-    
-    CCTK_REAL B2rhsL = (beta1L*(PDupwindNthAnti1B2 - PDupwindNthAnti1Xt2) 
-      + beta2L*(PDupwindNthAnti2B2 - PDupwindNthAnti2Xt2) + 
-      beta3L*(PDupwindNthAnti3B2 - PDupwindNthAnti3Xt2) + (PDupwindNthSymm1B2 
-      - PDupwindNthSymm1Xt2)*Abs(beta1L) + (PDupwindNthSymm2B2 - 
-      PDupwindNthSymm2Xt2)*Abs(beta2L) + (PDupwindNthSymm3B2 - 
-      PDupwindNthSymm3Xt2)*Abs(beta3L))*ToReal(ShiftAdvectionCoeff) + (dotXt2 
-      - B2L*eta*ToReal(BetaDriver))*ToReal(ShiftBCoeff);
-    
-    CCTK_REAL B3rhsL = (beta1L*(PDupwindNthAnti1B3 - PDupwindNthAnti1Xt3) 
-      + beta2L*(PDupwindNthAnti2B3 - PDupwindNthAnti2Xt3) + 
-      beta3L*(PDupwindNthAnti3B3 - PDupwindNthAnti3Xt3) + (PDupwindNthSymm1B3 
-      - PDupwindNthSymm1Xt3)*Abs(beta1L) + (PDupwindNthSymm2B3 - 
-      PDupwindNthSymm2Xt3)*Abs(beta2L) + (PDupwindNthSymm3B3 - 
-      PDupwindNthSymm3Xt3)*Abs(beta3L))*ToReal(ShiftAdvectionCoeff) + (dotXt3 
-      - B3L*eta*ToReal(BetaDriver))*ToReal(ShiftBCoeff);
+    CCTK_REAL beta1rhsL = theta*(Xt1L + beta1L*eta*ToReal(BetaDriver)*(-1 
+      + ToReal(ShiftBCoeff)) + (B1L - 
+      Xt1L)*ToReal(ShiftBCoeff))*ToReal(ShiftGammaCoeff);
+    
+    CCTK_REAL beta2rhsL = theta*(Xt2L + beta2L*eta*ToReal(BetaDriver)*(-1 
+      + ToReal(ShiftBCoeff)) + (B2L - 
+      Xt2L)*ToReal(ShiftBCoeff))*ToReal(ShiftGammaCoeff);
+    
+    CCTK_REAL beta3rhsL = theta*(Xt3L + beta3L*eta*ToReal(BetaDriver)*(-1 
+      + ToReal(ShiftBCoeff)) + (B3L - 
+      Xt3L)*ToReal(ShiftBCoeff))*ToReal(ShiftGammaCoeff);
+    
+    CCTK_REAL B1rhsL = (dotXt1 - 
+      B1L*eta*ToReal(BetaDriver))*ToReal(ShiftBCoeff);
+    
+    CCTK_REAL B2rhsL = (dotXt2 - 
+      B2L*eta*ToReal(BetaDriver))*ToReal(ShiftBCoeff);
+    
+    CCTK_REAL B3rhsL = (dotXt3 - 
+      B3L*eta*ToReal(BetaDriver))*ToReal(ShiftBCoeff);
     
     /* Copy local copies back to grid functions */
     alpharhs[index] = alpharhsL;
diff --git a/ML_BSSN_O2/src/ML_BSSN_O2_RHS2.cc b/ML_BSSN_O2/src/ML_BSSN_O2_RHS2.cc
index ad45db7..5e1a65c 100644
--- a/ML_BSSN_O2/src/ML_BSSN_O2_RHS2.cc
+++ b/ML_BSSN_O2/src/ML_BSSN_O2_RHS2.cc
@@ -54,7 +54,7 @@ static void ML_BSSN_O2_RHS2_Body(cGH const * restrict const cctkGH, int const di
   const char *groups[] = {"ML_BSSN_O2::ML_curv","ML_BSSN_O2::ML_curvrhs","ML_BSSN_O2::ML_Gamma","ML_BSSN_O2::ML_lapse","ML_BSSN_O2::ML_log_confac","ML_BSSN_O2::ML_metric","ML_BSSN_O2::ML_shift","ML_BSSN_O2::ML_trace_curv"};
   GenericFD_AssertGroupStorage(cctkGH, "ML_BSSN_O2_RHS2", 8, groups);
   
-  GenericFD_EnsureStencilFits(cctkGH, "ML_BSSN_O2_RHS2", 2, 2, 2);
+  GenericFD_EnsureStencilFits(cctkGH, "ML_BSSN_O2_RHS2", 1, 1, 1);
   
   /* Include user-supplied include files */
   
@@ -172,42 +172,6 @@ static void ML_BSSN_O2_RHS2_Body(cGH const * restrict const cctkGH, int const di
     CCTK_REAL const PDstandardNth12alpha = PDstandardNth12(&alpha[index]);
     CCTK_REAL const PDstandardNth13alpha = PDstandardNth13(&alpha[index]);
     CCTK_REAL const PDstandardNth23alpha = PDstandardNth23(&alpha[index]);
-    CCTK_REAL const PDupwindNthAnti1At11 = PDupwindNthAnti1(&At11[index]);
-    CCTK_REAL const PDupwindNthSymm1At11 = PDupwindNthSymm1(&At11[index]);
-    CCTK_REAL const PDupwindNthAnti2At11 = PDupwindNthAnti2(&At11[index]);
-    CCTK_REAL const PDupwindNthSymm2At11 = PDupwindNthSymm2(&At11[index]);
-    CCTK_REAL const PDupwindNthAnti3At11 = PDupwindNthAnti3(&At11[index]);
-    CCTK_REAL const PDupwindNthSymm3At11 = PDupwindNthSymm3(&At11[index]);
-    CCTK_REAL const PDupwindNthAnti1At12 = PDupwindNthAnti1(&At12[index]);
-    CCTK_REAL const PDupwindNthSymm1At12 = PDupwindNthSymm1(&At12[index]);
-    CCTK_REAL const PDupwindNthAnti2At12 = PDupwindNthAnti2(&At12[index]);
-    CCTK_REAL const PDupwindNthSymm2At12 = PDupwindNthSymm2(&At12[index]);
-    CCTK_REAL const PDupwindNthAnti3At12 = PDupwindNthAnti3(&At12[index]);
-    CCTK_REAL const PDupwindNthSymm3At12 = PDupwindNthSymm3(&At12[index]);
-    CCTK_REAL const PDupwindNthAnti1At13 = PDupwindNthAnti1(&At13[index]);
-    CCTK_REAL const PDupwindNthSymm1At13 = PDupwindNthSymm1(&At13[index]);
-    CCTK_REAL const PDupwindNthAnti2At13 = PDupwindNthAnti2(&At13[index]);
-    CCTK_REAL const PDupwindNthSymm2At13 = PDupwindNthSymm2(&At13[index]);
-    CCTK_REAL const PDupwindNthAnti3At13 = PDupwindNthAnti3(&At13[index]);
-    CCTK_REAL const PDupwindNthSymm3At13 = PDupwindNthSymm3(&At13[index]);
-    CCTK_REAL const PDupwindNthAnti1At22 = PDupwindNthAnti1(&At22[index]);
-    CCTK_REAL const PDupwindNthSymm1At22 = PDupwindNthSymm1(&At22[index]);
-    CCTK_REAL const PDupwindNthAnti2At22 = PDupwindNthAnti2(&At22[index]);
-    CCTK_REAL const PDupwindNthSymm2At22 = PDupwindNthSymm2(&At22[index]);
-    CCTK_REAL const PDupwindNthAnti3At22 = PDupwindNthAnti3(&At22[index]);
-    CCTK_REAL const PDupwindNthSymm3At22 = PDupwindNthSymm3(&At22[index]);
-    CCTK_REAL const PDupwindNthAnti1At23 = PDupwindNthAnti1(&At23[index]);
-    CCTK_REAL const PDupwindNthSymm1At23 = PDupwindNthSymm1(&At23[index]);
-    CCTK_REAL const PDupwindNthAnti2At23 = PDupwindNthAnti2(&At23[index]);
-    CCTK_REAL const PDupwindNthSymm2At23 = PDupwindNthSymm2(&At23[index]);
-    CCTK_REAL const PDupwindNthAnti3At23 = PDupwindNthAnti3(&At23[index]);
-    CCTK_REAL const PDupwindNthSymm3At23 = PDupwindNthSymm3(&At23[index]);
-    CCTK_REAL const PDupwindNthAnti1At33 = PDupwindNthAnti1(&At33[index]);
-    CCTK_REAL const PDupwindNthSymm1At33 = PDupwindNthSymm1(&At33[index]);
-    CCTK_REAL const PDupwindNthAnti2At33 = PDupwindNthAnti2(&At33[index]);
-    CCTK_REAL const PDupwindNthSymm2At33 = PDupwindNthSymm2(&At33[index]);
-    CCTK_REAL const PDupwindNthAnti3At33 = PDupwindNthAnti3(&At33[index]);
-    CCTK_REAL const PDupwindNthSymm3At33 = PDupwindNthSymm3(&At33[index]);
     CCTK_REAL const PDstandardNth1beta1 = PDstandardNth1(&beta1[index]);
     CCTK_REAL const PDstandardNth2beta1 = PDstandardNth2(&beta1[index]);
     CCTK_REAL const PDstandardNth3beta1 = PDstandardNth3(&beta1[index]);
@@ -685,86 +649,65 @@ static void ML_BSSN_O2_RHS2_Body(cGH const * restrict const cctkGH, int const di
     
     CCTK_REAL At11rhsL = -2.*alphaL*(At11L*Atm11 + At12L*Atm21 + 
       At13L*Atm31) + 2.*(At12L*PDstandardNth1beta2 + 
-      At13L*PDstandardNth1beta3) + beta1L*PDupwindNthAnti1At11 + 
-      beta2L*PDupwindNthAnti2At11 + beta3L*PDupwindNthAnti3At11 + 
+      At13L*PDstandardNth1beta3) + 
       At11L*(1.333333333333333333333333333333333333333*PDstandardNth1beta1 - 
       0.6666666666666666666666666666666666666667*(PDstandardNth2beta2 + 
       PDstandardNth3beta3) + alphaL*trKL) + em4phi*(Ats11 - 
       0.3333333333333333333333333333333333333333*g11*trAts + 
       alphaL*(-25.13274122871834590770114706623602307358*eTxxL + 
-      8.377580409572781969233715688745341024526*g11*trS)) + 
-      PDupwindNthSymm1At11*Abs(beta1L) + PDupwindNthSymm2At11*Abs(beta2L) + 
-      PDupwindNthSymm3At11*Abs(beta3L);
+      8.377580409572781969233715688745341024526*g11*trS));
     
     CCTK_REAL At12rhsL = -2.*alphaL*(At11L*Atm12 + At12L*Atm22 + 
       At13L*Atm32) + At22L*PDstandardNth1beta2 + At23L*PDstandardNth1beta3 + 
       At11L*PDstandardNth2beta1 + At13L*PDstandardNth2beta3 + 
-      beta1L*PDupwindNthAnti1At12 + beta2L*PDupwindNthAnti2At12 + 
-      beta3L*PDupwindNthAnti3At12 + 
       At12L*(0.3333333333333333333333333333333333333333*(PDstandardNth1beta1 
       + PDstandardNth2beta2) - 
       0.6666666666666666666666666666666666666667*PDstandardNth3beta3 + 
       alphaL*trKL) + em4phi*(Ats12 - 
       0.3333333333333333333333333333333333333333*g12*trAts + 
       alphaL*(-25.13274122871834590770114706623602307358*eTxyL + 
-      8.377580409572781969233715688745341024526*g12*trS)) + 
-      PDupwindNthSymm1At12*Abs(beta1L) + PDupwindNthSymm2At12*Abs(beta2L) + 
-      PDupwindNthSymm3At12*Abs(beta3L);
+      8.377580409572781969233715688745341024526*g12*trS));
     
     CCTK_REAL At13rhsL = -2.*alphaL*(At11L*Atm13 + At12L*Atm23 + 
       At13L*Atm33) + At23L*PDstandardNth1beta2 + At33L*PDstandardNth1beta3 + 
       At11L*PDstandardNth3beta1 + At12L*PDstandardNth3beta2 + 
-      beta1L*PDupwindNthAnti1At13 + beta2L*PDupwindNthAnti2At13 + 
-      beta3L*PDupwindNthAnti3At13 + 
       At13L*(-0.6666666666666666666666666666666666666667*PDstandardNth2beta2 
       + 0.3333333333333333333333333333333333333333*(PDstandardNth1beta1 + 
       PDstandardNth3beta3) + alphaL*trKL) + em4phi*(Ats13 - 
       0.3333333333333333333333333333333333333333*g13*trAts + 
       alphaL*(-25.13274122871834590770114706623602307358*eTxzL + 
-      8.377580409572781969233715688745341024526*g13*trS)) + 
-      PDupwindNthSymm1At13*Abs(beta1L) + PDupwindNthSymm2At13*Abs(beta2L) + 
-      PDupwindNthSymm3At13*Abs(beta3L);
+      8.377580409572781969233715688745341024526*g13*trS));
     
     CCTK_REAL At22rhsL = -2.*alphaL*(At12L*Atm12 + At22L*Atm22 + 
       At23L*Atm32) + 2.*(At12L*PDstandardNth2beta1 + 
-      At23L*PDstandardNth2beta3) + beta1L*PDupwindNthAnti1At22 + 
-      beta2L*PDupwindNthAnti2At22 + beta3L*PDupwindNthAnti3At22 + 
+      At23L*PDstandardNth2beta3) + 
       At22L*(1.333333333333333333333333333333333333333*PDstandardNth2beta2 - 
       0.6666666666666666666666666666666666666667*(PDstandardNth1beta1 + 
       PDstandardNth3beta3) + alphaL*trKL) + em4phi*(Ats22 - 
       0.3333333333333333333333333333333333333333*g22*trAts + 
       alphaL*(-25.13274122871834590770114706623602307358*eTyyL + 
-      8.377580409572781969233715688745341024526*g22*trS)) + 
-      PDupwindNthSymm1At22*Abs(beta1L) + PDupwindNthSymm2At22*Abs(beta2L) + 
-      PDupwindNthSymm3At22*Abs(beta3L);
+      8.377580409572781969233715688745341024526*g22*trS));
     
     CCTK_REAL At23rhsL = -2.*alphaL*(At12L*Atm13 + At22L*Atm23 + 
       At23L*Atm33) + At13L*PDstandardNth2beta1 + At33L*PDstandardNth2beta3 + 
       At12L*PDstandardNth3beta1 + At22L*PDstandardNth3beta2 + 
-      beta1L*PDupwindNthAnti1At23 + beta2L*PDupwindNthAnti2At23 + 
-      beta3L*PDupwindNthAnti3At23 + 
       At23L*(-0.6666666666666666666666666666666666666667*PDstandardNth1beta1 
       + 0.3333333333333333333333333333333333333333*(PDstandardNth2beta2 + 
       PDstandardNth3beta3) + alphaL*trKL) + em4phi*(Ats23 - 
       0.3333333333333333333333333333333333333333*g23*trAts + 
       alphaL*(-25.13274122871834590770114706623602307358*eTyzL + 
-      8.377580409572781969233715688745341024526*g23*trS)) + 
-      PDupwindNthSymm1At23*Abs(beta1L) + PDupwindNthSymm2At23*Abs(beta2L) + 
-      PDupwindNthSymm3At23*Abs(beta3L);
+      8.377580409572781969233715688745341024526*g23*trS));
     
     CCTK_REAL At33rhsL = -2.*alphaL*(At13L*Atm13 + At23L*Atm23 + 
       At33L*Atm33) + 2.*(At13L*PDstandardNth3beta1 + 
-      At23L*PDstandardNth3beta2) + beta1L*PDupwindNthAnti1At33 + 
-      beta2L*PDupwindNthAnti2At33 + beta3L*PDupwindNthAnti3At33 + 
+      At23L*PDstandardNth3beta2) + 
       At33L*(-0.6666666666666666666666666666666666666667*(PDstandardNth1beta1 
       + PDstandardNth2beta2) + 
       1.333333333333333333333333333333333333333*PDstandardNth3beta3 + 
       alphaL*trKL) + em4phi*(Ats33 - 
       0.3333333333333333333333333333333333333333*g33*trAts + 
       alphaL*(-25.13274122871834590770114706623602307358*eTzzL + 
-      8.377580409572781969233715688745341024526*g33*trS)) + 
-      PDupwindNthSymm1At33*Abs(beta1L) + PDupwindNthSymm2At33*Abs(beta2L) + 
-      PDupwindNthSymm3At33*Abs(beta3L);
+      8.377580409572781969233715688745341024526*g33*trS));
     
     /* Copy local copies back to grid functions */
     At11rhs[index] = At11rhsL;
diff --git a/ML_BSSN_O2/src/make.code.defn b/ML_BSSN_O2/src/make.code.defn
index 574dd54..aade8dd 100644
--- a/ML_BSSN_O2/src/make.code.defn
+++ b/ML_BSSN_O2/src/make.code.defn
@@ -1,3 +1,3 @@
 # File produced by Kranc
 
-SRCS = Startup.cc RegisterMoL.cc RegisterSymmetries.cc ML_BSSN_O2_Minkowski.cc ML_BSSN_O2_convertFromADMBase.cc ML_BSSN_O2_convertFromADMBaseGamma.cc ML_BSSN_O2_RHS1.cc ML_BSSN_O2_RHS2.cc ML_BSSN_O2_Dissipation.cc ML_BSSN_O2_RHSStaticBoundary.cc ML_BSSN_O2_enforce.cc ML_BSSN_O2_boundary.cc ML_BSSN_O2_convertToADMBase.cc ML_BSSN_O2_convertToADMBaseDtLapseShift.cc ML_BSSN_O2_convertToADMBaseDtLapseShiftBoundary.cc ML_BSSN_O2_convertToADMBaseFakeDtLapseShift.cc ML_BSSN_O2_constraints1.cc ML_BSSN_O2_constraints2.cc Boundaries.cc 
+SRCS = Startup.cc RegisterMoL.cc RegisterSymmetries.cc ML_BSSN_O2_Minkowski.cc ML_BSSN_O2_convertFromADMBase.cc ML_BSSN_O2_convertFromADMBaseGamma.cc ML_BSSN_O2_RHS1.cc ML_BSSN_O2_RHS2.cc ML_BSSN_O2_Dissipation.cc ML_BSSN_O2_Advect.cc ML_BSSN_O2_RHSStaticBoundary.cc ML_BSSN_O2_enforce.cc ML_BSSN_O2_boundary.cc ML_BSSN_O2_convertToADMBase.cc ML_BSSN_O2_convertToADMBaseDtLapseShift.cc ML_BSSN_O2_convertToADMBaseDtLapseShiftBoundary.cc ML_BSSN_O2_convertToADMBaseFakeDtLapseShift.cc ML_BSSN_O2_constraints1.cc ML_BSSN_O2_constraints2.cc Boundaries.cc