Regenerate code after Kranc change

18 files changed, 36 insertions, 36 deletions

diff --git a/ML_CCZ4/src/ML_CCZ4_Advect.cc b/ML_CCZ4/src/ML_CCZ4_Advect.cc
index 1c87f3d..0a1d8ca 100644
--- a/ML_CCZ4/src/ML_CCZ4_Advect.cc
+++ b/ML_CCZ4/src/ML_CCZ4_Advect.cc
@@ -236,7 +236,7 @@ static void ML_CCZ4_Advect_Body(cGH const * restrict const cctkGH, int const dir
   CCTK_LOOP3STR(ML_CCZ4_Advect,
     i,j,k, imin[0],imin[1],imin[2], imax[0],imax[1],imax[2],
     cctk_ash[0],cctk_ash[1],cctk_ash[2],
-    imin,imax, CCTK_REAL_VEC_SIZE)
+    kimin,kimax, CCTK_REAL_VEC_SIZE)
   {
     ptrdiff_t /*const*/ index CCTK_ATTRIBUTE_UNUSED  = di*i + dj*j + dk*k;
     
@@ -2142,7 +2142,7 @@ static void ML_CCZ4_Advect_Body(cGH const * restrict const cctkGH, int const dir
       + ShiftAdvectionCoeff)))),ToReal(ShiftBCoeff),B3rhsL);
     
     /* Copy local copies back to grid functions */
-    vec_store_partial_prepare(i,lc_imin,lc_imax);
+    vec_store_partial_prepare(i,kimin,kimax);
     vec_store_nta_partial(alpharhs[index],alpharhsL);
     vec_store_nta_partial(Arhs[index],ArhsL);
     vec_store_nta_partial(At11rhs[index],At11rhsL);
