Regenerate code

Testsuite passes

1 files changed, 58 insertions, 147 deletions

diff --git a/ML_BSSN/src/ML_BSSN_RHS1.cc b/ML_BSSN/src/ML_BSSN_RHS1.cc
index 5362559..0f1e946 100644
--- a/ML_BSSN/src/ML_BSSN_RHS1.cc
+++ b/ML_BSSN/src/ML_BSSN_RHS1.cc
@@ -191,9 +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 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]);
@@ -209,36 +206,24 @@ 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 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]);
@@ -254,9 +239,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 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]);
@@ -272,9 +254,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 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]);
@@ -290,9 +269,6 @@ 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 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]);
@@ -302,9 +278,6 @@ static void ML_BSSN_RHS1_Body(cGH const * restrict const cctkGH, int const dir,
     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]);
@@ -314,9 +287,6 @@ static void ML_BSSN_RHS1_Body(cGH const * restrict const cctkGH, int const dir,
     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]);
@@ -326,9 +296,6 @@ static void ML_BSSN_RHS1_Body(cGH const * restrict const cctkGH, int const dir,
     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]);
@@ -338,9 +305,6 @@ static void ML_BSSN_RHS1_Body(cGH const * restrict const cctkGH, int const dir,
     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]);
@@ -350,9 +314,6 @@ static void ML_BSSN_RHS1_Body(cGH const * restrict const cctkGH, int const dir,
     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]);
@@ -362,9 +323,6 @@ static void ML_BSSN_RHS1_Body(cGH const * restrict const cctkGH, int const dir,
     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]);
@@ -374,9 +332,6 @@ static void ML_BSSN_RHS1_Body(cGH const * restrict const cctkGH, int const dir,
     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]);
@@ -386,36 +341,24 @@ static void ML_BSSN_RHS1_Body(cGH const * restrict const cctkGH, int const dir,
     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]);
@@ -430,12 +373,6 @@ static void ML_BSSN_RHS1_Body(cGH const * restrict const cctkGH, int const dir,
     
     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));
@@ -594,20 +531,18 @@ 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 = epsdiss1*PDdissipationNth1phi + 
-      epsdiss2*PDdissipationNth2phi + epsdiss3*PDdissipationNth3phi + 
-      beta1L*PDupwindNthAnti1phi + beta2L*PDupwindNthAnti2phi + 
-      beta3L*PDupwindNthAnti3phi + PDupwindNthSymm1phi*Abs(beta1L) + 
-      PDupwindNthSymm2phi*Abs(beta2L) + PDupwindNthSymm3phi*Abs(beta3L) + 
+    CCTK_REAL phirhsL = beta1L*PDupwindNthAnti1phi + 
+      beta2L*PDupwindNthAnti2phi + beta3L*PDupwindNthAnti3phi + 
+      PDupwindNthSymm1phi*Abs(beta1L) + PDupwindNthSymm2phi*Abs(beta2L) + 
+      PDupwindNthSymm3phi*Abs(beta3L) + 
       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 + epsdiss1*PDdissipationNth1gt11 
-      + epsdiss2*PDdissipationNth2gt11 + epsdiss3*PDdissipationNth3gt11 + 
-      2*(gt12L*PDstandardNth1beta2 + gt13L*PDstandardNth1beta3) + 
+    CCTK_REAL gt11rhsL = -2*alphaL*At11L + 2*(gt12L*PDstandardNth1beta2 + 
+      gt13L*PDstandardNth1beta3) + 
       gt11L*(1.33333333333333333333333333333*PDstandardNth1beta1 - 
       0.666666666666666666666666666667*(PDstandardNth2beta2 + 
       PDstandardNth3beta3)) + beta1L*PDupwindNthAnti1gt11 + 
