From 6720d80eab38f9f24584bcf657bc85c1708ab701 Mon Sep 17 00:00:00 2001 From: Erik Schnetter Date: Sat, 19 Jan 2013 22:45:29 -0500 Subject: Regenerate code after Kranc change --- ML_ADM/src/ML_ADM_Minkowski.cc | 4 ++-- ML_ADM/src/ML_ADM_RHS.cc | 4 ++-- ML_ADM/src/ML_ADM_boundary.cc | 4 ++-- ML_ADM/src/ML_ADM_constraints.cc | 4 ++-- ML_ADM/src/ML_ADM_constraints_boundary.cc | 4 ++-- ML_ADM/src/ML_ADM_convertFromADMBase.cc | 4 ++-- ML_ADM/src/ML_ADM_convertToADMBase.cc | 4 ++-- ML_BSSN/src/ML_BSSN_Advect.cc | 4 ++-- ML_BSSN/src/ML_BSSN_Dissipation.cc | 4 ++-- ML_BSSN/src/ML_BSSN_InitGamma.cc | 4 ++-- ML_BSSN/src/ML_BSSN_InitRHS.cc | 4 ++-- ML_BSSN/src/ML_BSSN_Minkowski.cc | 4 ++-- ML_BSSN/src/ML_BSSN_RHS1.cc | 4 ++-- ML_BSSN/src/ML_BSSN_RHS2.cc | 4 ++-- ML_BSSN/src/ML_BSSN_RHSStaticBoundary.cc | 4 ++-- ML_BSSN/src/ML_BSSN_boundary.cc | 4 ++-- ML_BSSN/src/ML_BSSN_constraints1.cc | 4 ++-- ML_BSSN/src/ML_BSSN_constraints2.cc | 4 ++-- ML_BSSN/src/ML_BSSN_convertFromADMBase.cc | 4 ++-- ML_BSSN/src/ML_BSSN_convertFromADMBaseGamma.cc | 4 ++-- ML_BSSN/src/ML_BSSN_convertToADMBase.cc | 4 ++-- ML_BSSN/src/ML_BSSN_convertToADMBaseDtLapseShift.cc | 4 ++-- ML_BSSN/src/ML_BSSN_convertToADMBaseDtLapseShiftBoundary.cc | 4 ++-- ML_BSSN/src/ML_BSSN_convertToADMBaseFakeDtLapseShift.cc | 4 ++-- ML_BSSN/src/ML_BSSN_enforce.cc | 4 ++-- ML_CCZ4/src/ML_CCZ4_Advect.cc | 4 ++-- ML_CCZ4/src/ML_CCZ4_Dissipation.cc | 4 ++-- ML_CCZ4/src/ML_CCZ4_InitGamma.cc | 4 ++-- ML_CCZ4/src/ML_CCZ4_InitRHS.cc | 4 ++-- ML_CCZ4/src/ML_CCZ4_Minkowski.cc | 4 ++-- ML_CCZ4/src/ML_CCZ4_RHS1.cc | 4 ++-- ML_CCZ4/src/ML_CCZ4_RHS2.cc | 4 ++-- ML_CCZ4/src/ML_CCZ4_RHSStaticBoundary.cc | 4 ++-- ML_CCZ4/src/ML_CCZ4_boundary.cc | 4 ++-- ML_CCZ4/src/ML_CCZ4_constraints1.cc | 4 ++-- ML_CCZ4/src/ML_CCZ4_constraints2.cc | 4 ++-- ML_CCZ4/src/ML_CCZ4_convertFromADMBase.cc | 4 ++-- ML_CCZ4/src/ML_CCZ4_convertFromADMBaseGamma.cc | 4 ++-- ML_CCZ4/src/ML_CCZ4_convertToADMBase.cc | 4 ++-- ML_CCZ4/src/ML_CCZ4_convertToADMBaseDtLapseShift.cc | 4 ++-- ML_CCZ4/src/ML_CCZ4_convertToADMBaseDtLapseShiftBoundary.cc | 4 ++-- ML_CCZ4/src/ML_CCZ4_convertToADMBaseFakeDtLapseShift.cc | 4 ++-- ML_CCZ4/src/ML_CCZ4_enforce.cc | 4 ++-- ML_WaveToy/src/WT_Dirichlet.cc | 4 ++-- ML_WaveToy/src/WT_Energy.cc | 4 ++-- ML_WaveToy/src/WT_EnergyBoundary.cc | 4 ++-- ML_WaveToy/src/WT_Gaussian.cc | 4 ++-- ML_WaveToy/src/WT_RHS.cc | 4 ++-- ML_WaveToy/src/WT_Standing.cc | 4 ++-- ML_WaveToy_CL/src/WT_CL_Dirichlet.cc | 6 +++--- ML_WaveToy_CL/src/WT_CL_Energy.cc | 6 +++--- ML_WaveToy_CL/src/WT_CL_EnergyBoundary.cc | 6 +++--- ML_WaveToy_CL/src/WT_CL_Gaussian.cc | 6 +++--- ML_WaveToy_CL/src/WT_CL_RHS.cc | 6 +++--- ML_WaveToy_CL/src/WT_CL_Standing.cc | 6 +++--- 55 files changed, 116 insertions(+), 116 deletions(-) diff --git a/ML_ADM/src/ML_ADM_Minkowski.cc b/ML_ADM/src/ML_ADM_Minkowski.cc index 7795ebd..7e10b66 100644 --- a/ML_ADM/src/ML_ADM_Minkowski.cc +++ b/ML_ADM/src/ML_ADM_Minkowski.cc @@ -155,7 +155,7 @@ static void ML_ADM_Minkowski_Body(cGH const * restrict const cctkGH, int const d CCTK_LOOP3STR(ML_ADM_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; @@ -217,7 +217,7 @@ static void ML_ADM_Minkowski_Body(cGH const * restrict const cctkGH, int const d CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED beta3L = 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(beta1[index],beta1L); vec_store_nta_partial(beta2[index],beta2L); diff --git a/ML_ADM/src/ML_ADM_RHS.cc b/ML_ADM/src/ML_ADM_RHS.cc index 4769d12..ce37f26 100644 --- a/ML_ADM/src/ML_ADM_RHS.cc +++ b/ML_ADM/src/ML_ADM_RHS.cc @@ -176,7 +176,7 @@ static void ML_ADM_RHS_Body(cGH const * restrict const cctkGH, int const dir, in CCTK_LOOP3STR(ML_ADM_RHS, 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; @@ -1479,7 +1479,7 @@ static void ML_ADM_RHS_Body(cGH const * restrict const cctkGH, int const dir, in CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED beta3rhsL = 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(beta1rhs[index],beta1rhsL); vec_store_nta_partial(beta2rhs[index],beta2rhsL); diff --git a/ML_ADM/src/ML_ADM_boundary.cc b/ML_ADM/src/ML_ADM_boundary.cc index e70e87d..1796fdc 100644 --- a/ML_ADM/src/ML_ADM_boundary.cc +++ b/ML_ADM/src/ML_ADM_boundary.cc @@ -176,7 +176,7 @@ static void ML_ADM_boundary_Body(cGH const * restrict const cctkGH, int const di CCTK_LOOP3STR(ML_ADM_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; @@ -238,7 +238,7 @@ static void ML_ADM_boundary_Body(cGH const * restrict const cctkGH, int const di CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED beta3L = 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(beta1[index],beta1L); vec_store_nta_partial(beta2[index],beta2L); diff --git a/ML_ADM/src/ML_ADM_constraints.cc b/ML_ADM/src/ML_ADM_constraints.cc index a92dc85..69fd6de 100644 --- a/ML_ADM/src/ML_ADM_constraints.cc +++ b/ML_ADM/src/ML_ADM_constraints.cc @@ -170,7 +170,7 @@ static void ML_ADM_constraints_Body(cGH const * restrict const cctkGH, int const CCTK_LOOP3STR(ML_ADM_constraints, 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; @@ -1224,7 +1224,7 @@ static void ML_ADM_constraints_Body(cGH const * restrict const cctkGH, int const kmadd(gu11,kmadd(K11L,G113,kmadd(K12L,G213,kmadd(K13L,G313,kmadd(kmadd(K13L,G111,kmadd(K23L,G211,kmadd(K33L,G311,JacPDstandardNth3K11))),ToReal(-1.),JacPDstandardNth1K13)))),kmadd(gu12,kmadd(K11L,G123,kmadd(K12L,G223,kmadd(K13L,G323,kmadd(kmadd(K13L,G112,kmadd(K23L,G212,kmadd(K33L,G312,JacPDstandardNth3K12))),ToReal(-1.),JacPDstandardNth1K23)))),kmadd(gu21,kmadd(K12L,G113,kmadd(K22L,G213,kmadd(K23L,G313,kmadd(kmadd(K13L,G112,kmadd(K23L,G212,kmadd(K33L,G312,JacPDstandardNth3K12))),ToReal(-1.),JacPDstandardNth2K13)))),kmadd(gu13,kmadd(K11L,G133,kmadd(K12L,G233,kmadd(K13L,G333,kmadd(kmadd(K13L,G113,kmadd(K23L,G213,kmadd(K33L,G313,JacPDstandardNth3K13))),ToReal(-1.),JacPDstandardNth1K33)))),kmadd(gu22,kmadd(K12L,G123,kmadd(K22L,G223,kmadd(K23L,G323,kmadd(kmadd(K13L,G122,kmadd(K23L,G222,kmadd(K33L,G322,JacPDstandardNth3K22))),ToReal(-1.),JacPDstandardNth2K23)))),kmul(gu23,kmadd(K12L,G133,kmadd(K22L,G233,kmadd(K23L,G333,kmadd(kmadd(K13L,G123,kmadd(K23L,G223,kmadd(K33L,G323,JacPDstandardNth3K23))),ToReal(-1.),JacPDstandardNth2K33)))))))))); /* 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); vec_store_nta_partial(M1[index],M1L); vec_store_nta_partial(M2[index],M2L); diff --git a/ML_ADM/src/ML_ADM_constraints_boundary.cc b/ML_ADM/src/ML_ADM_constraints_boundary.cc index 01d49ca..e9cb98d 100644 --- a/ML_ADM/src/ML_ADM_constraints_boundary.cc +++ b/ML_ADM/src/ML_ADM_constraints_boundary.cc @@ -170,7 +170,7 @@ static void ML_ADM_constraints_boundary_Body(cGH const * restrict const cctkGH, CCTK_LOOP3STR(ML_ADM_constraints_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; @@ -208,7 +208,7 @@ static void ML_ADM_constraints_boundary_Body(cGH const * restrict const cctkGH, CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED M3L = 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(H[index],HL); vec_store_nta_partial(M1[index],M1L); vec_store_nta_partial(M2[index],M2L); diff --git a/ML_ADM/src/ML_ADM_convertFromADMBase.cc b/ML_ADM/src/ML_ADM_convertFromADMBase.cc index 40c1a4c..ab25ab9 100644 --- a/ML_ADM/src/ML_ADM_convertFromADMBase.cc +++ b/ML_ADM/src/ML_ADM_convertFromADMBase.cc @@ -155,7 +155,7 @@ static void ML_ADM_convertFromADMBase_Body(cGH const * restrict const cctkGH, in CCTK_LOOP3STR(ML_ADM_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; @@ -233,7 +233,7 @@ static void ML_ADM_convertFromADMBase_Body(cGH const * restrict const cctkGH, in CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED beta3L = betazL; /* 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(beta1[index],beta1L); vec_store_nta_partial(beta2[index],beta2L); diff --git a/ML_ADM/src/ML_ADM_convertToADMBase.cc b/ML_ADM/src/ML_ADM_convertToADMBase.cc index af74a5b..a4ab827 100644 --- a/ML_ADM/src/ML_ADM_convertToADMBase.cc +++ b/ML_ADM/src/ML_ADM_convertToADMBase.cc @@ -155,7 +155,7 @@ static void ML_ADM_convertToADMBase_Body(cGH const * restrict const cctkGH, int CCTK_LOOP3STR(ML_ADM_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; @@ -241,7 +241,7 @@ static void ML_ADM_convertToADMBase_Body(cGH const * restrict const cctkGH, int CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED dtbetazL = 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(alp[index],alpL); vec_store_nta_partial(betax[index],betaxL); vec_store_nta_partial(betay[index],betayL); diff --git a/ML_BSSN/src/ML_BSSN_Advect.cc b/ML_BSSN/src/ML_BSSN_Advect.cc index 94ea8e6..d74a205 100644 --- a/ML_BSSN/src/ML_BSSN_Advect.cc +++ b/ML_BSSN/src/ML_BSSN_Advect.cc @@ -233,7 +233,7 @@ static void ML_BSSN_Advect_Body(cGH const * restrict const cctkGH, int const dir CCTK_LOOP3STR(ML_BSSN_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; @@ -2068,7 +2068,7 @@ static void ML_BSSN_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_BSSN/src/ML_BSSN_Dissipation.cc b/ML_BSSN/src/ML_BSSN_Dissipation.cc index a2645cb..d2a0715 100644 --- a/ML_BSSN/src/ML_BSSN_Dissipation.cc +++ b/ML_BSSN/src/ML_BSSN_Dissipation.cc @@ -233,7 +233,7 @@ static void ML_BSSN_Dissipation_Body(cGH const * restrict const cctkGH, int cons CCTK_LOOP3STR(ML_BSSN_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; @@ -1239,7 +1239,7 @@ static void ML_BSSN_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_BSSN/src/ML_BSSN_InitGamma.cc b/ML_BSSN/src/ML_BSSN_InitGamma.cc index 968ac6b..c37ebc8 100644 --- a/ML_BSSN/src/ML_BSSN_InitGamma.cc +++ b/ML_BSSN/src/ML_BSSN_InitGamma.cc @@ -197,7 +197,7 @@ static void ML_BSSN_InitGamma_Body(cGH const * restrict const cctkGH, int const CCTK_LOOP3STR(ML_BSSN_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_BSSN_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_BSSN/src/ML_BSSN_InitRHS.cc b/ML_BSSN/src/ML_BSSN_InitRHS.cc index dde5f60..90a93bc 100644 --- a/ML_BSSN/src/ML_BSSN_InitRHS.cc +++ b/ML_BSSN/src/ML_BSSN_InitRHS.cc @@ -197,7 +197,7 @@ static void ML_BSSN_InitRHS_Body(cGH const * restrict const cctkGH, int const di CCTK_LOOP3STR(ML_BSSN_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; @@ -277,7 +277,7 @@ static void ML_BSSN_InitRHS_Body(cGH const * restrict const cctkGH, int const di CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED B3rhsL = 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_BSSN/src/ML_BSSN_Minkowski.cc b/ML_BSSN/src/ML_BSSN_Minkowski.cc index d5ac436..812f9e1 100644 --- a/ML_BSSN/src/ML_BSSN_Minkowski.cc +++ b/ML_BSSN/src/ML_BSSN_Minkowski.cc @@ -197,7 +197,7 @@ static void ML_BSSN_Minkowski_Body(cGH const * restrict const cctkGH, int const CCTK_LOOP3STR(ML_BSSN_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; @@ -278,7 +278,7 @@ static void ML_BSSN_Minkowski_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(alpha[index],alphaL); vec_store_nta_partial(At11[index],At11L); diff --git a/ML_BSSN/src/ML_BSSN_RHS1.cc b/ML_BSSN/src/ML_BSSN_RHS1.cc index 31b0601..66a02ac 100644 --- a/ML_BSSN/src/ML_BSSN_RHS1.cc +++ b/ML_BSSN/src/ML_BSSN_RHS1.cc @@ -230,7 +230,7 @@ static void ML_BSSN_RHS1_Body(cGH const * restrict const cctkGH, int const dir, CCTK_LOOP3STR(ML_BSSN_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; @@ -1398,7 +1398,7 @@ static void ML_BSSN_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_BSSN/src/ML_BSSN_RHS2.cc b/ML_BSSN/src/ML_BSSN_RHS2.cc index 02b35fe..d27c0b7 100644 --- a/ML_BSSN/src/ML_BSSN_RHS2.cc +++ b/ML_BSSN/src/ML_BSSN_RHS2.cc @@ -209,7 +209,7 @@ static void ML_BSSN_RHS2_Body(cGH const * restrict const cctkGH, int const dir, CCTK_LOOP3STR(ML_BSSN_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; @@ -1819,7 +1819,7 @@ static void ML_BSSN_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(At33L,trKL,kmadd(kmadd(At13L,Atm13,kmadd(At23L,Atm23,kmul(At33L,Atm33))),ToReal(-2.),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_BSSN/src/ML_BSSN_RHSStaticBoundary.cc b/ML_BSSN/src/ML_BSSN_RHSStaticBoundary.cc index c69d486..08fc3dd 100644 --- a/ML_BSSN/src/ML_BSSN_RHSStaticBoundary.cc +++ b/ML_BSSN/src/ML_BSSN_RHSStaticBoundary.cc @@ -233,7 +233,7 @@ static void ML_BSSN_RHSStaticBoundary_Body(cGH const * restrict const cctkGH, in CCTK_LOOP3STR(ML_BSSN_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; @@ -313,7 +313,7 @@ static void ML_BSSN_RHSStaticBoundary_Body(cGH const * restrict const cctkGH, in CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED B3rhsL = 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_BSSN/src/ML_BSSN_boundary.cc b/ML_BSSN/src/ML_BSSN_boundary.cc index e838f14..e8e87b5 100644 --- a/ML_BSSN/src/ML_BSSN_boundary.cc +++ b/ML_BSSN/src/ML_BSSN_boundary.cc @@ -233,7 +233,7 @@ static void ML_BSSN_boundary_Body(cGH const * restrict const cctkGH, int const d CCTK_LOOP3STR(ML_BSSN_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; @@ -314,7 +314,7 @@ static void ML_BSSN_boundary_Body(cGH const * restrict const cctkGH, int const d 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(alpha[index],alphaL); vec_store_nta_partial(At11[index],At11L); diff --git a/ML_BSSN/src/ML_BSSN_constraints1.cc b/ML_BSSN/src/ML_BSSN_constraints1.cc index 096e4d4..5c880fd 100644 --- a/ML_BSSN/src/ML_BSSN_constraints1.cc +++ b/ML_BSSN/src/ML_BSSN_constraints1.cc @@ -209,7 +209,7 @@ static void ML_BSSN_constraints1_Body(cGH const * restrict const cctkGH, int con CCTK_LOOP3STR(ML_BSSN_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; @@ -1578,7 +1578,7 @@ static void ML_BSSN_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_BSSN_constraints1); diff --git a/ML_BSSN/src/ML_BSSN_constraints2.cc b/ML_BSSN/src/ML_BSSN_constraints2.cc index a132d2c..362f533 100644 --- a/ML_BSSN/src/ML_BSSN_constraints2.cc +++ b/ML_BSSN/src/ML_BSSN_constraints2.cc @@ -218,7 +218,7 @@ static void ML_BSSN_constraints2_Body(cGH const * restrict const cctkGH, int con CCTK_LOOP3STR(ML_BSSN_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; @@ -949,7 +949,7 @@ static void ML_BSSN_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_BSSN/src/ML_BSSN_convertFromADMBase.cc b/ML_BSSN/src/ML_BSSN_convertFromADMBase.cc index 49f4382..8b5be6d 100644 --- a/ML_BSSN/src/ML_BSSN_convertFromADMBase.cc +++ b/ML_BSSN/src/ML_BSSN_convertFromADMBase.cc @@ -197,7 +197,7 @@ static void ML_BSSN_convertFromADMBase_Body(cGH const * restrict const cctkGH, i CCTK_LOOP3STR(ML_BSSN_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; @@ -334,7 +334,7 @@ static void ML_BSSN_convertFromADMBase_Body(cGH const * restrict const cctkGH, i CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED beta3L = betazL; /* 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_BSSN/src/ML_BSSN_convertFromADMBaseGamma.cc b/ML_BSSN/src/ML_BSSN_convertFromADMBaseGamma.cc index 253b6a0..e9db745 100644 --- a/ML_BSSN/src/ML_BSSN_convertFromADMBaseGamma.cc +++ b/ML_BSSN/src/ML_BSSN_convertFromADMBaseGamma.cc @@ -215,7 +215,7 @@ static void ML_BSSN_convertFromADMBaseGamma_Body(cGH const * restrict const cctk CCTK_LOOP3STR(ML_BSSN_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_BSSN_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_BSSN/src/ML_BSSN_convertToADMBase.cc b/ML_BSSN/src/ML_BSSN_convertToADMBase.cc index 24c249e..36d0c7d 100644 --- a/ML_BSSN/src/ML_BSSN_convertToADMBase.cc +++ b/ML_BSSN/src/ML_BSSN_convertToADMBase.cc @@ -197,7 +197,7 @@ static void ML_BSSN_convertToADMBase_Body(cGH const * restrict const cctkGH, int CCTK_LOOP3STR(ML_BSSN_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_BSSN_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_BSSN/src/ML_BSSN_convertToADMBaseDtLapseShift.cc b/ML_BSSN/src/ML_BSSN_convertToADMBaseDtLapseShift.cc index 3f243e2..d10b5d6 100644 --- a/ML_BSSN/src/ML_BSSN_convertToADMBaseDtLapseShift.cc +++ b/ML_BSSN/src/ML_BSSN_convertToADMBaseDtLapseShift.cc @@ -212,7 +212,7 @@ static void ML_BSSN_convertToADMBaseDtLapseShift_Body(cGH const * restrict const CCTK_LOOP3STR(ML_BSSN_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; @@ -857,7 +857,7 @@ static void ML_BSSN_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_BSSN/src/ML_BSSN_convertToADMBaseDtLapseShiftBoundary.cc b/ML_BSSN/src/ML_BSSN_convertToADMBaseDtLapseShiftBoundary.cc index 2f00e65..f50e8c2 100644 --- a/ML_BSSN/src/ML_BSSN_convertToADMBaseDtLapseShiftBoundary.cc +++ b/ML_BSSN/src/ML_BSSN_convertToADMBaseDtLapseShiftBoundary.cc @@ -212,7 +212,7 @@ static void ML_BSSN_convertToADMBaseDtLapseShiftBoundary_Body(cGH const * restri CCTK_LOOP3STR(ML_BSSN_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; @@ -291,7 +291,7 @@ static void ML_BSSN_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_BSSN/src/ML_BSSN_convertToADMBaseFakeDtLapseShift.cc b/ML_BSSN/src/ML_BSSN_convertToADMBaseFakeDtLapseShift.cc index 6de84e5..dd877ee 100644 --- a/ML_BSSN/src/ML_BSSN_convertToADMBaseFakeDtLapseShift.cc +++ b/ML_BSSN/src/ML_BSSN_convertToADMBaseFakeDtLapseShift.cc @@ -197,7 +197,7 @@ static void ML_BSSN_convertToADMBaseFakeDtLapseShift_Body(cGH const * restrict c CCTK_LOOP3STR(ML_BSSN_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; @@ -276,7 +276,7 @@ static void ML_BSSN_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_BSSN/src/ML_BSSN_enforce.cc b/ML_BSSN/src/ML_BSSN_enforce.cc index 71b2032..62f0a87 100644 --- a/ML_BSSN/src/ML_BSSN_enforce.cc +++ b/ML_BSSN/src/ML_BSSN_enforce.cc @@ -197,7 +197,7 @@ static void ML_BSSN_enforce_Body(cGH const * restrict const cctkGH, int const di CCTK_LOOP3STR(ML_BSSN_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_BSSN_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); 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); diff --git a/ML_WaveToy/src/WT_Dirichlet.cc b/ML_WaveToy/src/WT_Dirichlet.cc index 816ad00..a39eb69 100644 --- a/ML_WaveToy/src/WT_Dirichlet.cc +++ b/ML_WaveToy/src/WT_Dirichlet.cc @@ -98,7 +98,7 @@ static void WT_Dirichlet_Body(cGH const * restrict const cctkGH, int const dir, CCTK_LOOP3STR(WT_Dirichlet, 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; @@ -116,7 +116,7 @@ static void WT_Dirichlet_Body(cGH const * restrict const cctkGH, int const dir, CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED rhorhsL = 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(rhorhs[index],rhorhsL); vec_store_nta_partial(urhs[index],urhsL); } diff --git a/ML_WaveToy/src/WT_Energy.cc b/ML_WaveToy/src/WT_Energy.cc index ae69558..5a6d55d 100644 --- a/ML_WaveToy/src/WT_Energy.cc +++ b/ML_WaveToy/src/WT_Energy.cc @@ -95,7 +95,7 @@ static void WT_Energy_Body(cGH const * restrict const cctkGH, int const dir, int CCTK_LOOP3STR(WT_Energy, 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; @@ -117,7 +117,7 @@ static void WT_Energy_Body(cGH const * restrict const cctkGH, int const dir, int kmul(kmadd(rhoL,rhoL,kmadd(PDstandardNth1u,PDstandardNth1u,kmadd(PDstandardNth2u,PDstandardNth2u,kmul(PDstandardNth3u,PDstandardNth3u)))),ToReal(0.5)); /* 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(eps[index],epsL); } CCTK_ENDLOOP3STR(WT_Energy); diff --git a/ML_WaveToy/src/WT_EnergyBoundary.cc b/ML_WaveToy/src/WT_EnergyBoundary.cc index f4f2d22..08569ca 100644 --- a/ML_WaveToy/src/WT_EnergyBoundary.cc +++ b/ML_WaveToy/src/WT_EnergyBoundary.cc @@ -95,7 +95,7 @@ static void WT_EnergyBoundary_Body(cGH const * restrict const cctkGH, int const CCTK_LOOP3STR(WT_EnergyBoundary, 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; @@ -111,7 +111,7 @@ static void WT_EnergyBoundary_Body(cGH const * restrict const cctkGH, int const CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED epsL = 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(eps[index],epsL); } CCTK_ENDLOOP3STR(WT_EnergyBoundary); diff --git a/ML_WaveToy/src/WT_Gaussian.cc b/ML_WaveToy/src/WT_Gaussian.cc index acbb370..6d6b9b1 100644 --- a/ML_WaveToy/src/WT_Gaussian.cc +++ b/ML_WaveToy/src/WT_Gaussian.cc @@ -83,7 +83,7 @@ static void WT_Gaussian_Body(cGH const * restrict const cctkGH, int const dir, i CCTK_LOOP3STR(WT_Gaussian, 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; @@ -103,7 +103,7 @@ static void WT_Gaussian_Body(cGH const * restrict const cctkGH, int const dir, i CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED rhoL = 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(rho[index],rhoL); vec_store_nta_partial(u[index],uL); } diff --git a/ML_WaveToy/src/WT_RHS.cc b/ML_WaveToy/src/WT_RHS.cc index 990256d..d84954b 100644 --- a/ML_WaveToy/src/WT_RHS.cc +++ b/ML_WaveToy/src/WT_RHS.cc @@ -98,7 +98,7 @@ static void WT_RHS_Body(cGH const * restrict const cctkGH, int const dir, int co CCTK_LOOP3STR(WT_RHS, 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; @@ -122,7 +122,7 @@ static void WT_RHS_Body(cGH const * restrict const cctkGH, int const dir, int co kadd(PDstandardNth11u,kadd(PDstandardNth22u,PDstandardNth33u)); /* 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(rhorhs[index],rhorhsL); vec_store_nta_partial(urhs[index],urhsL); } diff --git a/ML_WaveToy/src/WT_Standing.cc b/ML_WaveToy/src/WT_Standing.cc index 6201bac..2d631f7 100644 --- a/ML_WaveToy/src/WT_Standing.cc +++ b/ML_WaveToy/src/WT_Standing.cc @@ -83,7 +83,7 @@ static void WT_Standing_Body(cGH const * restrict const cctkGH, int const dir, i CCTK_LOOP3STR(WT_Standing, 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; @@ -112,7 +112,7 @@ static void WT_Standing_Body(cGH const * restrict const cctkGH, int const dir, i kmul(omega,kmul(kcos(kmul(xL,kvec)),kmul(kcos(kmul(yL,kvec)),kmul(kcos(kmul(zL,kvec)),kmul(ksin(kmul(omega,t)),ToReal(-1.*amplitude)))))); /* 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(rho[index],rhoL); vec_store_nta_partial(u[index],uL); } diff --git a/ML_WaveToy_CL/src/WT_CL_Dirichlet.cc b/ML_WaveToy_CL/src/WT_CL_Dirichlet.cc index 65ed1ec..67c1ce2 100644 --- a/ML_WaveToy_CL/src/WT_CL_Dirichlet.cc +++ b/ML_WaveToy_CL/src/WT_CL_Dirichlet.cc @@ -100,7 +100,7 @@ static void WT_CL_Dirichlet_Body(cGH const * restrict const cctkGH, int const di "CCTK_LOOP3STR(WT_CL_Dirichlet,\n" " i,j,k, imin[0],imin[1],imin[2], imax[0],imax[1],imax[2],\n" " cctk_ash[0],cctk_ash[1],cctk_ash[2],\n" - " imin,imax, CCTK_REAL_VEC_SIZE)\n" + " kimin,kimax, CCTK_REAL_VEC_SIZE)\n" "{\n" " ptrdiff_t /*const*/ index CCTK_ATTRIBUTE_UNUSED = di*i + dj*j + dk*k;\n" " \n" @@ -118,7 +118,7 @@ static void WT_CL_Dirichlet_Body(cGH const * restrict const cctkGH, int const di " CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED rhorhsL = ToReal(0.);\n" " \n" " /* Copy local copies back to grid functions */\n" - " vec_store_partial_prepare(i,lc_imin,lc_imax);\n" + " vec_store_partial_prepare(i,kimin,kimax);\n" " vec_store_nta_partial(rhorhs[index],rhorhsL);\n" " vec_store_nta_partial(urhs[index],urhsL);\n" "}\n" @@ -135,7 +135,7 @@ static void WT_CL_Dirichlet_Body(cGH const * restrict const cctkGH, int const di char const *const sources[] = {differencing, source, NULL}; OpenCLRunTime_CallKernel(cctkGH, CCTK_THORNSTRING, "WT_CL_Dirichlet", sources, groups, NULL, NULL, NULL, -1, - imin, imax, &kernel); + kimin, kimax, &kernel); } diff --git a/ML_WaveToy_CL/src/WT_CL_Energy.cc b/ML_WaveToy_CL/src/WT_CL_Energy.cc index 1b2886f..7eb3385 100644 --- a/ML_WaveToy_CL/src/WT_CL_Energy.cc +++ b/ML_WaveToy_CL/src/WT_CL_Energy.cc @@ -97,7 +97,7 @@ static void WT_CL_Energy_Body(cGH const * restrict const cctkGH, int const dir, "CCTK_LOOP3STR(WT_CL_Energy,\n" " i,j,k, imin[0],imin[1],imin[2], imax[0],imax[1],imax[2],\n" " cctk_ash[0],cctk_ash[1],cctk_ash[2],\n" - " imin,imax, CCTK_REAL_VEC_SIZE)\n" + " kimin,kimax, CCTK_REAL_VEC_SIZE)\n" "{\n" " ptrdiff_t /*const*/ index CCTK_ATTRIBUTE_UNUSED = di*i + dj*j + dk*k;\n" " \n" @@ -119,7 +119,7 @@ static void WT_CL_Energy_Body(cGH const * restrict const cctkGH, int const dir, " kmul(kmadd(rhoL,rhoL,kmadd(PDstandardNth1u,PDstandardNth1u,kmadd(PDstandardNth2u,PDstandardNth2u,kmul(PDstandardNth3u,PDstandardNth3u)))),ToReal(0.5));\n" " \n" " /* Copy local copies back to grid functions */\n" - " vec_store_partial_prepare(i,lc_imin,lc_imax);\n" + " vec_store_partial_prepare(i,kimin,kimax);\n" " vec_store_nta_partial(eps[index],epsL);\n" "}\n" "CCTK_ENDLOOP3STR(WT_CL_Energy);\n" @@ -136,7 +136,7 @@ static void WT_CL_Energy_Body(cGH const * restrict const cctkGH, int const dir, char const *const sources[] = {differencing, source, NULL}; OpenCLRunTime_CallKernel(cctkGH, CCTK_THORNSTRING, "WT_CL_Energy", sources, groups, NULL, NULL, NULL, -1, - imin, imax, &kernel); + kimin, kimax, &kernel); } diff --git a/ML_WaveToy_CL/src/WT_CL_EnergyBoundary.cc b/ML_WaveToy_CL/src/WT_CL_EnergyBoundary.cc index 88eab00..f8e321e 100644 --- a/ML_WaveToy_CL/src/WT_CL_EnergyBoundary.cc +++ b/ML_WaveToy_CL/src/WT_CL_EnergyBoundary.cc @@ -97,7 +97,7 @@ static void WT_CL_EnergyBoundary_Body(cGH const * restrict const cctkGH, int con "CCTK_LOOP3STR(WT_CL_EnergyBoundary,\n" " i,j,k, imin[0],imin[1],imin[2], imax[0],imax[1],imax[2],\n" " cctk_ash[0],cctk_ash[1],cctk_ash[2],\n" - " imin,imax, CCTK_REAL_VEC_SIZE)\n" + " kimin,kimax, CCTK_REAL_VEC_SIZE)\n" "{\n" " ptrdiff_t /*const*/ index CCTK_ATTRIBUTE_UNUSED = di*i + dj*j + dk*k;\n" " \n" @@ -113,7 +113,7 @@ static void WT_CL_EnergyBoundary_Body(cGH const * restrict const cctkGH, int con " CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED epsL = ToReal(0.);\n" " \n" " /* Copy local copies back to grid functions */\n" - " vec_store_partial_prepare(i,lc_imin,lc_imax);\n" + " vec_store_partial_prepare(i,kimin,kimax);\n" " vec_store_nta_partial(eps[index],epsL);\n" "}\n" "CCTK_ENDLOOP3STR(WT_CL_EnergyBoundary);\n" @@ -128,7 +128,7 @@ static void WT_CL_EnergyBoundary_Body(cGH const * restrict const cctkGH, int con char const *const sources[] = {differencing, source, NULL}; OpenCLRunTime_CallKernel(cctkGH, CCTK_THORNSTRING, "WT_CL_EnergyBoundary", sources, groups, NULL, NULL, NULL, -1, - imin, imax, &kernel); + kimin, kimax, &kernel); } diff --git a/ML_WaveToy_CL/src/WT_CL_Gaussian.cc b/ML_WaveToy_CL/src/WT_CL_Gaussian.cc index 0b6f20e..adeacc0 100644 --- a/ML_WaveToy_CL/src/WT_CL_Gaussian.cc +++ b/ML_WaveToy_CL/src/WT_CL_Gaussian.cc @@ -85,7 +85,7 @@ static void WT_CL_Gaussian_Body(cGH const * restrict const cctkGH, int const dir "CCTK_LOOP3STR(WT_CL_Gaussian,\n" " i,j,k, imin[0],imin[1],imin[2], imax[0],imax[1],imax[2],\n" " cctk_ash[0],cctk_ash[1],cctk_ash[2],\n" - " imin,imax, CCTK_REAL_VEC_SIZE)\n" + " kimin,kimax, CCTK_REAL_VEC_SIZE)\n" "{\n" " ptrdiff_t /*const*/ index CCTK_ATTRIBUTE_UNUSED = di*i + dj*j + dk*k;\n" " \n" @@ -105,7 +105,7 @@ static void WT_CL_Gaussian_Body(cGH const * restrict const cctkGH, int const dir " CCTK_REAL_VEC CCTK_ATTRIBUTE_UNUSED rhoL = ToReal(0.);\n" " \n" " /* Copy local copies back to grid functions */\n" - " vec_store_partial_prepare(i,lc_imin,lc_imax);\n" + " vec_store_partial_prepare(i,kimin,kimax);\n" " vec_store_nta_partial(rho[index],rhoL);\n" " vec_store_nta_partial(u[index],uL);\n" "}\n" @@ -123,7 +123,7 @@ static void WT_CL_Gaussian_Body(cGH const * restrict const cctkGH, int const dir char const *const sources[] = {differencing, source, NULL}; OpenCLRunTime_CallKernel(cctkGH, CCTK_THORNSTRING, "WT_CL_Gaussian", sources, groups, NULL, NULL, NULL, -1, - imin, imax, &kernel); + kimin, kimax, &kernel); } diff --git a/ML_WaveToy_CL/src/WT_CL_RHS.cc b/ML_WaveToy_CL/src/WT_CL_RHS.cc index 5dbf41d..0e88732 100644 --- a/ML_WaveToy_CL/src/WT_CL_RHS.cc +++ b/ML_WaveToy_CL/src/WT_CL_RHS.cc @@ -100,7 +100,7 @@ static void WT_CL_RHS_Body(cGH const * restrict const cctkGH, int const dir, int "CCTK_LOOP3STR(WT_CL_RHS,\n" " i,j,k, imin[0],imin[1],imin[2], imax[0],imax[1],imax[2],\n" " cctk_ash[0],cctk_ash[1],cctk_ash[2],\n" - " imin,imax, CCTK_REAL_VEC_SIZE)\n" + " kimin,kimax, CCTK_REAL_VEC_SIZE)\n" "{\n" " ptrdiff_t /*const*/ index CCTK_ATTRIBUTE_UNUSED = di*i + dj*j + dk*k;\n" " \n" @@ -124,7 +124,7 @@ static void WT_CL_RHS_Body(cGH const * restrict const cctkGH, int const dir, int " kadd(PDstandardNth11u,kadd(PDstandardNth22u,PDstandardNth33u));\n" " \n" " /* Copy local copies back to grid functions */\n" - " vec_store_partial_prepare(i,lc_imin,lc_imax);\n" + " vec_store_partial_prepare(i,kimin,kimax);\n" " vec_store_nta_partial(rhorhs[index],rhorhsL);\n" " vec_store_nta_partial(urhs[index],urhsL);\n" "}\n" @@ -143,7 +143,7 @@ static void WT_CL_RHS_Body(cGH const * restrict const cctkGH, int const dir, int char const *const sources[] = {differencing, source, NULL}; OpenCLRunTime_CallKernel(cctkGH, CCTK_THORNSTRING, "WT_CL_RHS", sources, groups, NULL, NULL, NULL, -1, - imin, imax, &kernel); + kimin, kimax, &kernel); } diff --git a/ML_WaveToy_CL/src/WT_CL_Standing.cc b/ML_WaveToy_CL/src/WT_CL_Standing.cc index a65bf2c..e52a2f6 100644 --- a/ML_WaveToy_CL/src/WT_CL_Standing.cc +++ b/ML_WaveToy_CL/src/WT_CL_Standing.cc @@ -85,7 +85,7 @@ static void WT_CL_Standing_Body(cGH const * restrict const cctkGH, int const dir "CCTK_LOOP3STR(WT_CL_Standing,\n" " i,j,k, imin[0],imin[1],imin[2], imax[0],imax[1],imax[2],\n" " cctk_ash[0],cctk_ash[1],cctk_ash[2],\n" - " imin,imax, CCTK_REAL_VEC_SIZE)\n" + " kimin,kimax, CCTK_REAL_VEC_SIZE)\n" "{\n" " ptrdiff_t /*const*/ index CCTK_ATTRIBUTE_UNUSED = di*i + dj*j + dk*k;\n" " \n" @@ -114,7 +114,7 @@ static void WT_CL_Standing_Body(cGH const * restrict const cctkGH, int const dir " kmul(omega,kmul(kcos(kmul(xL,kvec)),kmul(kcos(kmul(yL,kvec)),kmul(kcos(kmul(zL,kvec)),kmul(ksin(kmul(omega,t)),ToReal(-1.*amplitude))))));\n" " \n" " /* Copy local copies back to grid functions */\n" - " vec_store_partial_prepare(i,lc_imin,lc_imax);\n" + " vec_store_partial_prepare(i,kimin,kimax);\n" " vec_store_nta_partial(rho[index],rhoL);\n" " vec_store_nta_partial(u[index],uL);\n" "}\n" @@ -132,7 +132,7 @@ static void WT_CL_Standing_Body(cGH const * restrict const cctkGH, int const dir char const *const sources[] = {differencing, source, NULL}; OpenCLRunTime_CallKernel(cctkGH, CCTK_THORNSTRING, "WT_CL_Standing", sources, groups, NULL, NULL, NULL, -1, - imin, imax, &kernel); + kimin, kimax, &kernel); } -- cgit v1.2.3