diff --git a/ML_CCZ4/src/ML_CCZ4_Dissipation.cc b/ML_CCZ4/src/ML_CCZ4_Dissipation.cc
index 1407243..48ebe3a 100644
--- a/ML_CCZ4/src/ML_CCZ4_Dissipation.cc
+++ b/ML_CCZ4/src/ML_CCZ4_Dissipation.cc
@@ -236,7 +236,7 @@ static void ML_CCZ4_Dissipation_Body(cGH const * restrict const cctkGH, int cons
   CCTK_LOOP3STR(ML_CCZ4_Dissipation,
     i,j,k, imin[0],imin[1],imin[2], imax[0],imax[1],imax[2],
     cctk_ash[0],cctk_ash[1],cctk_ash[2],
-    imin,imax, CCTK_REAL_VEC_SIZE)
+    kimin,kimax, CCTK_REAL_VEC_SIZE)
   {
     ptrdiff_t /*const*/ index CCTK_ATTRIBUTE_UNUSED  = di*i + dj*j + dk*k;
     
@@ -1280,7 +1280,7 @@ static void ML_CCZ4_Dissipation_Body(cGH const * restrict const cctkGH, int cons
       kadd(B3rhsL,kmadd(epsdiss1,JacPDdissipationNth1B3,kmadd(epsdiss2,JacPDdissipationNth2B3,kmul(epsdiss3,JacPDdissipationNth3B3))));
     
     /* Copy local copies back to grid functions */
-    vec_store_partial_prepare(i,lc_imin,lc_imax);
+    vec_store_partial_prepare(i,kimin,kimax);
     vec_store_nta_partial(alpharhs[index],alpharhsL);
     vec_store_nta_partial(Arhs[index],ArhsL);
     vec_store_nta_partial(At11rhs[index],At11rhsL);
diff --git a/ML_CCZ4/src/ML_CCZ4_InitGamma.cc b/ML_CCZ4/src/ML_CCZ4_InitGamma.cc
index 6c12fbe..e9a0ee8 100644
--- a/ML_CCZ4/src/ML_CCZ4_InitGamma.cc
+++ b/ML_CCZ4/src/ML_CCZ4_InitGamma.cc
@@ -197,7 +197,7 @@ static void ML_CCZ4_InitGamma_Body(cGH const * restrict const cctkGH, int const
   CCTK_LOOP3STR(ML_CCZ4_InitGamma,
     i,j,k, imin[0],imin[1],imin[2], imax[0],imax[1],imax[2],
     cctk_ash[0],cctk_ash[1],cctk_ash[2],
-    imin,imax, CCTK_REAL_VEC_SIZE)
+    kimin,kimax, CCTK_REAL_VEC_SIZE)
   {
     ptrdiff_t /*const*/ index CCTK_ATTRIBUTE_UNUSED  = di*i + dj*j + dk*k;
     
@@ -241,7 +241,7 @@ static void ML_CCZ4_InitGamma_Body(cGH const * restrict const cctkGH, int const
     CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED B3L = ToReal(0.);
     
     /* Copy local copies back to grid functions */
-    vec_store_partial_prepare(i,lc_imin,lc_imax);
+    vec_store_partial_prepare(i,kimin,kimax);
     vec_store_nta_partial(A[index],AL);
     vec_store_nta_partial(B1[index],B1L);
     vec_store_nta_partial(B2[index],B2L);
diff --git a/ML_CCZ4/src/ML_CCZ4_InitRHS.cc b/ML_CCZ4/src/ML_CCZ4_InitRHS.cc
index bc94138..70c4903 100644
--- a/ML_CCZ4/src/ML_CCZ4_InitRHS.cc
+++ b/ML_CCZ4/src/ML_CCZ4_InitRHS.cc
@@ -197,7 +197,7 @@ static void ML_CCZ4_InitRHS_Body(cGH const * restrict const cctkGH, int const di
   CCTK_LOOP3STR(ML_CCZ4_InitRHS,
     i,j,k, imin[0],imin[1],imin[2], imax[0],imax[1],imax[2],
     cctk_ash[0],cctk_ash[1],cctk_ash[2],
-    imin,imax, CCTK_REAL_VEC_SIZE)
+    kimin,kimax, CCTK_REAL_VEC_SIZE)
   {
     ptrdiff_t /*const*/ index CCTK_ATTRIBUTE_UNUSED  = di*i + dj*j + dk*k;
     
@@ -279,7 +279,7 @@ static void ML_CCZ4_InitRHS_Body(cGH const * restrict const cctkGH, int const di
     CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED ThetarhsL = ToReal(0.);
     
     /* Copy local copies back to grid functions */
-    vec_store_partial_prepare(i,lc_imin,lc_imax);
+    vec_store_partial_prepare(i,kimin,kimax);
     vec_store_nta_partial(alpharhs[index],alpharhsL);
     vec_store_nta_partial(Arhs[index],ArhsL);
     vec_store_nta_partial(At11rhs[index],At11rhsL);
diff --git a/ML_CCZ4/src/ML_CCZ4_Minkowski.cc b/ML_CCZ4/src/ML_CCZ4_Minkowski.cc
index b0eacc6..afeb35b 100644
--- a/ML_CCZ4/src/ML_CCZ4_Minkowski.cc
+++ b/ML_CCZ4/src/ML_CCZ4_Minkowski.cc
@@ -197,7 +197,7 @@ static void ML_CCZ4_Minkowski_Body(cGH const * restrict const cctkGH, int const
   CCTK_LOOP3STR(ML_CCZ4_Minkowski,
     i,j,k, imin[0],imin[1],imin[2], imax[0],imax[1],imax[2],
     cctk_ash[0],cctk_ash[1],cctk_ash[2],
-    imin,imax, CCTK_REAL_VEC_SIZE)
+    kimin,kimax, CCTK_REAL_VEC_SIZE)
   {
     ptrdiff_t /*const*/ index CCTK_ATTRIBUTE_UNUSED  = di*i + dj*j + dk*k;
     
@@ -280,7 +280,7 @@ static void ML_CCZ4_Minkowski_Body(cGH const * restrict const cctkGH, int const
     CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED ThetaL = ToReal(0.);
     
     /* Copy local copies back to grid functions */
-    vec_store_partial_prepare(i,lc_imin,lc_imax);
+    vec_store_partial_prepare(i,kimin,kimax);
     vec_store_nta_partial(A[index],AL);
     vec_store_nta_partial(alpha[index],alphaL);
     vec_store_nta_partial(At11[index],At11L);
diff --git a/ML_CCZ4/src/ML_CCZ4_RHS1.cc b/ML_CCZ4/src/ML_CCZ4_RHS1.cc
index 392a560..472c228 100644
--- a/ML_CCZ4/src/ML_CCZ4_RHS1.cc
+++ b/ML_CCZ4/src/ML_CCZ4_RHS1.cc
@@ -233,7 +233,7 @@ static void ML_CCZ4_RHS1_Body(cGH const * restrict const cctkGH, int const dir,
   CCTK_LOOP3STR(ML_CCZ4_RHS1,
     i,j,k, imin[0],imin[1],imin[2], imax[0],imax[1],imax[2],
     cctk_ash[0],cctk_ash[1],cctk_ash[2],
-    imin,imax, CCTK_REAL_VEC_SIZE)
+    kimin,kimax, CCTK_REAL_VEC_SIZE)
   {
     ptrdiff_t /*const*/ index CCTK_ATTRIBUTE_UNUSED  = di*i + dj*j + dk*k;
     
@@ -2312,7 +2312,7 @@ static void ML_CCZ4_RHS1_Body(cGH const * restrict const cctkGH, int const dir,
       kmul(kmadd(B3L,kmul(eta,ToReal(-1.*BetaDriver)),dotXt3),ToReal(ShiftBCoeff));
     
     /* Copy local copies back to grid functions */
-    vec_store_partial_prepare(i,lc_imin,lc_imax);
+    vec_store_partial_prepare(i,kimin,kimax);
     vec_store_nta_partial(alpharhs[index],alpharhsL);
     vec_store_nta_partial(Arhs[index],ArhsL);
     vec_store_nta_partial(B1rhs[index],B1rhsL);
diff --git a/ML_CCZ4/src/ML_CCZ4_RHS2.cc b/ML_CCZ4/src/ML_CCZ4_RHS2.cc
index f0d7eae..be21b81 100644
--- a/ML_CCZ4/src/ML_CCZ4_RHS2.cc
+++ b/ML_CCZ4/src/ML_CCZ4_RHS2.cc
@@ -209,7 +209,7 @@ static void ML_CCZ4_RHS2_Body(cGH const * restrict const cctkGH, int const dir,
   CCTK_LOOP3STR(ML_CCZ4_RHS2,
     i,j,k, imin[0],imin[1],imin[2], imax[0],imax[1],imax[2],
     cctk_ash[0],cctk_ash[1],cctk_ash[2],
-    imin,imax, CCTK_REAL_VEC_SIZE)
+    kimin,kimax, CCTK_REAL_VEC_SIZE)
   {
     ptrdiff_t /*const*/ index CCTK_ATTRIBUTE_UNUSED  = di*i + dj*j + dk*k;
     
@@ -1847,7 +1847,7 @@ static void ML_CCZ4_RHS2_Body(cGH const * restrict const cctkGH, int const dir,
       kmadd(At33L,kmul(kadd(JacPDstandardNth1beta1,kadd(JacPDstandardNth2beta2,JacPDstandardNth3beta3)),ToReal(-0.666666666666666666666666666667)),kmadd(em4phi,kmadd(g33,kmul(trAts,ToReal(-0.333333333333333333333333333333)),Ats33),kmadd(alphaL,kmadd(kmadd(At13L,Atm13,kmadd(At23L,Atm23,kmul(At33L,Atm33))),ToReal(-2.),kmadd(At33L,kmadd(ThetaL,ToReal(-2.),trKL),kmul(em4phi,kmul(ToReal(-25.132741228718345),kmadd(g33,kmul(trS,ToReal(-0.333333333333333333333333333333)),eTzzL))))),kmul(kmadd(At13L,JacPDstandardNth3beta1,kmadd(At23L,JacPDstandardNth3beta2,kmul(At33L,JacPDstandardNth3beta3))),ToReal(2.)))));
     
     /* Copy local copies back to grid functions */
-    vec_store_partial_prepare(i,lc_imin,lc_imax);
+    vec_store_partial_prepare(i,kimin,kimax);
     vec_store_nta_partial(At11rhs[index],At11rhsL);
     vec_store_nta_partial(At12rhs[index],At12rhsL);
     vec_store_nta_partial(At13rhs[index],At13rhsL);
diff --git a/ML_CCZ4/src/ML_CCZ4_RHSStaticBoundary.cc b/ML_CCZ4/src/ML_CCZ4_RHSStaticBoundary.cc
index 5baa773..f638511 100644
--- a/ML_CCZ4/src/ML_CCZ4_RHSStaticBoundary.cc
+++ b/ML_CCZ4/src/ML_CCZ4_RHSStaticBoundary.cc
@@ -236,7 +236,7 @@ static void ML_CCZ4_RHSStaticBoundary_Body(cGH const * restrict const cctkGH, in
   CCTK_LOOP3STR(ML_CCZ4_RHSStaticBoundary,
     i,j,k, imin[0],imin[1],imin[2], imax[0],imax[1],imax[2],
     cctk_ash[0],cctk_ash[1],cctk_ash[2],
-    imin,imax, CCTK_REAL_VEC_SIZE)
+    kimin,kimax, CCTK_REAL_VEC_SIZE)
   {
     ptrdiff_t /*const*/ index CCTK_ATTRIBUTE_UNUSED  = di*i + dj*j + dk*k;
     
@@ -318,7 +318,7 @@ static void ML_CCZ4_RHSStaticBoundary_Body(cGH const * restrict const cctkGH, in
     CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED ThetarhsL = ToReal(0.);
     
     /* Copy local copies back to grid functions */
-    vec_store_partial_prepare(i,lc_imin,lc_imax);
+    vec_store_partial_prepare(i,kimin,kimax);
     vec_store_nta_partial(alpharhs[index],alpharhsL);
     vec_store_nta_partial(Arhs[index],ArhsL);
     vec_store_nta_partial(At11rhs[index],At11rhsL);
diff --git a/ML_CCZ4/src/ML_CCZ4_boundary.cc b/ML_CCZ4/src/ML_CCZ4_boundary.cc
index 32fedb4..5eaa7a3 100644
--- a/ML_CCZ4/src/ML_CCZ4_boundary.cc
+++ b/ML_CCZ4/src/ML_CCZ4_boundary.cc
@@ -236,7 +236,7 @@ static void ML_CCZ4_boundary_Body(cGH const * restrict const cctkGH, int const d
   CCTK_LOOP3STR(ML_CCZ4_boundary,
     i,j,k, imin[0],imin[1],imin[2], imax[0],imax[1],imax[2],
     cctk_ash[0],cctk_ash[1],cctk_ash[2],
-    imin,imax, CCTK_REAL_VEC_SIZE)
+    kimin,kimax, CCTK_REAL_VEC_SIZE)
   {
     ptrdiff_t /*const*/ index CCTK_ATTRIBUTE_UNUSED  = di*i + dj*j + dk*k;
     
@@ -319,7 +319,7 @@ static void ML_CCZ4_boundary_Body(cGH const * restrict const cctkGH, int const d
     CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED ThetaL = ToReal(0.);
     
     /* Copy local copies back to grid functions */
-    vec_store_partial_prepare(i,lc_imin,lc_imax);
+    vec_store_partial_prepare(i,kimin,kimax);
     vec_store_nta_partial(A[index],AL);
     vec_store_nta_partial(alpha[index],alphaL);
     vec_store_nta_partial(At11[index],At11L);
diff --git a/ML_CCZ4/src/ML_CCZ4_constraints1.cc b/ML_CCZ4/src/ML_CCZ4_constraints1.cc
index 9e3c5ab..d79e218 100644
--- a/ML_CCZ4/src/ML_CCZ4_constraints1.cc
+++ b/ML_CCZ4/src/ML_CCZ4_constraints1.cc
@@ -209,7 +209,7 @@ static void ML_CCZ4_constraints1_Body(cGH const * restrict const cctkGH, int con
   CCTK_LOOP3STR(ML_CCZ4_constraints1,
     i,j,k, imin[0],imin[1],imin[2], imax[0],imax[1],imax[2],
     cctk_ash[0],cctk_ash[1],cctk_ash[2],
-    imin,imax, CCTK_REAL_VEC_SIZE)
+    kimin,kimax, CCTK_REAL_VEC_SIZE)
   {
     ptrdiff_t /*const*/ index CCTK_ATTRIBUTE_UNUSED  = di*i + dj*j + dk*k;
     
@@ -1617,7 +1617,7 @@ static void ML_CCZ4_constraints1_Body(cGH const * restrict const cctkGH, int con
       kadd(trR,kmadd(rho,ToReal(-50.26548245743669),kmadd(kmadd(Atm12,Atm21,kmadd(Atm13,Atm31,kmul(Atm23,Atm32))),ToReal(-2.),kmadd(kmadd(Atm11,Atm11,kmadd(Atm22,Atm22,kmul(Atm33,Atm33))),ToReal(-1.),kmul(kmul(trKL,trKL),ToReal(0.666666666666666666666666666667))))));
     
     /* Copy local copies back to grid functions */
-    vec_store_partial_prepare(i,lc_imin,lc_imax);
+    vec_store_partial_prepare(i,kimin,kimax);
     vec_store_nta_partial(H[index],HL);
   }
   CCTK_ENDLOOP3STR(ML_CCZ4_constraints1);
diff --git a/ML_CCZ4/src/ML_CCZ4_constraints2.cc b/ML_CCZ4/src/ML_CCZ4_constraints2.cc
index 7fb54a2..d1a3089 100644
--- a/ML_CCZ4/src/ML_CCZ4_constraints2.cc
+++ b/ML_CCZ4/src/ML_CCZ4_constraints2.cc
@@ -218,7 +218,7 @@ static void ML_CCZ4_constraints2_Body(cGH const * restrict const cctkGH, int con
   CCTK_LOOP3STR(ML_CCZ4_constraints2,
     i,j,k, imin[0],imin[1],imin[2], imax[0],imax[1],imax[2],
     cctk_ash[0],cctk_ash[1],cctk_ash[2],
-    imin,imax, CCTK_REAL_VEC_SIZE)
+    kimin,kimax, CCTK_REAL_VEC_SIZE)
   {
     ptrdiff_t /*const*/ index CCTK_ATTRIBUTE_UNUSED  = di*i + dj*j + dk*k;
     
@@ -1851,7 +1851,7 @@ static void ML_CCZ4_constraints2_Body(cGH const * restrict const cctkGH, int con
       kmadd(At11L,gtu11,kmadd(At22L,gtu22,kmadd(At33L,gtu33,kmul(kmadd(At12L,gtu12,kmadd(At13L,gtu13,kmul(At23L,gtu23))),ToReal(2.)))));
     
     /* Copy local copies back to grid functions */
-    vec_store_partial_prepare(i,lc_imin,lc_imax);
+    vec_store_partial_prepare(i,kimin,kimax);
     vec_store_nta_partial(cA[index],cAL);
     vec_store_nta_partial(cS[index],cSL);
     vec_store_nta_partial(cXt1[index],cXt1L);
diff --git a/ML_CCZ4/src/ML_CCZ4_convertFromADMBase.cc b/ML_CCZ4/src/ML_CCZ4_convertFromADMBase.cc
index f132a6c..004e119 100644
--- a/ML_CCZ4/src/ML_CCZ4_convertFromADMBase.cc
+++ b/ML_CCZ4/src/ML_CCZ4_convertFromADMBase.cc
@@ -197,7 +197,7 @@ static void ML_CCZ4_convertFromADMBase_Body(cGH const * restrict const cctkGH, i
   CCTK_LOOP3STR(ML_CCZ4_convertFromADMBase,
     i,j,k, imin[0],imin[1],imin[2], imax[0],imax[1],imax[2],
     cctk_ash[0],cctk_ash[1],cctk_ash[2],
-    imin,imax, CCTK_REAL_VEC_SIZE)
+    kimin,kimax, CCTK_REAL_VEC_SIZE)
   {
     ptrdiff_t /*const*/ index CCTK_ATTRIBUTE_UNUSED  = di*i + dj*j + dk*k;
     
@@ -336,7 +336,7 @@ static void ML_CCZ4_convertFromADMBase_Body(cGH const * restrict const cctkGH, i
     CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED ThetaL = ToReal(0.);
     
     /* Copy local copies back to grid functions */
-    vec_store_partial_prepare(i,lc_imin,lc_imax);
+    vec_store_partial_prepare(i,kimin,kimax);
     vec_store_nta_partial(alpha[index],alphaL);
     vec_store_nta_partial(At11[index],At11L);
     vec_store_nta_partial(At12[index],At12L);
diff --git a/ML_CCZ4/src/ML_CCZ4_convertFromADMBaseGamma.cc b/ML_CCZ4/src/ML_CCZ4_convertFromADMBaseGamma.cc
index f9343d1..048bcf4 100644
--- a/ML_CCZ4/src/ML_CCZ4_convertFromADMBaseGamma.cc
+++ b/ML_CCZ4/src/ML_CCZ4_convertFromADMBaseGamma.cc
@@ -215,7 +215,7 @@ static void ML_CCZ4_convertFromADMBaseGamma_Body(cGH const * restrict const cctk
   CCTK_LOOP3STR(ML_CCZ4_convertFromADMBaseGamma,
     i,j,k, imin[0],imin[1],imin[2], imax[0],imax[1],imax[2],
     cctk_ash[0],cctk_ash[1],cctk_ash[2],
-    imin,imax, CCTK_REAL_VEC_SIZE)
+    kimin,kimax, CCTK_REAL_VEC_SIZE)
   {
     ptrdiff_t /*const*/ index CCTK_ATTRIBUTE_UNUSED  = di*i + dj*j + dk*k;
     
@@ -861,7 +861,7 @@ static void ML_CCZ4_convertFromADMBaseGamma_Body(cGH const * restrict const cctk
     }
     
     /* Copy local copies back to grid functions */
-    vec_store_partial_prepare(i,lc_imin,lc_imax);
+    vec_store_partial_prepare(i,kimin,kimax);
     vec_store_nta_partial(A[index],AL);
     vec_store_nta_partial(B1[index],B1L);
     vec_store_nta_partial(B2[index],B2L);
diff --git a/ML_CCZ4/src/ML_CCZ4_convertToADMBase.cc b/ML_CCZ4/src/ML_CCZ4_convertToADMBase.cc
index c4a6724..d242b87 100644
--- a/ML_CCZ4/src/ML_CCZ4_convertToADMBase.cc
+++ b/ML_CCZ4/src/ML_CCZ4_convertToADMBase.cc
@@ -197,7 +197,7 @@ static void ML_CCZ4_convertToADMBase_Body(cGH const * restrict const cctkGH, int
   CCTK_LOOP3STR(ML_CCZ4_convertToADMBase,
     i,j,k, imin[0],imin[1],imin[2], imax[0],imax[1],imax[2],
     cctk_ash[0],cctk_ash[1],cctk_ash[2],
-    imin,imax, CCTK_REAL_VEC_SIZE)
+    kimin,kimax, CCTK_REAL_VEC_SIZE)
   {
     ptrdiff_t /*const*/ index CCTK_ATTRIBUTE_UNUSED  = di*i + dj*j + dk*k;
     
@@ -292,7 +292,7 @@ static void ML_CCZ4_convertToADMBase_Body(cGH const * restrict const cctkGH, int
     CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED betazL = beta3L;
     
     /* Copy local copies back to grid functions */
-    vec_store_partial_prepare(i,lc_imin,lc_imax);
+    vec_store_partial_prepare(i,kimin,kimax);
     vec_store_nta_partial(alp[index],alpL);
     vec_store_nta_partial(betax[index],betaxL);
     vec_store_nta_partial(betay[index],betayL);
diff --git a/ML_CCZ4/src/ML_CCZ4_convertToADMBaseDtLapseShift.cc b/ML_CCZ4/src/ML_CCZ4_convertToADMBaseDtLapseShift.cc
index 0dadc58..4c1d43b 100644
--- a/ML_CCZ4/src/ML_CCZ4_convertToADMBaseDtLapseShift.cc
+++ b/ML_CCZ4/src/ML_CCZ4_convertToADMBaseDtLapseShift.cc
@@ -212,7 +212,7 @@ static void ML_CCZ4_convertToADMBaseDtLapseShift_Body(cGH const * restrict const
   CCTK_LOOP3STR(ML_CCZ4_convertToADMBaseDtLapseShift,
     i,j,k, imin[0],imin[1],imin[2], imax[0],imax[1],imax[2],
     cctk_ash[0],cctk_ash[1],cctk_ash[2],
-    imin,imax, CCTK_REAL_VEC_SIZE)
+    kimin,kimax, CCTK_REAL_VEC_SIZE)
   {
     ptrdiff_t /*const*/ index CCTK_ATTRIBUTE_UNUSED  = di*i + dj*j + dk*k;
     
@@ -860,7 +860,7 @@ static void ML_CCZ4_convertToADMBaseDtLapseShift_Body(cGH const * restrict const
       + ShiftBCoeff)))))),ToReal(ShiftGammaCoeff)))));
     
     /* Copy local copies back to grid functions */
-    vec_store_partial_prepare(i,lc_imin,lc_imax);
+    vec_store_partial_prepare(i,kimin,kimax);
     vec_store_nta_partial(dtalp[index],dtalpL);
     vec_store_nta_partial(dtbetax[index],dtbetaxL);
     vec_store_nta_partial(dtbetay[index],dtbetayL);
diff --git a/ML_CCZ4/src/ML_CCZ4_convertToADMBaseDtLapseShiftBoundary.cc b/ML_CCZ4/src/ML_CCZ4_convertToADMBaseDtLapseShiftBoundary.cc
index 7c12de1..1acb283 100644
--- a/ML_CCZ4/src/ML_CCZ4_convertToADMBaseDtLapseShiftBoundary.cc
+++ b/ML_CCZ4/src/ML_CCZ4_convertToADMBaseDtLapseShiftBoundary.cc
@@ -212,7 +212,7 @@ static void ML_CCZ4_convertToADMBaseDtLapseShiftBoundary_Body(cGH const * restri
   CCTK_LOOP3STR(ML_CCZ4_convertToADMBaseDtLapseShiftBoundary,
     i,j,k, imin[0],imin[1],imin[2], imax[0],imax[1],imax[2],
     cctk_ash[0],cctk_ash[1],cctk_ash[2],
-    imin,imax, CCTK_REAL_VEC_SIZE)
+    kimin,kimax, CCTK_REAL_VEC_SIZE)
   {
     ptrdiff_t /*const*/ index CCTK_ATTRIBUTE_UNUSED  = di*i + dj*j + dk*k;
     
@@ -293,7 +293,7 @@ static void ML_CCZ4_convertToADMBaseDtLapseShiftBoundary_Body(cGH const * restri
     }
     
     /* Copy local copies back to grid functions */
-    vec_store_partial_prepare(i,lc_imin,lc_imax);
+    vec_store_partial_prepare(i,kimin,kimax);
     vec_store_nta_partial(dtalp[index],dtalpL);
     vec_store_nta_partial(dtbetax[index],dtbetaxL);
     vec_store_nta_partial(dtbetay[index],dtbetayL);
diff --git a/ML_CCZ4/src/ML_CCZ4_convertToADMBaseFakeDtLapseShift.cc b/ML_CCZ4/src/ML_CCZ4_convertToADMBaseFakeDtLapseShift.cc
index 73236d7..83460cd 100644
--- a/ML_CCZ4/src/ML_CCZ4_convertToADMBaseFakeDtLapseShift.cc
+++ b/ML_CCZ4/src/ML_CCZ4_convertToADMBaseFakeDtLapseShift.cc
@@ -197,7 +197,7 @@ static void ML_CCZ4_convertToADMBaseFakeDtLapseShift_Body(cGH const * restrict c
   CCTK_LOOP3STR(ML_CCZ4_convertToADMBaseFakeDtLapseShift,
     i,j,k, imin[0],imin[1],imin[2], imax[0],imax[1],imax[2],
     cctk_ash[0],cctk_ash[1],cctk_ash[2],
-    imin,imax, CCTK_REAL_VEC_SIZE)
+    kimin,kimax, CCTK_REAL_VEC_SIZE)
   {
     ptrdiff_t /*const*/ index CCTK_ATTRIBUTE_UNUSED  = di*i + dj*j + dk*k;
     
@@ -278,7 +278,7 @@ static void ML_CCZ4_convertToADMBaseFakeDtLapseShift_Body(cGH const * restrict c
     }
     
     /* Copy local copies back to grid functions */
-    vec_store_partial_prepare(i,lc_imin,lc_imax);
+    vec_store_partial_prepare(i,kimin,kimax);
     vec_store_nta_partial(dtalp[index],dtalpL);
     vec_store_nta_partial(dtbetax[index],dtbetaxL);
     vec_store_nta_partial(dtbetay[index],dtbetayL);
diff --git a/ML_CCZ4/src/ML_CCZ4_enforce.cc b/ML_CCZ4/src/ML_CCZ4_enforce.cc
index 94885d8..8ec94a5 100644
--- a/ML_CCZ4/src/ML_CCZ4_enforce.cc
+++ b/ML_CCZ4/src/ML_CCZ4_enforce.cc
@@ -197,7 +197,7 @@ static void ML_CCZ4_enforce_Body(cGH const * restrict const cctkGH, int const di
   CCTK_LOOP3STR(ML_CCZ4_enforce,
     i,j,k, imin[0],imin[1],imin[2], imax[0],imax[1],imax[2],
     cctk_ash[0],cctk_ash[1],cctk_ash[2],
-    imin,imax, CCTK_REAL_VEC_SIZE)
+    kimin,kimax, CCTK_REAL_VEC_SIZE)
   {
     ptrdiff_t /*const*/ index CCTK_ATTRIBUTE_UNUSED  = di*i + dj*j + dk*k;
     
@@ -283,7 +283,7 @@ static void ML_CCZ4_enforce_Body(cGH const * restrict const cctkGH, int const di
     alphaL = kfmax(alphaL,ToReal(MinimumLapse));
     
     /* Copy local copies back to grid functions */
-    vec_store_partial_prepare(i,lc_imin,lc_imax);
+    vec_store_partial_prepare(i,kimin,kimax);
     vec_store_nta_partial(alpha[index],alphaL);
     vec_store_nta_partial(At11[index],At11L);
     vec_store_nta_partial(At12[index],At12L);