From 4bf9a93c11c9f2baf4290dea63b6db6e7ad199cb Mon Sep 17 00:00:00 2001
From: Stefan Paquay <stefanpaquay@gmail.com>
Date: Wed, 6 Jun 2018 10:47:07 -0400
Subject: [PATCH] Removed x dependency from enforce2d_kokkos.
---
src/KOKKOS/fix_enforce2d_kokkos.cpp | 9 ++++++---
src/KOKKOS/fix_enforce2d_kokkos.h | 2 --
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/KOKKOS/fix_enforce2d_kokkos.cpp b/src/KOKKOS/fix_enforce2d_kokkos.cpp
index 8ba68a0c0c..da33455978 100644
--- a/src/KOKKOS/fix_enforce2d_kokkos.cpp
+++ b/src/KOKKOS/fix_enforce2d_kokkos.cpp
@@ -33,10 +33,10 @@ FixEnforce2DKokkos<DeviceType>::FixEnforce2DKokkos(LAMMPS *lmp, int narg, char *
atomKK = (AtomKokkos *) atom;
execution_space = ExecutionSpaceFromDevice<DeviceType>::space;
- datamask_read = X_MASK | V_MASK | F_MASK | OMEGA_MASK | MASK_MASK
+ datamask_read = V_MASK | F_MASK | OMEGA_MASK | MASK_MASK
| TORQUE_MASK | ANGMOM_MASK; // | */ // MASK_MASK;
- datamask_modify = X_MASK | V_MASK | F_MASK | OMEGA_MASK
+ datamask_modify = V_MASK | F_MASK | OMEGA_MASK
| TORQUE_MASK | ANGMOM_MASK;
}
@@ -44,6 +44,10 @@ FixEnforce2DKokkos<DeviceType>::FixEnforce2DKokkos(LAMMPS *lmp, int narg, char *
template <class DeviceType>
void FixEnforce2DKokkos<DeviceType>::setup(int vflag)
{
+ if( comm->me == 0 ){
+ fprintf(screen, "omega, angmom and torque flags are %d, %d, %d\n",
+ atomKK->omega_flag, atomKK->angmom_flag, atomKK->torque_flag );
+ }
post_force(vflag);
}
@@ -54,7 +58,6 @@ void FixEnforce2DKokkos<DeviceType>::post_force(int vflag)
atomKK->sync(execution_space,datamask_read);
atomKK->modified(execution_space,datamask_modify);
- x = atomKK->k_x.view<DeviceType>();
v = atomKK->k_v.view<DeviceType>();
f = atomKK->k_f.view<DeviceType>();
diff --git a/src/KOKKOS/fix_enforce2d_kokkos.h b/src/KOKKOS/fix_enforce2d_kokkos.h
index 4130797f2c..d8a13d281f 100644
--- a/src/KOKKOS/fix_enforce2d_kokkos.h
+++ b/src/KOKKOS/fix_enforce2d_kokkos.h
@@ -46,8 +46,6 @@ class FixEnforce2DKokkos : public FixEnforce2D {
// void post_force_respa(int, int, int); No RRESPA support yet.
private:
-
- typename ArrayTypes<DeviceType>::t_x_array x;
typename ArrayTypes<DeviceType>::t_v_array v;
typename ArrayTypes<DeviceType>::t_f_array f;
--
GitLab