Regenerate thorns which were missed in 45bcf7046474c39dc6fb7c3e7729cdd1143a70fe.

2 files changed, 176 insertions, 158 deletions

diff --git a/ML_ADMConstraints/schedule.ccl b/ML_ADMConstraints/schedule.ccl
index d0c358e..cfbd37e 100644
--- a/ML_ADMConstraints/schedule.ccl
+++ b/ML_ADMConstraints/schedule.ccl
@@ -47,32 +47,32 @@ schedule group ML_ADMConstraints_group in MoL_PseudoEvolution after MoL_PostStep
 schedule ML_ADMConstraints in ML_ADMConstraints_group
 {
   LANG: C
+  READS:    ADMBase::kxx
+  READS:    ADMBase::kxy
+  READS:    ADMBase::kxz
+  READS:    ADMBase::kyy
+  READS:    ADMBase::kyz
+  READS:    ADMBase::kzz
   READS:    ADMBase::alp
+  READS:    ADMBase::gxx
+  READS:    ADMBase::gxy
+  READS:    ADMBase::gxz
+  READS:    ADMBase::gyy
+  READS:    ADMBase::gyz
+  READS:    ADMBase::gzz
   READS:    ADMBase::betax
   READS:    ADMBase::betay
   READS:    ADMBase::betaz
   READS:    TmunuBase::eTtt
-  READS:    TmunuBase::eTtx
-  READS:    TmunuBase::eTty
-  READS:    TmunuBase::eTtz
   READS:    TmunuBase::eTxx
   READS:    TmunuBase::eTxy
   READS:    TmunuBase::eTxz
   READS:    TmunuBase::eTyy
   READS:    TmunuBase::eTyz
   READS:    TmunuBase::eTzz
-  READS:    ADMBase::gxx
-  READS:    ADMBase::gxy
-  READS:    ADMBase::gxz
-  READS:    ADMBase::gyy
-  READS:    ADMBase::gyz
-  READS:    ADMBase::gzz
-  READS:    ADMBase::kxx
-  READS:    ADMBase::kxy
-  READS:    ADMBase::kxz
-  READS:    ADMBase::kyy
-  READS:    ADMBase::kyz
-  READS:    ADMBase::kzz
+  READS:    TmunuBase::eTtx
+  READS:    TmunuBase::eTty
+  READS:    TmunuBase::eTtz
   WRITES:   ML_ADMConstraints::H
   WRITES:   ML_ADMConstraints::M1
   WRITES:   ML_ADMConstraints::M2
diff --git a/ML_ADMConstraints/src/ML_ADMConstraints.cc b/ML_ADMConstraints/src/ML_ADMConstraints.cc
index e0ce995..a9f6db1 100644
--- a/ML_ADMConstraints/src/ML_ADMConstraints.cc
+++ b/ML_ADMConstraints/src/ML_ADMConstraints.cc
@@ -1080,158 +1080,176 @@ static void ML_ADMConstraints_Body(cGH const * restrict const cctkGH, int const
       gu32*(-JacPDstandardNth2gzz + 2*JacPDstandardNth3gyz) + 
       gu33*JacPDstandardNth3gzz);
     
-    CCTK_REAL CCTK_ATTRIBUTE_UNUSED R11 = 
-      0.5*(gu21*(-JacPDstandardNth12gxx + JacPDstandardNth21gxx) + 
+    CCTK_REAL CCTK_ATTRIBUTE_UNUSED R11 = 0.5*(gxyL*(-4*G123*G211*gu32 + 
+      4*G113*G212*gu32 + 4*G113*G213*gu33) + gxzL*(-4*G123*G311*gu32 + 
+      4*G113*G312*gu32 - 2*G133*G311*gu33) + 4*(gyzL*G213*G312*gu32 + 
+      gyzL*G212*G313*gu32 + G112*(gxyL*G212*gu22 + gxzL*G312*gu22 + 
+      gxxL*G113*gu32 + gxyL*G213*gu32 + gxzL*G313*gu32) + 
+      gxzL*G113*G313*gu33) + gyzL*(4*G212*G312*gu22 - 2*G211*G322*gu22 - 
+      4*G223*G311*gu32 - 2*G233*G311*gu33 + 4*G213*G313*gu33 - 
+      2*G211*G333*gu33) - 2*(gxyL*G122*G211*gu22 + gyyL*G211*G222*gu22 + 
+      gxzL*G122*G311*gu22 + gyzL*G222*G311*gu22 + gzzL*G311*G322*gu22 + 
+      gxyL*G133*G211*gu33 + gzzL*G311*G333*gu33 + G111*(gxxL*G122*gu22 
+      + gxyL*G222*gu22 + gxzL*G322*gu22 + 2*gxxL*G123*gu32 + 
+      2*gxyL*G223*gu32 + 2*gxzL*G323*gu32 + gxxL*G133*gu33 + 
+      gxyL*G233*gu33 + gxzL*G333*gu33)) + gu21*(-JacPDstandardNth12gxx + 
+      JacPDstandardNth21gxx) + gu22*(-JacPDstandardNth11gyy + 
+      2*JacPDstandardNth21gxy - JacPDstandardNth22gxx) + 
+      gu32*(4*gzzL*G312*G313 - 4*gyzL*G211*G323 - 4*gzzL*G311*G323 - 
+      2*JacPDstandardNth11gyz - JacPDstandardNth23gxx) + 
       gu31*(-JacPDstandardNth13gxx + JacPDstandardNth31gxx) + 
-      gu32*(4*(gxyL*(-(G123*G211) + G113*G212) + gyyL*(G212*G213 - 
-      G211*G223) + gxzL*G113*G312 + gyzL*G212*G313 + gzzL*G312*G313 + 
-      G112*(gxxL*G113 + gxyL*G213 + gxzL*G313) - G111*(gxxL*G123 + 
-      gxyL*G223 + gxzL*G323) + G311*(-(gxzL*G123) - gyzL*G223 - 
-      gzzL*G323) + gyzL*(G213*G312 - G211*G323)) - JacPDstandardNth11gyz 
-      + JacPDstandardNth21gxz - JacPDstandardNth23gxx + 
-      JacPDstandardNth31gxy) + gu32*(-JacPDstandardNth11gyz + 
-      JacPDstandardNth21gxz + JacPDstandardNth31gxy - JacPDstandardNth32gxx) 
-      + gu22*(-JacPDstandardNth11gyy + 2*JacPDstandardNth21gxy - 
-      JacPDstandardNth22gxx + 2*(2*gyzL*G212*G312 + 2*G112*(gxyL*G212 + 
-      gxzL*G312) - G111*(gxxL*G122 + gxyL*G222 + gxzL*G322) + 
-      G211*(-(gxyL*G122) - gyyL*G222 - gyzL*G322) + 
-      G311*(-(gxzL*G122) - gyzL*G222 - gzzL*G322) + gxxL*SQR(G112) + 
-      gyyL*SQR(G212) + gzzL*SQR(G312))) + gu33*(-JacPDstandardNth11gzz + 
-      2*JacPDstandardNth31gxz - JacPDstandardNth33gxx + 2*(2*gyzL*G213*G313 
-      + 2*G113*(gxyL*G213 + gxzL*G313) - G111*(gxxL*G133 + gxyL*G233 
-      + gxzL*G333) + G211*(-(gxyL*G133) - gyyL*G233 - gyzL*G333) + 
-      G311*(-(gxzL*G133) - gyzL*G233 - gzzL*G333) + gxxL*SQR(G113) + 
-      gyyL*SQR(G213) + gzzL*SQR(G313))));
+      2*gu32*JacPDstandardNth31gxy + gu32*(2*JacPDstandardNth21gxz - 
+      JacPDstandardNth32gxx) + gu33*(-JacPDstandardNth11gzz + 
+      2*JacPDstandardNth31gxz - JacPDstandardNth33gxx) + 
+      2*gxxL*gu22*SQR(G112) + 2*gxxL*gu33*SQR(G113) + 
+      gyyL*(4*G212*G213*gu32 - 4*G211*G223*gu32 - 2*G211*G233*gu33 + 
+      2*gu22*SQR(G212)) + 2*gyyL*gu33*SQR(G213) + 2*gzzL*gu22*SQR(G312) + 
+      2*gzzL*gu33*SQR(G313));
     
-    CCTK_REAL CCTK_ATTRIBUTE_UNUSED R12 = 
-      0.5*(gu22*(-JacPDstandardNth12gyy + JacPDstandardNth21gyy) + 
-      gu21*(JacPDstandardNth11gyy - 2*JacPDstandardNth12gxy + 
-      JacPDstandardNth22gxx) + gu32*(-2*JacPDstandardNth12gyz + 
-      JacPDstandardNth21gyz + JacPDstandardNth22gxz - JacPDstandardNth23gxy + 
-      JacPDstandardNth31gyy) + gu31*(JacPDstandardNth11gyz - 
-      JacPDstandardNth12gxz - JacPDstandardNth13gxy + JacPDstandardNth32gxx) 
-      + gu33*(-JacPDstandardNth12gzz + JacPDstandardNth31gyz + 
-      JacPDstandardNth32gxz - JacPDstandardNth33gxy) + 2*((gxyL*(G123*G211 
-      - G113*G212) + gyyL*(-(G212*G213) + G211*G223) - G112*(gxxL*G113 + 
-      gxyL*G213 + gxzL*G313) + G312*(-(gxzL*G113) - gyzL*G213 - 
-      gzzL*G313) + G111*(gxxL*G123 + gxyL*G223 + gxzL*G323) + 
-      G311*(gxzL*G123 + gyzL*G223 + gzzL*G323) + gyzL*(-(G212*G313) + 
-      G211*G323))*gu31 + (gxyL*(-(G123*G212) + G122*G213) + 
-      gyyL*(G213*G222 - G212*G223) + gxzL*G122*G313 + gyzL*G213*G322 + 
-      gzzL*G313*G322 + G113*(gxxL*G122 + gxyL*G222 + gxzL*G322) - 
-      G112*(gxxL*G123 + gxyL*G223 + gxzL*G323) + G312*(-(gxzL*G123) - 
-      gyzL*G223 - gzzL*G323) + gyzL*(G222*G313 - G212*G323))*gu32 + 
-      (gxyL*(-(G133*G212) + G123*G213) + gyyL*(G213*G223 - G212*G233) + 
-      gxzL*G123*G313 + gyzL*G213*G323 + gzzL*G313*G323 + 
-      G113*(gxxL*G123 + gxyL*G223 + gxzL*G323) - G112*(gxxL*G133 + 
-      gxyL*G233 + gxzL*G333) + G312*(-(gxzL*G133) - gyzL*G233 - 
-      gzzL*G333) + gyzL*(G223*G313 - G212*G333))*gu33 + 
-      gu21*(-2*(gyzL*G212*G312 + G112*(gxyL*G212 + gxzL*G312)) + 
-      G111*(gxxL*G122 + gxyL*G222 + gxzL*G322) + G211*(gxyL*G122 + 
-      gyyL*G222 + gyzL*G322) + G311*(gxzL*G122 + gyzL*G222 + 
-      gzzL*G322) - gxxL*SQR(G112) - gyyL*SQR(G212) - 
-      gzzL*SQR(G312))));
+    CCTK_REAL CCTK_ATTRIBUTE_UNUSED R12 = 0.5*(gxzL*((-2*G123*G312 + 
+      2*G122*G313)*gu32 - 2*G133*G312*gu33) + gyzL*((-4*G212*G312 + 
+      2*G211*G322)*gu21 + G223*(2*G311*gu31 - 2*G312*gu32) - 
+      2*G233*G312*gu33) + 2*(G111*((gxxL*G122 + gxyL*G222 + 
+      gxzL*G322)*gu21 + (gxxL*G123 + gxyL*G223 + gxzL*G323)*gu31) + 
+      G211*((gxyL*G122 + gyyL*G222)*gu21 + (gxyL*G123 + gyyL*G223 + 
+      gyzL*G323)*gu31) + G311*((gxzL*G122 + gyzL*G222 + 
+      gzzL*G322)*gu21 + (gxzL*G123 + gzzL*G323)*gu31) + 
+      (G122*(gxxL*G113 + gxyL*G213) + G222*(gxyL*G113 + gyzL*G313) + 
+      (gxzL*G113 + gyzL*G213 + gzzL*G313)*G322)*gu32 + 
+      (G123*(gxxL*G113 + gxyL*G213) + gxyL*G113*G223 + (gyzL*G213 + 
+      gzzL*G313)*G323)*gu33) + gu22*(-JacPDstandardNth12gyy + 
+      JacPDstandardNth21gyy) + gu32*(JacPDstandardNth21gyz + 
+      JacPDstandardNth22gxz - JacPDstandardNth23gxy + JacPDstandardNth31gyy) 
+      + gu31*(JacPDstandardNth11gyz - JacPDstandardNth12gxz - 
+      JacPDstandardNth13gxy + JacPDstandardNth32gxx) + 
+      gu33*(2*(gxzL*G123*G313 + gyzL*G223*G313 + gxzL*G113*G323) - 
+      2*(gyyL*G212*G233 + gyzL*G212*G333 + gzzL*G312*G333) - 
+      JacPDstandardNth12gzz + JacPDstandardNth31gyz + JacPDstandardNth32gxz - 
+      JacPDstandardNth33gxy) - 2*((gyzL*G212 + gzzL*G312)*G313*gu31 + 
+      G312*((gxzL*G113 + gyzL*G213)*gu31 + gzzL*G323*gu32) + 
+      G212*((gxyL*G113 + gyyL*G213)*gu31 + (gxyL*G123 + 
+      gyzL*G323)*gu32 + gxyL*G133*gu33) + G112*(2*(gxyL*G212 + 
+      gxzL*G312)*gu21 + (gxxL*G113 + gxyL*G213 + gxzL*G313)*gu31 + 
+      (gxxL*G123 + gxyL*G223 + gxzL*G323)*gu32 + (gxxL*G133 + 
+      gxyL*G233 + gxzL*G333)*gu33) + gu32*JacPDstandardNth12gyz + 
+      gu21*(JacPDstandardNth12gxy + gxxL*SQR(G112))) + gyyL*((2*G213*G222 
+      - 2*G212*G223)*gu32 + 2*G213*G223*gu33 - 2*gu21*SQR(G212)) + 
+      gu21*(JacPDstandardNth11gyy + JacPDstandardNth22gxx - 
+      2*gzzL*SQR(G312)));
     
-    CCTK_REAL CCTK_ATTRIBUTE_UNUSED R13 = 0.5*(gu21*(JacPDstandardNth11gyz 
-      - JacPDstandardNth12gxz - JacPDstandardNth13gxy + 
-      JacPDstandardNth23gxx) + gu22*(-JacPDstandardNth13gyy + 
-      JacPDstandardNth21gyz - JacPDstandardNth22gxz + JacPDstandardNth23gxy) 
-      + gu33*(-JacPDstandardNth13gzz + JacPDstandardNth31gzz) + 
-      gu31*(JacPDstandardNth11gzz - 2*JacPDstandardNth13gxz + 
-      JacPDstandardNth33gxx) + gu32*(-2*JacPDstandardNth13gyz + 
-      JacPDstandardNth21gzz + JacPDstandardNth31gyz - JacPDstandardNth32gxz + 
-      JacPDstandardNth33gxy) + 2*((gxyL*(G123*G211 - G113*G212) + 
-      gyyL*(-(G212*G213) + G211*G223) - G112*(gxxL*G113 + gxyL*G213 + 
-      gxzL*G313) + G312*(-(gxzL*G113) - gyzL*G213 - gzzL*G313) + 
-      G111*(gxxL*G123 + gxyL*G223 + gxzL*G323) + G311*(gxzL*G123 + 
-      gyzL*G223 + gzzL*G323) + gyzL*(-(G212*G313) + G211*G323))*gu21 + 
-      (gxyL*(G123*G212 - G122*G213) + gyyL*(-(G213*G222) + G212*G223) - 
-      G113*(gxxL*G122 + gxyL*G222 + gxzL*G322) + G313*(-(gxzL*G122) - 
-      gyzL*G222 - gzzL*G322) + G112*(gxxL*G123 + gxyL*G223 + 
-      gxzL*G323) + G312*(gxzL*G123 + gyzL*G223 + gzzL*G323) + 
-      gyzL*(-(G213*G322) + G212*G323))*gu22 + (gxyL*(G133*G212 - 
-      G123*G213) + gyyL*(-(G213*G223) + G212*G233) - G113*(gxxL*G123 + 
-      gxyL*G223 + gxzL*G323) + G313*(-(gxzL*G123) - gyzL*G223 - 
-      gzzL*G323) + G112*(gxxL*G133 + gxyL*G233 + gxzL*G333) + 
-      G312*(gxzL*G133 + gyzL*G233 + gzzL*G333) + gyzL*(-(G213*G323) + 
-      G212*G333))*gu32 + gu31*(-2*(gyzL*G213*G313 + G113*(gxyL*G213 + 
-      gxzL*G313)) + G111*(gxxL*G133 + gxyL*G233 + gxzL*G333) + 
-      G211*(gxyL*G133 + gyyL*G233 + gyzL*G333) + G311*(gxzL*G133 + 
-      gyzL*G233 + gzzL*G333) - gxxL*SQR(G113) - gyyL*SQR(G213) - 
-      gzzL*SQR(G313))));
+    CCTK_REAL CCTK_ATTRIBUTE_UNUSED R13 = 0.5*(gxyL*(2*G123*G211*gu21 - 
+      2*G113*G212*gu21 + 2*G123*G212*gu22 + 2*G133*G211*gu31 + 
+      2*G133*G212*gu32) + 2*(gxzL*G123*G311*gu21 + gyzL*G223*G311*gu21 + 
+      gyzL*G211*G323*gu21 + gzzL*G311*G323*gu21 + gyyL*G212*G223*gu22 + 
+      gxzL*G123*G312*gu22 + gyzL*G223*G312*gu22 + gxzL*G133*G311*gu31 + 
+      G111*(gxxL*G123*gu21 + gxyL*G223*gu21 + gxzL*G323*gu21 + 
+      gxxL*G133*gu31 + gxyL*G233*gu31 + gxzL*G333*gu31) + 
+      gyyL*G212*G233*gu32 + gxzL*G133*G312*gu32 + gyzL*G233*G312*gu32 + 
+      G112*((-(gxxL*G113) - gxyL*G213 - gxzL*G313)*gu21 + 
+      gxxL*G123*gu22 + gxyL*G223*gu22 + gxzL*G323*gu22 + 
+      gxxL*G133*gu32 + gxyL*G233*gu32 + gxzL*G333*gu32)) + 
+      gu22*(-2*gzzL*G313*G322 + 2*gyzL*G212*G323 + 2*gzzL*G312*G323 - 
+      JacPDstandardNth13gyy + JacPDstandardNth21gyz - JacPDstandardNth22gxz) 
+      + gu21*(JacPDstandardNth11gyz - JacPDstandardNth12gxz - 
+      JacPDstandardNth13gxy + JacPDstandardNth23gxx) + 
+      gu22*JacPDstandardNth23gxy + gu32*JacPDstandardNth31gyz + 
+      gu33*(-JacPDstandardNth13gzz + JacPDstandardNth31gzz) + 
+      gu32*(-2*gzzL*G313*G323 + 2*gyzL*G212*G333 + 2*gzzL*G312*G333 - 
+      2*JacPDstandardNth13gyz + JacPDstandardNth21gzz - 
+      JacPDstandardNth32gxz) + gu31*(-4*gxyL*G113*G213 + 2*gyzL*G233*G311 
+      - 4*gxzL*G113*G313 - 4*gyzL*G213*G313 + 2*gyzL*G211*G333 + 
+      2*gzzL*G311*G333 + JacPDstandardNth11gzz + JacPDstandardNth33gxx) + 
+      gu32*JacPDstandardNth33gxy - 2*(gxzL*G113*G312*gu21 + 
+      gyzL*G213*G312*gu21 + gyzL*G212*G313*gu21 + gzzL*G312*G313*gu21 + 
+      gxxL*G113*G122*gu22 + gxyL*G122*G213*gu22 + gxyL*G113*G222*gu22 + 
+      gxzL*G122*G313*gu22 + gyzL*G222*G313*gu22 + gxzL*G113*G322*gu22 + 
+      gyzL*G213*G322*gu22 + gxxL*G113*G123*gu32 + gxyL*G123*G213*gu32 + 
+      gxyL*G113*G223*gu32 + gxzL*G123*G313*gu32 + gyzL*G223*G313*gu32 + 
+      gxzL*G113*G323*gu32 + gyzL*G213*G323*gu32 + 
+      gu31*JacPDstandardNth13gxz + gxxL*gu31*SQR(G113)) + 
+      gyyL*(-2*G212*G213*gu21 + 2*G211*G223*gu21 - 2*G213*G222*gu22 + 
+      2*G211*G233*gu31 - 2*G213*G223*gu32 - 2*gu31*SQR(G213)) - 
+      2*gzzL*gu31*SQR(G313));
     
-    CCTK_REAL CCTK_ATTRIBUTE_UNUSED R22 = 0.5*(gu21*(JacPDstandardNth12gyy 
-      - JacPDstandardNth21gyy) + gu31*(4*(gxyL*(G123*G212 - G122*G213) + 
-      gyyL*(-(G213*G222) + G212*G223) + gxzL*(G123*G312 - G122*G313) - 
-      G113*(gxxL*G122 + gxyL*G222 + gxzL*G322) + gyzL*(G223*G312 - 
-      G222*G313 - G213*G322) + gyzL*G212*G323 + G112*(gxxL*G123 + 
-      gxyL*G223 + gxzL*G323) + gzzL*(-(G313*G322) + G312*G323)) + 
-      JacPDstandardNth12gyz - JacPDstandardNth13gyy - JacPDstandardNth22gxz + 
-      JacPDstandardNth32gxy) + gu31*(JacPDstandardNth12gyz - 
-      JacPDstandardNth22gxz - JacPDstandardNth31gyy + JacPDstandardNth32gxy) 
-      + gu32*(-JacPDstandardNth23gyy + JacPDstandardNth32gyy) + 
+    CCTK_REAL CCTK_ATTRIBUTE_UNUSED R22 = 0.5*(-4*(gyzL*G213*G322*gu31 + 
+      gzzL*G313*G322*gu31) + gyzL*(4*G212*G312*gu11 - 2*G211*G322*gu11 + 
+      4*G223*G312*gu31 - 2*G233*G322*gu33) + 4*(G112*(gxyL*G212*gu11 + 
+      gxzL*G312*gu11 + gxxL*G123*gu31 + gxyL*G223*gu31 + 
+      gxzL*G323*gu31) + gxyL*G123*G223*gu33 + gxzL*G123*G323*gu33 + 
+      gyzL*G223*G323*gu33) + gu21*(JacPDstandardNth12gyy - 
+      JacPDstandardNth21gyy) - 2*(gxyL*G122*G211*gu11 + 
+      gyyL*G211*G222*gu11 + gxzL*G122*G311*gu11 + gyzL*G222*G311*gu11 + 
+      gzzL*G311*G322*gu11 + G111*(gxxL*G122 + gxyL*G222 + 
+      gxzL*G322)*gu11 + gxxL*G122*G133*gu33 + gxyL*G133*G222*gu33 + 
+      gxyL*G122*G233*gu33 + gyyL*G222*G233*gu33 + gxzL*G133*G322*gu33 + 
+      gxzL*G122*G333*gu33 + gyzL*G222*G333*gu33 + gzzL*G322*G333*gu33 + 
+      gu31*JacPDstandardNth22gxz) + gu31*(-4*gxxL*G113*G122 + 
+      4*gxyL*G123*G212 - 4*gxyL*G122*G213 - 4*gxyL*G113*G222 - 
+      4*gyyL*G213*G222 + 4*gyyL*G212*G223 + 4*gxzL*G123*G312 - 
+      4*gxzL*G122*G313 - 4*gyzL*G222*G313 - 4*gxzL*G113*G322 + 
+      4*gyzL*G212*G323 + 4*gzzL*G312*G323 + 2*JacPDstandardNth12gyz - 
+      JacPDstandardNth13gyy - JacPDstandardNth31gyy) + 
+      2*gu31*JacPDstandardNth32gxy + gu32*(-JacPDstandardNth23gyy + 
+      JacPDstandardNth32gyy) + gu33*(-JacPDstandardNth22gzz + 
+      2*JacPDstandardNth32gyz - JacPDstandardNth33gyy) + 
       gu11*(-JacPDstandardNth11gyy + 2*JacPDstandardNth12gxy - 
-      JacPDstandardNth22gxx + 2*(2*gyzL*G212*G312 + 2*G112*(gxyL*G212 + 
-      gxzL*G312) - G111*(gxxL*G122 + gxyL*G222 + gxzL*G322) + 
-      G211*(-(gxyL*G122) - gyyL*G222 - gyzL*G322) + 
-      G311*(-(gxzL*G122) - gyzL*G222 - gzzL*G322) + gxxL*SQR(G112) + 
-      gyyL*SQR(G212) + gzzL*SQR(G312))) + gu33*(-JacPDstandardNth22gzz + 
-      2*JacPDstandardNth32gyz - JacPDstandardNth33gyy + 2*(2*gyzL*G223*G323 
-      + 2*G123*(gxyL*G223 + gxzL*G323) - G122*(gxxL*G133 + gxyL*G233 
-      + gxzL*G333) + G222*(-(gxyL*G133) - gyyL*G233 - gyzL*G333) + 
-      G322*(-(gxzL*G133) - gyzL*G233 - gzzL*G333) + gxxL*SQR(G123) + 
-      gyyL*SQR(G223) + gzzL*SQR(G323))));
+      JacPDstandardNth22gxx + 2*gxxL*SQR(G112)) + 2*gxxL*gu33*SQR(G123) + 
+      2*gyyL*gu11*SQR(G212) + 2*gyyL*gu33*SQR(G223) + 
+      2*gzzL*gu11*SQR(G312) + 2*gzzL*gu33*SQR(G323));
     
