Skip to content

Turn on single_bond method for Hopkins contact model for CPUs #48

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
akturner wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Turn on single_bond method for Hopkins contact model for CPUs #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/KOKKOS/pair_gran_hopkins_kokkos.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,10 +382,10 @@ void PairGranHopkinsKokkos<DeviceType>::operator()(TagPairGranHopkinsCompute<NEI
}

//-----------------------------------------------------------------------------

#ifndef KOKKOS_ENABLE_CUDA
template<class DeviceType>
KOKKOS_INLINE_FUNCTION
void PairGranHopkinsKokkos<DeviceType>::demsi_single_bond(int i,
void PairGranHopkinsKokkos<DeviceType>::single_bond(int i,
int j,
int jj,
F_FLOAT &fx,
Expand Down Expand Up @@ -432,7 +432,7 @@ void PairGranHopkinsKokkos<DeviceType>::demsi_single_bond(int i,
}

}

#endif
//-----------------------------------------------------------------------------

template<class DeviceType>
Expand Down
4 changes: 3 additions & 1 deletion src/KOKKOS/pair_gran_hopkins_kokkos.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,9 @@ class PairGranHopkinsKokkos : public PairGranHopkins {
KOKKOS_INLINE_FUNCTION
void operator()(TagPairGranHopkinsCompute<NEIGHFLAG,NEWTON_PAIR,HISTORYUPDATE,EVFLAG>, const int, EV_FLOAT &ev) const;

#ifndef KOKKOS_ENABLE_CUDA
KOKKOS_INLINE_FUNCTION
void demsi_single_bond(int,
void single_bond(int,
int,
int,
F_FLOAT &fx,
Expand All @@ -62,6 +63,7 @@ class PairGranHopkinsKokkos : public PairGranHopkins {
F_FLOAT &fyt,
F_FLOAT &torque_i,
F_FLOAT &torque_j);
#endif

template<int NEIGHFLAG, int NEWTON_PAIR, int HISTORYUPDATE>
KOKKOS_INLINE_FUNCTION
Expand Down