From 5dc381949716bef58ea2c47447f2b07a023d77e2 Mon Sep 17 00:00:00 2001 From: Liwei Ji Date: Sun, 21 Apr 2024 18:09:13 -0500 Subject: [PATCH] Subcycling: remove unnecessary CCTK_DEVICE --- Subcycling/src/subcycling.hxx | 4 ++-- TestSubcyclingMC/src/testsubcyclingmc.cxx | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Subcycling/src/subcycling.hxx b/Subcycling/src/subcycling.hxx index 679bdd7ba..a681cf399 100644 --- a/Subcycling/src/subcycling.hxx +++ b/Subcycling/src/subcycling.hxx @@ -74,7 +74,7 @@ inline array get_group_indextype(const int gi) { * \param stage RK stage number starting from 1 */ template -CCTK_DEVICE CCTK_HOST CCTK_ATTRIBUTE_ALWAYS_INLINE inline void +CCTK_HOST CCTK_ATTRIBUTE_ALWAYS_INLINE inline void CalcYfFromKcs(const Loop::GridDescBaseDevice &grid, const Loop::GF3D2 &Yf, const Loop::GF3D2 &u0, @@ -164,7 +164,7 @@ CalcYfFromKcs(const Loop::GridDescBaseDevice &grid, /* Varlist version */ template -CCTK_DEVICE CCTK_HOST CCTK_ATTRIBUTE_ALWAYS_INLINE inline void +CCTK_HOST CCTK_ATTRIBUTE_ALWAYS_INLINE inline void CalcYfFromKcs(CCTK_ARGUMENTS, vector &Yfs, vector &u0s, const array, RKSTAGES> &kcss, const CCTK_REAL dtc, const CCTK_REAL xsi, const CCTK_INT stage) { diff --git a/TestSubcyclingMC/src/testsubcyclingmc.cxx b/TestSubcyclingMC/src/testsubcyclingmc.cxx index 2087fda8b..64d60d19c 100644 --- a/TestSubcyclingMC/src/testsubcyclingmc.cxx +++ b/TestSubcyclingMC/src/testsubcyclingmc.cxx @@ -104,7 +104,7 @@ extern "C" void TestSubcyclingMC_Initial(CCTK_ARGUMENTS) { * \param vlu state vector Us */ template -CCTK_DEVICE CCTK_HOST CCTK_ATTRIBUTE_ALWAYS_INLINE inline void +CCTK_HOST CCTK_ATTRIBUTE_ALWAYS_INLINE inline void CalcRhs(const Loop::GridDescBaseDevice &grid, const array &vlr, const array &vlu) { tVarOut &u_rhs = vlr[0]; @@ -138,7 +138,7 @@ CalcRhs(const Loop::GridDescBaseDevice &grid, const array &vlr, * \param dt time factor of each RK substep */ template -CCTK_DEVICE CCTK_HOST CCTK_ATTRIBUTE_ALWAYS_INLINE inline void +CCTK_HOST CCTK_ATTRIBUTE_ALWAYS_INLINE inline void UpdateU(const Loop::GridDescBaseDevice &grid, const array &vlu, const array &vlr, const CCTK_REAL dt) { for (size_t v = 0; v < D; ++v) { @@ -160,7 +160,7 @@ UpdateU(const Loop::GridDescBaseDevice &grid, const array &vlu, * \param dt time factor of each RK substep */ template -CCTK_DEVICE CCTK_HOST CCTK_ATTRIBUTE_ALWAYS_INLINE inline void +CCTK_HOST CCTK_ATTRIBUTE_ALWAYS_INLINE inline void CalcRhsAndUpdateU(const Loop::GridDescBaseDevice &grid, const array &vlr, const array &vlw, const array &vlu, const CCTK_REAL dt) { @@ -178,7 +178,7 @@ CalcRhsAndUpdateU(const Loop::GridDescBaseDevice &grid, * \param dt time factor of each RK substage */ template -CCTK_DEVICE CCTK_HOST CCTK_ATTRIBUTE_ALWAYS_INLINE inline void +CCTK_HOST CCTK_ATTRIBUTE_ALWAYS_INLINE inline void CalcYs(const Loop::GridDescBaseDevice &grid, const array &vlw, const array &vlp, const array &vlr, const CCTK_REAL dt) {