Regenerate thorns which were missed in 45bcf7046474c39dc6fb7c3e7729cdd1143a70fe.

2 files changed, 116 insertions, 112 deletions

diff --git a/ML_ADMQuantities/schedule.ccl b/ML_ADMQuantities/schedule.ccl
index 5253582..8adebf2 100644
--- a/ML_ADMQuantities/schedule.ccl
+++ b/ML_ADMQuantities/schedule.ccl
@@ -47,40 +47,40 @@ schedule group ML_ADMQuantities_group in MoL_PseudoEvolution after MoL_PostStep
 schedule ML_ADMQuantities in ML_ADMQuantities_group
 {
   LANG: C
-  READS:    ML_BSSN::alpha
+  READS:    grid::x
+  READS:    grid::y
+  READS:    grid::z
   READS:    ML_BSSN::At11
   READS:    ML_BSSN::At12
   READS:    ML_BSSN::At13
   READS:    ML_BSSN::At22
   READS:    ML_BSSN::At23
   READS:    ML_BSSN::At33
+  READS:    ML_BSSN::Xt1
+  READS:    ML_BSSN::Xt2
+  READS:    ML_BSSN::Xt3
+  READS:    ML_BSSN::alpha
+  READS:    ML_BSSN::phi
+  READS:    ML_BSSN::gt11
+  READS:    ML_BSSN::gt12
+  READS:    ML_BSSN::gt13
+  READS:    ML_BSSN::gt22
+  READS:    ML_BSSN::gt23
+  READS:    ML_BSSN::gt33
   READS:    ML_BSSN::beta1
   READS:    ML_BSSN::beta2
   READS:    ML_BSSN::beta3
+  READS:    ML_BSSN::trK
   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:    ML_BSSN::gt11
-  READS:    ML_BSSN::gt12
-  READS:    ML_BSSN::gt13
-  READS:    ML_BSSN::gt22
-  READS:    ML_BSSN::gt23
-  READS:    ML_BSSN::gt33
-  READS:    ML_BSSN::phi
-  READS:    ML_BSSN::trK
-  READS:    grid::x
-  READS:    ML_BSSN::Xt1
-  READS:    ML_BSSN::Xt2
-  READS:    ML_BSSN::Xt3
-  READS:    grid::y
-  READS:    grid::z
+  READS:    TmunuBase::eTtx
+  READS:    TmunuBase::eTty
+  READS:    TmunuBase::eTtz
   WRITES:   ML_ADMQuantities::Jadm1
   WRITES:   ML_ADMQuantities::Jadm2
   WRITES:   ML_ADMQuantities::Jadm3
diff --git a/ML_ADMQuantities/src/ML_ADMQuantities.cc b/ML_ADMQuantities/src/ML_ADMQuantities.cc
index d7e40ab..4879023 100644
--- a/ML_ADMQuantities/src/ML_ADMQuantities.cc
+++ b/ML_ADMQuantities/src/ML_ADMQuantities.cc
@@ -1074,11 +1074,11 @@ static void ML_ADMQuantities_Body(cGH const * restrict const cctkGH, int const d
       JacPDstandardNth1gt22*SQR(gtu21) - JacPDstandardNth1gt33*SQR(gtu31);
     
     CCTK_REAL CCTK_ATTRIBUTE_UNUSED dgtu211 = 
-      -(gtu11*(gtu21*JacPDstandardNth1gt11 + gtu22*JacPDstandardNth1gt12 + 
-      gtu32*JacPDstandardNth1gt13)) - gtu21*(gtu31*JacPDstandardNth1gt13 + 
-      gtu22*JacPDstandardNth1gt22 + gtu32*JacPDstandardNth1gt23) - 
-      gtu31*(gtu22*JacPDstandardNth1gt23 + gtu32*JacPDstandardNth1gt33) - 
-      JacPDstandardNth1gt12*SQR(gtu21);
+      -(gtu21*(gtu11*JacPDstandardNth1gt11 + gtu21*JacPDstandardNth1gt12 + 
+      gtu31*JacPDstandardNth1gt13)) - gtu22*(gtu11*JacPDstandardNth1gt12 + 
+      gtu21*JacPDstandardNth1gt22 + gtu31*JacPDstandardNth1gt23) - 
+      gtu32*(gtu11*JacPDstandardNth1gt13 + gtu21*JacPDstandardNth1gt23 + 
+      gtu31*JacPDstandardNth1gt33);
     
     CCTK_REAL CCTK_ATTRIBUTE_UNUSED dgtu311 = 
       -(gtu11*(gtu31*JacPDstandardNth1gt11 + gtu32*JacPDstandardNth1gt12 + 
@@ -1110,11 +1110,11 @@ static void ML_ADMQuantities_Body(cGH const * restrict const cctkGH, int const d
       JacPDstandardNth2gt22*SQR(gtu21) - JacPDstandardNth2gt33*SQR(gtu31);
     
     CCTK_REAL CCTK_ATTRIBUTE_UNUSED dgtu212 = 
-      -(gtu11*(gtu21*JacPDstandardNth2gt11 + gtu22*JacPDstandardNth2gt12 + 
-      gtu32*JacPDstandardNth2gt13)) - gtu21*(gtu31*JacPDstandardNth2gt13 + 
-      gtu22*JacPDstandardNth2gt22 + gtu32*JacPDstandardNth2gt23) - 
-      gtu31*(gtu22*JacPDstandardNth2gt23 + gtu32*JacPDstandardNth2gt33) - 
-      JacPDstandardNth2gt12*SQR(gtu21);
+      -(gtu21*(gtu11*JacPDstandardNth2gt11 + gtu21*JacPDstandardNth2gt12 + 
+      gtu31*JacPDstandardNth2gt13)) - gtu22*(gtu11*JacPDstandardNth2gt12 + 
+      gtu21*JacPDstandardNth2gt22 + gtu31*JacPDstandardNth2gt23) - 
+      gtu32*(gtu11*JacPDstandardNth2gt13 + gtu21*JacPDstandardNth2gt23 + 
+      gtu31*JacPDstandardNth2gt33);
     
     CCTK_REAL CCTK_ATTRIBUTE_UNUSED dgtu312 = 
       -(gtu11*(gtu31*JacPDstandardNth2gt11 + gtu32*JacPDstandardNth2gt12 + 
@@ -1146,11 +1146,11 @@ static void ML_ADMQuantities_Body(cGH const * restrict const cctkGH, int const d
       JacPDstandardNth3gt22*SQR(gtu21) - JacPDstandardNth3gt33*SQR(gtu31);
     
     CCTK_REAL CCTK_ATTRIBUTE_UNUSED dgtu213 = 
-      -(gtu11*(gtu21*JacPDstandardNth3gt11 + gtu22*JacPDstandardNth3gt12 + 
-      gtu32*JacPDstandardNth3gt13)) - gtu21*(gtu31*JacPDstandardNth3gt13 + 
-      gtu22*JacPDstandardNth3gt22 + gtu32*JacPDstandardNth3gt23) - 
-      gtu31*(gtu22*JacPDstandardNth3gt23 + gtu32*JacPDstandardNth3gt33) - 
-      JacPDstandardNth3gt12*SQR(gtu21);
+      -(gtu21*(gtu11*JacPDstandardNth3gt11 + gtu21*JacPDstandardNth3gt12 + 
+      gtu31*JacPDstandardNth3gt13)) - gtu22*(gtu11*JacPDstandardNth3gt12 + 
+      gtu21*JacPDstandardNth3gt22 + gtu31*JacPDstandardNth3gt23) - 
+      gtu32*(gtu11*JacPDstandardNth3gt13 + gtu21*JacPDstandardNth3gt23 + 
+      gtu31*JacPDstandardNth3gt33);
     
     CCTK_REAL CCTK_ATTRIBUTE_UNUSED dgtu313 = 
       -(gtu11*(gtu31*JacPDstandardNth3gt11 + gtu32*JacPDstandardNth3gt12 + 
@@ -1365,18 +1365,18 @@ static void ML_ADMQuantities_Body(cGH const * restrict const cctkGH, int const d
     CCTK_REAL CCTK_ATTRIBUTE_UNUSED Xtn3 = Gt311*gtu11 + Gt322*gtu22 + 
       2*(Gt312*gtu21 + Gt313*gtu31 + Gt323*gtu32) + Gt333*gtu33;
     
-    CCTK_REAL CCTK_ATTRIBUTE_UNUSED Rt11 = 0.5*(6*(Gt111*Gtlu111 + 
-      Gt112*Gtlu112 + Gt113*Gtlu113) + 4*(Gt211*Gtlu121 + Gt212*Gtlu122 + 
-      Gt213*Gtlu123 + Gt311*Gtlu131 + Gt312*Gtlu132 + Gt313*Gtlu133) - 
-      gtu11*JacPDstandardNth11gt11 + 2*(Gt211*Gtlu211 + Gt212*Gtlu212 + 
-      Gt213*Gtlu213 + Gt311*Gtlu311 + Gt312*Gtlu312 + Gt313*Gtlu313 + 
-      gt11L*JacPDstandardNth1Xt1) + 2*gt12L*JacPDstandardNth1Xt2 + 
-      2*gt13L*JacPDstandardNth1Xt3 + gtu21*(-JacPDstandardNth12gt11 - 
+    CCTK_REAL CCTK_ATTRIBUTE_UNUSED Rt11 = 3*(Gt111*Gtlu111 + 
+      Gt112*Gtlu112 + Gt113*Gtlu113) + 2*(Gt211*Gtlu121 + Gt212*Gtlu122 + 
+      Gt213*Gtlu123 + Gt311*Gtlu131 + Gt312*Gtlu132 + Gt313*Gtlu133) + 
+      Gt211*Gtlu211 + Gt212*Gtlu212 + Gt213*Gtlu213 + Gt311*Gtlu311 + 
+      Gt312*Gtlu312 + Gt313*Gtlu313 + gt11L*JacPDstandardNth1Xt1 + 
+      gt12L*JacPDstandardNth1Xt2 + gt13L*JacPDstandardNth1Xt3 + 
+      0.5*(-(gtu11*JacPDstandardNth11gt11) - gtu21*(JacPDstandardNth12gt11 + 
       JacPDstandardNth21gt11) - gtu22*JacPDstandardNth22gt11 + 
       gtu31*(-JacPDstandardNth13gt11 - JacPDstandardNth31gt11) + 
       gtu32*(-JacPDstandardNth23gt11 - JacPDstandardNth32gt11) - 
-      gtu33*JacPDstandardNth33gt11 + 2*Gtl111*Xtn1 + 2*Gtl112*Xtn2 + 
-      2*Gtl113*Xtn3);
+      gtu33*JacPDstandardNth33gt11) + Gtl111*Xtn1 + Gtl112*Xtn2 + 
+      Gtl113*Xtn3;
     
     CCTK_REAL CCTK_ATTRIBUTE_UNUSED Rt12 = 0.5*(4*(Gt211*Gtlu221 + 
       Gt212*Gtlu222 + Gt213*Gtlu223) + 2*(Gt122*Gtlu112 + Gt123*Gtlu113 + 
@@ -1411,18 +1411,18 @@ static void ML_ADMQuantities_Body(cGH const * restrict const cctkGH, int const d
       Gtl113*Xtn1 + Gtl311*Xtn1 + Gtl123*Xtn2 + Gtl312*Xtn2 + Gtl133*Xtn3 + 
       Gtl313*Xtn3);
     
-    CCTK_REAL CCTK_ATTRIBUTE_UNUSED Rt22 = 0.5*(6*(Gt212*Gtlu221 + 
-      Gt222*Gtlu222 + Gt223*Gtlu223) + 4*(Gt123*Gtlu213 + Gt312*Gtlu231 + 
-      Gt322*Gtlu232 + Gt323*Gtlu233) - gtu11*JacPDstandardNth11gt22 + 
-      gtu21*(-JacPDstandardNth12gt22 - JacPDstandardNth21gt22) - 
-      gtu22*JacPDstandardNth22gt22 + 2*(Gt123*Gtlu123 + Gt112*(Gtlu121 + 
-      2*Gtlu211) + Gt122*(Gtlu122 + 2*Gtlu212) + Gt312*Gtlu321 + 
-      Gt322*Gtlu322 + Gt323*Gtlu323 + gt12L*JacPDstandardNth2Xt1) + 
-      2*gt22L*JacPDstandardNth2Xt2 + 2*gt23L*JacPDstandardNth2Xt3 + 
+    CCTK_REAL CCTK_ATTRIBUTE_UNUSED Rt22 = Gt112*(Gtlu121 + 2*Gtlu211) + 
+      Gt122*(Gtlu122 + 2*Gtlu212) + Gt123*(Gtlu123 + 2*Gtlu213) + 
+      3*(Gt212*Gtlu221 + Gt222*Gtlu222 + Gt223*Gtlu223) + 2*(Gt312*Gtlu231 + 
+      Gt322*Gtlu232 + Gt323*Gtlu233) + Gt312*Gtlu321 + Gt322*Gtlu322 + 
+      Gt323*Gtlu323 + gt12L*JacPDstandardNth2Xt1 + 
+      gt22L*JacPDstandardNth2Xt2 + gt23L*JacPDstandardNth2Xt3 + 
+      0.5*(-(gtu11*JacPDstandardNth11gt22) - gtu21*(JacPDstandardNth12gt22 + 
+      JacPDstandardNth21gt22) - gtu22*JacPDstandardNth22gt22 + 
       gtu31*(-JacPDstandardNth13gt22 - JacPDstandardNth31gt22) + 
       gtu32*(-JacPDstandardNth23gt22 - JacPDstandardNth32gt22) - 
-      gtu33*JacPDstandardNth33gt22 + 2*Gtl212*Xtn1 + 2*Gtl222*Xtn2 + 
-      2*Gtl223*Xtn3);
+      gtu33*JacPDstandardNth33gt22) + Gtl212*Xtn1 + Gtl222*Xtn2 + 
+      Gtl223*Xtn3;
     
     CCTK_REAL CCTK_ATTRIBUTE_UNUSED Rt23 = 0.5*(2*(Gt123*Gtlu133 + 
       Gt113*Gtlu211 + Gt123*Gtlu212 + Gt133*Gtlu213 + Gt213*Gtlu221 + 
@@ -1441,18 +1441,17 @@ static void ML_ADMQuantities_Body(cGH const * restrict const cctkGH, int const d
       Gtl213*Xtn1 + Gtl312*Xtn1 + Gtl223*Xtn2 + Gtl322*Xtn2 + Gtl233*Xtn3 + 
       Gtl323*Xtn3);
     
-    CCTK_REAL CCTK_ATTRIBUTE_UNUSED Rt33 = 0.5*(4*(Gt133*Gtlu313 + 
-      Gt213*Gtlu321 + Gt223*Gtlu322 + Gt233*Gtlu323) + 6*(Gt313*Gtlu331 + 
-      Gt323*Gtlu332 + Gt333*Gtlu333) - gtu11*JacPDstandardNth11gt33 + 
-      gtu21*(-JacPDstandardNth12gt33 - JacPDstandardNth21gt33) - 
+    CCTK_REAL CCTK_ATTRIBUTE_UNUSED Rt33 = Gt113*(Gtlu131 + 2*Gtlu311) + 
+      Gt123*(Gtlu132 + 2*Gtlu312) + Gt133*(Gtlu133 + 2*Gtlu313) + 
+      Gt213*(Gtlu231 + 2*Gtlu321) + Gt223*(Gtlu232 + 2*Gtlu322) + 
+      Gt233*(Gtlu233 + 2*Gtlu323) + 3*(Gt313*Gtlu331 + Gt323*Gtlu332 + 
+      Gt333*Gtlu333) + 0.5*(-(gtu11*JacPDstandardNth11gt33) - 
+      gtu21*(JacPDstandardNth12gt33 + JacPDstandardNth21gt33) - 
       gtu22*JacPDstandardNth22gt33 + gtu31*(-JacPDstandardNth13gt33 - 
       JacPDstandardNth31gt33) + gtu32*(-JacPDstandardNth23gt33 - 
-      JacPDstandardNth32gt33) - gtu33*JacPDstandardNth33gt33 + 
-      2*(Gt133*Gtlu133 + Gt213*Gtlu231 + Gt223*Gtlu232 + Gt233*Gtlu233 + 
-      Gt113*(Gtlu131 + 2*Gtlu311) + Gt123*(Gtlu132 + 2*Gtlu312) + 
-      gt13L*JacPDstandardNth3Xt1) + 2*gt23L*JacPDstandardNth3Xt2 + 
-      2*gt33L*JacPDstandardNth3Xt3 + 2*Gtl313*Xtn1 + 2*Gtl323*Xtn2 + 
-      2*Gtl333*Xtn3);
+      JacPDstandardNth32gt33) - gtu33*JacPDstandardNth33gt33) + 
+      gt13L*JacPDstandardNth3Xt1 + gt23L*JacPDstandardNth3Xt2 + 
+      gt33L*JacPDstandardNth3Xt3 + Gtl313*Xtn1 + Gtl323*Xtn2 + Gtl333*Xtn3;
     
     CCTK_REAL CCTK_ATTRIBUTE_UNUSED trRt = gtu11*Rt11 + gtu22*Rt22 + 
       2*(gtu21*Rt12 + gtu31*Rt13 + gtu32*Rt23) + gtu33*Rt33;
@@ -1502,57 +1501,63 @@ static void ML_ADMQuantities_Body(cGH const * restrict const cctkGH, int const d
       beta2L*eTyzL + beta3L*eTzzL)*INV(alphaL);
     
     CCTK_REAL CCTK_ATTRIBUTE_UNUSED MadmL = 
-      -0.0625*INV(Pi)*((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 + (-1 + ephi)*trRt - pow(ephi,5)*(2*(Atm12*Atm21 + 
-      Atm13*Atm31 + Atm23*Atm32) + 16*Pi*rho - 
+      -0.0625*INV(Pi)*(Gtlu111*(Gt111*gtu11 + Gt112*gtu21 + Gt113*gtu31) + 
+      Gtlu112*(Gt112*gtu11 + Gt122*gtu21 + Gt123*gtu31) + 
+      Gtlu113*(Gt113*gtu11 + Gt123*gtu21 + Gt133*gtu31) + 
+      Gtlu121*(Gt211*gtu11 + Gt212*gtu21 + Gt213*gtu31) + 
+      Gtlu122*(Gt212*gtu11 + Gt222*gtu21 + Gt223*gtu31) + 
+      Gtlu123*(Gt213*gtu11 + Gt223*gtu21 + Gt233*gtu31) + 
+      Gtlu131*(Gt311*gtu11 + Gt312*gtu21 + Gt313*gtu31) + 
+      Gtlu132*(Gt312*gtu11 + Gt322*gtu21 + Gt323*gtu31) + 
+      Gtlu133*(Gt313*gtu11 + Gt323*gtu21 + Gt333*gtu31) + 
+      Gtlu211*(Gt111*gtu21 + Gt112*gtu22 + Gt113*gtu32) + 
+      Gtlu212*(Gt112*gtu21 + Gt122*gtu22 + Gt123*gtu32) + 
+      Gtlu213*(Gt113*gtu21 + Gt123*gtu22 + Gt133*gtu32) + 
+      Gtlu221*(Gt211*gtu21 + Gt212*gtu22 + Gt213*gtu32) + 
+      Gtlu222*(Gt212*gtu21 + Gt222*gtu22 + Gt223*gtu32) + 
+      Gtlu223*(Gt213*gtu21 + Gt223*gtu22 + Gt233*gtu32) + 
+      Gtlu231*(Gt311*gtu21 + Gt312*gtu22 + Gt313*gtu32) + 
+      Gtlu232*(Gt312*gtu21 + Gt322*gtu22 + Gt323*gtu32) + 
+      Gtlu233*(Gt313*gtu21 + Gt323*gtu22 + Gt333*gtu32) + 
+      Gtlu311*(Gt111*gtu31 + Gt112*gtu32 + Gt113*gtu33) + 
+      Gtlu312*(Gt112*gtu31 + Gt122*gtu32 + Gt123*gtu33) + 
+      Gtlu313*(Gt113*gtu31 + Gt123*gtu32 + Gt133*gtu33) + 
+      Gtlu321*(Gt211*gtu31 + Gt212*gtu32 + Gt213*gtu33) + 
+      Gtlu322*(Gt212*gtu31 + Gt222*gtu32 + Gt223*gtu33) + 
+      Gtlu323*(Gt213*gtu31 + Gt223*gtu32 + Gt233*gtu33) + 
+      Gtlu331*(Gt311*gtu31 + Gt312*gtu32 + Gt313*gtu33) + 
+      Gtlu332*(Gt312*gtu31 + Gt322*gtu32 + Gt323*gtu33) + 
+      Gtlu333*(Gt313*gtu31 + Gt323*gtu32 + Gt333*gtu33) + (-1 + ephi)*trRt - 
+      pow(ephi,5)*(2*(Atm12*Atm21 + Atm13*Atm31 + Atm23*Atm32) + 16*Pi*rho - 
       0.666666666666666666666666666667*SQR(trKL) + SQR(Atm11) + SQR(Atm22) 
       + SQR(Atm33)));
     
-    CCTK_REAL CCTK_ATTRIBUTE_UNUSED Jadm1L = 
-      0.0208333333333333333333333333333*(At11L*(3*zL*dgtu112 - 
-      3*yL*dgtu113) + At22L*(3*zL*dgtu222 - 3*yL*dgtu223) + 6*(Atm23 
-      + zL*(At12L*dgtu212 + At13L*dgtu312 + At23L*dgtu322)) - 
-      6*(Atm32 + yL*(At12L*dgtu213 + At13L*dgtu313 + At23L*dgtu323)) 
-      + At33L*(3*zL*dgtu332 - 3*yL*dgtu333) + 
-      zL*(-4*JacPDstandardNth2trK - 48*Pi*S2) + 
-      yL*(4*JacPDstandardNth3trK + 48*Pi*S3))*INV(Pi)*pow(ephi,6);
-    
-    CCTK_REAL CCTK_ATTRIBUTE_UNUSED Jadm2L = 
-      0.0208333333333333333333333333333*(At11L*(-3*zL*dgtu111 + 
-      3*xL*dgtu113) + At22L*(-3*zL*dgtu221 + 3*xL*dgtu223) - 6*(Atm13 
-      + zL*(At12L*dgtu211 + At13L*dgtu311 + At23L*dgtu321)) + 
-      6*(Atm31 + xL*(At12L*dgtu213 + At13L*dgtu313 + At23L*dgtu323)) 
-      + At33L*(-3*zL*dgtu331 + 3*xL*dgtu333) + 
-      zL*(4*JacPDstandardNth1trK + 48*Pi*S1) + 
-      xL*(-4*JacPDstandardNth3trK - 48*Pi*S3))*INV(Pi)*pow(ephi,6);
-    
-    CCTK_REAL CCTK_ATTRIBUTE_UNUSED Jadm3L = 
-      0.0208333333333333333333333333333*(At11L*(3*yL*dgtu111 - 
-      3*xL*dgtu112) + At22L*(3*yL*dgtu221 - 3*xL*dgtu222) + 6*(Atm12 
-      + yL*(At12L*dgtu211 + At13L*dgtu311 + At23L*dgtu321)) - 
-      6*(Atm21 + xL*(At12L*dgtu212 + At13L*dgtu312 + At23L*dgtu322)) 
-      + At33L*(3*yL*dgtu331 - 3*xL*dgtu332) + 
-      yL*(-4*JacPDstandardNth1trK - 48*Pi*S1) + 
-      xL*(4*JacPDstandardNth2trK + 48*Pi*S2))*INV(Pi)*pow(ephi,6);
+    CCTK_REAL CCTK_ATTRIBUTE_UNUSED Jadm1L = 0.0625*(2*Atm23 - 2*Atm32 + 
+      zL*(At11L*dgtu112 + At22L*dgtu222 + 2*(At12L*dgtu212 + 
+      At13L*dgtu312 + At23L*dgtu322) + At33L*dgtu332 - 
+      1.33333333333333333333333333333*JacPDstandardNth2trK - 16*Pi*S2) + 
+      yL*(-(At11L*dgtu113) - 2*At12L*dgtu213 - At22L*dgtu223 - 
+      2*At13L*dgtu313 - 2*At23L*dgtu323 - At33L*dgtu333 + 
+      1.33333333333333333333333333333*JacPDstandardNth3trK + 
+      16*Pi*S3))*INV(Pi)*pow(ephi,6);
+    
+    CCTK_REAL CCTK_ATTRIBUTE_UNUSED Jadm2L = 0.0625*(-2*Atm13 + 2*Atm31 + 
+      zL*(-(At11L*dgtu111) - 2*At12L*dgtu211 - At22L*dgtu221 - 
+      2*At13L*dgtu311 - 2*At23L*dgtu321 - At33L*dgtu331 + 
+      1.33333333333333333333333333333*JacPDstandardNth1trK + 16*Pi*S1) + 
+      xL*(At11L*dgtu113 + At22L*dgtu223 + 2*(At12L*dgtu213 + 
+      At13L*dgtu313 + At23L*dgtu323) + At33L*dgtu333 - 
+      1.33333333333333333333333333333*JacPDstandardNth3trK - 
+      16*Pi*S3))*INV(Pi)*pow(ephi,6);
+    
+    CCTK_REAL CCTK_ATTRIBUTE_UNUSED Jadm3L = 0.0625*(2*Atm12 - 2*Atm21 + 
+      yL*(At11L*dgtu111 + At22L*dgtu221 + 2*(At12L*dgtu211 + 
+      At13L*dgtu311 + At23L*dgtu321) + At33L*dgtu331 - 
+      1.33333333333333333333333333333*JacPDstandardNth1trK - 16*Pi*S1) + 
+      xL*(-(At11L*dgtu112) - 2*At12L*dgtu212 - At22L*dgtu222 - 
+      2*At13L*dgtu312 - 2*At23L*dgtu322 - At33L*dgtu332 + 
+      1.33333333333333333333333333333*JacPDstandardNth2trK + 
+      16*Pi*S2))*INV(Pi)*pow(ephi,6);
     
     /* Copy local copies back to grid functions */
     Jadm1[index] = Jadm1L;
@@ -1581,7 +1586,6 @@ extern "C" void ML_ADMQuantities(CCTK_ARGUMENTS)
   
   const char *const groups[] = {
     "grid::coordinates",
-    "Grid::coordinates",
     "ML_BSSN::ML_curv",
     "ML_BSSN::ML_Gamma",
     "ML_BSSN::ML_lapse",
@@ -1591,7 +1595,7 @@ extern "C" void ML_ADMQuantities(CCTK_ARGUMENTS)
     "ML_BSSN::ML_trace_curv",
     "ML_ADMQuantities::ML_Jadm",
     "ML_ADMQuantities::ML_Madm"};
-  GenericFD_AssertGroupStorage(cctkGH, "ML_ADMQuantities", 11, groups);
+  GenericFD_AssertGroupStorage(cctkGH, "ML_ADMQuantities", 10, groups);
   
   GenericFD_EnsureStencilFits(cctkGH, "ML_ADMQuantities", 2, 2, 2);