Regenerate ML_ADMQuantities and ML_WaveToyFO

1 files changed, 161 insertions, 147 deletions

diff --git a/ML_ADMQuantities_MP/src/ML_ADMQuantities_MP.cc b/ML_ADMQuantities_MP/src/ML_ADMQuantities_MP.cc
index 9c770d3..b8e41cb 100644
--- a/ML_ADMQuantities_MP/src/ML_ADMQuantities_MP.cc
+++ b/ML_ADMQuantities_MP/src/ML_ADMQuantities_MP.cc
@@ -718,49 +718,50 @@ static void ML_ADMQuantities_MP_Body(cGH const * restrict const cctkGH, int cons
       Gt213*Gtlu213 + Gt311*Gtlu311 + Gt312*Gtlu312 + Gt313*Gtlu313 + 
       J11L*(gt11L*PDstandardNth1Xt1 + gt12L*PDstandardNth1Xt2 + 
       gt13L*PDstandardNth1Xt3) + J21L*(gt11L*PDstandardNth2Xt1 + 
-      gt12L*PDstandardNth2Xt2 + gt13L*PDstandardNth2Xt3) + 
-      J31L*(gt11L*PDstandardNth3Xt1 + gt12L*PDstandardNth3Xt2 + 
-      gt13L*PDstandardNth3Xt3) + Gtl111*Xtn1 + Gtl112*Xtn2 + Gtl113*Xtn3 + 
-      0.5*(-2*(gtu21*(J11L*J12L*PDstandardNth11gt11 + 
-      J12L*J21L*PDstandardNth12gt11 + J11L*J22L*PDstandardNth12gt11 + 
-      J12L*J31L*PDstandardNth13gt11 + J11L*J32L*PDstandardNth13gt11 + 
-      dJ112L*PDstandardNth1gt11 + J21L*J22L*PDstandardNth22gt11 + 
-      J22L*J31L*PDstandardNth23gt11 + J21L*J32L*PDstandardNth23gt11 + 
-      dJ212L*PDstandardNth2gt11 + J31L*J32L*PDstandardNth33gt11 + 
-      dJ312L*PDstandardNth3gt11) + gtu31*(J11L*J13L*PDstandardNth11gt11 + 
-      J13L*J21L*PDstandardNth12gt11 + J11L*J23L*PDstandardNth12gt11 + 
-      J13L*J31L*PDstandardNth13gt11 + J11L*J33L*PDstandardNth13gt11 + 
-      dJ113L*PDstandardNth1gt11 + J21L*J23L*PDstandardNth22gt11 + 
-      J23L*J31L*PDstandardNth23gt11 + J21L*J33L*PDstandardNth23gt11 + 
-      dJ213L*PDstandardNth2gt11 + J31L*J33L*PDstandardNth33gt11 + 
-      dJ313L*PDstandardNth3gt11) + gtu32*(J12L*J13L*PDstandardNth11gt11 + 
-      J13L*J22L*PDstandardNth12gt11 + J12L*J23L*PDstandardNth12gt11 + 
-      J13L*J32L*PDstandardNth13gt11 + J12L*J33L*PDstandardNth13gt11 + 
-      dJ123L*PDstandardNth1gt11 + J22L*J23L*PDstandardNth22gt11 + 
-      J23L*J32L*PDstandardNth23gt11 + J22L*J33L*PDstandardNth23gt11 + 
-      dJ223L*PDstandardNth2gt11 + J32L*J33L*PDstandardNth33gt11 + 
-      dJ323L*PDstandardNth3gt11)) - gtu11*(2*J11L*J21L*PDstandardNth12gt11 + 
+      gt12L*PDstandardNth2Xt2 + gt13L*PDstandardNth2Xt3) - 
+      gtu21*(J11L*J12L*PDstandardNth11gt11 + J12L*J21L*PDstandardNth12gt11 + 
+      J11L*J22L*PDstandardNth12gt11 + J12L*J31L*PDstandardNth13gt11 + 
+      J11L*J32L*PDstandardNth13gt11 + dJ112L*PDstandardNth1gt11 + 
+      J21L*J22L*PDstandardNth22gt11 + J22L*J31L*PDstandardNth23gt11 + 
+      J21L*J32L*PDstandardNth23gt11 + dJ212L*PDstandardNth2gt11 + 
+      J31L*J32L*PDstandardNth33gt11 + dJ312L*PDstandardNth3gt11) - 
+      gtu31*(J11L*J13L*PDstandardNth11gt11 + J13L*J21L*PDstandardNth12gt11 + 
+      J11L*J23L*PDstandardNth12gt11 + J13L*J31L*PDstandardNth13gt11 + 
+      J11L*J33L*PDstandardNth13gt11 + dJ113L*PDstandardNth1gt11 + 
+      J21L*J23L*PDstandardNth22gt11 + J23L*J31L*PDstandardNth23gt11 + 
+      J21L*J33L*PDstandardNth23gt11 + dJ213L*PDstandardNth2gt11 + 
+      J31L*J33L*PDstandardNth33gt11 + dJ313L*PDstandardNth3gt11) - 
+      gtu32*(J12L*J13L*PDstandardNth11gt11 + J13L*J22L*PDstandardNth12gt11 + 
+      J12L*J23L*PDstandardNth12gt11 + J13L*J32L*PDstandardNth13gt11 + 
+      J12L*J33L*PDstandardNth13gt11 + dJ123L*PDstandardNth1gt11 + 
+      J22L*J23L*PDstandardNth22gt11 + J23L*J32L*PDstandardNth23gt11 + 
+      J22L*J33L*PDstandardNth23gt11 + dJ223L*PDstandardNth2gt11 + 
+      J32L*J33L*PDstandardNth33gt11 + dJ323L*PDstandardNth3gt11) + 
+      gt11L*J31L*PDstandardNth3Xt1 + gt12L*J31L*PDstandardNth3Xt2 + 
+      gt13L*J31L*PDstandardNth3Xt3 + Gtl111*Xtn1 + Gtl112*Xtn2 + Gtl113*Xtn3 
+      - 0.5*gtu11*(2*J11L*J21L*PDstandardNth12gt11 + 
       2*J11L*J31L*PDstandardNth13gt11 + dJ111L*PDstandardNth1gt11 + 
       2*J21L*J31L*PDstandardNth23gt11 + dJ211L*PDstandardNth2gt11 + 
       dJ311L*PDstandardNth3gt11 + PDstandardNth11gt11*SQR(J11L) + 
       PDstandardNth22gt11*SQR(J21L) + PDstandardNth33gt11*SQR(J31L)) - 
-      gtu22*(2*J12L*J22L*PDstandardNth12gt11 + 
+      0.5*gtu22*(2*J12L*J22L*PDstandardNth12gt11 + 
       2*J12L*J32L*PDstandardNth13gt11 + dJ122L*PDstandardNth1gt11 + 
       2*J22L*J32L*PDstandardNth23gt11 + dJ222L*PDstandardNth2gt11 + 
       dJ322L*PDstandardNth3gt11 + PDstandardNth11gt11*SQR(J12L) + 
       PDstandardNth22gt11*SQR(J22L) + PDstandardNth33gt11*SQR(J32L)) - 
-      gtu33*(2*J13L*J23L*PDstandardNth12gt11 + 
+      0.5*gtu33*(2*J13L*J23L*PDstandardNth12gt11 + 
       2*J13L*J33L*PDstandardNth13gt11 + dJ133L*PDstandardNth1gt11 + 
       2*J23L*J33L*PDstandardNth23gt11 + dJ233L*PDstandardNth2gt11 + 
       dJ333L*PDstandardNth3gt11 + PDstandardNth11gt11*SQR(J13L) + 
-      PDstandardNth22gt11*SQR(J23L) + PDstandardNth33gt11*SQR(J33L)));
-    
-    CCTK_REAL Rt12 = Gt122*Gtlu112 + Gt123*Gtlu113 + (Gt111 + 
-      Gt212)*Gtlu121 + Gt222*Gtlu122 + (Gt113 + Gt223)*Gtlu123 + 
-      Gt322*Gtlu132 + Gt323*Gtlu133 + Gt111*Gtlu211 + Gt112*(Gtlu111 + 
-      Gtlu122 + Gtlu212) + Gt113*Gtlu213 + 2*(Gt211*Gtlu221 + Gt212*Gtlu222 + 
-      Gt213*Gtlu223) + Gt311*(Gtlu231 + Gtlu321) + Gt312*(Gtlu131 + Gtlu232 + 
-      Gtlu322) + Gt313*(Gtlu233 + Gtlu323) + 0.5*((gt12L*J11L + 
+      PDstandardNth22gt11*SQR(J23L) + PDstandardNth33gt11*SQR(J33L));
+    
+    CCTK_REAL Rt12 = 0.5*(4*(Gt211*Gtlu221 + Gt212*Gtlu222 + 
+      Gt213*Gtlu223) + 2*(Gt112*Gtlu111 + Gt122*Gtlu112 + Gt123*Gtlu113 + 
+      Gt111*Gtlu121 + Gt212*Gtlu121 + Gt112*Gtlu122 + Gt222*Gtlu122 + 
+      Gt113*Gtlu123 + Gt223*Gtlu123 + Gt312*Gtlu131 + Gt322*Gtlu132 + 
+      Gt323*Gtlu133 + Gt111*Gtlu211 + Gt112*Gtlu212 + Gt113*Gtlu213 + 
+      Gt311*Gtlu231 + Gt312*Gtlu232 + Gt313*Gtlu233 + Gt311*Gtlu321 + 
+      Gt312*Gtlu322 + Gt313*Gtlu323) + (gt12L*J11L + 
       gt11L*J12L)*PDstandardNth1Xt1 + (gt22L*J11L + 
       gt12L*J12L)*PDstandardNth1Xt2 + (gt23L*J11L + 
       gt13L*J12L)*PDstandardNth1Xt3 + (gt12L*J21L + 
@@ -805,14 +806,14 @@ static void ML_ADMQuantities_MP_Body(cGH const * restrict const cctkGH, int cons
       dJ333L*PDstandardNth3gt12 + PDstandardNth11gt12*SQR(J13L) + 
       PDstandardNth22gt12*SQR(J23L) + PDstandardNth33gt12*SQR(J33L)));
     
-    CCTK_REAL Rt13 = Gt123*Gtlu112 + Gt133*Gtlu113 + Gt223*Gtlu122 + 
-      Gt233*Gtlu123 + (Gt111 + Gt313)*Gtlu131 + (Gt112 + Gt323)*Gtlu132 + 
-      Gt333*Gtlu133 + Gt111*Gtlu311 + Gt112*Gtlu312 + Gt113*(Gtlu111 + 
-      Gtlu133 + Gtlu313) + Gt211*(Gtlu231 + Gtlu321) + Gt212*(Gtlu232 + 
-      Gtlu322) + Gt213*(Gtlu121 + Gtlu233 + Gtlu323) + 2*(Gt311*Gtlu331 + 
-      Gt312*Gtlu332 + Gt313*Gtlu333) + 0.5*((gt13L*J11L + 
-      gt11L*J13L)*PDstandardNth1Xt1 + (gt23L*J11L + 
-      gt12L*J13L)*PDstandardNth1Xt2 + (gt33L*J11L + 
+    CCTK_REAL Rt13 = 0.5*(2*(Gt113*Gtlu111 + Gt123*Gtlu112 + Gt133*Gtlu113 
+      + Gt213*Gtlu121 + Gt223*Gtlu122 + Gt233*Gtlu123 + Gt111*Gtlu131 + 
+      Gt313*Gtlu131 + Gt112*Gtlu132 + Gt323*Gtlu132 + Gt113*Gtlu133 + 
+      Gt333*Gtlu133 + Gt211*Gtlu231 + Gt212*Gtlu232 + Gt213*Gtlu233 + 
+      Gt111*Gtlu311 + Gt112*Gtlu312 + Gt113*Gtlu313 + Gt211*Gtlu321 + 
+      Gt212*Gtlu322 + Gt213*Gtlu323) + 4*(Gt311*Gtlu331 + Gt312*Gtlu332 + 
+      Gt313*Gtlu333) + (gt13L*J11L + gt11L*J13L)*PDstandardNth1Xt1 + 
+      (gt23L*J11L + gt12L*J13L)*PDstandardNth1Xt2 + (gt33L*J11L + 
       gt13L*J13L)*PDstandardNth1Xt3 + (gt13L*J21L + 
       gt11L*J23L)*PDstandardNth2Xt1 + (gt23L*J21L + 
       gt12L*J23L)*PDstandardNth2Xt2 + (gt33L*J21L + 
@@ -861,49 +862,50 @@ static void ML_ADMQuantities_MP_Body(cGH const * restrict const cctkGH, int cons
       Gt323*Gtlu233) + Gt312*Gtlu321 + Gt322*Gtlu322 + Gt323*Gtlu323 + 
       J12L*(gt12L*PDstandardNth1Xt1 + gt22L*PDstandardNth1Xt2 + 
       gt23L*PDstandardNth1Xt3) + J22L*(gt12L*PDstandardNth2Xt1 + 
-      gt22L*PDstandardNth2Xt2 + gt23L*PDstandardNth2Xt3) + 
-      J32L*(gt12L*PDstandardNth3Xt1 + gt22L*PDstandardNth3Xt2 + 
-      gt23L*PDstandardNth3Xt3) + Gtl212*Xtn1 + Gtl222*Xtn2 + Gtl223*Xtn3 + 
-      0.5*(-2*(gtu21*(J11L*J12L*PDstandardNth11gt22 + 
-      J12L*J21L*PDstandardNth12gt22 + J11L*J22L*PDstandardNth12gt22 + 
-      J12L*J31L*PDstandardNth13gt22 + J11L*J32L*PDstandardNth13gt22 + 
-      dJ112L*PDstandardNth1gt22 + J21L*J22L*PDstandardNth22gt22 + 
-      J22L*J31L*PDstandardNth23gt22 + J21L*J32L*PDstandardNth23gt22 + 
-      dJ212L*PDstandardNth2gt22 + J31L*J32L*PDstandardNth33gt22 + 
-      dJ312L*PDstandardNth3gt22) + gtu31*(J11L*J13L*PDstandardNth11gt22 + 
-      J13L*J21L*PDstandardNth12gt22 + J11L*J23L*PDstandardNth12gt22 + 
-      J13L*J31L*PDstandardNth13gt22 + J11L*J33L*PDstandardNth13gt22 + 
-      dJ113L*PDstandardNth1gt22 + J21L*J23L*PDstandardNth22gt22 + 
-      J23L*J31L*PDstandardNth23gt22 + J21L*J33L*PDstandardNth23gt22 + 
-      dJ213L*PDstandardNth2gt22 + J31L*J33L*PDstandardNth33gt22 + 
-      dJ313L*PDstandardNth3gt22) + gtu32*(J12L*J13L*PDstandardNth11gt22 + 
-      J13L*J22L*PDstandardNth12gt22 + J12L*J23L*PDstandardNth12gt22 + 
-      J13L*J32L*PDstandardNth13gt22 + J12L*J33L*PDstandardNth13gt22 + 
-      dJ123L*PDstandardNth1gt22 + J22L*J23L*PDstandardNth22gt22 + 
-      J23L*J32L*PDstandardNth23gt22 + J22L*J33L*PDstandardNth23gt22 + 
-      dJ223L*PDstandardNth2gt22 + J32L*J33L*PDstandardNth33gt22 + 
-      dJ323L*PDstandardNth3gt22)) - gtu11*(2*J11L*J21L*PDstandardNth12gt22 + 
+      gt22L*PDstandardNth2Xt2 + gt23L*PDstandardNth2Xt3) - 
+      gtu21*(J11L*J12L*PDstandardNth11gt22 + J12L*J21L*PDstandardNth12gt22 + 
+      J11L*J22L*PDstandardNth12gt22 + J12L*J31L*PDstandardNth13gt22 + 
+      J11L*J32L*PDstandardNth13gt22 + dJ112L*PDstandardNth1gt22 + 
+      J21L*J22L*PDstandardNth22gt22 + J22L*J31L*PDstandardNth23gt22 + 
+      J21L*J32L*PDstandardNth23gt22 + dJ212L*PDstandardNth2gt22 + 
+      J31L*J32L*PDstandardNth33gt22 + dJ312L*PDstandardNth3gt22) - 
+      gtu31*(J11L*J13L*PDstandardNth11gt22 + J13L*J21L*PDstandardNth12gt22 + 
+      J11L*J23L*PDstandardNth12gt22 + J13L*J31L*PDstandardNth13gt22 + 
+      J11L*J33L*PDstandardNth13gt22 + dJ113L*PDstandardNth1gt22 + 
+      J21L*J23L*PDstandardNth22gt22 + J23L*J31L*PDstandardNth23gt22 + 
+      J21L*J33L*PDstandardNth23gt22 + dJ213L*PDstandardNth2gt22 + 
+      J31L*J33L*PDstandardNth33gt22 + dJ313L*PDstandardNth3gt22) - 
+      gtu32*(J12L*J13L*PDstandardNth11gt22 + J13L*J22L*PDstandardNth12gt22 + 
+      J12L*J23L*PDstandardNth12gt22 + J13L*J32L*PDstandardNth13gt22 + 
+      J12L*J33L*PDstandardNth13gt22 + dJ123L*PDstandardNth1gt22 + 
+      J22L*J23L*PDstandardNth22gt22 + J23L*J32L*PDstandardNth23gt22 + 
+      J22L*J33L*PDstandardNth23gt22 + dJ223L*PDstandardNth2gt22 + 
+      J32L*J33L*PDstandardNth33gt22 + dJ323L*PDstandardNth3gt22) + 
+      gt12L*J32L*PDstandardNth3Xt1 + gt22L*J32L*PDstandardNth3Xt2 + 
+      gt23L*J32L*PDstandardNth3Xt3 + Gtl212*Xtn1 + Gtl222*Xtn2 + Gtl223*Xtn3 
+      - 0.5*gtu11*(2*J11L*J21L*PDstandardNth12gt22 + 
       2*J11L*J31L*PDstandardNth13gt22 + dJ111L*PDstandardNth1gt22 + 
       2*J21L*J31L*PDstandardNth23gt22 + dJ211L*PDstandardNth2gt22 + 
       dJ311L*PDstandardNth3gt22 + PDstandardNth11gt22*SQR(J11L) + 
       PDstandardNth22gt22*SQR(J21L) + PDstandardNth33gt22*SQR(J31L)) - 
-      gtu22*(2*J12L*J22L*PDstandardNth12gt22 + 
+      0.5*gtu22*(2*J12L*J22L*PDstandardNth12gt22 + 
       2*J12L*J32L*PDstandardNth13gt22 + dJ122L*PDstandardNth1gt22 + 
       2*J22L*J32L*PDstandardNth23gt22 + dJ222L*PDstandardNth2gt22 + 
       dJ322L*PDstandardNth3gt22 + PDstandardNth11gt22*SQR(J12L) + 
       PDstandardNth22gt22*SQR(J22L) + PDstandardNth33gt22*SQR(J32L)) - 
-      gtu33*(2*J13L*J23L*PDstandardNth12gt22 + 
+      0.5*gtu33*(2*J13L*J23L*PDstandardNth12gt22 + 
       2*J13L*J33L*PDstandardNth13gt22 + dJ133L*PDstandardNth1gt22 + 
       2*J23L*J33L*PDstandardNth23gt22 + dJ233L*PDstandardNth2gt22 + 
       dJ333L*PDstandardNth3gt22 + PDstandardNth11gt22*SQR(J13L) + 
-      PDstandardNth22gt22*SQR(J23L) + PDstandardNth33gt22*SQR(J33L)));
-    
-    CCTK_REAL Rt23 = Gt113*Gtlu211 + Gt133*Gtlu213 + Gt213*Gtlu221 + 
-      Gt233*Gtlu223 + (Gt212 + Gt313)*Gtlu231 + (Gt222 + Gt323)*Gtlu232 + 
-      Gt333*Gtlu233 + Gt112*(Gtlu131 + Gtlu311) + Gt122*(Gtlu132 + Gtlu312) + 
-      Gt123*(Gtlu133 + Gtlu212 + Gtlu313) + Gt212*Gtlu321 + Gt222*Gtlu322 + 
-      Gt223*(Gtlu222 + Gtlu233 + Gtlu323) + 2*(Gt312*Gtlu331 + Gt322*Gtlu332 
-      + Gt323*Gtlu333) + 0.5*((gt13L*J12L + gt12L*J13L)*PDstandardNth1Xt1 + 
+      PDstandardNth22gt22*SQR(J23L) + PDstandardNth33gt22*SQR(J33L));
+    
+    CCTK_REAL Rt23 = 0.5*(2*(Gt112*Gtlu131 + Gt122*Gtlu132 + Gt123*Gtlu133 
+      + Gt113*Gtlu211 + Gt123*Gtlu212 + Gt133*Gtlu213 + Gt213*Gtlu221 + 
+      Gt223*Gtlu222 + Gt233*Gtlu223 + Gt212*Gtlu231 + Gt313*Gtlu231 + 
+      Gt222*Gtlu232 + Gt323*Gtlu232 + Gt223*Gtlu233 + Gt333*Gtlu233 + 
+      Gt112*Gtlu311 + Gt122*Gtlu312 + Gt123*Gtlu313 + Gt212*Gtlu321 + 
+      Gt222*Gtlu322 + Gt223*Gtlu323) + 4*(Gt312*Gtlu331 + Gt322*Gtlu332 + 
+      Gt323*Gtlu333) + (gt13L*J12L + gt12L*J13L)*PDstandardNth1Xt1 + 
       (gt23L*J12L + gt22L*J13L)*PDstandardNth1Xt2 + (gt33L*J12L + 
       gt23L*J13L)*PDstandardNth1Xt3 + (gt13L*J22L + 
       gt12L*J23L)*PDstandardNth2Xt1 + (gt23L*J22L + 
@@ -953,48 +955,47 @@ static void ML_ADMQuantities_MP_Body(cGH const * restrict const cctkGH, int cons
       3*(Gt313*Gtlu331 + Gt323*Gtlu332 + Gt333*Gtlu333) + 
       J13L*(gt13L*PDstandardNth1Xt1 + gt23L*PDstandardNth1Xt2 + 
       gt33L*PDstandardNth1Xt3) + J23L*(gt13L*PDstandardNth2Xt1 + 
-      gt23L*PDstandardNth2Xt2 + gt33L*PDstandardNth2Xt3) + 
-      J33L*(gt13L*PDstandardNth3Xt1 + gt23L*PDstandardNth3Xt2 + 
-      gt33L*PDstandardNth3Xt3) + Gtl313*Xtn1 + Gtl323*Xtn2 + Gtl333*Xtn3 + 
-      0.5*(-2*(gtu21*(J11L*J12L*PDstandardNth11gt33 + 
-      J12L*J21L*PDstandardNth12gt33 + J11L*J22L*PDstandardNth12gt33 + 
-      J12L*J31L*PDstandardNth13gt33 + J11L*J32L*PDstandardNth13gt33 + 
-      dJ112L*PDstandardNth1gt33 + J21L*J22L*PDstandardNth22gt33 + 
-      J22L*J31L*PDstandardNth23gt33 + J21L*J32L*PDstandardNth23gt33 + 
-      dJ212L*PDstandardNth2gt33 + J31L*J32L*PDstandardNth33gt33 + 
-      dJ312L*PDstandardNth3gt33) + gtu31*(J11L*J13L*PDstandardNth11gt33 + 
-      J13L*J21L*PDstandardNth12gt33 + J11L*J23L*PDstandardNth12gt33 + 
-      J13L*J31L*PDstandardNth13gt33 + J11L*J33L*PDstandardNth13gt33 + 
-      dJ113L*PDstandardNth1gt33 + J21L*J23L*PDstandardNth22gt33 + 
-      J23L*J31L*PDstandardNth23gt33 + J21L*J33L*PDstandardNth23gt33 + 
-      dJ213L*PDstandardNth2gt33 + J31L*J33L*PDstandardNth33gt33 + 
-      dJ313L*PDstandardNth3gt33) + gtu32*(J12L*J13L*PDstandardNth11gt33 + 
-      J13L*J22L*PDstandardNth12gt33 + J12L*J23L*PDstandardNth12gt33 + 
-      J13L*J32L*PDstandardNth13gt33 + J12L*J33L*PDstandardNth13gt33 + 
-      dJ123L*PDstandardNth1gt33 + J22L*J23L*PDstandardNth22gt33 + 
-      J23L*J32L*PDstandardNth23gt33 + J22L*J33L*PDstandardNth23gt33 + 
-      dJ223L*PDstandardNth2gt33 + J32L*J33L*PDstandardNth33gt33 + 
-      dJ323L*PDstandardNth3gt33)) - gtu11*(2*J11L*J21L*PDstandardNth12gt33 + 
+      gt23L*PDstandardNth2Xt2 + gt33L*PDstandardNth2Xt3) - 
+      gtu21*(J11L*J12L*PDstandardNth11gt33 + J12L*J21L*PDstandardNth12gt33 + 
+      J11L*J22L*PDstandardNth12gt33 + J12L*J31L*PDstandardNth13gt33 + 
+      J11L*J32L*PDstandardNth13gt33 + dJ112L*PDstandardNth1gt33 + 
+      J21L*J22L*PDstandardNth22gt33 + J22L*J31L*PDstandardNth23gt33 + 
+      J21L*J32L*PDstandardNth23gt33 + dJ212L*PDstandardNth2gt33 + 
+      J31L*J32L*PDstandardNth33gt33 + dJ312L*PDstandardNth3gt33) - 
+      gtu31*(J11L*J13L*PDstandardNth11gt33 + J13L*J21L*PDstandardNth12gt33 + 
+      J11L*J23L*PDstandardNth12gt33 + J13L*J31L*PDstandardNth13gt33 + 
+      J11L*J33L*PDstandardNth13gt33 + dJ113L*PDstandardNth1gt33 + 
+      J21L*J23L*PDstandardNth22gt33 + J23L*J31L*PDstandardNth23gt33 + 
+      J21L*J33L*PDstandardNth23gt33 + dJ213L*PDstandardNth2gt33 + 
+      J31L*J33L*PDstandardNth33gt33 + dJ313L*PDstandardNth3gt33) - 
+      gtu32*(J12L*J13L*PDstandardNth11gt33 + J13L*J22L*PDstandardNth12gt33 + 
+      J12L*J23L*PDstandardNth12gt33 + J13L*J32L*PDstandardNth13gt33 + 
+      J12L*J33L*PDstandardNth13gt33 + dJ123L*PDstandardNth1gt33 + 
+      J22L*J23L*PDstandardNth22gt33 + J23L*J32L*PDstandardNth23gt33 + 
+      J22L*J33L*PDstandardNth23gt33 + dJ223L*PDstandardNth2gt33 + 
+      J32L*J33L*PDstandardNth33gt33 + dJ323L*PDstandardNth3gt33) + 
+      gt13L*J33L*PDstandardNth3Xt1 + gt23L*J33L*PDstandardNth3Xt2 + 
+      gt33L*J33L*PDstandardNth3Xt3 + Gtl313*Xtn1 + Gtl323*Xtn2 + Gtl333*Xtn3 
+      - 0.5*gtu11*(2*J11L*J21L*PDstandardNth12gt33 + 
       2*J11L*J31L*PDstandardNth13gt33 + dJ111L*PDstandardNth1gt33 + 
       2*J21L*J31L*PDstandardNth23gt33 + dJ211L*PDstandardNth2gt33 + 
       dJ311L*PDstandardNth3gt33 + PDstandardNth11gt33*SQR(J11L) + 
       PDstandardNth22gt33*SQR(J21L) + PDstandardNth33gt33*SQR(J31L)) - 
-      gtu22*(2*J12L*J22L*PDstandardNth12gt33 + 
+      0.5*gtu22*(2*J12L*J22L*PDstandardNth12gt33 + 
       2*J12L*J32L*PDstandardNth13gt33 + dJ122L*PDstandardNth1gt33 + 
       2*J22L*J32L*PDstandardNth23gt33 + dJ222L*PDstandardNth2gt33 + 
       dJ322L*PDstandardNth3gt33 + PDstandardNth11gt33*SQR(J12L) + 
       PDstandardNth22gt33*SQR(J22L) + PDstandardNth33gt33*SQR(J32L)) - 
-      gtu33*(2*J13L*J23L*PDstandardNth12gt33 + 
+      0.5*gtu33*(2*J13L*J23L*PDstandardNth12gt33 + 
       2*J13L*J33L*PDstandardNth13gt33 + dJ133L*PDstandardNth1gt33 + 
       2*J23L*J33L*PDstandardNth23gt33 + dJ233L*PDstandardNth2gt33 + 
       dJ333L*PDstandardNth3gt33 + PDstandardNth11gt33*SQR(J13L) + 
-      PDstandardNth22gt33*SQR(J23L) + PDstandardNth33gt33*SQR(J33L)));
+      PDstandardNth22gt33*SQR(J23L) + PDstandardNth33gt33*SQR(J33L));
     
     CCTK_REAL trRt = gtu11*Rt11 + gtu22*Rt22 + 2*(gtu21*Rt12 + gtu31*Rt13 
       + gtu32*Rt23) + gtu33*Rt33;
     
-    CCTK_REAL ephi = 
-      IfThen(ToReal(conformalMethod),INV(sqrt(phiL)),exp(phiL));
+    CCTK_REAL ephi = IfThen(conformalMethod,INV(sqrt(phiL)),exp(phiL));
     
     CCTK_REAL Atm11 = At11L*gtu11 + At12L*gtu21 + At13L*gtu31;
     
@@ -1029,66 +1030,79 @@ static void ML_ADMQuantities_MP_Body(cGH const * restrict const cctkGH, int cons
       beta3L*eTzzL)*INV(alphaL);
     
     CCTK_REAL MadmL = 
-      0.01989436788648691697111047042156429525431*(-((Gt111*Gtlu111 + 
-      Gt112*Gtlu112 + Gt113*Gtlu113 + Gt211*Gtlu121 + Gt212*Gtlu122 + 
-      Gt213*Gtlu123 + Gt311*Gtlu131 + Gt312*Gtlu132 + Gt313*Gtlu133)*gtu11) + 
+      0.01989436788648691697111047042156429525431*((-(Gt111*Gtlu111) - 
+      Gt112*Gtlu112 - Gt113*Gtlu113 - Gt211*Gtlu121 - Gt212*Gtlu122 - 
+      Gt213*Gtlu123 - Gt311*Gtlu131 - Gt312*Gtlu132 - Gt313*Gtlu133)*gtu11 + 
       (-(Gt122*Gtlu112) - Gt123*Gtlu113 - Gt222*Gtlu122 - Gt223*Gtlu123 - 
       Gt322*Gtlu132 - Gt323*Gtlu133 - Gt111*Gtlu211 + Gt112*(-Gtlu111 - 
       Gtlu212) - Gt113*Gtlu213 - Gt211*Gtlu221 + Gt212*(-Gtlu121 - Gtlu222) - 
       Gt213*Gtlu223 - Gt311*Gtlu231 + Gt312*(-Gtlu131 - Gtlu232) - 
-      Gt313*Gtlu233)*gtu21 - (Gt112*Gtlu211 + Gt122*Gtlu212 + Gt123*Gtlu213 + 
-      Gt212*Gtlu221 + Gt222*Gtlu222 + Gt223*Gtlu223 + Gt312*Gtlu231 + 
-      Gt322*Gtlu232 + Gt323*Gtlu233)*gtu22 + (-(Gt123*Gtlu112) - 
-      Gt133*Gtlu113 - Gt223*Gtlu122 - Gt233*Gtlu123 - Gt323*Gtlu132 - 
-      Gt333*Gtlu133 - Gt111*Gtlu311 - Gt112*Gtlu312 + Gt113*(-Gtlu111 - 
-      Gtlu313) - Gt211*Gtlu321 - Gt212*Gtlu322 + Gt213*(-Gtlu121 - Gtlu323) - 
-      Gt311*Gtlu331 - Gt312*Gtlu332 + Gt313*(-Gtlu131 - Gtlu333))*gtu31 + 
-      (-(Gt113*Gtlu211) - Gt133*Gtlu213 - Gt213*Gtlu221 - Gt233*Gtlu223 - 
-      Gt313*Gtlu231 - Gt333*Gtlu233 - Gt112*Gtlu311 - Gt122*Gtlu312 + 
-      Gt123*(-Gtlu212 - Gtlu313) - Gt212*Gtlu321 - Gt222*Gtlu322 + 
-      Gt223*(-Gtlu222 - Gtlu323) - Gt312*Gtlu331 - Gt322*Gtlu332 + 
-      Gt323*(-Gtlu232 - Gtlu333))*gtu32 - (Gt113*Gtlu311 + Gt123*Gtlu312 + 
-      Gt133*Gtlu313 + Gt213*Gtlu321 + Gt223*Gtlu322 + Gt233*Gtlu323 + 
-      Gt313*Gtlu331 + Gt323*Gtlu332 + Gt333*Gtlu333)*gtu33 + trRt - ephi*trRt 
-      + pow(ephi,5)*(2*Atm12*Atm21 + 2.*Atm13*Atm31 + 2.*Atm23*Atm32 + 
+      Gt313*Gtlu233)*gtu21 + (-(Gt112*Gtlu211) - Gt122*Gtlu212 - 
+      Gt123*Gtlu213 - Gt212*Gtlu221 - Gt222*Gtlu222 - Gt223*Gtlu223 - 
+      Gt312*Gtlu231 - Gt322*Gtlu232 - Gt323*Gtlu233)*gtu22 + 
+      (-(Gt123*Gtlu112) - Gt133*Gtlu113 - Gt223*Gtlu122 - Gt233*Gtlu123 - 
+      Gt323*Gtlu132 - Gt333*Gtlu133 - Gt111*Gtlu311 - Gt112*Gtlu312 + 
+      Gt113*(-Gtlu111 - Gtlu313) - Gt211*Gtlu321 - Gt212*Gtlu322 + 
+      Gt213*(-Gtlu121 - Gtlu323) - Gt311*Gtlu331 - Gt312*Gtlu332 + 
+      Gt313*(-Gtlu131 - Gtlu333))*gtu31 + (-(Gt113*Gtlu211) - Gt133*Gtlu213 - 
+      Gt213*Gtlu221 - Gt233*Gtlu223 - Gt313*Gtlu231 - Gt333*Gtlu233 - 
+      Gt112*Gtlu311 - Gt122*Gtlu312 + Gt123*(-Gtlu212 - Gtlu313) - 
+      Gt212*Gtlu321 - Gt222*Gtlu322 + Gt223*(-Gtlu222 - Gtlu323) - 
+      Gt312*Gtlu331 - Gt322*Gtlu332 + Gt323*(-Gtlu232 - Gtlu333))*gtu32 + 
+      (-(Gt113*Gtlu311) - Gt123*Gtlu312 - Gt133*Gtlu313 - Gt213*Gtlu321 - 
+      Gt223*Gtlu322 - Gt233*Gtlu323 - Gt313*Gtlu331 - Gt323*Gtlu332 - 
+      Gt333*Gtlu333)*gtu33 + trRt - ephi*trRt + pow(ephi,5)*(2*Atm12*Atm21 + 
+      2.*Atm13*Atm31 + 2.*Atm23*Atm32 + 
       50.26548245743669181540229413247204614715*rho + SQR(Atm11) + SQR(Atm22) 
       + SQR(Atm33) - 0.6666666666666666666666666666666666666667*SQR(trKL)));
     
     CCTK_REAL Jadm1L = 
-      0.01989436788648691697111047042156429525431*(2*Atm23 - 2*Atm32 + 
-      (-(At11L*dgtu113) - 2*At12L*dgtu213 - At22L*dgtu223 - 2*At13L*dgtu313 - 
-      2*At23L*dgtu323 - At33L*dgtu333 + 
-      1.33333333333333333333333333333*(J13L*PDstandardNth1trK + 
-      J23L*PDstandardNth2trK + J33L*PDstandardNth3trK) + 
-      50.26548245743669181540229413247204614715*S3)*yL + (At11L*dgtu112 + 
-      At22L*dgtu222 + 2*(At12L*dgtu212 + At13L*dgtu312 + At23L*dgtu322) + 
-      At33L*dgtu332 - 1.33333333333333333333333333333*(J12L*PDstandardNth1trK 
-      + J22L*PDstandardNth2trK + J32L*PDstandardNth3trK) - 
-      50.26548245743669181540229413247204614715*S2)*zL)*pow(ephi,6);
+      ((-0.01989436788648691697111047042156429525431*(At11L*dgtu113 + 
+      At22L*dgtu223 + At33L*dgtu333) + 
+      0.02652582384864922262814729389541906033908*J33L*PDstandardNth3trK + 
+      1.*S3)*yL - 0.03978873577297383394222094084312859050861*(Atm32 + 
+      (At12L*dgtu213 + At13L*dgtu313 + At23L*dgtu323)*yL) + 
+      (0.01989436788648691697111047042156429525431*(At11L*dgtu112 + 
+      At22L*dgtu222 + At33L*dgtu332) - 
+      0.02652582384864922262814729389541906033908*J32L*PDstandardNth3trK - 
+      1.*S2)*zL + 0.03978873577297383394222094084312859050861*(Atm23 + 
+      (At12L*dgtu212 + At13L*dgtu312 + At23L*dgtu322)*zL) + 
+      PDstandardNth1trK*(0.02652582384864922262814729389541906033908*J13L*yL 
+      - 0.02652582384864922262814729389541906033908*J12L*zL) + 
+      PDstandardNth2trK*(0.02652582384864922262814729389541906033908*J23L*yL 
+      - 0.02652582384864922262814729389541906033908*J22L*zL))*pow(ephi,6);
     
     CCTK_REAL Jadm2L = 
-      0.01989436788648691697111047042156429525431*(-2*Atm13 + 2*Atm31 + 
-      (At11L*dgtu113 + At22L*dgtu223 + 2*(At12L*dgtu213 + At13L*dgtu313 + 
-      At23L*dgtu323) + At33L*dgtu333 - 
-      1.33333333333333333333333333333*(J13L*PDstandardNth1trK + 
-      J23L*PDstandardNth2trK + J33L*PDstandardNth3trK) - 
-      50.26548245743669181540229413247204614715*S3)*xL + (-(At11L*dgtu111) - 
-      2*At12L*dgtu211 - At22L*dgtu221 - 2*At13L*dgtu311 - 2*At23L*dgtu321 - 
-      At33L*dgtu331 + 1.33333333333333333333333333333*(J11L*PDstandardNth1trK 
-      + J21L*PDstandardNth2trK + J31L*PDstandardNth3trK) + 
-      50.26548245743669181540229413247204614715*S1)*zL)*pow(ephi,6);
+      ((0.01989436788648691697111047042156429525431*(At11L*dgtu113 + 
+      At22L*dgtu223 + At33L*dgtu333) - 
+      0.02652582384864922262814729389541906033908*J33L*PDstandardNth3trK - 
+      1.*S3)*xL + 0.03978873577297383394222094084312859050861*(Atm31 + 
+      (At12L*dgtu213 + At13L*dgtu313 + At23L*dgtu323)*xL) + 
+      (-0.01989436788648691697111047042156429525431*(At11L*dgtu111 + 
+      At22L*dgtu221 + At33L*dgtu331) + 
+      0.02652582384864922262814729389541906033908*J31L*PDstandardNth3trK + 
+      1.*S1)*zL - 0.03978873577297383394222094084312859050861*(Atm13 + 
+      (At12L*dgtu211 + At13L*dgtu311 + At23L*dgtu321)*zL) + 
+      PDstandardNth1trK*(-0.02652582384864922262814729389541906033908*J13L*xL 
+      + 0.02652582384864922262814729389541906033908*J11L*zL) + 
+      PDstandardNth2trK*(-0.02652582384864922262814729389541906033908*J23L*xL 
+      + 0.02652582384864922262814729389541906033908*J21L*zL))*pow(ephi,6);
     
     CCTK_REAL Jadm3L = 
-      0.01989436788648691697111047042156429525431*(2*Atm12 - 2*Atm21 + 
-      (-(At11L*dgtu112) - 2*At12L*dgtu212 - At22L*dgtu222 - 2*At13L*dgtu312 - 
-      2*At23L*dgtu322 - At33L*dgtu332 + 
-      1.33333333333333333333333333333*(J12L*PDstandardNth1trK + 
-      J22L*PDstandardNth2trK + J32L*PDstandardNth3trK) + 
-      50.26548245743669181540229413247204614715*S2)*xL + (At11L*dgtu111 + 
-      At22L*dgtu221 + 2*(At12L*dgtu211 + At13L*dgtu311 + At23L*dgtu321) + 
-      At33L*dgtu331 - 1.33333333333333333333333333333*(J11L*PDstandardNth1trK 
-      + J21L*PDstandardNth2trK + J31L*PDstandardNth3trK) - 
-      50.26548245743669181540229413247204614715*S1)*yL)*pow(ephi,6);
+      ((-0.01989436788648691697111047042156429525431*(At11L*dgtu112 + 
+      At22L*dgtu222 + At33L*dgtu332) + 
+      0.02652582384864922262814729389541906033908*J32L*PDstandardNth3trK + 
+      1.*S2)*xL - 0.03978873577297383394222094084312859050861*(Atm21 + 
+      (At12L*dgtu212 + At13L*dgtu312 + At23L*dgtu322)*xL) + 
+      (0.01989436788648691697111047042156429525431*(At11L*dgtu111 + 
+      At22L*dgtu221 + At33L*dgtu331) - 
+      0.02652582384864922262814729389541906033908*J31L*PDstandardNth3trK - 
+      1.*S1)*yL + 0.03978873577297383394222094084312859050861*(Atm12 + 
+      (At12L*dgtu211 + At13L*dgtu311 + At23L*dgtu321)*yL) + 
+      PDstandardNth1trK*(0.02652582384864922262814729389541906033908*J12L*xL 
+      - 0.02652582384864922262814729389541906033908*J11L*yL) + 
+      PDstandardNth2trK*(0.02652582384864922262814729389541906033908*J22L*xL 
+      - 0.02652582384864922262814729389541906033908*J21L*yL))*pow(ephi,6);
     
     /* Copy local copies back to grid functions */
     Jadm1[index] = Jadm1L;