Regenerate code

Testsuite passes

4 files changed, 582 insertions, 286 deletions

diff --git a/ML_BSSN_MP_O8/src/ML_BSSN_MP_O8_Dissipation.cc b/ML_BSSN_MP_O8/src/ML_BSSN_MP_O8_Dissipation.cc
new file mode 100644
index 0000000..c39f29a
--- /dev/null
+++ b/ML_BSSN_MP_O8/src/ML_BSSN_MP_O8_Dissipation.cc
@@ -0,0 +1,452 @@
+/*  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_MP_O8_Dissipation_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_MP_O8::ML_curvrhs","flat");
+  if (ierr < 0)
+    CCTK_WARN(1, "Failed to register flat BC for ML_BSSN_MP_O8::ML_curvrhs.");
+  ierr = Boundary_SelectGroupForBC(cctkGH, CCTK_ALL_FACES, GenericFD_GetBoundaryWidth(cctkGH), -1 /* no table */, "ML_BSSN_MP_O8::ML_dtlapserhs","flat");
+  if (ierr < 0)
+    CCTK_WARN(1, "Failed to register flat BC for ML_BSSN_MP_O8::ML_dtlapserhs.");
+  ierr = Boundary_SelectGroupForBC(cctkGH, CCTK_ALL_FACES, GenericFD_GetBoundaryWidth(cctkGH), -1 /* no table */, "ML_BSSN_MP_O8::ML_dtshiftrhs","flat");
+  if (ierr < 0)
+    CCTK_WARN(1, "Failed to register flat BC for ML_BSSN_MP_O8::ML_dtshiftrhs.");
+  ierr = Boundary_SelectGroupForBC(cctkGH, CCTK_ALL_FACES, GenericFD_GetBoundaryWidth(cctkGH), -1 /* no table */, "ML_BSSN_MP_O8::ML_Gammarhs","flat");
+  if (ierr < 0)
+    CCTK_WARN(1, "Failed to register flat BC for ML_BSSN_MP_O8::ML_Gammarhs.");
+  ierr = Boundary_SelectGroupForBC(cctkGH, CCTK_ALL_FACES, GenericFD_GetBoundaryWidth(cctkGH), -1 /* no table */, "ML_BSSN_MP_O8::ML_lapserhs","flat");
+  if (ierr < 0)
+    CCTK_WARN(1, "Failed to register flat BC for ML_BSSN_MP_O8::ML_lapserhs.");
+  ierr = Boundary_SelectGroupForBC(cctkGH, CCTK_ALL_FACES, GenericFD_GetBoundaryWidth(cctkGH), -1 /* no table */, "ML_BSSN_MP_O8::ML_log_confacrhs","flat");
+  if (ierr < 0)
+    CCTK_WARN(1, "Failed to register flat BC for ML_BSSN_MP_O8::ML_log_confacrhs.");
+  ierr = Boundary_SelectGroupForBC(cctkGH, CCTK_ALL_FACES, GenericFD_GetBoundaryWidth(cctkGH), -1 /* no table */, "ML_BSSN_MP_O8::ML_metricrhs","flat");
+  if (ierr < 0)
+    CCTK_WARN(1, "Failed to register flat BC for ML_BSSN_MP_O8::ML_metricrhs.");
+  ierr = Boundary_SelectGroupForBC(cctkGH, CCTK_ALL_FACES, GenericFD_GetBoundaryWidth(cctkGH), -1 /* no table */, "ML_BSSN_MP_O8::ML_shiftrhs","flat");
+  if (ierr < 0)
+    CCTK_WARN(1, "Failed to register flat BC for ML_BSSN_MP_O8::ML_shiftrhs.");
+  ierr = Boundary_SelectGroupForBC(cctkGH, CCTK_ALL_FACES, GenericFD_GetBoundaryWidth(cctkGH), -1 /* no table */, "ML_BSSN_MP_O8::ML_trace_curvrhs","flat");
+  if (ierr < 0)
+    CCTK_WARN(1, "Failed to register flat BC for ML_BSSN_MP_O8::ML_trace_curvrhs.");
+  return;
+}
+
+static void ML_BSSN_MP_O8_Dissipation_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_MP_O8_Dissipation_Body");
+  }
+  
+  if (cctk_iteration % ML_BSSN_MP_O8_Dissipation_calc_every != ML_BSSN_MP_O8_Dissipation_calc_offset)
+  {
+    return;
+  }
+  
+  const char *groups[] = {"Coordinates::jacobian","ML_BSSN_MP_O8::ML_curv","ML_BSSN_MP_O8::ML_curvrhs","ML_BSSN_MP_O8::ML_dtlapse","ML_BSSN_MP_O8::ML_dtlapserhs","ML_BSSN_MP_O8::ML_dtshift","ML_BSSN_MP_O8::ML_dtshiftrhs","ML_BSSN_MP_O8::ML_Gamma","ML_BSSN_MP_O8::ML_Gammarhs","ML_BSSN_MP_O8::ML_lapse","ML_BSSN_MP_O8::ML_lapserhs","ML_BSSN_MP_O8::ML_log_confac","ML_BSSN_MP_O8::ML_log_confacrhs","ML_BSSN_MP_O8::ML_metric","ML_BSSN_MP_O8::ML_metricrhs","ML_BSSN_MP_O8::ML_shift","ML_BSSN_MP_O8::ML_shiftrhs","ML_BSSN_MP_O8::ML_trace_curv","ML_BSSN_MP_O8::ML_trace_curvrhs"};
+  GenericFD_AssertGroupStorage(cctkGH, "ML_BSSN_MP_O8_Dissipation", 19, groups);
+  
+  GenericFD_EnsureStencilFits(cctkGH, "ML_BSSN_MP_O8_Dissipation", 5, 5, 5);
+  
+  /* 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 p1o1024dx = 0.0009765625*INV(dx);
+  CCTK_REAL const p1o1024dy = 0.0009765625*INV(dy);
+  CCTK_REAL const p1o1024dz = 0.0009765625*INV(dz);
+  CCTK_REAL const p1o1680dx = 0.000595238095238095238095238095238*INV(dx);
+  CCTK_REAL const p1o1680dy = 0.000595238095238095238095238095238*INV(dy);
+  CCTK_REAL const p1o1680dz = 0.000595238095238095238095238095238*INV(dz);
+  CCTK_REAL const p1o5040dx2 = 0.000198412698412698412698412698413*INV(SQR(dx));
+  CCTK_REAL const p1o5040dy2 = 0.000198412698412698412698412698413*INV(SQR(dy));
+  CCTK_REAL const p1o5040dz2 = 0.000198412698412698412698412698413*INV(SQR(dz));
+  CCTK_REAL const p1o560dx = 0.00178571428571428571428571428571*INV(dx);
+  CCTK_REAL const p1o560dy = 0.00178571428571428571428571428571*INV(dy);
+  CCTK_REAL const p1o560dz = 0.00178571428571428571428571428571*INV(dz);
+  CCTK_REAL const p1o705600dxdy = 1.41723356009070294784580498866e-6*INV(dx)*INV(dy);
+  CCTK_REAL const p1o705600dxdz = 1.41723356009070294784580498866e-6*INV(dx)*INV(dz);
+  CCTK_REAL const p1o705600dydz = 1.41723356009070294784580498866e-6*INV(dy)*INV(dz);
+  CCTK_REAL const p1o840dx = 0.00119047619047619047619047619048*INV(dx);
+  CCTK_REAL const p1o840dy = 0.00119047619047619047619047619048*INV(dy);
+  CCTK_REAL const p1o840dz = 0.00119047619047619047619047619048*INV(dz);
+  CCTK_REAL const p1odx = INV(dx);
+  CCTK_REAL const p1ody = INV(dy);
+  CCTK_REAL const p1odz = INV(dz);
+  CCTK_REAL const pm1o840dx = -0.00119047619047619047619047619048*INV(dx);
+  CCTK_REAL const pm1o840dy = -0.00119047619047619047619047619048*INV(dy);
+  CCTK_REAL const pm1o840dz = -0.00119047619047619047619047619048*INV(dz);
+  
+  /* Loop over the grid points */
+  #pragma omp parallel
+  LC_LOOP3 (ML_BSSN_MP_O8_Dissipation,
+    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 J11L = J11[index];
+    CCTK_REAL J12L = J12[index];
+    CCTK_REAL J13L = J13[index];
+    CCTK_REAL J21L = J21[index];
+    CCTK_REAL J22L = J22[index];
+    CCTK_REAL J23L = J23[index];
+    CCTK_REAL J31L = J31[index];
+    CCTK_REAL J32L = J32[index];
+    CCTK_REAL J33L = J33[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 PDdissipationNth1A = PDdissipationNth1(&A[index]);
+    CCTK_REAL const PDdissipationNth2A = PDdissipationNth2(&A[index]);
+    CCTK_REAL const PDdissipationNth3A = PDdissipationNth3(&A[index]);
+    CCTK_REAL const PDdissipationNth1alpha = PDdissipationNth1(&alpha[index]);
+    CCTK_REAL const PDdissipationNth2alpha = PDdissipationNth2(&alpha[index]);
+    CCTK_REAL const PDdissipationNth3alpha = PDdissipationNth3(&alpha[index]);
+    CCTK_REAL const PDdissipationNth1At11 = PDdissipationNth1(&At11[index]);
+    CCTK_REAL const PDdissipationNth2At11 = PDdissipationNth2(&At11[index]);
+    CCTK_REAL const PDdissipationNth3At11 = PDdissipationNth3(&At11[index]);
+    CCTK_REAL const PDdissipationNth1At12 = PDdissipationNth1(&At12[index]);
+    CCTK_REAL const PDdissipationNth2At12 = PDdissipationNth2(&At12[index]);
+    CCTK_REAL const PDdissipationNth3At12 = PDdissipationNth3(&At12[index]);
+    CCTK_REAL const PDdissipationNth1At13 = PDdissipationNth1(&At13[index]);
+    CCTK_REAL const PDdissipationNth2At13 = PDdissipationNth2(&At13[index]);
+    CCTK_REAL const PDdissipationNth3At13 = PDdissipationNth3(&At13[index]);
+    CCTK_REAL const PDdissipationNth1At22 = PDdissipationNth1(&At22[index]);
+    CCTK_REAL const PDdissipationNth2At22 = PDdissipationNth2(&At22[index]);
+    CCTK_REAL const PDdissipationNth3At22 = PDdissipationNth3(&At22[index]);
+    CCTK_REAL const PDdissipationNth1At23 = PDdissipationNth1(&At23[index]);
+    CCTK_REAL const PDdissipationNth2At23 = PDdissipationNth2(&At23[index]);
+    CCTK_REAL const PDdissipationNth3At23 = PDdissipationNth3(&At23[index]);
+    CCTK_REAL const PDdissipationNth1At33 = PDdissipationNth1(&At33[index]);
+    CCTK_REAL const PDdissipationNth2At33 = PDdissipationNth2(&At33[index]);
+    CCTK_REAL const PDdissipationNth3At33 = PDdissipationNth3(&At33[index]);
+    CCTK_REAL const PDdissipationNth1B1 = PDdissipationNth1(&B1[index]);
+    CCTK_REAL const PDdissipationNth2B1 = PDdissipationNth2(&B1[index]);
+    CCTK_REAL const PDdissipationNth3B1 = PDdissipationNth3(&B1[index]);
+    CCTK_REAL const PDdissipationNth1B2 = PDdissipationNth1(&B2[index]);
+    CCTK_REAL const PDdissipationNth2B2 = PDdissipationNth2(&B2[index]);
+    CCTK_REAL const PDdissipationNth3B2 = PDdissipationNth3(&B2[index]);
+    CCTK_REAL const PDdissipationNth1B3 = PDdissipationNth1(&B3[index]);
+    CCTK_REAL const PDdissipationNth2B3 = PDdissipationNth2(&B3[index]);
+    CCTK_REAL const PDdissipationNth3B3 = PDdissipationNth3(&B3[index]);
+    CCTK_REAL const PDdissipationNth1beta1 = PDdissipationNth1(&beta1[index]);
+    CCTK_REAL const PDdissipationNth2beta1 = PDdissipationNth2(&beta1[index]);
+    CCTK_REAL const PDdissipationNth3beta1 = PDdissipationNth3(&beta1[index]);
+    CCTK_REAL const PDdissipationNth1beta2 = PDdissipationNth1(&beta2[index]);
+    CCTK_REAL const PDdissipationNth2beta2 = PDdissipationNth2(&beta2[index]);
+    CCTK_REAL const PDdissipationNth3beta2 = PDdissipationNth3(&beta2[index]);
+    CCTK_REAL const PDdissipationNth1beta3 = PDdissipationNth1(&beta3[index]);
+    CCTK_REAL const PDdissipationNth2beta3 = PDdissipationNth2(&beta3[index]);
+    CCTK_REAL const PDdissipationNth3beta3 = PDdissipationNth3(&beta3[index]);
+    CCTK_REAL const PDdissipationNth1gt11 = PDdissipationNth1(&gt11[index]);
+    CCTK_REAL const PDdissipationNth2gt11 = PDdissipationNth2(&gt11[index]);
+    CCTK_REAL const PDdissipationNth3gt11 = PDdissipationNth3(&gt11[index]);
+    CCTK_REAL const PDdissipationNth1gt12 = PDdissipationNth1(&gt12[index]);
+    CCTK_REAL const PDdissipationNth2gt12 = PDdissipationNth2(&gt12[index]);
+    CCTK_REAL const PDdissipationNth3gt12 = PDdissipationNth3(&gt12[index]);
+    CCTK_REAL const PDdissipationNth1gt13 = PDdissipationNth1(&gt13[index]);
+    CCTK_REAL const PDdissipationNth2gt13 = PDdissipationNth2(&gt13[index]);
+    CCTK_REAL const PDdissipationNth3gt13 = PDdissipationNth3(&gt13[index]);
+    CCTK_REAL const PDdissipationNth1gt22 = PDdissipationNth1(&gt22[index]);
+    CCTK_REAL const PDdissipationNth2gt22 = PDdissipationNth2(&gt22[index]);
+    CCTK_REAL const PDdissipationNth3gt22 = PDdissipationNth3(&gt22[index]);
+    CCTK_REAL const PDdissipationNth1gt23 = PDdissipationNth1(&gt23[index]);
+    CCTK_REAL const PDdissipationNth2gt23 = PDdissipationNth2(&gt23[index]);
+    CCTK_REAL const PDdissipationNth3gt23 = PDdissipationNth3(&gt23[index]);
+    CCTK_REAL const PDdissipationNth1gt33 = PDdissipationNth1(&gt33[index]);
+    CCTK_REAL const PDdissipationNth2gt33 = PDdissipationNth2(&gt33[index]);
+    CCTK_REAL const PDdissipationNth3gt33 = PDdissipationNth3(&gt33[index]);
+    CCTK_REAL const PDdissipationNth1phi = PDdissipationNth1(&phi[index]);
+    CCTK_REAL const PDdissipationNth2phi = PDdissipationNth2(&phi[index]);
+    CCTK_REAL const PDdissipationNth3phi = PDdissipationNth3(&phi[index]);
+    CCTK_REAL const PDdissipationNth1trK = PDdissipationNth1(&trK[index]);
+    CCTK_REAL const PDdissipationNth2trK = PDdissipationNth2(&trK[index]);
+    CCTK_REAL const PDdissipationNth3trK = PDdissipationNth3(&trK[index]);
+    CCTK_REAL const PDdissipationNth1Xt1 = PDdissipationNth1(&Xt1[index]);
+    CCTK_REAL const PDdissipationNth2Xt1 = PDdissipationNth2(&Xt1[index]);
+    CCTK_REAL const PDdissipationNth3Xt1 = PDdissipationNth3(&Xt1[index]);
+    CCTK_REAL const PDdissipationNth1Xt2 = PDdissipationNth1(&Xt2[index]);
+    CCTK_REAL const PDdissipationNth2Xt2 = PDdissipationNth2(&Xt2[index]);
+    CCTK_REAL const PDdissipationNth3Xt2 = PDdissipationNth3(&Xt2[index]);
+    CCTK_REAL const PDdissipationNth1Xt3 = PDdissipationNth1(&Xt3[index]);
+    CCTK_REAL const PDdissipationNth2Xt3 = PDdissipationNth2(&Xt3[index]);
+    CCTK_REAL const PDdissipationNth3Xt3 = PDdissipationNth3(&Xt3[index]);
+    
+    /* Calculate temporaries and grid functions */
+    CCTK_REAL epsdiss1 = ToReal(EpsDiss);
+    
+    CCTK_REAL epsdiss2 = ToReal(EpsDiss);
+    
+    CCTK_REAL epsdiss3 = ToReal(EpsDiss);
+    
+    phirhsL = (epsdiss1*J11L + epsdiss2*J12L + 
+      epsdiss3*J13L)*PDdissipationNth1phi + (epsdiss1*J21L + epsdiss2*J22L + 
+      epsdiss3*J23L)*PDdissipationNth2phi + (epsdiss1*J31L + epsdiss2*J32L + 
+      epsdiss3*J33L)*PDdissipationNth3phi + phirhsL;
+    
+    gt11rhsL = gt11rhsL + (epsdiss1*J11L + epsdiss2*J12L + 
+      epsdiss3*J13L)*PDdissipationNth1gt11 + (epsdiss1*J21L + epsdiss2*J22L + 
+      epsdiss3*J23L)*PDdissipationNth2gt11 + (epsdiss1*J31L + epsdiss2*J32L + 
+      epsdiss3*J33L)*PDdissipationNth3gt11;
+    
+    gt12rhsL = gt12rhsL + (epsdiss1*J11L + epsdiss2*J12L + 
+      epsdiss3*J13L)*PDdissipationNth1gt12 + (epsdiss1*J21L + epsdiss2*J22L + 
+      epsdiss3*J23L)*PDdissipationNth2gt12 + (epsdiss1*J31L + epsdiss2*J32L + 
+      epsdiss3*J33L)*PDdissipationNth3gt12;
+    
+    gt13rhsL = gt13rhsL + (epsdiss1*J11L + epsdiss2*J12L + 
+      epsdiss3*J13L)*PDdissipationNth1gt13 + (epsdiss1*J21L + epsdiss2*J22L + 
+      epsdiss3*J23L)*PDdissipationNth2gt13 + (epsdiss1*J31L + epsdiss2*J32L + 
+      epsdiss3*J33L)*PDdissipationNth3gt13;
+    
+    gt22rhsL = gt22rhsL + (epsdiss1*J11L + epsdiss2*J12L + 
+      epsdiss3*J13L)*PDdissipationNth1gt22 + (epsdiss1*J21L + epsdiss2*J22L + 
+      epsdiss3*J23L)*PDdissipationNth2gt22 + (epsdiss1*J31L + epsdiss2*J32L + 
+      epsdiss3*J33L)*PDdissipationNth3gt22;
+    
+    gt23rhsL = gt23rhsL + (epsdiss1*J11L + epsdiss2*J12L + 
+      epsdiss3*J13L)*PDdissipationNth1gt23 + (epsdiss1*J21L + epsdiss2*J22L + 
+      epsdiss3*J23L)*PDdissipationNth2gt23 + (epsdiss1*J31L + epsdiss2*J32L + 
+      epsdiss3*J33L)*PDdissipationNth3gt23;
+    
+    gt33rhsL = gt33rhsL + (epsdiss1*J11L + epsdiss2*J12L + 
+      epsdiss3*J13L)*PDdissipationNth1gt33 + (epsdiss1*J21L + epsdiss2*J22L + 
+      epsdiss3*J23L)*PDdissipationNth2gt33 + (epsdiss1*J31L + epsdiss2*J32L + 
+      epsdiss3*J33L)*PDdissipationNth3gt33;
+    
+    Xt1rhsL = (epsdiss1*J11L + epsdiss2*J12L + 
+      epsdiss3*J13L)*PDdissipationNth1Xt1 + (epsdiss1*J21L + epsdiss2*J22L + 
+      epsdiss3*J23L)*PDdissipationNth2Xt1 + (epsdiss1*J31L + epsdiss2*J32L + 
+      epsdiss3*J33L)*PDdissipationNth3Xt1 + Xt1rhsL;
+    
+    Xt2rhsL = (epsdiss1*J11L + epsdiss2*J12L + 
+      epsdiss3*J13L)*PDdissipationNth1Xt2 + (epsdiss1*J21L + epsdiss2*J22L + 
+      epsdiss3*J23L)*PDdissipationNth2Xt2 + (epsdiss1*J31L + epsdiss2*J32L + 
+      epsdiss3*J33L)*PDdissipationNth3Xt2 + Xt2rhsL;
+    
+    Xt3rhsL = (epsdiss1*J11L + epsdiss2*J12L + 
+      epsdiss3*J13L)*PDdissipationNth1Xt3 + (epsdiss1*J21L + epsdiss2*J22L + 
+      epsdiss3*J23L)*PDdissipationNth2Xt3 + (epsdiss1*J31L + epsdiss2*J32L + 
+      epsdiss3*J33L)*PDdissipationNth3Xt3 + Xt3rhsL;
+    
+    trKrhsL = (epsdiss1*J11L + epsdiss2*J12L + 
+      epsdiss3*J13L)*PDdissipationNth1trK + (epsdiss1*J21L + epsdiss2*J22L + 
+      epsdiss3*J23L)*PDdissipationNth2trK + (epsdiss1*J31L + epsdiss2*J32L + 
+      epsdiss3*J33L)*PDdissipationNth3trK + trKrhsL;
+    
+    At11rhsL = At11rhsL + (epsdiss1*J11L + epsdiss2*J12L + 
+      epsdiss3*J13L)*PDdissipationNth1At11 + (epsdiss1*J21L + epsdiss2*J22L + 
+      epsdiss3*J23L)*PDdissipationNth2At11 + (epsdiss1*J31L + epsdiss2*J32L + 
+      epsdiss3*J33L)*PDdissipationNth3At11;
+    
+    At12rhsL = At12rhsL + (epsdiss1*J11L + epsdiss2*J12L + 
+      epsdiss3*J13L)*PDdissipationNth1At12 + (epsdiss1*J21L + epsdiss2*J22L + 
+      epsdiss3*J23L)*PDdissipationNth2At12 + (epsdiss1*J31L + epsdiss2*J32L + 
+      epsdiss3*J33L)*PDdissipationNth3At12;
+    
+    At13rhsL = At13rhsL + (epsdiss1*J11L + epsdiss2*J12L + 
+      epsdiss3*J13L)*PDdissipationNth1At13 + (epsdiss1*J21L + epsdiss2*J22L + 
+      epsdiss3*J23L)*PDdissipationNth2At13 + (epsdiss1*J31L + epsdiss2*J32L + 
+      epsdiss3*J33L)*PDdissipationNth3At13;
+    
+    At22rhsL = At22rhsL + (epsdiss1*J11L + epsdiss2*J12L + 
+      epsdiss3*J13L)*PDdissipationNth1At22 + (epsdiss1*J21L + epsdiss2*J22L + 
+      epsdiss3*J23L)*PDdissipationNth2At22 + (epsdiss1*J31L + epsdiss2*J32L + 
+      epsdiss3*J33L)*PDdissipationNth3At22;
+    
+    At23rhsL = At23rhsL + (epsdiss1*J11L + epsdiss2*J12L + 
+      epsdiss3*J13L)*PDdissipationNth1At23 + (epsdiss1*J21L + epsdiss2*J22L + 
+      epsdiss3*J23L)*PDdissipationNth2At23 + (epsdiss1*J31L + epsdiss2*J32L + 
+      epsdiss3*J33L)*PDdissipationNth3At23;
+    
+    At33rhsL = At33rhsL + (epsdiss1*J11L + epsdiss2*J12L + 
+      epsdiss3*J13L)*PDdissipationNth1At33 + (epsdiss1*J21L + epsdiss2*J22L + 
+      epsdiss3*J23L)*PDdissipationNth2At33 + (epsdiss1*J31L + epsdiss2*J32L + 
+      epsdiss3*J33L)*PDdissipationNth3At33;
+    
+    alpharhsL = alpharhsL + (epsdiss1*J11L + epsdiss2*J12L + 
+      epsdiss3*J13L)*PDdissipationNth1alpha + (epsdiss1*J21L + epsdiss2*J22L 
+      + epsdiss3*J23L)*PDdissipationNth2alpha + (epsdiss1*J31L + 
+      epsdiss2*J32L + epsdiss3*J33L)*PDdissipationNth3alpha;
+    
+    ArhsL = ArhsL + (epsdiss1*J11L + epsdiss2*J12L + 
+      epsdiss3*J13L)*PDdissipationNth1A + (epsdiss1*J21L + epsdiss2*J22L + 
+      epsdiss3*J23L)*PDdissipationNth2A + (epsdiss1*J31L + epsdiss2*J32L + 
+      epsdiss3*J33L)*PDdissipationNth3A;
+    
+    beta1rhsL = beta1rhsL + (epsdiss1*J11L + epsdiss2*J12L + 
+      epsdiss3*J13L)*PDdissipationNth1beta1 + (epsdiss1*J21L + epsdiss2*J22L 
+      + epsdiss3*J23L)*PDdissipationNth2beta1 + (epsdiss1*J31L + 
+      epsdiss2*J32L + epsdiss3*J33L)*PDdissipationNth3beta1;
+    
+    beta2rhsL = beta2rhsL + (epsdiss1*J11L + epsdiss2*J12L + 
+      epsdiss3*J13L)*PDdissipationNth1beta2 + (epsdiss1*J21L + epsdiss2*J22L 
+      + epsdiss3*J23L)*PDdissipationNth2beta2 + (epsdiss1*J31L + 
+      epsdiss2*J32L + epsdiss3*J33L)*PDdissipationNth3beta2;
+    
+    beta3rhsL = beta3rhsL + (epsdiss1*J11L + epsdiss2*J12L + 
+      epsdiss3*J13L)*PDdissipationNth1beta3 + (epsdiss1*J21L + epsdiss2*J22L 
+      + epsdiss3*J23L)*PDdissipationNth2beta3 + (epsdiss1*J31L + 
+      epsdiss2*J32L + epsdiss3*J33L)*PDdissipationNth3beta3;
+    
+    B1rhsL = B1rhsL + (epsdiss1*J11L + epsdiss2*J12L + 
+      epsdiss3*J13L)*PDdissipationNth1B1 + (epsdiss1*J21L + epsdiss2*J22L + 
+      epsdiss3*J23L)*PDdissipationNth2B1 + (epsdiss1*J31L + epsdiss2*J32L + 
+      epsdiss3*J33L)*PDdissipationNth3B1;
+    
+    B2rhsL = B2rhsL + (epsdiss1*J11L + epsdiss2*J12L + 
+      epsdiss3*J13L)*PDdissipationNth1B2 + (epsdiss1*J21L + epsdiss2*J22L + 
+      epsdiss3*J23L)*PDdissipationNth2B2 + (epsdiss1*J31L + epsdiss2*J32L + 
+      epsdiss3*J33L)*PDdissipationNth3B2;
+    
+    B3rhsL = B3rhsL + (epsdiss1*J11L + epsdiss2*J12L + 
+      epsdiss3*J13L)*PDdissipationNth1B3 + (epsdiss1*J21L + epsdiss2*J22L + 
+      epsdiss3*J23L)*PDdissipationNth2B3 + (epsdiss1*J31L + epsdiss2*J32L + 
+      epsdiss3*J33L)*PDdissipationNth3B3;
+    
+    /* 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_MP_O8_Dissipation);
+}
+
+extern "C" void ML_BSSN_MP_O8_Dissipation(CCTK_ARGUMENTS)
+{
+  DECLARE_CCTK_ARGUMENTS;
+  DECLARE_CCTK_PARAMETERS;
+  
+  GenericFD_LoopOverInterior(cctkGH, &ML_BSSN_MP_O8_Dissipation_Body);
+}
diff --git a/ML_BSSN_MP_O8/src/ML_BSSN_MP_O8_RHS1.cc b/ML_BSSN_MP_O8/src/ML_BSSN_MP_O8_RHS1.cc
index e67bccc..59be553 100644
--- a/ML_BSSN_MP_O8/src/ML_BSSN_MP_O8_RHS1.cc
+++ b/ML_BSSN_MP_O8/src/ML_BSSN_MP_O8_RHS1.cc
@@ -224,9 +224,6 @@ static void ML_BSSN_MP_O8_RHS1_Body(cGH const * restrict const cctkGH, int const
     /* Include user supplied include files */
     
     /* Precompute derivatives */
-    CCTK_REAL const PDdissipationNth1A = PDdissipationNth1(&A[index]);
-    CCTK_REAL const PDdissipationNth2A = PDdissipationNth2(&A[index]);
-    CCTK_REAL const PDdissipationNth3A = PDdissipationNth3(&A[index]);
     CCTK_REAL const PDupwindNthAnti1A = PDupwindNthAnti1(&A[index]);
     CCTK_REAL const PDupwindNthSymm1A = PDupwindNthSymm1(&A[index]);
     CCTK_REAL const PDupwindNthAnti2A = PDupwindNthAnti2(&A[index]);
@@ -242,36 +239,24 @@ static void ML_BSSN_MP_O8_RHS1_Body(cGH const * restrict const cctkGH, int const
     CCTK_REAL const PDstandardNth12alpha = PDstandardNth12(&alpha[index]);
     CCTK_REAL const PDstandardNth13alpha = PDstandardNth13(&alpha[index]);
     CCTK_REAL const PDstandardNth23alpha = PDstandardNth23(&alpha[index]);
-    CCTK_REAL const PDdissipationNth1alpha = PDdissipationNth1(&alpha[index]);
-    CCTK_REAL const PDdissipationNth2alpha = PDdissipationNth2(&alpha[index]);
-    CCTK_REAL const PDdissipationNth3alpha = PDdissipationNth3(&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 PDdissipationNth1B1 = PDdissipationNth1(&B1[index]);
-    CCTK_REAL const PDdissipationNth2B1 = PDdissipationNth2(&B1[index]);
-    CCTK_REAL const PDdissipationNth3B1 = PDdissipationNth3(&B1[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 PDdissipationNth1B2 = PDdissipationNth1(&B2[index]);
-    CCTK_REAL const PDdissipationNth2B2 = PDdissipationNth2(&B2[index]);
-    CCTK_REAL const PDdissipationNth3B2 = PDdissipationNth3(&B2[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 PDdissipationNth1B3 = PDdissipationNth1(&B3[index]);
-    CCTK_REAL const PDdissipationNth2B3 = PDdissipationNth2(&B3[index]);
-    CCTK_REAL const PDdissipationNth3B3 = PDdissipationNth3(&B3[index]);
     CCTK_REAL const PDupwindNthAnti1B3 = PDupwindNthAnti1(&B3[index]);
     CCTK_REAL const PDupwindNthSymm1B3 = PDupwindNthSymm1(&B3[index]);
     CCTK_REAL const PDupwindNthAnti2B3 = PDupwindNthAnti2(&B3[index]);
@@ -287,9 +272,6 @@ static void ML_BSSN_MP_O8_RHS1_Body(cGH const * restrict const cctkGH, int const
     CCTK_REAL const PDstandardNth12beta1 = PDstandardNth12(&beta1[index]);
     CCTK_REAL const PDstandardNth13beta1 = PDstandardNth13(&beta1[index]);
     CCTK_REAL const PDstandardNth23beta1 = PDstandardNth23(&beta1[index]);
-    CCTK_REAL const PDdissipationNth1beta1 = PDdissipationNth1(&beta1[index]);
-    CCTK_REAL const PDdissipationNth2beta1 = PDdissipationNth2(&beta1[index]);
-    CCTK_REAL const PDdissipationNth3beta1 = PDdissipationNth3(&beta1[index]);
     CCTK_REAL const PDupwindNthAnti1beta1 = PDupwindNthAnti1(&beta1[index]);
     CCTK_REAL const PDupwindNthSymm1beta1 = PDupwindNthSymm1(&beta1[index]);
     CCTK_REAL const PDupwindNthAnti2beta1 = PDupwindNthAnti2(&beta1[index]);
@@ -305,9 +287,6 @@ static void ML_BSSN_MP_O8_RHS1_Body(cGH const * restrict const cctkGH, int const
     CCTK_REAL const PDstandardNth12beta2 = PDstandardNth12(&beta2[index]);
     CCTK_REAL const PDstandardNth13beta2 = PDstandardNth13(&beta2[index]);
     CCTK_REAL const PDstandardNth23beta2 = PDstandardNth23(&beta2[index]);
-    CCTK_REAL const PDdissipationNth1beta2 = PDdissipationNth1(&beta2[index]);
-    CCTK_REAL const PDdissipationNth2beta2 = PDdissipationNth2(&beta2[index]);
-    CCTK_REAL const PDdissipationNth3beta2 = PDdissipationNth3(&beta2[index]);
     CCTK_REAL const PDupwindNthAnti1beta2 = PDupwindNthAnti1(&beta2[index]);
     CCTK_REAL const PDupwindNthSymm1beta2 = PDupwindNthSymm1(&beta2[index]);
     CCTK_REAL const PDupwindNthAnti2beta2 = PDupwindNthAnti2(&beta2[index]);
@@ -323,9 +302,6 @@ static void ML_BSSN_MP_O8_RHS1_Body(cGH const * restrict const cctkGH, int const
     CCTK_REAL const PDstandardNth12beta3 = PDstandardNth12(&beta3[index]);
     CCTK_REAL const PDstandardNth13beta3 = PDstandardNth13(&beta3[index]);
     CCTK_REAL const PDstandardNth23beta3 = PDstandardNth23(&beta3[index]);
-    CCTK_REAL const PDdissipationNth1beta3 = PDdissipationNth1(&beta3[index]);
-    CCTK_REAL const PDdissipationNth2beta3 = PDdissipationNth2(&beta3[index]);
-    CCTK_REAL const PDdissipationNth3beta3 = PDdissipationNth3(&beta3[index]);
     CCTK_REAL const PDupwindNthAnti1beta3 = PDupwindNthAnti1(&beta3[index]);
     CCTK_REAL const PDupwindNthSymm1beta3 = PDupwindNthSymm1(&beta3[index]);
     CCTK_REAL const PDupwindNthAnti2beta3 = PDupwindNthAnti2(&beta3[index]);
@@ -335,9 +311,6 @@ static void ML_BSSN_MP_O8_RHS1_Body(cGH const * restrict const cctkGH, int const
     CCTK_REAL const PDstandardNth1gt11 = PDstandardNth1(&gt11[index]);
     CCTK_REAL const PDstandardNth2gt11 = PDstandardNth2(&gt11[index]);
     CCTK_REAL const PDstandardNth3gt11 = PDstandardNth3(&gt11[index]);
-    CCTK_REAL const PDdissipationNth1gt11 = PDdissipationNth1(&gt11[index]);
-    CCTK_REAL const PDdissipationNth2gt11 = PDdissipationNth2(&gt11[index]);
-    CCTK_REAL const PDdissipationNth3gt11 = PDdissipationNth3(&gt11[index]);
     CCTK_REAL const PDupwindNthAnti1gt11 = PDupwindNthAnti1(&gt11[index]);
     CCTK_REAL const PDupwindNthSymm1gt11 = PDupwindNthSymm1(&gt11[index]);
     CCTK_REAL const PDupwindNthAnti2gt11 = PDupwindNthAnti2(&gt11[index]);
@@ -347,9 +320,6 @@ static void ML_BSSN_MP_O8_RHS1_Body(cGH const * restrict const cctkGH, int const
     CCTK_REAL const PDstandardNth1gt12 = PDstandardNth1(&gt12[index]);
     CCTK_REAL const PDstandardNth2gt12 = PDstandardNth2(&gt12[index]);
     CCTK_REAL const PDstandardNth3gt12 = PDstandardNth3(&gt12[index]);
-    CCTK_REAL const PDdissipationNth1gt12 = PDdissipationNth1(&gt12[index]);
-    CCTK_REAL const PDdissipationNth2gt12 = PDdissipationNth2(&gt12[index]);
-    CCTK_REAL const PDdissipationNth3gt12 = PDdissipationNth3(&gt12[index]);
     CCTK_REAL const PDupwindNthAnti1gt12 = PDupwindNthAnti1(&gt12[index]);
     CCTK_REAL const PDupwindNthSymm1gt12 = PDupwindNthSymm1(&gt12[index]);
     CCTK_REAL const PDupwindNthAnti2gt12 = PDupwindNthAnti2(&gt12[index]);
@@ -359,9 +329,6 @@ static void ML_BSSN_MP_O8_RHS1_Body(cGH const * restrict const cctkGH, int const
     CCTK_REAL const PDstandardNth1gt13 = PDstandardNth1(&gt13[index]);
     CCTK_REAL const PDstandardNth2gt13 = PDstandardNth2(&gt13[index]);
     CCTK_REAL const PDstandardNth3gt13 = PDstandardNth3(&gt13[index]);
-    CCTK_REAL const PDdissipationNth1gt13 = PDdissipationNth1(&gt13[index]);
-    CCTK_REAL const PDdissipationNth2gt13 = PDdissipationNth2(&gt13[index]);
-    CCTK_REAL const PDdissipationNth3gt13 = PDdissipationNth3(&gt13[index]);
     CCTK_REAL const PDupwindNthAnti1gt13 = PDupwindNthAnti1(&gt13[index]);
     CCTK_REAL const PDupwindNthSymm1gt13 = PDupwindNthSymm1(&gt13[index]);
     CCTK_REAL const PDupwindNthAnti2gt13 = PDupwindNthAnti2(&gt13[index]);
@@ -371,9 +338,6 @@ static void ML_BSSN_MP_O8_RHS1_Body(cGH const * restrict const cctkGH, int const
     CCTK_REAL const PDstandardNth1gt22 = PDstandardNth1(&gt22[index]);
     CCTK_REAL const PDstandardNth2gt22 = PDstandardNth2(&gt22[index]);
     CCTK_REAL const PDstandardNth3gt22 = PDstandardNth3(&gt22[index]);
-    CCTK_REAL const PDdissipationNth1gt22 = PDdissipationNth1(&gt22[index]);
-    CCTK_REAL const PDdissipationNth2gt22 = PDdissipationNth2(&gt22[index]);
-    CCTK_REAL const PDdissipationNth3gt22 = PDdissipationNth3(&gt22[index]);
     CCTK_REAL const PDupwindNthAnti1gt22 = PDupwindNthAnti1(&gt22[index]);
     CCTK_REAL const PDupwindNthSymm1gt22 = PDupwindNthSymm1(&gt22[index]);
     CCTK_REAL const PDupwindNthAnti2gt22 = PDupwindNthAnti2(&gt22[index]);
@@ -383,9 +347,6 @@ static void ML_BSSN_MP_O8_RHS1_Body(cGH const * restrict const cctkGH, int const
     CCTK_REAL const PDstandardNth1gt23 = PDstandardNth1(&gt23[index]);
     CCTK_REAL const PDstandardNth2gt23 = PDstandardNth2(&gt23[index]);
     CCTK_REAL const PDstandardNth3gt23 = PDstandardNth3(&gt23[index]);
-    CCTK_REAL const PDdissipationNth1gt23 = PDdissipationNth1(&gt23[index]);
-    CCTK_REAL const PDdissipationNth2gt23 = PDdissipationNth2(&gt23[index]);
-    CCTK_REAL const PDdissipationNth3gt23 = PDdissipationNth3(&gt23[index]);
     CCTK_REAL const PDupwindNthAnti1gt23 = PDupwindNthAnti1(&gt23[index]);
     CCTK_REAL const PDupwindNthSymm1gt23 = PDupwindNthSymm1(&gt23[index]);
     CCTK_REAL const PDupwindNthAnti2gt23 = PDupwindNthAnti2(&gt23[index]);
@@ -395,9 +356,6 @@ static void ML_BSSN_MP_O8_RHS1_Body(cGH const * restrict const cctkGH, int const
     CCTK_REAL const PDstandardNth1gt33 = PDstandardNth1(&gt33[index]);
     CCTK_REAL const PDstandardNth2gt33 = PDstandardNth2(&gt33[index]);
     CCTK_REAL const PDstandardNth3gt33 = PDstandardNth3(&gt33[index]);
-    CCTK_REAL const PDdissipationNth1gt33 = PDdissipationNth1(&gt33[index]);
-    CCTK_REAL const PDdissipationNth2gt33 = PDdissipationNth2(&gt33[index]);
-    CCTK_REAL const PDdissipationNth3gt33 = PDdissipationNth3(&gt33[index]);
     CCTK_REAL const PDupwindNthAnti1gt33 = PDupwindNthAnti1(&gt33[index]);
     CCTK_REAL const PDupwindNthSymm1gt33 = PDupwindNthSymm1(&gt33[index]);
     CCTK_REAL const PDupwindNthAnti2gt33 = PDupwindNthAnti2(&gt33[index]);
@@ -407,9 +365,6 @@ static void ML_BSSN_MP_O8_RHS1_Body(cGH const * restrict const cctkGH, int const
     CCTK_REAL const PDstandardNth1phi = PDstandardNth1(&phi[index]);
     CCTK_REAL const PDstandardNth2phi = PDstandardNth2(&phi[index]);
     CCTK_REAL const PDstandardNth3phi = PDstandardNth3(&phi[index]);
-    CCTK_REAL const PDdissipationNth1phi = PDdissipationNth1(&phi[index]);
-    CCTK_REAL const PDdissipationNth2phi = PDdissipationNth2(&phi[index]);
-    CCTK_REAL const PDdissipationNth3phi = PDdissipationNth3(&phi[index]);
     CCTK_REAL const PDupwindNthAnti1phi = PDupwindNthAnti1(&phi[index]);
     CCTK_REAL const PDupwindNthSymm1phi = PDupwindNthSymm1(&phi[index]);
     CCTK_REAL const PDupwindNthAnti2phi = PDupwindNthAnti2(&phi[index]);
@@ -419,36 +374,24 @@ static void ML_BSSN_MP_O8_RHS1_Body(cGH const * restrict const cctkGH, int const
     CCTK_REAL const PDstandardNth1trK = PDstandardNth1(&trK[index]);
     CCTK_REAL const PDstandardNth2trK = PDstandardNth2(&trK[index]);
     CCTK_REAL const PDstandardNth3trK = PDstandardNth3(&trK[index]);
-    CCTK_REAL const PDdissipationNth1trK = PDdissipationNth1(&trK[index]);
-    CCTK_REAL const PDdissipationNth2trK = PDdissipationNth2(&trK[index]);
-    CCTK_REAL const PDdissipationNth3trK = PDdissipationNth3(&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 PDdissipationNth1Xt1 = PDdissipationNth1(&Xt1[index]);
-    CCTK_REAL const PDdissipationNth2Xt1 = PDdissipationNth2(&Xt1[index]);
-    CCTK_REAL const PDdissipationNth3Xt1 = PDdissipationNth3(&Xt1[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 PDdissipationNth1Xt2 = PDdissipationNth1(&Xt2[index]);
-    CCTK_REAL const PDdissipationNth2Xt2 = PDdissipationNth2(&Xt2[index]);
-    CCTK_REAL const PDdissipationNth3Xt2 = PDdissipationNth3(&Xt2[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 PDdissipationNth1Xt3 = PDdissipationNth1(&Xt3[index]);
-    CCTK_REAL const PDdissipationNth2Xt3 = PDdissipationNth2(&Xt3[index]);
-    CCTK_REAL const PDdissipationNth3Xt3 = PDdissipationNth3(&Xt3[index]);
     CCTK_REAL const PDupwindNthAnti1Xt3 = PDupwindNthAnti1(&Xt3[index]);
     CCTK_REAL const PDupwindNthSymm1Xt3 = PDupwindNthSymm1(&Xt3[index]);
     CCTK_REAL const PDupwindNthAnti2Xt3 = PDupwindNthAnti2(&Xt3[index]);
@@ -463,12 +406,6 @@ static void ML_BSSN_MP_O8_RHS1_Body(cGH const * restrict const cctkGH, int const
     
     ptrdiff_t dir3 = Sign(beta3L);
     
-    CCTK_REAL epsdiss1 = ToReal(EpsDiss);
-    
-    CCTK_REAL epsdiss2 = ToReal(EpsDiss);
-    
-    CCTK_REAL epsdiss3 = ToReal(EpsDiss);
-    
     CCTK_REAL detgt = 1;
     
     CCTK_REAL gtu11 = INV(detgt)*(gt22L*gt33L - SQR(gt23L));
@@ -660,10 +597,7 @@ static void ML_BSSN_MP_O8_RHS1_Body(cGH const * restrict const cctkGH, int const
     CCTK_REAL trS = em4phi*(eTxxL*gtu11 + eTyyL*gtu22 + 2*(eTxyL*gtu12 + 
       eTxzL*gtu13 + eTyzL*gtu23) + eTzzL*gtu33);
     
-    CCTK_REAL phirhsL = (epsdiss1*J11L + epsdiss2*J12L + 
-      epsdiss3*J13L)*PDdissipationNth1phi + (epsdiss1*J21L + epsdiss2*J22L + 
-      epsdiss3*J23L)*PDdissipationNth2phi + (epsdiss1*J31L + epsdiss2*J32L + 
-      epsdiss3*J33L)*PDdissipationNth3phi + (beta1L*J11L + beta2L*J12L + 
+    CCTK_REAL phirhsL = (beta1L*J11L + beta2L*J12L + 
       beta3L*J13L)*PDupwindNthAnti1phi + (beta1L*J21L + beta2L*J22L + 
       beta3L*J23L)*PDupwindNthAnti2phi + (beta1L*J31L + beta2L*J32L + 
       beta3L*J33L)*PDupwindNthAnti3phi + (J11L*PDupwindNthSymm1phi + 
@@ -683,10 +617,7 @@ static void ML_BSSN_MP_O8_RHS1_Body(cGH const * restrict const cctkGH, int const
       J32L*PDstandardNth3beta2 + J33L*PDstandardNth3beta3) - 
       0.166666666666666666666666666667*alphaL*trKL);
     
-    CCTK_REAL gt11rhsL = -2*alphaL*At11L + (epsdiss1*J11L + epsdiss2*J12L 
-      + epsdiss3*J13L)*PDdissipationNth1gt11 + (epsdiss1*J21L + epsdiss2*J22L 
-      + epsdiss3*J23L)*PDdissipationNth2gt11 + (epsdiss1*J31L + epsdiss2*J32L 
-      + epsdiss3*J33L)*PDdissipationNth3gt11 - 
+    CCTK_REAL gt11rhsL = -2*alphaL*At11L - 
       0.666666666666666666666666666667*gt11L*(J11L*PDstandardNth1beta1 + 
       J12L*PDstandardNth1beta2 + J13L*PDstandardNth1beta3 + 
       J21L*PDstandardNth2beta1 + J22L*PDstandardNth2beta2 + 
@@ -705,10 +636,7 @@ static void ML_BSSN_MP_O8_RHS1_Body(cGH const * restrict const cctkGH, int const
       J32L*PDupwindNthSymm3gt11)*Abs(beta2L) + (J13L*PDupwindNthSymm1gt11 + 
       J23L*PDupwindNthSymm2gt11 + J33L*PDupwindNthSymm3gt11)*Abs(beta3L);
     
-    CCTK_REAL gt12rhsL = -2*alphaL*At12L + (epsdiss1*J11L + epsdiss2*J12L 
-      + epsdiss3*J13L)*PDdissipationNth1gt12 + (epsdiss1*J21L + epsdiss2*J22L 
-      + epsdiss3*J23L)*PDdissipationNth2gt12 + (epsdiss1*J31L + epsdiss2*J32L 
-      + epsdiss3*J33L)*PDdissipationNth3gt12 + (gt12L*J11L + 
+    CCTK_REAL gt12rhsL = -2*alphaL*At12L + (gt12L*J11L + 
       gt11L*J12L)*PDstandardNth1beta1 + (gt22L*J11L + 
       gt12L*J12L)*PDstandardNth1beta2 + (gt23L*J11L + 
       gt13L*J12L)*PDstandardNth1beta3 + (gt12L*J21L + 
@@ -732,10 +660,7 @@ static void ML_BSSN_MP_O8_RHS1_Body(cGH const * restrict const cctkGH, int const
       (J13L*PDupwindNthSymm1gt12 + J23L*PDupwindNthSymm2gt12 + 
       J33L*PDupwindNthSymm3gt12)*Abs(beta3L);
     
-    CCTK_REAL gt13rhsL = -2*alphaL*At13L + (epsdiss1*J11L + epsdiss2*J12L 
-      + epsdiss3*J13L)*PDdissipationNth1gt13 + (epsdiss1*J21L + epsdiss2*J22L 
-      + epsdiss3*J23L)*PDdissipationNth2gt13 + (epsdiss1*J31L + epsdiss2*J32L 
-      + epsdiss3*J33L)*PDdissipationNth3gt13 + (gt13L*J11L + 
+    CCTK_REAL gt13rhsL = -2*alphaL*At13L + (gt13L*J11L + 
       gt11L*J13L)*PDstandardNth1beta1 + (gt23L*J11L + 
       gt12L*J13L)*PDstandardNth1beta2 + (gt33L*J11L + 
       gt13L*J13L)*PDstandardNth1beta3 + (gt13L*J21L + 
@@ -759,10 +684,7 @@ static void ML_BSSN_MP_O8_RHS1_Body(cGH const * restrict const cctkGH, int const
       (J13L*PDupwindNthSymm1gt13 + J23L*PDupwindNthSymm2gt13 + 
       J33L*PDupwindNthSymm3gt13)*Abs(beta3L);
     
-    CCTK_REAL gt22rhsL = -2*alphaL*At22L + (epsdiss1*J11L + epsdiss2*J12L 
-      + epsdiss3*J13L)*PDdissipationNth1gt22 + (epsdiss1*J21L + epsdiss2*J22L 
-      + epsdiss3*J23L)*PDdissipationNth2gt22 + (epsdiss1*J31L + epsdiss2*J32L 
-      + epsdiss3*J33L)*PDdissipationNth3gt22 - 
+    CCTK_REAL gt22rhsL = -2*alphaL*At22L - 
       0.666666666666666666666666666667*gt22L*(J11L*PDstandardNth1beta1 + 
       J12L*PDstandardNth1beta2 + J13L*PDstandardNth1beta3 + 
       J21L*PDstandardNth2beta1 + J22L*PDstandardNth2beta2 + 
@@ -781,10 +703,7 @@ static void ML_BSSN_MP_O8_RHS1_Body(cGH const * restrict const cctkGH, int const
       J32L*PDupwindNthSymm3gt22)*Abs(beta2L) + (J13L*PDupwindNthSymm1gt22 + 
       J23L*PDupwindNthSymm2gt22 + J33L*PDupwindNthSymm3gt22)*Abs(beta3L);
     
-    CCTK_REAL gt23rhsL = -2*alphaL*At23L + (epsdiss1*J11L + epsdiss2*J12L 
-      + epsdiss3*J13L)*PDdissipationNth1gt23 + (epsdiss1*J21L + epsdiss2*J22L 
-      + epsdiss3*J23L)*PDdissipationNth2gt23 + (epsdiss1*J31L + epsdiss2*J32L 
-      + epsdiss3*J33L)*PDdissipationNth3gt23 + (gt13L*J12L + 
+    CCTK_REAL gt23rhsL = -2*alphaL*At23L + (gt13L*J12L + 
       gt12L*J13L)*PDstandardNth1beta1 + (gt23L*J12L + 
       gt22L*J13L)*PDstandardNth1beta2 + (gt33L*J12L + 
       gt23L*J13L)*PDstandardNth1beta3 + (gt13L*J22L + 
@@ -808,10 +727,7 @@ static void ML_BSSN_MP_O8_RHS1_Body(cGH const * restrict const cctkGH, int const
       (J13L*PDupwindNthSymm1gt23 + J23L*PDupwindNthSymm2gt23 + 
       J33L*PDupwindNthSymm3gt23)*Abs(beta3L);
     
-    CCTK_REAL gt33rhsL = -2*alphaL*At33L + (epsdiss1*J11L + epsdiss2*J12L 
-      + epsdiss3*J13L)*PDdissipationNth1gt33 + (epsdiss1*J21L + epsdiss2*J22L 
-      + epsdiss3*J23L)*PDdissipationNth2gt33 + (epsdiss1*J31L + epsdiss2*J32L 
-      + epsdiss3*J33L)*PDdissipationNth3gt33 - 
+    CCTK_REAL gt33rhsL = -2*alphaL*At33L - 
       0.666666666666666666666666666667*gt33L*(J11L*PDstandardNth1beta1 + 
       J12L*PDstandardNth1beta2 + J13L*PDstandardNth1beta3 + 
       J21L*PDstandardNth2beta1 + J22L*PDstandardNth2beta2 + 
@@ -1166,25 +1082,13 @@ static void ML_BSSN_MP_O8_RHS1_Body(cGH const * restrict const cctkGH, int const
       dJ333L*PDstandardNth3beta3 + PDstandardNth11beta3*SQR(J13L) + 
       PDstandardNth22beta3*SQR(J23L) + PDstandardNth33beta3*SQR(J33L)));
     
-    CCTK_REAL Xt1rhsL = dotXt1 + (epsdiss1*J11L + epsdiss2*J12L + 
-      epsdiss3*J13L)*PDdissipationNth1Xt1 + (epsdiss1*J21L + epsdiss2*J22L + 
-      epsdiss3*J23L)*PDdissipationNth2Xt1 + (epsdiss1*J31L + epsdiss2*J32L + 
-      epsdiss3*J33L)*PDdissipationNth3Xt1;
-    
-    CCTK_REAL Xt2rhsL = dotXt2 + (epsdiss1*J11L + epsdiss2*J12L + 
-      epsdiss3*J13L)*PDdissipationNth1Xt2 + (epsdiss1*J21L + epsdiss2*J22L + 
-      epsdiss3*J23L)*PDdissipationNth2Xt2 + (epsdiss1*J31L + epsdiss2*J32L + 
-      epsdiss3*J33L)*PDdissipationNth3Xt2;
-    
-    CCTK_REAL Xt3rhsL = dotXt3 + (epsdiss1*J11L + epsdiss2*J12L + 
-      epsdiss3*J13L)*PDdissipationNth1Xt3 + (epsdiss1*J21L + epsdiss2*J22L + 
-      epsdiss3*J23L)*PDdissipationNth2Xt3 + (epsdiss1*J31L + epsdiss2*J32L + 
-      epsdiss3*J33L)*PDdissipationNth3Xt3;
-    
-    CCTK_REAL dottrK = (epsdiss1*J11L + epsdiss2*J12L + 
-      epsdiss3*J13L)*PDdissipationNth1trK + (epsdiss1*J21L + epsdiss2*J22L + 
-      epsdiss3*J23L)*PDdissipationNth2trK + (epsdiss1*J31L + epsdiss2*J32L + 
-      epsdiss3*J33L)*PDdissipationNth3trK + (beta1L*J11L + beta2L*J12L + 
+    CCTK_REAL Xt1rhsL = dotXt1;
+    
+    CCTK_REAL Xt2rhsL = dotXt2;
+    
+    CCTK_REAL Xt3rhsL = dotXt3;
+    
+    CCTK_REAL dottrK = (beta1L*J11L + beta2L*J12L + 
       beta3L*J13L)*PDupwindNthAnti1trK + (beta1L*J21L + beta2L*J22L + 
       beta3L*J23L)*PDupwindNthAnti2trK + (beta1L*J31L + beta2L*J32L + 
       beta3L*J33L)*PDupwindNthAnti3trK + (J11L*PDupwindNthSymm1trK + 
@@ -1235,12 +1139,9 @@ static void ML_BSSN_MP_O8_RHS1_Body(cGH const * restrict const cctkGH, int const
     
     CCTK_REAL trKrhsL = dottrK;
     
-    CCTK_REAL alpharhsL = (epsdiss1*J11L + epsdiss2*J12L + 
-      epsdiss3*J13L)*PDdissipationNth1alpha + (epsdiss1*J21L + epsdiss2*J22L 
-      + epsdiss3*J23L)*PDdissipationNth2alpha + (epsdiss1*J31L + 
-      epsdiss2*J32L + epsdiss3*J33L)*PDdissipationNth3alpha - 
-      pow(alphaL,ToReal(harmonicN))*ToReal(harmonicF)*(trKL + (AL - 
-      trKL)*ToReal(LapseACoeff)) + ((beta1L*J11L + beta2L*J12L + 
+    CCTK_REAL alpharhsL = 
+      -(pow(alphaL,ToReal(harmonicN))*ToReal(harmonicF)*(trKL + (AL - 
+      trKL)*ToReal(LapseACoeff))) + ((beta1L*J11L + beta2L*J12L + 
       beta3L*J13L)*PDupwindNthAnti1alpha + (beta1L*J21L + beta2L*J22L + 
       beta3L*J23L)*PDupwindNthAnti2alpha + (beta1L*J31L + beta2L*J32L + 
       beta3L*J33L)*PDupwindNthAnti3alpha + (J11L*PDupwindNthSymm1alpha + 
@@ -1250,10 +1151,7 @@ static void ML_BSSN_MP_O8_RHS1_Body(cGH const * restrict const cctkGH, int const
       J23L*PDupwindNthSymm2alpha + 
       J33L*PDupwindNthSymm3alpha)*Abs(beta3L))*ToReal(LapseAdvectionCoeff);
     
-    CCTK_REAL ArhsL = (epsdiss1*J11L + epsdiss2*J12L + 
-      epsdiss3*J13L)*PDdissipationNth1A + (epsdiss1*J21L + epsdiss2*J22L + 
-      epsdiss3*J23L)*PDdissipationNth2A + (epsdiss1*J31L + epsdiss2*J32L + 
-      epsdiss3*J33L)*PDdissipationNth3A + (dottrK - 
+    CCTK_REAL ArhsL = (dottrK - 
       AL*ToReal(AlphaDriver))*ToReal(LapseACoeff) + ((beta1L*J11L + 
       beta2L*J12L + beta3L*J13L)*PDupwindNthAnti1A + (beta1L*J21L + 
       beta2L*J22L + beta3L*J23L)*PDupwindNthAnti2A + (beta1L*J31L + 
@@ -1269,55 +1167,43 @@ static void ML_BSSN_MP_O8_RHS1_Body(cGH const * restrict const cctkGH, int const
     CCTK_REAL theta = fmin(1,exp(1 - 
       rL*INV(ToReal(SpatialShiftGammaCoeffRadius))));
     
-    CCTK_REAL beta1rhsL = (epsdiss1*J11L + epsdiss2*J12L + 
-      epsdiss3*J13L)*PDdissipationNth1beta1 + (epsdiss1*J21L + epsdiss2*J22L 
-      + epsdiss3*J23L)*PDdissipationNth2beta1 + (epsdiss1*J31L + 
-      epsdiss2*J32L + epsdiss3*J33L)*PDdissipationNth3beta1 + ((beta1L*J11L + 
-      beta2L*J12L + beta3L*J13L)*PDupwindNthAnti1beta1 + (beta1L*J21L + 
-      beta2L*J22L + beta3L*J23L)*PDupwindNthAnti2beta1 + (beta1L*J31L + 
-      beta2L*J32L + beta3L*J33L)*PDupwindNthAnti3beta1 + 
-      (J11L*PDupwindNthSymm1beta1 + J21L*PDupwindNthSymm2beta1 + 
-      J31L*PDupwindNthSymm3beta1)*Abs(beta1L) + (J12L*PDupwindNthSymm1beta1 + 
-      J22L*PDupwindNthSymm2beta1 + J32L*PDupwindNthSymm3beta1)*Abs(beta2L) + 
-      (J13L*PDupwindNthSymm1beta1 + J23L*PDupwindNthSymm2beta1 + 
+    CCTK_REAL beta1rhsL = ((beta1L*J11L + beta2L*J12L + 
+      beta3L*J13L)*PDupwindNthAnti1beta1 + (beta1L*J21L + beta2L*J22L + 
+      beta3L*J23L)*PDupwindNthAnti2beta1 + (beta1L*J31L + beta2L*J32L + 
+      beta3L*J33L)*PDupwindNthAnti3beta1 + (J11L*PDupwindNthSymm1beta1 + 
+      J21L*PDupwindNthSymm2beta1 + J31L*PDupwindNthSymm3beta1)*Abs(beta1L) + 
+      (J12L*PDupwindNthSymm1beta1 + J22L*PDupwindNthSymm2beta1 + 
+      J32L*PDupwindNthSymm3beta1)*Abs(beta2L) + (J13L*PDupwindNthSymm1beta1 + 
+      J23L*PDupwindNthSymm2beta1 + 
       J33L*PDupwindNthSymm3beta1)*Abs(beta3L))*ToReal(ShiftAdvectionCoeff) + 
       theta*(Xt1L + beta1L*eta*ToReal(BetaDriver)*(-1 + ToReal(ShiftBCoeff)) 
       + (B1L - Xt1L)*ToReal(ShiftBCoeff))*ToReal(ShiftGammaCoeff);
     
-    CCTK_REAL beta2rhsL = (epsdiss1*J11L + epsdiss2*J12L + 
-      epsdiss3*J13L)*PDdissipationNth1beta2 + (epsdiss1*J21L + epsdiss2*J22L 
-      + epsdiss3*J23L)*PDdissipationNth2beta2 + (epsdiss1*J31L + 
-      epsdiss2*J32L + epsdiss3*J33L)*PDdissipationNth3beta2 + ((beta1L*J11L + 
-      beta2L*J12L + beta3L*J13L)*PDupwindNthAnti1beta2 + (beta1L*J21L + 
-      beta2L*J22L + beta3L*J23L)*PDupwindNthAnti2beta2 + (beta1L*J31L + 
-      beta2L*J32L + beta3L*J33L)*PDupwindNthAnti3beta2 + 
-      (J11L*PDupwindNthSymm1beta2 + J21L*PDupwindNthSymm2beta2 + 
-      J31L*PDupwindNthSymm3beta2)*Abs(beta1L) + (J12L*PDupwindNthSymm1beta2 + 
-      J22L*PDupwindNthSymm2beta2 + J32L*PDupwindNthSymm3beta2)*Abs(beta2L) + 
-      (J13L*PDupwindNthSymm1beta2 + J23L*PDupwindNthSymm2beta2 + 
+    CCTK_REAL beta2rhsL = ((beta1L*J11L + beta2L*J12L + 
+      beta3L*J13L)*PDupwindNthAnti1beta2 + (beta1L*J21L + beta2L*J22L + 
+      beta3L*J23L)*PDupwindNthAnti2beta2 + (beta1L*J31L + beta2L*J32L + 
+      beta3L*J33L)*PDupwindNthAnti3beta2 + (J11L*PDupwindNthSymm1beta2 + 
+      J21L*PDupwindNthSymm2beta2 + J31L*PDupwindNthSymm3beta2)*Abs(beta1L) + 
+      (J12L*PDupwindNthSymm1beta2 + J22L*PDupwindNthSymm2beta2 + 
+      J32L*PDupwindNthSymm3beta2)*Abs(beta2L) + (J13L*PDupwindNthSymm1beta2 + 
+      J23L*PDupwindNthSymm2beta2 + 
       J33L*PDupwindNthSymm3beta2)*Abs(beta3L))*ToReal(ShiftAdvectionCoeff) + 
       theta*(Xt2L + beta2L*eta*ToReal(BetaDriver)*(-1 + ToReal(ShiftBCoeff)) 
       + (B2L - Xt2L)*ToReal(ShiftBCoeff))*ToReal(ShiftGammaCoeff);
     
-    CCTK_REAL beta3rhsL = (epsdiss1*J11L + epsdiss2*J12L + 
-      epsdiss3*J13L)*PDdissipationNth1beta3 + (epsdiss1*J21L + epsdiss2*J22L 
-      + epsdiss3*J23L)*PDdissipationNth2beta3 + (epsdiss1*J31L + 
-      epsdiss2*J32L + epsdiss3*J33L)*PDdissipationNth3beta3 + ((beta1L*J11L + 
-      beta2L*J12L + beta3L*J13L)*PDupwindNthAnti1beta3 + (beta1L*J21L + 
-      beta2L*J22L + beta3L*J23L)*PDupwindNthAnti2beta3 + (beta1L*J31L + 
-      beta2L*J32L + beta3L*J33L)*PDupwindNthAnti3beta3 + 
-      (J11L*PDupwindNthSymm1beta3 + J21L*PDupwindNthSymm2beta3 + 
-      J31L*PDupwindNthSymm3beta3)*Abs(beta1L) + (J12L*PDupwindNthSymm1beta3 + 
-      J22L*PDupwindNthSymm2beta3 + J32L*PDupwindNthSymm3beta3)*Abs(beta2L) + 
-      (J13L*PDupwindNthSymm1beta3 + J23L*PDupwindNthSymm2beta3 + 
+    CCTK_REAL beta3rhsL = ((beta1L*J11L + beta2L*J12L + 
+      beta3L*J13L)*PDupwindNthAnti1beta3 + (beta1L*J21L + beta2L*J22L + 
+      beta3L*J23L)*PDupwindNthAnti2beta3 + (beta1L*J31L + beta2L*J32L + 
+      beta3L*J33L)*PDupwindNthAnti3beta3 + (J11L*PDupwindNthSymm1beta3 + 
+      J21L*PDupwindNthSymm2beta3 + J31L*PDupwindNthSymm3beta3)*Abs(beta1L) + 
+      (J12L*PDupwindNthSymm1beta3 + J22L*PDupwindNthSymm2beta3 + 
+      J32L*PDupwindNthSymm3beta3)*Abs(beta2L) + (J13L*PDupwindNthSymm1beta3 + 
+      J23L*PDupwindNthSymm2beta3 + 
       J33L*PDupwindNthSymm3beta3)*Abs(beta3L))*ToReal(ShiftAdvectionCoeff) + 
       theta*(Xt3L + beta3L*eta*ToReal(BetaDriver)*(-1 + ToReal(ShiftBCoeff)) 
       + (B3L - Xt3L)*ToReal(ShiftBCoeff))*ToReal(ShiftGammaCoeff);
     
-    CCTK_REAL B1rhsL = (epsdiss1*J11L + epsdiss2*J12L + 
-      epsdiss3*J13L)*PDdissipationNth1B1 + (epsdiss1*J21L + epsdiss2*J22L + 
-      epsdiss3*J23L)*PDdissipationNth2B1 + (epsdiss1*J31L + epsdiss2*J32L + 
-      epsdiss3*J33L)*PDdissipationNth3B1 + ((beta1L*J11L + beta2L*J12L + 
+    CCTK_REAL B1rhsL = ((beta1L*J11L + beta2L*J12L + 
       beta3L*J13L)*(PDupwindNthAnti1B1 - PDupwindNthAnti1Xt1) + (beta1L*J21L 
       + beta2L*J22L + beta3L*J23L)*(PDupwindNthAnti2B1 - PDupwindNthAnti2Xt1) 
       + (beta1L*J31L + beta2L*J32L + beta3L*J33L)*(PDupwindNthAnti3B1 - 
@@ -1333,10 +1219,7 @@ static void ML_BSSN_MP_O8_RHS1_Body(cGH const * restrict const cctkGH, int const
       PDupwindNthSymm3Xt1))*Abs(beta3L))*ToReal(ShiftAdvectionCoeff) + 
       (dotXt1 - B1L*eta*ToReal(BetaDriver))*ToReal(ShiftBCoeff);
     
-    CCTK_REAL B2rhsL = (epsdiss1*J11L + epsdiss2*J12L + 
-      epsdiss3*J13L)*PDdissipationNth1B2 + (epsdiss1*J21L + epsdiss2*J22L + 
-      epsdiss3*J23L)*PDdissipationNth2B2 + (epsdiss1*J31L + epsdiss2*J32L + 
-      epsdiss3*J33L)*PDdissipationNth3B2 + ((beta1L*J11L + beta2L*J12L + 
+    CCTK_REAL B2rhsL = ((beta1L*J11L + beta2L*J12L + 
       beta3L*J13L)*(PDupwindNthAnti1B2 - PDupwindNthAnti1Xt2) + (beta1L*J21L 
       + beta2L*J22L + beta3L*J23L)*(PDupwindNthAnti2B2 - PDupwindNthAnti2Xt2) 
       + (beta1L*J31L + beta2L*J32L + beta3L*J33L)*(PDupwindNthAnti3B2 - 
@@ -1352,10 +1235,7 @@ static void ML_BSSN_MP_O8_RHS1_Body(cGH const * restrict const cctkGH, int const
       PDupwindNthSymm3Xt2))*Abs(beta3L))*ToReal(ShiftAdvectionCoeff) + 
       (dotXt2 - B2L*eta*ToReal(BetaDriver))*ToReal(ShiftBCoeff);
     
-    CCTK_REAL B3rhsL = (epsdiss1*J11L + epsdiss2*J12L + 
-      epsdiss3*J13L)*PDdissipationNth1B3 + (epsdiss1*J21L + epsdiss2*J22L + 
-      epsdiss3*J23L)*PDdissipationNth2B3 + (epsdiss1*J31L + epsdiss2*J32L + 
-      epsdiss3*J33L)*PDdissipationNth3B3 + ((beta1L*J11L + beta2L*J12L + 
+    CCTK_REAL B3rhsL = ((beta1L*J11L + beta2L*J12L + 
       beta3L*J13L)*(PDupwindNthAnti1B3 - PDupwindNthAnti1Xt3) + (beta1L*J21L 
       + beta2L*J22L + beta3L*J23L)*(PDupwindNthAnti2B3 - PDupwindNthAnti2Xt3) 
       + (beta1L*J31L + beta2L*J32L + beta3L*J33L)*(PDupwindNthAnti3B3 - 
diff --git a/ML_BSSN_MP_O8/src/ML_BSSN_MP_O8_RHS2.cc b/ML_BSSN_MP_O8/src/ML_BSSN_MP_O8_RHS2.cc
index 9256bd7..53297d2 100644
--- a/ML_BSSN_MP_O8/src/ML_BSSN_MP_O8_RHS2.cc
+++ b/ML_BSSN_MP_O8/src/ML_BSSN_MP_O8_RHS2.cc
@@ -199,54 +199,36 @@ static void ML_BSSN_MP_O8_RHS2_Body(cGH const * restrict const cctkGH, int const
     CCTK_REAL const PDstandardNth12alpha = PDstandardNth12(&alpha[index]);
     CCTK_REAL const PDstandardNth13alpha = PDstandardNth13(&alpha[index]);
     CCTK_REAL const PDstandardNth23alpha = PDstandardNth23(&alpha[index]);
-    CCTK_REAL const PDdissipationNth1At11 = PDdissipationNth1(&At11[index]);
-    CCTK_REAL const PDdissipationNth2At11 = PDdissipationNth2(&At11[index]);
-    CCTK_REAL const PDdissipationNth3At11 = PDdissipationNth3(&At11[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 PDdissipationNth1At12 = PDdissipationNth1(&At12[index]);
-    CCTK_REAL const PDdissipationNth2At12 = PDdissipationNth2(&At12[index]);
-    CCTK_REAL const PDdissipationNth3At12 = PDdissipationNth3(&At12[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 PDdissipationNth1At13 = PDdissipationNth1(&At13[index]);
-    CCTK_REAL const PDdissipationNth2At13 = PDdissipationNth2(&At13[index]);
-    CCTK_REAL const PDdissipationNth3At13 = PDdissipationNth3(&At13[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 PDdissipationNth1At22 = PDdissipationNth1(&At22[index]);
-    CCTK_REAL const PDdissipationNth2At22 = PDdissipationNth2(&At22[index]);
-    CCTK_REAL const PDdissipationNth3At22 = PDdissipationNth3(&At22[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 PDdissipationNth1At23 = PDdissipationNth1(&At23[index]);
-    CCTK_REAL const PDdissipationNth2At23 = PDdissipationNth2(&At23[index]);
-    CCTK_REAL const PDdissipationNth3At23 = PDdissipationNth3(&At23[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 PDdissipationNth1At33 = PDdissipationNth1(&At33[index]);
-    CCTK_REAL const PDdissipationNth2At33 = PDdissipationNth2(&At33[index]);
-    CCTK_REAL const PDdissipationNth3At33 = PDdissipationNth3(&At33[index]);
     CCTK_REAL const PDupwindNthAnti1At33 = PDupwindNthAnti1(&At33[index]);
     CCTK_REAL const PDupwindNthSymm1At33 = PDupwindNthSymm1(&At33[index]);
     CCTK_REAL const PDupwindNthAnti2At33 = PDupwindNthAnti2(&At33[index]);
@@ -342,12 +324,6 @@ static void ML_BSSN_MP_O8_RHS2_Body(cGH const * restrict const cctkGH, int const
     
     ptrdiff_t dir3 = Sign(beta3L);
     
-    CCTK_REAL epsdiss1 = ToReal(EpsDiss);
-    
-    CCTK_REAL epsdiss2 = ToReal(EpsDiss);
-    
-    CCTK_REAL epsdiss3 = ToReal(EpsDiss);
-    
     CCTK_REAL detgt = 1;
     
     CCTK_REAL gtu11 = INV(detgt)*(gt22L*gt33L - SQR(gt23L));
@@ -1054,11 +1030,8 @@ static void ML_BSSN_MP_O8_RHS2_Body(cGH const * restrict const cctkGH, int const
     CCTK_REAL trAts = Ats11*gu11 + Ats22*gu22 + 2*(Ats12*gu12 + Ats13*gu13 
       + Ats23*gu23) + Ats33*gu33;
     
-    CCTK_REAL At11rhsL = (epsdiss1*J11L + epsdiss2*J12L + 
-      epsdiss3*J13L)*PDdissipationNth1At11 + (epsdiss1*J21L + epsdiss2*J22L + 
-      epsdiss3*J23L)*PDdissipationNth2At11 + (epsdiss1*J31L + epsdiss2*J32L + 
-      epsdiss3*J33L)*PDdissipationNth3At11 - 
-      0.666666666666666666666666666667*At11L*(J11L*PDstandardNth1beta1 + 
+    CCTK_REAL At11rhsL = 
+      -0.666666666666666666666666666667*At11L*(J11L*PDstandardNth1beta1 + 
       J12L*PDstandardNth1beta2 + J13L*PDstandardNth1beta3 + 
       J21L*PDstandardNth2beta1 + J22L*PDstandardNth2beta2 + 
       J23L*PDstandardNth2beta3 + J31L*PDstandardNth3beta1 + 
@@ -1080,71 +1053,66 @@ static void ML_BSSN_MP_O8_RHS2_Body(cGH const * restrict const cctkGH, int const
       J32L*PDupwindNthSymm3At11)*Abs(beta2L) + (J13L*PDupwindNthSymm1At11 + 
       J23L*PDupwindNthSymm2At11 + J33L*PDupwindNthSymm3At11)*Abs(beta3L);
     
-    CCTK_REAL At12rhsL = (epsdiss1*J11L + epsdiss2*J12L + 
-      epsdiss3*J13L)*PDdissipationNth1At12 + (epsdiss1*J21L + epsdiss2*J22L + 
-      epsdiss3*J23L)*PDdissipationNth2At12 + (epsdiss1*J31L + epsdiss2*J32L + 
-      epsdiss3*J33L)*PDdissipationNth3At12 + (At12L*J11L + 
+    CCTK_REAL At12rhsL = 
+      (0.3333333333333333333333333333333333333333*At12L*J11L + 
       At11L*J12L)*PDstandardNth1beta1 + (At22L*J11L + 
-      At12L*J12L)*PDstandardNth1beta2 + (At23L*J11L + 
-      At13L*J12L)*PDstandardNth1beta3 + (At12L*J21L + 
+      0.3333333333333333333333333333333333333333*At12L*J12L)*PDstandardNth1beta2 
+      + (At23L*J11L + At13L*J12L - 
+      0.6666666666666666666666666666666666666667*At12L*J13L)*PDstandardNth1beta3 
+      + (0.3333333333333333333333333333333333333333*At12L*J21L + 
       At11L*J22L)*PDstandardNth2beta1 + (At22L*J21L + 
-      At12L*J22L)*PDstandardNth2beta2 + (At23L*J21L + 
-      At13L*J22L)*PDstandardNth2beta3 + (At12L*J31L + 
+      0.3333333333333333333333333333333333333333*At12L*J22L)*PDstandardNth2beta2 
+      + (At23L*J21L + At13L*J22L - 
+      0.6666666666666666666666666666666666666667*At12L*J23L)*PDstandardNth2beta3 
+      + (0.3333333333333333333333333333333333333333*At12L*J31L + 
       At11L*J32L)*PDstandardNth3beta1 + (At22L*J31L + 
-      At12L*J32L)*PDstandardNth3beta2 + (At23L*J31L + 
-      At13L*J32L)*PDstandardNth3beta3 - 
-      0.666666666666666666666666666667*At12L*(J11L*PDstandardNth1beta1 + 
-      J12L*PDstandardNth1beta2 + J13L*PDstandardNth1beta3 + 
-      J21L*PDstandardNth2beta1 + J22L*PDstandardNth2beta2 + 
-      J23L*PDstandardNth2beta3 + J31L*PDstandardNth3beta1 + 
-      J32L*PDstandardNth3beta2 + J33L*PDstandardNth3beta3) + (beta1L*J11L + 
-      beta2L*J12L + beta3L*J13L)*PDupwindNthAnti1At12 + (beta1L*J21L + 
-      beta2L*J22L + beta3L*J23L)*PDupwindNthAnti2At12 + (beta1L*J31L + 
-      beta2L*J32L + beta3L*J33L)*PDupwindNthAnti3At12 + 
-      alphaL*(-2*(At11L*Atm12 + At12L*Atm22 + At13L*Atm32) + At12L*trKL) + 
-      em4phi*(Ats12 - 0.333333333333333333333333333333*g12*trAts - 
-      25.13274122871834590770114706623602307358*alphaL*(eTxyL - 
-      0.333333333333333333333333333333*g12*trS)) + (J11L*PDupwindNthSymm1At12 
-      + J21L*PDupwindNthSymm2At12 + J31L*PDupwindNthSymm3At12)*Abs(beta1L) + 
-      (J12L*PDupwindNthSymm1At12 + J22L*PDupwindNthSymm2At12 + 
-      J32L*PDupwindNthSymm3At12)*Abs(beta2L) + (J13L*PDupwindNthSymm1At12 + 
-      J23L*PDupwindNthSymm2At12 + J33L*PDupwindNthSymm3At12)*Abs(beta3L);
-    
-    CCTK_REAL At13rhsL = (epsdiss1*J11L + epsdiss2*J12L + 
-      epsdiss3*J13L)*PDdissipationNth1At13 + (epsdiss1*J21L + epsdiss2*J22L + 
-      epsdiss3*J23L)*PDdissipationNth2At13 + (epsdiss1*J31L + epsdiss2*J32L + 
-      epsdiss3*J33L)*PDdissipationNth3At13 + (At13L*J11L + 
-      At11L*J13L)*PDstandardNth1beta1 + (At23L*J11L + 
+      0.3333333333333333333333333333333333333333*At12L*J32L)*PDstandardNth3beta2 
+      + (At23L*J31L + At13L*J32L - 
+      0.6666666666666666666666666666666666666667*At12L*J33L)*PDstandardNth3beta3 
+      + (beta1L*J11L + beta2L*J12L + beta3L*J13L)*PDupwindNthAnti1At12 + 
+      (beta1L*J21L + beta2L*J22L + beta3L*J23L)*PDupwindNthAnti2At12 + 
+      (beta1L*J31L + beta2L*J32L + beta3L*J33L)*PDupwindNthAnti3At12 + 
+      alphaL*(-2.*(At11L*Atm12 + At12L*Atm22 + At13L*Atm32) + At12L*trKL) + 
+      em4phi*(Ats12 - 0.3333333333333333333333333333333333333333*g12*trAts + 
+      alphaL*(-25.13274122871834590770114706623602307358*eTxyL + 
+      8.377580409572781969233715688745341024526*g12*trS)) + 
+      (J11L*PDupwindNthSymm1At12 + J21L*PDupwindNthSymm2At12 + 
+      J31L*PDupwindNthSymm3At12)*Abs(beta1L) + (J12L*PDupwindNthSymm1At12 + 
+      J22L*PDupwindNthSymm2At12 + J32L*PDupwindNthSymm3At12)*Abs(beta2L) + 
+      (J13L*PDupwindNthSymm1At12 + J23L*PDupwindNthSymm2At12 + 
+      J33L*PDupwindNthSymm3At12)*Abs(beta3L);
+    
+    CCTK_REAL At13rhsL = 
+      (0.3333333333333333333333333333333333333333*At13L*J11L + 
+      At11L*J13L)*PDstandardNth1beta1 + (At23L*J11L - 
+      0.6666666666666666666666666666666666666667*At13L*J12L + 
       At12L*J13L)*PDstandardNth1beta2 + (At33L*J11L + 
-      At13L*J13L)*PDstandardNth1beta3 + (At13L*J21L + 
-      At11L*J23L)*PDstandardNth2beta1 + (At23L*J21L + 
+      0.3333333333333333333333333333333333333333*At13L*J13L)*PDstandardNth1beta3 
+      + (0.3333333333333333333333333333333333333333*At13L*J21L + 
+      At11L*J23L)*PDstandardNth2beta1 + (At23L*J21L - 
+      0.6666666666666666666666666666666666666667*At13L*J22L + 
       At12L*J23L)*PDstandardNth2beta2 + (At33L*J21L + 
-      At13L*J23L)*PDstandardNth2beta3 + (At13L*J31L + 
-      At11L*J33L)*PDstandardNth3beta1 + (At23L*J31L + 
+      0.3333333333333333333333333333333333333333*At13L*J23L)*PDstandardNth2beta3 
+      + (0.3333333333333333333333333333333333333333*At13L*J31L + 
+      At11L*J33L)*PDstandardNth3beta1 + (At23L*J31L - 
+      0.6666666666666666666666666666666666666667*At13L*J32L + 
       At12L*J33L)*PDstandardNth3beta2 + (At33L*J31L + 
-      At13L*J33L)*PDstandardNth3beta3 - 
-      0.666666666666666666666666666667*At13L*(J11L*PDstandardNth1beta1 + 
-      J12L*PDstandardNth1beta2 + J13L*PDstandardNth1beta3 + 
-      J21L*PDstandardNth2beta1 + J22L*PDstandardNth2beta2 + 
-      J23L*PDstandardNth2beta3 + J31L*PDstandardNth3beta1 + 
-      J32L*PDstandardNth3beta2 + J33L*PDstandardNth3beta3) + (beta1L*J11L + 
-      beta2L*J12L + beta3L*J13L)*PDupwindNthAnti1At13 + (beta1L*J21L + 
-      beta2L*J22L + beta3L*J23L)*PDupwindNthAnti2At13 + (beta1L*J31L + 
-      beta2L*J32L + beta3L*J33L)*PDupwindNthAnti3At13 + 
-      alphaL*(-2*(At11L*Atm13 + At12L*Atm23 + At13L*Atm33) + At13L*trKL) + 
-      em4phi*(Ats13 - 0.333333333333333333333333333333*g13*trAts - 
-      25.13274122871834590770114706623602307358*alphaL*(eTxzL - 
-      0.333333333333333333333333333333*g13*trS)) + (J11L*PDupwindNthSymm1At13 
-      + J21L*PDupwindNthSymm2At13 + J31L*PDupwindNthSymm3At13)*Abs(beta1L) + 
-      (J12L*PDupwindNthSymm1At13 + J22L*PDupwindNthSymm2At13 + 
-      J32L*PDupwindNthSymm3At13)*Abs(beta2L) + (J13L*PDupwindNthSymm1At13 + 
-      J23L*PDupwindNthSymm2At13 + J33L*PDupwindNthSymm3At13)*Abs(beta3L);
-    
-    CCTK_REAL At22rhsL = (epsdiss1*J11L + epsdiss2*J12L + 
-      epsdiss3*J13L)*PDdissipationNth1At22 + (epsdiss1*J21L + epsdiss2*J22L + 
-      epsdiss3*J23L)*PDdissipationNth2At22 + (epsdiss1*J31L + epsdiss2*J32L + 
-      epsdiss3*J33L)*PDdissipationNth3At22 - 
-      0.666666666666666666666666666667*At22L*(J11L*PDstandardNth1beta1 + 
+      0.3333333333333333333333333333333333333333*At13L*J33L)*PDstandardNth3beta3 
+      + (beta1L*J11L + beta2L*J12L + beta3L*J13L)*PDupwindNthAnti1At13 + 
+      (beta1L*J21L + beta2L*J22L + beta3L*J23L)*PDupwindNthAnti2At13 + 
+      (beta1L*J31L + beta2L*J32L + beta3L*J33L)*PDupwindNthAnti3At13 + 
+      alphaL*(-2.*(At11L*Atm13 + At12L*Atm23 + At13L*Atm33) + At13L*trKL) + 
+      em4phi*(Ats13 - 0.3333333333333333333333333333333333333333*g13*trAts + 
+      alphaL*(-25.13274122871834590770114706623602307358*eTxzL + 
+      8.377580409572781969233715688745341024526*g13*trS)) + 
+      (J11L*PDupwindNthSymm1At13 + J21L*PDupwindNthSymm2At13 + 
+      J31L*PDupwindNthSymm3At13)*Abs(beta1L) + (J12L*PDupwindNthSymm1At13 + 
+      J22L*PDupwindNthSymm2At13 + J32L*PDupwindNthSymm3At13)*Abs(beta2L) + 
+      (J13L*PDupwindNthSymm1At13 + J23L*PDupwindNthSymm2At13 + 
+      J33L*PDupwindNthSymm3At13)*Abs(beta3L);
+    
+    CCTK_REAL At22rhsL = 
+      -0.666666666666666666666666666667*At22L*(J11L*PDstandardNth1beta1 + 
       J12L*PDstandardNth1beta2 + J13L*PDstandardNth1beta3 + 
       J21L*PDstandardNth2beta1 + J22L*PDstandardNth2beta2 + 
       J23L*PDstandardNth2beta3 + J31L*PDstandardNth3beta1 + 
@@ -1166,41 +1134,37 @@ static void ML_BSSN_MP_O8_RHS2_Body(cGH const * restrict const cctkGH, int const
       J32L*PDupwindNthSymm3At22)*Abs(beta2L) + (J13L*PDupwindNthSymm1At22 + 
       J23L*PDupwindNthSymm2At22 + J33L*PDupwindNthSymm3At22)*Abs(beta3L);
     
-    CCTK_REAL At23rhsL = (epsdiss1*J11L + epsdiss2*J12L + 
-      epsdiss3*J13L)*PDdissipationNth1At23 + (epsdiss1*J21L + epsdiss2*J22L + 
-      epsdiss3*J23L)*PDdissipationNth2At23 + (epsdiss1*J31L + epsdiss2*J32L + 
-      epsdiss3*J33L)*PDdissipationNth3At23 + (At13L*J12L + 
-      At12L*J13L)*PDstandardNth1beta1 + (At23L*J12L + 
+    CCTK_REAL At23rhsL = 
+      (-0.6666666666666666666666666666666666666667*At23L*J11L + At13L*J12L + 
+      At12L*J13L)*PDstandardNth1beta1 + 
+      (0.3333333333333333333333333333333333333333*At23L*J12L + 
       At22L*J13L)*PDstandardNth1beta2 + (At33L*J12L + 
-      At23L*J13L)*PDstandardNth1beta3 + (At13L*J22L + 
-      At12L*J23L)*PDstandardNth2beta1 + (At23L*J22L + 
+      0.3333333333333333333333333333333333333333*At23L*J13L)*PDstandardNth1beta3 
+      + (-0.6666666666666666666666666666666666666667*At23L*J21L + At13L*J22L 
+      + At12L*J23L)*PDstandardNth2beta1 + 
+      (0.3333333333333333333333333333333333333333*At23L*J22L + 
       At22L*J23L)*PDstandardNth2beta2 + (At33L*J22L + 
-      At23L*J23L)*PDstandardNth2beta3 + (At13L*J32L + 
-      At12L*J33L)*PDstandardNth3beta1 + (At23L*J32L + 
+      0.3333333333333333333333333333333333333333*At23L*J23L)*PDstandardNth2beta3 
+      + (-0.6666666666666666666666666666666666666667*At23L*J31L + At13L*J32L 
+      + At12L*J33L)*PDstandardNth3beta1 + 
+      (0.3333333333333333333333333333333333333333*At23L*J32L + 
       At22L*J33L)*PDstandardNth3beta2 + (At33L*J32L + 
-      At23L*J33L)*PDstandardNth3beta3 - 
-      0.666666666666666666666666666667*At23L*(J11L*PDstandardNth1beta1 + 
-      J12L*PDstandardNth1beta2 + J13L*PDstandardNth1beta3 + 
-      J21L*PDstandardNth2beta1 + J22L*PDstandardNth2beta2 + 
-      J23L*PDstandardNth2beta3 + J31L*PDstandardNth3beta1 + 
-      J32L*PDstandardNth3beta2 + J33L*PDstandardNth3beta3) + (beta1L*J11L + 
-      beta2L*J12L + beta3L*J13L)*PDupwindNthAnti1At23 + (beta1L*J21L + 
-      beta2L*J22L + beta3L*J23L)*PDupwindNthAnti2At23 + (beta1L*J31L + 
-      beta2L*J32L + beta3L*J33L)*PDupwindNthAnti3At23 + 
-      alphaL*(-2*(At12L*Atm13 + At22L*Atm23 + At23L*Atm33) + At23L*trKL) + 
-      em4phi*(Ats23 - 0.333333333333333333333333333333*g23*trAts - 
-      25.13274122871834590770114706623602307358*alphaL*(eTyzL - 
-      0.333333333333333333333333333333*g23*trS)) + (J11L*PDupwindNthSymm1At23 
-      + J21L*PDupwindNthSymm2At23 + J31L*PDupwindNthSymm3At23)*Abs(beta1L) + 
-      (J12L*PDupwindNthSymm1At23 + J22L*PDupwindNthSymm2At23 + 
-      J32L*PDupwindNthSymm3At23)*Abs(beta2L) + (J13L*PDupwindNthSymm1At23 + 
-      J23L*PDupwindNthSymm2At23 + J33L*PDupwindNthSymm3At23)*Abs(beta3L);
-    
-    CCTK_REAL At33rhsL = (epsdiss1*J11L + epsdiss2*J12L + 
-      epsdiss3*J13L)*PDdissipationNth1At33 + (epsdiss1*J21L + epsdiss2*J22L + 
-      epsdiss3*J23L)*PDdissipationNth2At33 + (epsdiss1*J31L + epsdiss2*J32L + 
-      epsdiss3*J33L)*PDdissipationNth3At33 - 
-      0.666666666666666666666666666667*At33L*(J11L*PDstandardNth1beta1 + 
+      0.3333333333333333333333333333333333333333*At23L*J33L)*PDstandardNth3beta3 
+      + (beta1L*J11L + beta2L*J12L + beta3L*J13L)*PDupwindNthAnti1At23 + 
+      (beta1L*J21L + beta2L*J22L + beta3L*J23L)*PDupwindNthAnti2At23 + 
+      (beta1L*J31L + beta2L*J32L + beta3L*J33L)*PDupwindNthAnti3At23 + 
+      alphaL*(-2.*(At12L*Atm13 + At22L*Atm23 + At23L*Atm33) + At23L*trKL) + 
+      em4phi*(Ats23 - 0.3333333333333333333333333333333333333333*g23*trAts + 
+      alphaL*(-25.13274122871834590770114706623602307358*eTyzL + 
+      8.377580409572781969233715688745341024526*g23*trS)) + 
+      (J11L*PDupwindNthSymm1At23 + J21L*PDupwindNthSymm2At23 + 
+      J31L*PDupwindNthSymm3At23)*Abs(beta1L) + (J12L*PDupwindNthSymm1At23 + 
+      J22L*PDupwindNthSymm2At23 + J32L*PDupwindNthSymm3At23)*Abs(beta2L) + 
+      (J13L*PDupwindNthSymm1At23 + J23L*PDupwindNthSymm2At23 + 
+      J33L*PDupwindNthSymm3At23)*Abs(beta3L);
+    
+    CCTK_REAL At33rhsL = 
+      -0.666666666666666666666666666667*At33L*(J11L*PDstandardNth1beta1 + 
       J12L*PDstandardNth1beta2 + J13L*PDstandardNth1beta3 + 
       J21L*PDstandardNth2beta1 + J22L*PDstandardNth2beta2 + 
       J23L*PDstandardNth2beta3 + J31L*PDstandardNth3beta1 + 
diff --git a/ML_BSSN_MP_O8/src/make.code.defn b/ML_BSSN_MP_O8/src/make.code.defn
index b78a0fe..0cf4f8f 100644
--- a/ML_BSSN_MP_O8/src/make.code.defn
+++ b/ML_BSSN_MP_O8/src/make.code.defn
@@ -1,3 +1,3 @@
 # File produced by Kranc
 
-SRCS = Startup.cc RegisterMoL.cc RegisterSymmetries.cc ML_BSSN_MP_O8_Minkowski.cc ML_BSSN_MP_O8_convertFromADMBase.cc ML_BSSN_MP_O8_convertFromADMBaseGamma.cc ML_BSSN_MP_O8_RHS1.cc ML_BSSN_MP_O8_RHS2.cc ML_BSSN_MP_O8_RHSStaticBoundary.cc ML_BSSN_MP_O8_enforce.cc ML_BSSN_MP_O8_boundary.cc ML_BSSN_MP_O8_convertToADMBase.cc ML_BSSN_MP_O8_convertToADMBaseDtLapseShift.cc ML_BSSN_MP_O8_convertToADMBaseDtLapseShiftBoundary.cc ML_BSSN_MP_O8_convertToADMBaseFakeDtLapseShift.cc ML_BSSN_MP_O8_constraints1.cc ML_BSSN_MP_O8_constraints2.cc Boundaries.cc 
+SRCS = Startup.cc RegisterMoL.cc RegisterSymmetries.cc ML_BSSN_MP_O8_Minkowski.cc ML_BSSN_MP_O8_convertFromADMBase.cc ML_BSSN_MP_O8_convertFromADMBaseGamma.cc ML_BSSN_MP_O8_RHS1.cc ML_BSSN_MP_O8_RHS2.cc ML_BSSN_MP_O8_Dissipation.cc ML_BSSN_MP_O8_RHSStaticBoundary.cc ML_BSSN_MP_O8_enforce.cc ML_BSSN_MP_O8_boundary.cc ML_BSSN_MP_O8_convertToADMBase.cc ML_BSSN_MP_O8_convertToADMBaseDtLapseShift.cc ML_BSSN_MP_O8_convertToADMBaseDtLapseShiftBoundary.cc ML_BSSN_MP_O8_convertToADMBaseFakeDtLapseShift.cc ML_BSSN_MP_O8_constraints1.cc ML_BSSN_MP_O8_constraints2.cc Boundaries.cc