diff --git a/src/KOKKOS/region_block_kokkos.cpp b/src/KOKKOS/region_block_kokkos.cpp index 43fd7e7607..ef0d5d27b2 100644 --- a/src/KOKKOS/region_block_kokkos.cpp +++ b/src/KOKKOS/region_block_kokkos.cpp @@ -300,7 +300,7 @@ void RegBlockKokkos::operator()(TagRegBlockMatchAll, const int &i) c double x_tmp = x(i,0); double y_tmp = x(i,1); double z_tmp = x(i,2); - d_match[i] = match(x_tmp,y_tmp,z_tmp); + d_match[i] = match_kokkos(x_tmp,y_tmp,z_tmp); } } @@ -318,7 +318,7 @@ void RegBlockKokkos::operator()(TagRegBlockMatchAll, const int &i) c template KOKKOS_INLINE_FUNCTION -int RegBlockKokkos::match(double x, double y, double z) const +int RegBlockKokkos::match_kokkos(double x, double y, double z) const { if (dynamic) inverse_transform(x,y,z); if (openflag) return 1; diff --git a/src/KOKKOS/region_block_kokkos.h b/src/KOKKOS/region_block_kokkos.h index 8f967cbd7f..417fb2f214 100644 --- a/src/KOKKOS/region_block_kokkos.h +++ b/src/KOKKOS/region_block_kokkos.h @@ -62,7 +62,7 @@ class RegBlockKokkos : public RegBlock, public KokkosBase { KOKKOS_INLINE_FUNCTION int k_inside(double, double, double) const; KOKKOS_INLINE_FUNCTION - int match(double, double, double) const; + int match_kokkos(double, double, double) const; KOKKOS_INLINE_FUNCTION void forward_transform(double&, double&, double&) const; KOKKOS_INLINE_FUNCTION diff --git a/src/KOKKOS/region_sphere_kokkos.cpp b/src/KOKKOS/region_sphere_kokkos.cpp index e27bfa114b..86d3181048 100644 --- a/src/KOKKOS/region_sphere_kokkos.cpp +++ b/src/KOKKOS/region_sphere_kokkos.cpp @@ -218,7 +218,7 @@ void RegSphereKokkos::match_all_kokkos(int groupbit_in, DAT::tdual_i double x_tmp = d_x(i,0); double y_tmp = d_x(i,1); double z_tmp = d_x(i,2); - d_match[i] = match(x_tmp,y_tmp,z_tmp); + d_match[i] = match_kokkos(x_tmp,y_tmp,z_tmp); }}); copymode = 0; @@ -240,7 +240,7 @@ void RegSphereKokkos::match_all_kokkos(int groupbit_in, DAT::tdual_i template KOKKOS_INLINE_FUNCTION -int RegSphereKokkos::match(double x, double y, double z) const +int RegSphereKokkos::match_kokkos(double x, double y, double z) const { if (dynamic) inverse_transform(x,y,z); if (openflag) return 1; diff --git a/src/KOKKOS/region_sphere_kokkos.h b/src/KOKKOS/region_sphere_kokkos.h index db0d8b2ad3..b573a59a83 100644 --- a/src/KOKKOS/region_sphere_kokkos.h +++ b/src/KOKKOS/region_sphere_kokkos.h @@ -51,7 +51,7 @@ class RegSphereKokkos : public RegSphere, public KokkosBase { KOKKOS_INLINE_FUNCTION int k_inside(double, double, double) const; KOKKOS_INLINE_FUNCTION - int match(double, double, double) const; + int match_kokkos(double, double, double) const; KOKKOS_INLINE_FUNCTION void forward_transform(double &, double &, double &) const; KOKKOS_INLINE_FUNCTION