@@ -615,10 +550,9 @@ static void ML_BSSN_RHS1_Body(cGH const * restrict const cctkGH, int const dir,
       PDupwindNthSymm1gt11*Abs(beta1L) + PDupwindNthSymm2gt11*Abs(beta2L) + 
       PDupwindNthSymm3gt11*Abs(beta3L);
     
-    CCTK_REAL gt12rhsL = -2*alphaL*At12L + epsdiss1*PDdissipationNth1gt12 
-      + epsdiss2*PDdissipationNth2gt12 + epsdiss3*PDdissipationNth3gt12 + 
-      gt22L*PDstandardNth1beta2 + gt23L*PDstandardNth1beta3 + 
-      gt11L*PDstandardNth2beta1 + gt13L*PDstandardNth2beta3 + 
+    CCTK_REAL gt12rhsL = -2*alphaL*At12L + gt22L*PDstandardNth1beta2 + 
+      gt23L*PDstandardNth1beta3 + gt11L*PDstandardNth2beta1 + 
+      gt13L*PDstandardNth2beta3 + 
       gt12L*(0.333333333333333333333333333333*(PDstandardNth1beta1 + 
       PDstandardNth2beta2) - 
       0.666666666666666666666666666667*PDstandardNth3beta3) + 
@@ -626,10 +560,9 @@ static void ML_BSSN_RHS1_Body(cGH const * restrict const cctkGH, int const dir,
       beta3L*PDupwindNthAnti3gt12 + PDupwindNthSymm1gt12*Abs(beta1L) + 
       PDupwindNthSymm2gt12*Abs(beta2L) + PDupwindNthSymm3gt12*Abs(beta3L);
     
-    CCTK_REAL gt13rhsL = -2*alphaL*At13L + epsdiss1*PDdissipationNth1gt13 
-      + epsdiss2*PDdissipationNth2gt13 + epsdiss3*PDdissipationNth3gt13 + 
-      gt23L*PDstandardNth1beta2 + gt33L*PDstandardNth1beta3 + 
-      gt11L*PDstandardNth3beta1 + gt12L*PDstandardNth3beta2 + 
+    CCTK_REAL gt13rhsL = -2*alphaL*At13L + gt23L*PDstandardNth1beta2 + 
+      gt33L*PDstandardNth1beta3 + gt11L*PDstandardNth3beta1 + 
+      gt12L*PDstandardNth3beta2 + 
       gt13L*(-0.666666666666666666666666666667*PDstandardNth2beta2 + 
       0.333333333333333333333333333333*(PDstandardNth1beta1 + 
       PDstandardNth3beta3)) + beta1L*PDupwindNthAnti1gt13 + 
@@ -637,9 +570,8 @@ static void ML_BSSN_RHS1_Body(cGH const * restrict const cctkGH, int const dir,
       PDupwindNthSymm1gt13*Abs(beta1L) + PDupwindNthSymm2gt13*Abs(beta2L) + 
       PDupwindNthSymm3gt13*Abs(beta3L);
     
-    CCTK_REAL gt22rhsL = -2*alphaL*At22L + epsdiss1*PDdissipationNth1gt22 
-      + epsdiss2*PDdissipationNth2gt22 + epsdiss3*PDdissipationNth3gt22 + 
-      2*(gt12L*PDstandardNth2beta1 + gt23L*PDstandardNth2beta3) + 
+    CCTK_REAL gt22rhsL = -2*alphaL*At22L + 2*(gt12L*PDstandardNth2beta1 + 
+      gt23L*PDstandardNth2beta3) + 
       gt22L*(1.33333333333333333333333333333*PDstandardNth2beta2 - 
       0.666666666666666666666666666667*(PDstandardNth1beta1 + 
       PDstandardNth3beta3)) + beta1L*PDupwindNthAnti1gt22 + 
@@ -647,10 +579,9 @@ static void ML_BSSN_RHS1_Body(cGH const * restrict const cctkGH, int const dir,
       PDupwindNthSymm1gt22*Abs(beta1L) + PDupwindNthSymm2gt22*Abs(beta2L) + 
       PDupwindNthSymm3gt22*Abs(beta3L);
     
-    CCTK_REAL gt23rhsL = -2*alphaL*At23L + epsdiss1*PDdissipationNth1gt23 
-      + epsdiss2*PDdissipationNth2gt23 + epsdiss3*PDdissipationNth3gt23 + 
-      gt13L*PDstandardNth2beta1 + gt33L*PDstandardNth2beta3 + 
-      gt12L*PDstandardNth3beta1 + gt22L*PDstandardNth3beta2 + 
+    CCTK_REAL gt23rhsL = -2*alphaL*At23L + gt13L*PDstandardNth2beta1 + 
+      gt33L*PDstandardNth2beta3 + gt12L*PDstandardNth3beta1 + 
+      gt22L*PDstandardNth3beta2 + 
       gt23L*(-0.666666666666666666666666666667*PDstandardNth1beta1 + 
       0.333333333333333333333333333333*(PDstandardNth2beta2 + 
       PDstandardNth3beta3)) + beta1L*PDupwindNthAnti1gt23 + 
@@ -658,9 +589,8 @@ static void ML_BSSN_RHS1_Body(cGH const * restrict const cctkGH, int const dir,
       PDupwindNthSymm1gt23*Abs(beta1L) + PDupwindNthSymm2gt23*Abs(beta2L) + 
       PDupwindNthSymm3gt23*Abs(beta3L);
     
-    CCTK_REAL gt33rhsL = -2*alphaL*At33L + epsdiss1*PDdissipationNth1gt33 
-      + epsdiss2*PDdissipationNth2gt33 + epsdiss3*PDdissipationNth3gt33 + 
-      2*(gt13L*PDstandardNth3beta1 + gt23L*PDstandardNth3beta2) + 
+    CCTK_REAL gt33rhsL = -2*alphaL*At33L + 2*(gt13L*PDstandardNth3beta1 + 
+      gt23L*PDstandardNth3beta2) + 
       gt33L*(-0.666666666666666666666666666667*(PDstandardNth1beta1 + 
       PDstandardNth2beta2) + 
       1.33333333333333333333333333333*PDstandardNth3beta3) + 
@@ -731,44 +661,37 @@ static void ML_BSSN_RHS1_Body(cGH const * restrict const cctkGH, int const dir,
       beta3L*PDupwindNthAnti3Xt3 + PDupwindNthSymm1Xt3*Abs(beta1L) + 
       PDupwindNthSymm2Xt3*Abs(beta2L) + PDupwindNthSymm3Xt3*Abs(beta3L)));
     
-    CCTK_REAL Xt1rhsL = dotXt1 + epsdiss1*PDdissipationNth1Xt1 + 
-      epsdiss2*PDdissipationNth2Xt1 + epsdiss3*PDdissipationNth3Xt1;
-    
-    CCTK_REAL Xt2rhsL = dotXt2 + epsdiss1*PDdissipationNth1Xt2 + 
-      epsdiss2*PDdissipationNth2Xt2 + epsdiss3*PDdissipationNth3Xt2;
-    
-    CCTK_REAL Xt3rhsL = dotXt3 + epsdiss1*PDdissipationNth1Xt3 + 
-      epsdiss2*PDdissipationNth2Xt3 + epsdiss3*PDdissipationNth3Xt3;
-    
-    CCTK_REAL dottrK = epsdiss1*PDdissipationNth1trK + 
-      epsdiss2*PDdissipationNth2trK + epsdiss3*PDdissipationNth3trK + 
-      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) + alphaL*(2*(Atm12*Atm21 + Atm13*Atm31 
-      + Atm23*Atm32) + 12.56637061435917295385057353311801153679*(rho + trS) 
-      + SQR(Atm11) + SQR(Atm22) + SQR(Atm33) + 
-      0.333333333333333333333333333333*SQR(trKL));
+    CCTK_REAL Xt1rhsL = dotXt1;
+    
+    CCTK_REAL Xt2rhsL = dotXt2;
+    
+    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) + 
+      alphaL*(2*(Atm12*Atm21 + Atm13*Atm31 + Atm23*Atm32) + 
+      12.56637061435917295385057353311801153679*(rho + trS) + SQR(Atm11) + 
+      SQR(Atm22) + SQR(Atm33) + 0.333333333333333333333333333333*SQR(trKL));
     
     CCTK_REAL trKrhsL = dottrK;
     
-    CCTK_REAL alpharhsL = epsdiss1*PDdissipationNth1alpha + 
-      epsdiss2*PDdissipationNth2alpha + epsdiss3*PDdissipationNth3alpha - 
-      pow(alphaL,ToReal(harmonicN))*ToReal(harmonicF)*(trKL + (AL - 
-      trKL)*ToReal(LapseACoeff)) + (beta1L*PDupwindNthAnti1alpha + 
+    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);
     
-    CCTK_REAL ArhsL = epsdiss1*PDdissipationNth1A + 
-      epsdiss2*PDdissipationNth2A + epsdiss3*PDdissipationNth3A + (dottrK - 
+    CCTK_REAL ArhsL = (dottrK - 
       AL*ToReal(AlphaDriver))*ToReal(LapseACoeff) + (beta1L*PDupwindNthAnti1A 
       + beta2L*PDupwindNthAnti2A + beta3L*PDupwindNthAnti3A + 
       PDupwindNthSymm1A*Abs(beta1L) + PDupwindNthSymm2A*Abs(beta2L) + 
@@ -779,57 +702,45 @@ static void ML_BSSN_RHS1_Body(cGH const * restrict const cctkGH, int const dir,
     CCTK_REAL theta = fmin(1,exp(1 - 
       rL*INV(ToReal(SpatialShiftGammaCoeffRadius))));
     
-    CCTK_REAL beta1rhsL = epsdiss1*PDdissipationNth1beta1 + 
-      epsdiss2*PDdissipationNth2beta1 + epsdiss3*PDdissipationNth3beta1 + 
-      (beta1L*PDupwindNthAnti1beta1 + beta2L*PDupwindNthAnti2beta1 + 
-      beta3L*PDupwindNthAnti3beta1 + PDupwindNthSymm1beta1*Abs(beta1L) + 
-      PDupwindNthSymm2beta1*Abs(beta2L) + 
+    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 = epsdiss1*PDdissipationNth1beta2 + 
-      epsdiss2*PDdissipationNth2beta2 + epsdiss3*PDdissipationNth3beta2 + 
-      (beta1L*PDupwindNthAnti1beta2 + beta2L*PDupwindNthAnti2beta2 + 
-      beta3L*PDupwindNthAnti3beta2 + PDupwindNthSymm1beta2*Abs(beta1L) + 
-      PDupwindNthSymm2beta2*Abs(beta2L) + 
+    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 = epsdiss1*PDdissipationNth1beta3 + 
-      epsdiss2*PDdissipationNth2beta3 + epsdiss3*PDdissipationNth3beta3 + 
-      (beta1L*PDupwindNthAnti1beta3 + beta2L*PDupwindNthAnti2beta3 + 
-      beta3L*PDupwindNthAnti3beta3 + PDupwindNthSymm1beta3*Abs(beta1L) + 
-      PDupwindNthSymm2beta3*Abs(beta2L) + 
+    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 = epsdiss1*PDdissipationNth1B1 + 
-      epsdiss2*PDdissipationNth2B1 + epsdiss3*PDdissipationNth3B1 + 
-      (beta1L*(PDupwindNthAnti1B1 - PDupwindNthAnti1Xt1) + 
-      beta2L*(PDupwindNthAnti2B1 - PDupwindNthAnti2Xt1) + 
+    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 = epsdiss1*PDdissipationNth1B2 + 
-      epsdiss2*PDdissipationNth2B2 + epsdiss3*PDdissipationNth3B2 + 
-      (beta1L*(PDupwindNthAnti1B2 - PDupwindNthAnti1Xt2) + 
-      beta2L*(PDupwindNthAnti2B2 - PDupwindNthAnti2Xt2) + 
+    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 = epsdiss1*PDdissipationNth1B3 + 
-      epsdiss2*PDdissipationNth2B3 + epsdiss3*PDdissipationNth3B3 + 
-      (beta1L*(PDupwindNthAnti1B3 - PDupwindNthAnti1Xt3) + 
-      beta2L*(PDupwindNthAnti2B3 - PDupwindNthAnti2Xt3) + 
+    CCTK_REAL B3rhsL = (beta1L*(PDupwindNthAnti1B3 - PDupwindNthAnti1Xt3) 
+      + beta2L*(PDupwindNthAnti2B3 - PDupwindNthAnti2Xt3) + 
       beta3L*(PDupwindNthAnti3B3 - PDupwindNthAnti3Xt3) + (PDupwindNthSymm1B3 
       - PDupwindNthSymm1Xt3)*Abs(beta1L) + (PDupwindNthSymm2B3 - 
       PDupwindNthSymm2Xt3)*Abs(beta2L) + (PDupwindNthSymm3B3 -