jianmu
/
lammps
forked from lijiext/lammps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rename region_block_kokkos inside() 

this prevents compiler confusion with
the inside() function provided by
the normal region_block, as the two
should be completely separate.
This commit is contained in:
Dan Ibanez 2016-12-22 10:49:28 -07:00 committed by Stan Gerald Moore (stamoor)
parent 994f36bc6f
commit 9a0007a13f
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/KOKKOS/region_block_kokkos.cpp
View File

@ -46,7 +46,7 @@ RegBlockKokkos<DeviceType>::~RegBlockKokkos()
template<class DeviceType>
KOKKOS_INLINE_FUNCTION
int RegBlockKokkos<DeviceType>::inside(double x, double y, double z) const
int RegBlockKokkos<DeviceType>::k_inside(double x, double y, double z) const
{
if (x >= xlo && x <= xhi && y >= ylo && y <= yhi && z >= zlo && z <= zhi)
return 1;
@ -85,7 +85,7 @@ void RegBlockKokkos<DeviceType>::operator()(TagRegBlockMatchAll, const int &i) c
/* ----------------------------------------------------------------------
determine if point x,y,z is a match to region volume
XOR computes 0 if 2 args are the same, 1 if different
note that inside() returns 1 for points on surface of region
note that k_inside() returns 1 for points on surface of region
thus point on surface of exterior region will not match
if region has variable shape, invoke shape_update() once per timestep
if region is dynamic, apply inverse transform to x,y,z
@ -99,7 +99,7 @@ KOKKOS_INLINE_FUNCTION
int RegBlockKokkos<DeviceType>::match(double x, double y, double z) const
{
if (dynamic) inverse_transform(x,y,z);
return !(inside(x,y,z) ^ interior);
return !(k_inside(x,y,z) ^ interior);
}
/* ----------------------------------------------------------------------

2
src/KOKKOS/region_block_kokkos.h
View File

@ -52,7 +52,7 @@ class RegBlockKokkos : public RegBlock {
typename AT::t_int_1d_randomread mask;
KOKKOS_INLINE_FUNCTION
int inside(double, double, double) const;
int k_inside(double, double, double) const;
KOKKOS_INLINE_FUNCTION
int match(double, double, double) const;
KOKKOS_INLINE_FUNCTION