-    CCTK_REAL CCTK_ATTRIBUTE_UNUSED R23 = 
-      0.5*(gu11*(-JacPDstandardNth11gyz + JacPDstandardNth12gxz + 
+    CCTK_REAL CCTK_ATTRIBUTE_UNUSED R23 = 0.5*(gxyL*((-2*G123*G211 + 
+      2*G113*G212)*gu11 + G212*(-2*G123*gu21 + 2*G133*gu31) + (-4*G123*G223 + 
+      2*(G133*G222 + G122*G233))*gu32) + 2*(G313*((gyzL*G212 + 
+      gzzL*G312)*gu11 + gxzL*G122*gu21) + G312*((gxzL*G113 + 
+      gyzL*G213)*gu11 + gxzL*G133*gu31) + G112*((gxxL*G113 + 
+      gxyL*G213 + gxzL*G313)*gu11 + (-(gxxL*G123) - gxyL*G223 - 
+      gxzL*G323)*gu21 + gxxL*G133*gu31 + gxyL*G233*gu31 + 
+      gxzL*G333*gu31) + (gxzL*G122 + gzzL*G322)*G333*gu32 + 
+      G122*((gxxL*G113 + gxyL*G213)*gu21 + gxxL*G133*gu32) + 
+      G322*((gxzL*G113 + gyzL*G213)*gu21 + gxzL*G133*gu32) + 
+      G233*((gyyL*G212 + gyzL*G312)*gu31 + gyzL*G322*gu32) + 
+      G222*((gxyL*G113 + gyzL*G313)*gu21 + gyzL*G333*gu32)) + 
+      gu11*(-JacPDstandardNth11gyz + JacPDstandardNth12gxz + 
       JacPDstandardNth13gxy - JacPDstandardNth23gxx) + 
-      gu21*(JacPDstandardNth13gyy - JacPDstandardNth21gyz + 
-      JacPDstandardNth22gxz - JacPDstandardNth23gxy) + 
-      gu33*(-JacPDstandardNth23gzz + JacPDstandardNth32gzz) + 
-      gu31*(JacPDstandardNth12gzz - 2*JacPDstandardNth23gxz - 
+      gu21*(-2*gyzL*G212*G323 + gzzL*(2*G313*G322 - 2*G312*G323) + 
+      JacPDstandardNth13gyy - JacPDstandardNth21gyz + JacPDstandardNth22gxz - 
+      JacPDstandardNth23gxy) + gu33*(-JacPDstandardNth23gzz + 
+      JacPDstandardNth32gzz) + gu31*(2*gyzL*G212*G333 + 
+      gzzL*(-2*G313*G323 + 2*G312*G333) + JacPDstandardNth12gzz - 
       JacPDstandardNth31gyz + JacPDstandardNth32gxz + JacPDstandardNth33gxy) 
-      + gu32*(JacPDstandardNth22gzz - 2*JacPDstandardNth23gyz + 
-      JacPDstandardNth33gyy) + 2*((gxyL*(-(G123*G211) + G113*G212) + 
-      gyyL*(G212*G213 - G211*G223) + gxzL*G113*G312 + gyzL*G212*G313 + 
-      gzzL*G312*G313 + G112*(gxxL*G113 + gxyL*G213 + gxzL*G313) - 
-      G111*(gxxL*G123 + gxyL*G223 + gxzL*G323) + G311*(-(gxzL*G123) - 
-      gyzL*G223 - gzzL*G323) + gyzL*(G213*G312 - G211*G323))*gu11 + 
-      (gxyL*(-(G123*G212) + G122*G213) + gyyL*(G213*G222 - G212*G223) + 
-      gxzL*G122*G313 + gyzL*G213*G322 + gzzL*G313*G322 + 
-      G113*(gxxL*G122 + gxyL*G222 + gxzL*G322) - G112*(gxxL*G123 + 
-      gxyL*G223 + gxzL*G323) + G312*(-(gxzL*G123) - gyzL*G223 - 
-      gzzL*G323) + gyzL*(G222*G313 - G212*G323))*gu21 + 
-      (gxyL*(G133*G212 - G123*G213) + gyyL*(-(G213*G223) + G212*G233) - 
-      G113*(gxxL*G123 + gxyL*G223 + gxzL*G323) + G313*(-(gxzL*G123) - 
-      gyzL*G223 - gzzL*G323) + G112*(gxxL*G133 + gxyL*G233 + 
-      gxzL*G333) + G312*(gxzL*G133 + gyzL*G233 + gzzL*G333) + 
-      gyzL*(-(G213*G323) + G212*G333))*gu31 + gu32*(-2*(gyzL*G223*G323 + 
-      G123*(gxyL*G223 + gxzL*G323)) + G122*(gxxL*G133 + gxyL*G233 + 
-      gxzL*G333) + G222*(gxyL*G133 + gyyL*G233 + gyzL*G333) + 
-      G322*(gxzL*G133 + gyzL*G233 + gzzL*G333) - gxxL*SQR(G123) - 
-      gyyL*SQR(G223) - gzzL*SQR(G323))));
+      - 2*(((gxzL*G123 + gyzL*G223)*G311 + G111*(gxxL*G123 + 
+      gxyL*G223 + gxzL*G323))*gu11 + (gxzL*G123*G312 + 
+      G223*(gyyL*G212 + gyzL*G312))*gu21 + G323*((gyzL*G211 + 
+      gzzL*G311)*gu11 + gxzL*G113*gu31) + gu31*(G123*(gxxL*G113 + 
+      gxyL*G213 + gxzL*G313) + G223*(gxyL*G113 + gyzL*G313) + 
+      gyzL*G213*G323 + JacPDstandardNth23gxz) + gxxL*gu32*SQR(G123)) + 
+      gyyL*((2*G212*G213 - 2*G211*G223)*gu11 + G213*(2*G222*gu21 - 
+      2*G223*gu31) + gu32*(2*G222*G233 - 2*SQR(G223))) + 
+      gu32*(-4*(gxzL*G123 + gyzL*G223)*G323 + JacPDstandardNth22gzz + 
+      JacPDstandardNth33gyy - 2*(JacPDstandardNth23gyz + gzzL*SQR(G323))));
     
-    CCTK_REAL CCTK_ATTRIBUTE_UNUSED R33 = 0.5*(gu31*(JacPDstandardNth13gzz 
-      - JacPDstandardNth31gzz) + gu32*(JacPDstandardNth23gzz - 
-      JacPDstandardNth32gzz) + gu21*(4*(gxyL*(-(G133*G212) + G123*G213) + 
-      gyyL*(G213*G223 - G212*G233) + gxzL*G123*G313 + gyzL*G213*G323 + 
-      gzzL*G313*G323 + G113*(gxxL*G123 + gxyL*G223 + gxzL*G323) - 
-      G112*(gxxL*G133 + gxyL*G233 + gxzL*G333) + G312*(-(gxzL*G133) - 
-      gyzL*G233 - gzzL*G333) + gyzL*(G223*G313 - G212*G333)) - 
-      JacPDstandardNth12gzz + JacPDstandardNth13gyz + JacPDstandardNth23gxz - 
-      JacPDstandardNth33gxy) + gu21*(JacPDstandardNth13gyz - 
-      JacPDstandardNth21gzz + JacPDstandardNth23gxz - JacPDstandardNth33gxy) 
-      + gu11*(-JacPDstandardNth11gzz + 2*JacPDstandardNth13gxz - 
-      JacPDstandardNth33gxx + 2*(2*gyzL*G213*G313 + 2*G113*(gxyL*G213 + 
-      gxzL*G313) - G111*(gxxL*G133 + gxyL*G233 + gxzL*G333) + 
-      G211*(-(gxyL*G133) - gyyL*G233 - gyzL*G333) + 
-      G311*(-(gxzL*G133) - gyzL*G233 - gzzL*G333) + gxxL*SQR(G113) + 
-      gyyL*SQR(G213) + gzzL*SQR(G313))) + gu22*(-JacPDstandardNth22gzz + 
-      2*JacPDstandardNth23gyz - JacPDstandardNth33gyy + 2*(2*gyzL*G223*G323 
-      + 2*G123*(gxyL*G223 + gxzL*G323) - G122*(gxxL*G133 + gxyL*G233 
-      + gxzL*G333) + G222*(-(gxyL*G133) - gyyL*G233 - gyzL*G333) + 
-      G322*(-(gxzL*G133) - gyzL*G233 - gzzL*G333) + gxxL*SQR(G123) + 
-      gyyL*SQR(G223) + gzzL*SQR(G323))));
+    CCTK_REAL CCTK_ATTRIBUTE_UNUSED R33 = 0.5*(4*((G213*(gxyL*G123 + 
+      gyyL*G223) + gyzL*(G223*G313 + G213*G323))*gu21 + 
+      G113*((gxyL*G213 + gxzL*G313)*gu11 + (gxxL*G123 + gxyL*G223 + 
+      gxzL*G323)*gu21) + gxyL*G123*G223*gu22) + gxzL*((-4*G133*G312 + 
+      4*G123*G313)*gu21 - 2*G133*G322*gu22) + gyzL*((4*G213*G313 - 
+      2*G211*G333)*gu11 + G233*(-4*G312*gu21 - 2*G322*gu22)) + 
+      gu21*(4*gzzL*G313*G323 - 4*(G133*(gxxL*G112 + gxyL*G212) + 
+      (gxyL*G112 + gyyL*G212)*G233 + gxzL*G112*G333 + (gyzL*G212 + 
+      gzzL*G312)*G333) - JacPDstandardNth12gzz + 2*JacPDstandardNth13gyz - 
+      JacPDstandardNth21gzz + 2*JacPDstandardNth23gxz) + 
+      gu31*(JacPDstandardNth13gzz - JacPDstandardNth31gzz) + 
+      gu32*(JacPDstandardNth23gzz - JacPDstandardNth32gzz) - 
+      2*((G211*(gxyL*G133 + gyyL*G233) + G111*(gxxL*G133 + gxyL*G233 
+      + gxzL*G333) + G311*(gxzL*G133 + gyzL*G233 + gzzL*G333))*gu11 + 
+      (G133*(gxxL*G122 + gxyL*G222) + gxyL*G122*G233 + (gyzL*G222 + 
+      gzzL*G322)*G333)*gu22 + gu21*JacPDstandardNth33gxy) + 
+      gu11*(-JacPDstandardNth11gzz + 2*JacPDstandardNth13gxz - 
+      JacPDstandardNth33gxx + 2*gxxL*SQR(G113) + 2*gyyL*SQR(G213) + 
+      2*gzzL*SQR(G313)) + gu22*(4*(gxzL*G123*G323 + gyzL*G223*G323) - 
+      2*(gyyL*G222*G233 + gxzL*G122*G333) - JacPDstandardNth22gzz + 
+      2*JacPDstandardNth23gyz - JacPDstandardNth33gyy + 2*gxxL*SQR(G123) + 
+      2*gyyL*SQR(G223) + 2*gzzL*SQR(G323)));
     
     CCTK_REAL CCTK_ATTRIBUTE_UNUSED trR = gu11*R11 + gu22*R22 + 
       2*(gu21*R12 + gu31*R13 + gu32*R23) + gu33*R33;