Regenerate code

Testsuite passes

1 files changed, 71 insertions, 254 deletions

diff --git a/ML_BSSN/src/ML_BSSN_RHS1.cc b/ML_BSSN/src/ML_BSSN_RHS1.cc
index 0f1e946..8a09a0b 100644
--- a/ML_BSSN/src/ML_BSSN_RHS1.cc
+++ b/ML_BSSN/src/ML_BSSN_RHS1.cc
@@ -75,7 +75,7 @@ static void ML_BSSN_RHS1_Body(cGH const * restrict const cctkGH, int const dir,
   const char *groups[] = {"grid::coordinates","Grid::coordinates","ML_BSSN::ML_curv","ML_BSSN::ML_dtlapse","ML_BSSN::ML_dtlapserhs","ML_BSSN::ML_dtshift","ML_BSSN::ML_dtshiftrhs","ML_BSSN::ML_Gamma","ML_BSSN::ML_Gammarhs","ML_BSSN::ML_lapse","ML_BSSN::ML_lapserhs","ML_BSSN::ML_log_confac","ML_BSSN::ML_log_confacrhs","ML_BSSN::ML_metric","ML_BSSN::ML_metricrhs","ML_BSSN::ML_shift","ML_BSSN::ML_shiftrhs","ML_BSSN::ML_trace_curv","ML_BSSN::ML_trace_curvrhs"};
   GenericFD_AssertGroupStorage(cctkGH, "ML_BSSN_RHS1", 19, groups);
   
-  GenericFD_EnsureStencilFits(cctkGH, "ML_BSSN_RHS1", 3, 3, 3);
+  GenericFD_EnsureStencilFits(cctkGH, "ML_BSSN_RHS1", 2, 2, 2);
   
   /* Include user-supplied include files */
   
@@ -191,12 +191,6 @@ static void ML_BSSN_RHS1_Body(cGH const * restrict const cctkGH, int const dir,
     /* 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]);
@@ -206,30 +200,6 @@ static void ML_BSSN_RHS1_Body(cGH const * restrict const cctkGH, int const dir,
     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]);
@@ -239,12 +209,6 @@ static void ML_BSSN_RHS1_Body(cGH const * restrict const cctkGH, int const dir,
     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]);
@@ -254,12 +218,6 @@ static void ML_BSSN_RHS1_Body(cGH const * restrict const cctkGH, int const dir,
     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]);
@@ -269,102 +227,30 @@ static void ML_BSSN_RHS1_Body(cGH const * restrict const cctkGH, int const dir,
     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);
@@ -531,78 +417,52 @@ static void ML_BSSN_RHS1_Body(cGH const * restrict const cctkGH, int const dir,
     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 + 
@@ -613,17 +473,14 @@ static void ML_BSSN_RHS1_Body(cGH const * restrict const cctkGH, int const dir,
       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 + 
@@ -634,15 +491,12 @@ static void ML_BSSN_RHS1_Body(cGH const * restrict const cctkGH, int const dir,
       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) - 
@@ -655,11 +509,7 @@ static void ML_BSSN_RHS1_Body(cGH const * restrict const cctkGH, int const dir,
       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;
     
@@ -667,17 +517,14 @@ static void ML_BSSN_RHS1_Body(cGH const * restrict const cctkGH, int const dir,
     
     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));
@@ -686,66 +533,36 @@ static void ML_BSSN_RHS1_Body(cGH const * restrict const cctkGH, int const dir,
     
     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;