Use Ian's version of Kranc, which is found at

<git@github.com:ianhinder/Kranc.git>.

1 files changed, 115 insertions, 137 deletions

diff --git a/ML_BSSN_O2/src/ML_BSSN_O2_convertFromADMBaseGamma.c b/ML_BSSN_O2/src/ML_BSSN_O2_convertFromADMBaseGamma.c
index ef2ad48..8891aa8 100644
--- a/ML_BSSN_O2/src/ML_BSSN_O2_convertFromADMBaseGamma.c
+++ b/ML_BSSN_O2/src/ML_BSSN_O2_convertFromADMBaseGamma.c
@@ -28,23 +28,6 @@ void ML_BSSN_O2_convertFromADMBaseGamma_Body(cGH const * restrict const cctkGH,
   
   /* Declare finite differencing variables */
   
-  /* Declare predefined quantities */
-  // CCTK_REAL p1o2dx = INITVALUE;
-  // CCTK_REAL p1o2dy = INITVALUE;
-  // CCTK_REAL p1o2dz = INITVALUE;
-  // CCTK_REAL p1o4dxdy = INITVALUE;
-  // CCTK_REAL p1o4dxdz = INITVALUE;
-  // CCTK_REAL p1o4dydz = INITVALUE;
-  // CCTK_REAL p1odx = INITVALUE;
-  // CCTK_REAL p1odx2 = INITVALUE;
-  // CCTK_REAL p1ody = INITVALUE;
-  // CCTK_REAL p1ody2 = INITVALUE;
-  // CCTK_REAL p1odz = INITVALUE;
-  // CCTK_REAL p1odz2 = INITVALUE;
-  // CCTK_REAL pm1o2dx = INITVALUE;
-  // CCTK_REAL pm1o2dy = INITVALUE;
-  // CCTK_REAL pm1o2dz = INITVALUE;
-  
   if (verbose > 1)
   {
     CCTK_VInfo(CCTK_THORNSTRING,"Entering ML_BSSN_O2_convertFromADMBaseGamma_Body");
@@ -100,34 +83,7 @@ void ML_BSSN_O2_convertFromADMBaseGamma_Body(cGH const * restrict const cctkGH,
             cctk_lsh[0],cctk_lsh[1],cctk_lsh[2])
   {
     // int index = INITVALUE;
-    // int subblock_index = INITVALUE;
     int const index = CCTK_GFINDEX3D(cctkGH,i,j,k);
-    int const subblock_index = i - min[0] + (max[0] - min[0]) * (j - min[1] + (max[1]-min[1]) * (k - min[2]));
-    
-    /* Declare shorthands */
-    // CCTK_REAL detgt = INITVALUE;
-    // CCTK_REAL dir1 = INITVALUE, dir2 = INITVALUE, dir3 = INITVALUE;
-    // CCTK_REAL Gt111 = INITVALUE, Gt112 = INITVALUE, Gt113 = INITVALUE, Gt122 = INITVALUE, Gt123 = INITVALUE, Gt133 = INITVALUE;
-    // CCTK_REAL Gt211 = INITVALUE, Gt212 = INITVALUE, Gt213 = INITVALUE, Gt222 = INITVALUE, Gt223 = INITVALUE, Gt233 = INITVALUE;
-    // CCTK_REAL Gt311 = INITVALUE, Gt312 = INITVALUE, Gt313 = INITVALUE, Gt322 = INITVALUE, Gt323 = INITVALUE, Gt333 = INITVALUE;
-    // CCTK_REAL gtu11 = INITVALUE, gtu21 = INITVALUE, gtu22 = INITVALUE, gtu31 = INITVALUE, gtu32 = INITVALUE, gtu33 = INITVALUE;
-    
-    /* Declare local copies of grid functions */
-    // CCTK_REAL AL = INITVALUE;
-    // CCTK_REAL alphaL = INITVALUE;
-    // CCTK_REAL B1L = INITVALUE, B2L = INITVALUE, B3L = INITVALUE;
-    // CCTK_REAL beta1L = INITVALUE, beta2L = INITVALUE, beta3L = INITVALUE;
-    // CCTK_REAL betaxL = INITVALUE;
-    // CCTK_REAL betayL = INITVALUE;
-    // CCTK_REAL betazL = INITVALUE;
-    // CCTK_REAL dtalpL = INITVALUE;
-    // CCTK_REAL dtbetaxL = INITVALUE;
-    // CCTK_REAL dtbetayL = INITVALUE;
-    // CCTK_REAL dtbetazL = INITVALUE;
-    // CCTK_REAL gt11L = INITVALUE, gt12L = INITVALUE, gt13L = INITVALUE, gt22L = INITVALUE, gt23L = INITVALUE, gt33L = INITVALUE;
-    // CCTK_REAL Xt1L = INITVALUE, Xt2L = INITVALUE, Xt3L = INITVALUE;
-    /* Declare precomputed derivatives*/
-    
     /* Declare derivatives */
     // CCTK_REAL PDstandardNth1gt11 = INITVALUE;
     // CCTK_REAL PDstandardNth2gt11 = INITVALUE;
@@ -149,29 +105,27 @@ void ML_BSSN_O2_convertFromADMBaseGamma_Body(cGH const * restrict const cctkGH,
     // CCTK_REAL PDstandardNth3gt33 = INITVALUE;
     
     /* Assign local copies of grid functions */
-    CCTK_REAL const alphaL = alpha[index];
-    CCTK_REAL const beta1L = beta1[index];
-    CCTK_REAL const beta2L = beta2[index];
-    CCTK_REAL const beta3L = beta3[index];
-    CCTK_REAL const betaxL = betax[index];
-    CCTK_REAL const betayL = betay[index];
-    CCTK_REAL const betazL = betaz[index];
-    CCTK_REAL const dtalpL = dtalp[index];
-    CCTK_REAL const dtbetaxL = dtbetax[index];
-    CCTK_REAL const dtbetayL = dtbetay[index];
-    CCTK_REAL const dtbetazL = dtbetaz[index];
-    CCTK_REAL const gt11L = gt11[index];
-    CCTK_REAL const gt12L = gt12[index];
-    CCTK_REAL const gt13L = gt13[index];
-    CCTK_REAL const gt22L = gt22[index];
-    CCTK_REAL const gt23L = gt23[index];
-    CCTK_REAL const gt33L = gt33[index];
-    
-    /* Assign local copies of subblock grid functions */
+    CCTK_REAL  alphaL = alpha[index];
+    CCTK_REAL  beta1L = beta1[index];
+    CCTK_REAL  beta2L = beta2[index];
+    CCTK_REAL  beta3L = beta3[index];
+    CCTK_REAL  betaxL = betax[index];
+    CCTK_REAL  betayL = betay[index];
+    CCTK_REAL  betazL = betaz[index];
+    CCTK_REAL  dtalpL = dtalp[index];
+    CCTK_REAL  dtbetaxL = dtbetax[index];
+    CCTK_REAL  dtbetayL = dtbetay[index];
+    CCTK_REAL  dtbetazL = dtbetaz[index];
+    CCTK_REAL  gt11L = gt11[index];
+    CCTK_REAL  gt12L = gt12[index];
+    CCTK_REAL  gt13L = gt13[index];
+    CCTK_REAL  gt22L = gt22[index];
+    CCTK_REAL  gt23L = gt23[index];
+    CCTK_REAL  gt33L = gt33[index];
     
     /* Include user supplied include files */
     
-    /* Precompute derivatives (new style) */
+    /* Precompute derivatives */
     CCTK_REAL const PDstandardNth1gt11 = PDstandardNth1(gt11, i, j, k);
     CCTK_REAL const PDstandardNth2gt11 = PDstandardNth2(gt11, i, j, k);
     CCTK_REAL const PDstandardNth3gt11 = PDstandardNth3(gt11, i, j, k);
@@ -191,111 +145,137 @@ void ML_BSSN_O2_convertFromADMBaseGamma_Body(cGH const * restrict const cctkGH,
     CCTK_REAL const PDstandardNth2gt33 = PDstandardNth2(gt33, i, j, k);
     CCTK_REAL const PDstandardNth3gt33 = PDstandardNth3(gt33, i, j, k);
     
-    /* Precompute derivatives (old style) */
-    
     /* Calculate temporaries and grid functions */
-    int const dir1  =  Sign(beta1L);
+    int dir1 = Sign(beta1L);
     
-    int const dir2  =  Sign(beta2L);
+    int dir2 = Sign(beta2L);
     
-    int const dir3  =  Sign(beta3L);
+    int dir3 = Sign(beta3L);
     
-    CCTK_REAL const detgt  =  1;
+    CCTK_REAL detgt = 1;
     
-    CCTK_REAL const gtu11  =  INV(detgt)*(gt22L*gt33L - SQR(gt23L));
+    CCTK_REAL gtu11 = INV(detgt)*(gt22L*gt33L - SQR(gt23L));
     
-    CCTK_REAL const gtu21  =  (gt13L*gt23L - gt12L*gt33L)*INV(detgt);
+    CCTK_REAL gtu21 = (gt13L*gt23L - gt12L*gt33L)*INV(detgt);
     
-    CCTK_REAL const gtu31  =  (-(gt13L*gt22L) + gt12L*gt23L)*INV(detgt);
+    CCTK_REAL gtu31 = (-(gt13L*gt22L) + gt12L*gt23L)*INV(detgt);
     
-    CCTK_REAL const gtu22  =  INV(detgt)*(gt11L*gt33L - SQR(gt13L));
+    CCTK_REAL gtu22 = INV(detgt)*(gt11L*gt33L - SQR(gt13L));
     
-    CCTK_REAL const gtu32  =  (gt12L*gt13L - gt11L*gt23L)*INV(detgt);
+    CCTK_REAL gtu32 = (gt12L*gt13L - gt11L*gt23L)*INV(detgt);
     
-    CCTK_REAL const gtu33  =  INV(detgt)*(gt11L*gt22L - SQR(gt12L));
+    CCTK_REAL gtu33 = INV(detgt)*(gt11L*gt22L - SQR(gt12L));
     
-    CCTK_REAL const Gt111  =  khalf*(gtu11*PDstandardNth1gt11 + 2*(gtu21*PDstandardNth1gt12 + gtu31*PDstandardNth1gt13) - 
-          gtu21*PDstandardNth2gt11 - gtu31*PDstandardNth3gt11);
+    CCTK_REAL Gt111 = khalf*(gtu11*PDstandardNth1gt11 + 
+      2*(gtu21*PDstandardNth1gt12 + gtu31*PDstandardNth1gt13) - 
+      gtu21*PDstandardNth2gt11 - gtu31*PDstandardNth3gt11);
     
-    CCTK_REAL const Gt211  =  khalf*(gtu21*PDstandardNth1gt11 + 2*(gtu22*PDstandardNth1gt12 + gtu32*PDstandardNth1gt13) - 
-          gtu22*PDstandardNth2gt11 - gtu32*PDstandardNth3gt11);
+    CCTK_REAL Gt211 = khalf*(gtu21*PDstandardNth1gt11 + 
+      2*(gtu22*PDstandardNth1gt12 + gtu32*PDstandardNth1gt13) - 
+      gtu22*PDstandardNth2gt11 - gtu32*PDstandardNth3gt11);
     
-    CCTK_REAL const Gt311  =  khalf*(gtu31*PDstandardNth1gt11 + 2*(gtu32*PDstandardNth1gt12 + gtu33*PDstandardNth1gt13) - 
-          gtu32*PDstandardNth2gt11 - gtu33*PDstandardNth3gt11);
+    CCTK_REAL Gt311 = khalf*(gtu31*PDstandardNth1gt11 + 
+      2*(gtu32*PDstandardNth1gt12 + gtu33*PDstandardNth1gt13) - 
+      gtu32*PDstandardNth2gt11 - gtu33*PDstandardNth3gt11);
     
-    CCTK_REAL const Gt112  =  khalf*(gtu21*PDstandardNth1gt22 + gtu11*PDstandardNth2gt11 + 
-          gtu31*(PDstandardNth1gt23 + PDstandardNth2gt13 - PDstandardNth3gt12));
+    CCTK_REAL Gt112 = khalf*(gtu21*PDstandardNth1gt22 + 
+      gtu11*PDstandardNth2gt11 + gtu31*(PDstandardNth1gt23 + 
+      PDstandardNth2gt13 - PDstandardNth3gt12));
     
-    CCTK_REAL const Gt212  =  khalf*(gtu22*PDstandardNth1gt22 + gtu21*PDstandardNth2gt11 + 
-          gtu32*(PDstandardNth1gt23 + PDstandardNth2gt13 - PDstandardNth3gt12));
+    CCTK_REAL Gt212 = khalf*(gtu22*PDstandardNth1gt22 + 
+      gtu21*PDstandardNth2gt11 + gtu32*(PDstandardNth1gt23 + 
+      PDstandardNth2gt13 - PDstandardNth3gt12));
     
-    CCTK_REAL const Gt312  =  khalf*(gtu32*PDstandardNth1gt22 + gtu31*PDstandardNth2gt11 + 
-          gtu33*(PDstandardNth1gt23 + PDstandardNth2gt13 - PDstandardNth3gt12));
+    CCTK_REAL Gt312 = khalf*(gtu32*PDstandardNth1gt22 + 
+      gtu31*PDstandardNth2gt11 + gtu33*(PDstandardNth1gt23 + 
+      PDstandardNth2gt13 - PDstandardNth3gt12));
     
-    CCTK_REAL const Gt113  =  khalf*(gtu31*PDstandardNth1gt33 + gtu11*PDstandardNth3gt11 + 
-          gtu21*(PDstandardNth1gt23 - PDstandardNth2gt13 + PDstandardNth3gt12));
+    CCTK_REAL Gt113 = khalf*(gtu31*PDstandardNth1gt33 + 
+      gtu11*PDstandardNth3gt11 + gtu21*(PDstandardNth1gt23 - 
+      PDstandardNth2gt13 + PDstandardNth3gt12));
     
-    CCTK_REAL const Gt213  =  khalf*(gtu32*PDstandardNth1gt33 + gtu21*PDstandardNth3gt11 + 
-          gtu22*(PDstandardNth1gt23 - PDstandardNth2gt13 + PDstandardNth3gt12));
+    CCTK_REAL Gt213 = khalf*(gtu32*PDstandardNth1gt33 + 
+      gtu21*PDstandardNth3gt11 + gtu22*(PDstandardNth1gt23 - 
+      PDstandardNth2gt13 + PDstandardNth3gt12));
     
-    CCTK_REAL const Gt313  =  khalf*(gtu33*PDstandardNth1gt33 + gtu31*PDstandardNth3gt11 + 
-          gtu32*(PDstandardNth1gt23 - PDstandardNth2gt13 + PDstandardNth3gt12));
+    CCTK_REAL Gt313 = khalf*(gtu33*PDstandardNth1gt33 + 
+      gtu31*PDstandardNth3gt11 + gtu32*(PDstandardNth1gt23 - 
+      PDstandardNth2gt13 + PDstandardNth3gt12));
     
-    CCTK_REAL const Gt122  =  khalf*(gtu11*(-PDstandardNth1gt22 + 2*PDstandardNth2gt12) + gtu21*PDstandardNth2gt22 + 
-          gtu31*(2*PDstandardNth2gt23 - PDstandardNth3gt22));
+    CCTK_REAL Gt122 = khalf*(gtu11*(-PDstandardNth1gt22 + 
+      2*PDstandardNth2gt12) + gtu21*PDstandardNth2gt22 + 
+      gtu31*(2*PDstandardNth2gt23 - PDstandardNth3gt22));
     
-    CCTK_REAL const Gt222  =  khalf*(gtu21*(-PDstandardNth1gt22 + 2*PDstandardNth2gt12) + gtu22*PDstandardNth2gt22 + 
-          gtu32*(2*PDstandardNth2gt23 - PDstandardNth3gt22));
+    CCTK_REAL Gt222 = khalf*(gtu21*(-PDstandardNth1gt22 + 
+      2*PDstandardNth2gt12) + gtu22*PDstandardNth2gt22 + 
+      gtu32*(2*PDstandardNth2gt23 - PDstandardNth3gt22));
     
-    CCTK_REAL const Gt322  =  khalf*(gtu31*(-PDstandardNth1gt22 + 2*PDstandardNth2gt12) + gtu32*PDstandardNth2gt22 + 
-          gtu33*(2*PDstandardNth2gt23 - PDstandardNth3gt22));
+    CCTK_REAL Gt322 = khalf*(gtu31*(-PDstandardNth1gt22 + 
+      2*PDstandardNth2gt12) + gtu32*PDstandardNth2gt22 + 
+      gtu33*(2*PDstandardNth2gt23 - PDstandardNth3gt22));
     
-    CCTK_REAL const Gt123  =  khalf*(gtu31*PDstandardNth2gt33 + gtu11*(-PDstandardNth1gt23 + PDstandardNth2gt13 + PDstandardNth3gt12) + 
-          gtu21*PDstandardNth3gt22);
+    CCTK_REAL Gt123 = khalf*(gtu31*PDstandardNth2gt33 + 
+      gtu11*(-PDstandardNth1gt23 + PDstandardNth2gt13 + PDstandardNth3gt12) + 
+      gtu21*PDstandardNth3gt22);
     
-    CCTK_REAL const Gt223  =  khalf*(gtu32*PDstandardNth2gt33 + gtu21*(-PDstandardNth1gt23 + PDstandardNth2gt13 + PDstandardNth3gt12) + 
-          gtu22*PDstandardNth3gt22);
+    CCTK_REAL Gt223 = khalf*(gtu32*PDstandardNth2gt33 + 
+      gtu21*(-PDstandardNth1gt23 + PDstandardNth2gt13 + PDstandardNth3gt12) + 
+      gtu22*PDstandardNth3gt22);
     
-    CCTK_REAL const Gt323  =  khalf*(gtu33*PDstandardNth2gt33 + gtu31*(-PDstandardNth1gt23 + PDstandardNth2gt13 + PDstandardNth3gt12) + 
-          gtu32*PDstandardNth3gt22);
+    CCTK_REAL Gt323 = khalf*(gtu33*PDstandardNth2gt33 + 
+      gtu31*(-PDstandardNth1gt23 + PDstandardNth2gt13 + PDstandardNth3gt12) + 
+      gtu32*PDstandardNth3gt22);
     
-    CCTK_REAL const Gt133  =  khalf*(-(gtu11*PDstandardNth1gt33) - gtu21*PDstandardNth2gt33 + 2*gtu11*PDstandardNth3gt13 + 
-          2*gtu21*PDstandardNth3gt23 + gtu31*PDstandardNth3gt33);
+    CCTK_REAL Gt133 = khalf*(-(gtu11*PDstandardNth1gt33) - 
+      gtu21*PDstandardNth2gt33 + 2*gtu11*PDstandardNth3gt13 + 
+      2*gtu21*PDstandardNth3gt23 + gtu31*PDstandardNth3gt33);
     
-    CCTK_REAL const Gt233  =  khalf*(-(gtu21*PDstandardNth1gt33) - gtu22*PDstandardNth2gt33 + 2*gtu21*PDstandardNth3gt13 + 
-          2*gtu22*PDstandardNth3gt23 + gtu32*PDstandardNth3gt33);
+    CCTK_REAL Gt233 = khalf*(-(gtu21*PDstandardNth1gt33) - 
+      gtu22*PDstandardNth2gt33 + 2*gtu21*PDstandardNth3gt13 + 
+      2*gtu22*PDstandardNth3gt23 + gtu32*PDstandardNth3gt33);
     
-    CCTK_REAL const Gt333  =  khalf*(-(gtu31*PDstandardNth1gt33) - gtu32*PDstandardNth2gt33 + 2*gtu31*PDstandardNth3gt13 + 
-          2*gtu32*PDstandardNth3gt23 + gtu33*PDstandardNth3gt33);
+    CCTK_REAL Gt333 = khalf*(-(gtu31*PDstandardNth1gt33) - 
+      gtu32*PDstandardNth2gt33 + 2*gtu31*PDstandardNth3gt13 + 
+      2*gtu32*PDstandardNth3gt23 + gtu33*PDstandardNth3gt33);
     
-    CCTK_REAL const Xt1L  =  Gt111*gtu11 + Gt122*gtu22 + 2*(Gt112*gtu21 + Gt113*gtu31 + Gt123*gtu32) + Gt133*gtu33;
+    CCTK_REAL Xt1L = Gt111*gtu11 + Gt122*gtu22 + 2*(Gt112*gtu21 + 
+      Gt113*gtu31 + Gt123*gtu32) + Gt133*gtu33;
     
-    CCTK_REAL const Xt2L  =  Gt211*gtu11 + Gt222*gtu22 + 2*(Gt212*gtu21 + Gt213*gtu31 + Gt223*gtu32) + Gt233*gtu33;
+    CCTK_REAL Xt2L = Gt211*gtu11 + Gt222*gtu22 + 2*(Gt212*gtu21 + 
+      Gt213*gtu31 + Gt223*gtu32) + Gt233*gtu33;
     
-    CCTK_REAL const Xt3L  =  Gt311*gtu11 + Gt322*gtu22 + 2*(Gt312*gtu21 + Gt313*gtu31 + Gt323*gtu32) + Gt333*gtu33;
+    CCTK_REAL Xt3L = Gt311*gtu11 + Gt322*gtu22 + 2*(Gt312*gtu21 + 
+      Gt313*gtu31 + Gt323*gtu32) + Gt333*gtu33;
     
-    CCTK_REAL const AL  =  -(dtalpL*(-1 + LapseAdvectionCoeff)*INV(harmonicF)*pow(alphaL,-harmonicN));
+    CCTK_REAL AL = -(dtalpL*(-1 + 
+      LapseAdvectionCoeff)*INV(harmonicF)*pow(alphaL,-harmonicN));
     
-    CCTK_REAL const B1L  =  6*IfThen(ShiftGammaCoeff != 0,dtbetaxL*INV(ShiftGammaCoeff),0) + 
-        IfThen(ShiftGammaCoeff != 0,(dtbetaxL - PDupwindNth1(betax, i, j, k)*beta1L*ShiftAdvectionCoeff)*
-          INV(ShiftGammaCoeff),0) + IfThen(ShiftGammaCoeff != 0,
-         (dtbetaxL - PDupwindNth2(betax, i, j, k)*beta2L*ShiftAdvectionCoeff)*INV(ShiftGammaCoeff),0) + 
-        IfThen(ShiftGammaCoeff != 0,(dtbetaxL - PDupwindNth3(betax, i, j, k)*beta3L*ShiftAdvectionCoeff)*
-          INV(ShiftGammaCoeff),0);
+    CCTK_REAL B1L = 6*IfThen(ShiftGammaCoeff != 
+      0,dtbetaxL*INV(ShiftGammaCoeff),0) + IfThen(ShiftGammaCoeff != 
+      0,(dtbetaxL - PDupwindNth1(betax, i, j, 
+      k)*beta1L*ShiftAdvectionCoeff)*INV(ShiftGammaCoeff),0) + 
+      IfThen(ShiftGammaCoeff != 0,(dtbetaxL - PDupwindNth2(betax, i, j, 
+      k)*beta2L*ShiftAdvectionCoeff)*INV(ShiftGammaCoeff),0) + 
+      IfThen(ShiftGammaCoeff != 0,(dtbetaxL - PDupwindNth3(betax, i, j, 
+      k)*beta3L*ShiftAdvectionCoeff)*INV(ShiftGammaCoeff),0);
     
-    CCTK_REAL const B2L  =  6*IfThen(ShiftGammaCoeff != 0,dtbetayL*INV(ShiftGammaCoeff),0) + 
-        IfThen(ShiftGammaCoeff != 0,(dtbetayL - PDupwindNth1(betay, i, j, k)*beta1L*ShiftAdvectionCoeff)*
-          INV(ShiftGammaCoeff),0) + IfThen(ShiftGammaCoeff != 0,
-         (dtbetayL - PDupwindNth2(betay, i, j, k)*beta2L*ShiftAdvectionCoeff)*INV(ShiftGammaCoeff),0) + 
-        IfThen(ShiftGammaCoeff != 0,(dtbetayL - PDupwindNth3(betay, i, j, k)*beta3L*ShiftAdvectionCoeff)*
-          INV(ShiftGammaCoeff),0);
-    
-    CCTK_REAL const B3L  =  6*IfThen(ShiftGammaCoeff != 0,dtbetazL*INV(ShiftGammaCoeff),0) + 
-        IfThen(ShiftGammaCoeff != 0,(dtbetazL - PDupwindNth1(betaz, i, j, k)*beta1L*ShiftAdvectionCoeff)*
-          INV(ShiftGammaCoeff),0) + IfThen(ShiftGammaCoeff != 0,
-         (dtbetazL - PDupwindNth2(betaz, i, j, k)*beta2L*ShiftAdvectionCoeff)*INV(ShiftGammaCoeff),0) + 
-        IfThen(ShiftGammaCoeff != 0,(dtbetazL - PDupwindNth3(betaz, i, j, k)*beta3L*ShiftAdvectionCoeff)*
-          INV(ShiftGammaCoeff),0);
+    CCTK_REAL B2L = 6*IfThen(ShiftGammaCoeff != 
+      0,dtbetayL*INV(ShiftGammaCoeff),0) + IfThen(ShiftGammaCoeff != 
+      0,(dtbetayL - PDupwindNth1(betay, i, j, 
+      k)*beta1L*ShiftAdvectionCoeff)*INV(ShiftGammaCoeff),0) + 
+      IfThen(ShiftGammaCoeff != 0,(dtbetayL - PDupwindNth2(betay, i, j, 
+      k)*beta2L*ShiftAdvectionCoeff)*INV(ShiftGammaCoeff),0) + 
+      IfThen(ShiftGammaCoeff != 0,(dtbetayL - PDupwindNth3(betay, i, j, 
+      k)*beta3L*ShiftAdvectionCoeff)*INV(ShiftGammaCoeff),0);
+    
+    CCTK_REAL B3L = 6*IfThen(ShiftGammaCoeff != 
+      0,dtbetazL*INV(ShiftGammaCoeff),0) + IfThen(ShiftGammaCoeff != 
+      0,(dtbetazL - PDupwindNth1(betaz, i, j, 
+      k)*beta1L*ShiftAdvectionCoeff)*INV(ShiftGammaCoeff),0) + 
+      IfThen(ShiftGammaCoeff != 0,(dtbetazL - PDupwindNth2(betaz, i, j, 
+      k)*beta2L*ShiftAdvectionCoeff)*INV(ShiftGammaCoeff),0) + 
+      IfThen(ShiftGammaCoeff != 0,(dtbetazL - PDupwindNth3(betaz, i, j, 
+      k)*beta3L*ShiftAdvectionCoeff)*INV(ShiftGammaCoeff),0);
     
     
     /* Copy local copies back to grid functions */
@@ -306,8 +286,6 @@ void ML_BSSN_O2_convertFromADMBaseGamma_Body(cGH const * restrict const cctkGH,
     Xt1[index] = Xt1L;
     Xt2[index] = Xt2L;
     Xt3[index] = Xt3L;
-    
-    /* Copy local copies back to subblock grid functions */
   }
   LC_ENDLOOP3 (ML_BSSN_O2_convertFromADMBaseGamma);
 }