From d5e202b1879cba4befc471c5c958a3ee2b8568a1 Mon Sep 17 00:00:00 2001 From: Erik Schnetter Date: Sun, 20 Jan 2013 10:09:04 -0500 Subject: Update OpenCL code after Kranc change --- ML_WaveToy_CL/src/WT_CL_Dirichlet.cc | 4 ++-- ML_WaveToy_CL/src/WT_CL_Energy.cc | 4 ++-- ML_WaveToy_CL/src/WT_CL_EnergyBoundary.cc | 4 ++-- ML_WaveToy_CL/src/WT_CL_Gaussian.cc | 4 ++-- ML_WaveToy_CL/src/WT_CL_RHS.cc | 4 ++-- ML_WaveToy_CL/src/WT_CL_Standing.cc | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/ML_WaveToy_CL/src/WT_CL_Dirichlet.cc b/ML_WaveToy_CL/src/WT_CL_Dirichlet.cc index 67c1ce2..1974909 100644 --- a/ML_WaveToy_CL/src/WT_CL_Dirichlet.cc +++ b/ML_WaveToy_CL/src/WT_CL_Dirichlet.cc @@ -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,kimin,kimax);\n" + " vec_store_partial_prepare(i,lc_imin,lc_imax);\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, - kimin, kimax, &kernel); + imin, imax, &kernel); } diff --git a/ML_WaveToy_CL/src/WT_CL_Energy.cc b/ML_WaveToy_CL/src/WT_CL_Energy.cc index 7eb3385..89b8524 100644 --- a/ML_WaveToy_CL/src/WT_CL_Energy.cc +++ b/ML_WaveToy_CL/src/WT_CL_Energy.cc @@ -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,kimin,kimax);\n" + " vec_store_partial_prepare(i,lc_imin,lc_imax);\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, - kimin, kimax, &kernel); + imin, imax, &kernel); } diff --git a/ML_WaveToy_CL/src/WT_CL_EnergyBoundary.cc b/ML_WaveToy_CL/src/WT_CL_EnergyBoundary.cc index f8e321e..592d29e 100644 --- a/ML_WaveToy_CL/src/WT_CL_EnergyBoundary.cc +++ b/ML_WaveToy_CL/src/WT_CL_EnergyBoundary.cc @@ -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,kimin,kimax);\n" + " vec_store_partial_prepare(i,lc_imin,lc_imax);\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, - kimin, kimax, &kernel); + imin, imax, &kernel); } diff --git a/ML_WaveToy_CL/src/WT_CL_Gaussian.cc b/ML_WaveToy_CL/src/WT_CL_Gaussian.cc index adeacc0..fde5721 100644 --- a/ML_WaveToy_CL/src/WT_CL_Gaussian.cc +++ b/ML_WaveToy_CL/src/WT_CL_Gaussian.cc @@ -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,kimin,kimax);\n" + " vec_store_partial_prepare(i,lc_imin,lc_imax);\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, - kimin, kimax, &kernel); + imin, imax, &kernel); } diff --git a/ML_WaveToy_CL/src/WT_CL_RHS.cc b/ML_WaveToy_CL/src/WT_CL_RHS.cc index 0e88732..a8212f6 100644 --- a/ML_WaveToy_CL/src/WT_CL_RHS.cc +++ b/ML_WaveToy_CL/src/WT_CL_RHS.cc @@ -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,kimin,kimax);\n" + " vec_store_partial_prepare(i,lc_imin,lc_imax);\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, - kimin, kimax, &kernel); + imin, imax, &kernel); } diff --git a/ML_WaveToy_CL/src/WT_CL_Standing.cc b/ML_WaveToy_CL/src/WT_CL_Standing.cc index e52a2f6..3f79b33 100644 --- a/ML_WaveToy_CL/src/WT_CL_Standing.cc +++ b/ML_WaveToy_CL/src/WT_CL_Standing.cc @@ -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,kimin,kimax);\n" + " vec_store_partial_prepare(i,lc_imin,lc_imax);\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, - kimin, kimax, &kernel); + imin, imax, &kernel); } -- cgit v1.2.3