From 91f119e8dd8128183f3fe84639c92c2da4443dfa Mon Sep 17 00:00:00 2001 From: jpekkila Date: Thu, 4 Jul 2019 16:37:55 +0300 Subject: [PATCH] Deprecated the old implementation of acIntegrateStep. acIntegrateStep now calls acIntegrateStepWithOffset instead of device.cuh functions. --- src/core/astaroth.cu | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/src/core/astaroth.cu b/src/core/astaroth.cu index e361c90..65943ae 100644 --- a/src/core/astaroth.cu +++ b/src/core/astaroth.cu @@ -251,18 +251,6 @@ acStore(AcMesh* host_mesh) return acStoreWithOffset((int3){0, 0, 0}, AC_VTXBUF_SIZE(host_mesh->info), host_mesh); } -AcResult -acIntegrateStep(const int& isubstep, const AcReal& dt) -{ - const int3 start = (int3){NGHOST, NGHOST, NGHOST}; - const int3 end = start + subgrid.n; - for (int i = 0; i < num_devices; ++i) { - rkStep(devices[i], STREAM_PRIMARY, isubstep, start, end, dt); - } - - return AC_SUCCESS; -} - AcResult acIntegrateStepWithOffset(const int& isubstep, const AcReal& dt, const int3& start, const int3& end) { @@ -282,6 +270,21 @@ acIntegrateStepWithOffset(const int& isubstep, const AcReal& dt, const int3& sta return AC_SUCCESS; } +AcResult +acIntegrateStep(const int& isubstep, const AcReal& dt) +{ + const int3 start = (int3){NGHOST, NGHOST, NGHOST}; + const int3 end = start + subgrid.n; + /* Deprecated block, TODO remove when acIntegrateStepWithOffset confirmed to work + for (int i = 0; i < num_devices; ++i) { + rkStep(devices[i], STREAM_PRIMARY, isubstep, start, end, dt); + } + */ + acIntegrateStepWithOffset(isubstep, dt, start, end); + + return AC_SUCCESS; +} + AcResult acBoundcondStep(void) {