ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15261 f3b2605a-c512-4ea7-a41b-209d697bcdaa

Browse Source
This commit is contained in:
sjplimp
2016-07-05 14:41:13 +00:00
parent 742ad5ac50
commit 34f829c5ac
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/gpu/lal_base_three.cpp
View File

@ -227,7 +227,7 @@ void BaseThreeT::compute(const int f_ago, const int inum_full, const int nall,
const bool vatom, int &host_start, const bool vatom, int &host_start,
const double cpu_time, bool &success) { const double cpu_time, bool &success) {
acc_timers(); acc_timers();
if (nlist==0) { if (inum_full==0) {
host_start=0; host_start=0;
// Make sure textures are correct if realloc by a different hybrid style // Make sure textures are correct if realloc by a different hybrid style
resize_atom(0,nall,success); resize_atom(0,nall,success);

6
lib/gpu/lal_tersoff.cpp
View File

@ -223,14 +223,14 @@ double TersoffT::host_memory_usage() const {
// Copy nbor list from host if necessary and then calculate forces, virials,.. // Copy nbor list from host if necessary and then calculate forces, virials,..
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
template <class numtyp, class acctyp> template <class numtyp, class acctyp>
void TersoffT::compute(const int f_ago, const int nlocal, const int nall, void TersoffT::compute(const int f_ago, const int inum_full, const int nall,
const int nlist, double **host_x, int *host_type, const int nlist, double **host_x, int *host_type,
int *ilist, int *numj, int **firstneigh, int *ilist, int *numj, int **firstneigh,
const bool eflag, const bool vflag, const bool eatom, const bool eflag, const bool vflag, const bool eatom,
const bool vatom, int &host_start, const bool vatom, int &host_start,
const double cpu_time, bool &success) { const double cpu_time, bool &success) {
this->acc_timers(); this->acc_timers();
if (nlist==0) { if (inum_full==0) {
host_start=0; host_start=0;
// Make sure textures are correct if realloc by a different hybrid style // Make sure textures are correct if realloc by a different hybrid style
this->resize_atom(0,nall,success); this->resize_atom(0,nall,success);
@ -239,7 +239,7 @@ void TersoffT::compute(const int f_ago, const int nlocal, const int nall,
} }
int ago=this->hd_balancer.ago_first(f_ago); int ago=this->hd_balancer.ago_first(f_ago);
int inum=this->hd_balancer.balance(ago,nlocal,cpu_time); int inum=this->hd_balancer.balance(ago,inum_full,cpu_time);
this->ans->inum(inum); this->ans->inum(inum);
#ifdef THREE_CONCURRENT #ifdef THREE_CONCURRENT
this->ans2->inum(inum); this->ans2->inum(inum);

6
lib/gpu/lal_tersoff_mod.cpp
View File

@ -223,14 +223,14 @@ double TersoffMT::host_memory_usage() const {
// Copy nbor list from host if necessary and then calculate forces, virials,.. // Copy nbor list from host if necessary and then calculate forces, virials,..
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
template <class numtyp, class acctyp> template <class numtyp, class acctyp>
void TersoffMT::compute(const int f_ago, const int nlocal, const int nall, void TersoffMT::compute(const int f_ago, const int inum_full, const int nall,
const int nlist, double **host_x, int *host_type, const int nlist, double **host_x, int *host_type,
int *ilist, int *numj, int **firstneigh, int *ilist, int *numj, int **firstneigh,
const bool eflag, const bool vflag, const bool eatom, const bool eflag, const bool vflag, const bool eatom,
const bool vatom, int &host_start, const bool vatom, int &host_start,
const double cpu_time, bool &success) { const double cpu_time, bool &success) {
this->acc_timers(); this->acc_timers();
if (nlist==0) { if (inum_full==0) {
host_start=0; host_start=0;
// Make sure textures are correct if realloc by a different hybrid style // Make sure textures are correct if realloc by a different hybrid style
this->resize_atom(0,nall,success); this->resize_atom(0,nall,success);
@ -239,7 +239,7 @@ void TersoffMT::compute(const int f_ago, const int nlocal, const int nall,
} }
int ago=this->hd_balancer.ago_first(f_ago); int ago=this->hd_balancer.ago_first(f_ago);
int inum=this->hd_balancer.balance(ago,nlocal,cpu_time); int inum=this->hd_balancer.balance(ago,inum_full,cpu_time);
this->ans->inum(inum); this->ans->inum(inum);
#ifdef THREE_CONCURRENT #ifdef THREE_CONCURRENT
this->ans2->inum(inum); this->ans2->inum(inum);

6
lib/gpu/lal_tersoff_zbl.cpp
View File

@ -248,14 +248,14 @@ double TersoffZT::host_memory_usage() const {
// Copy nbor list from host if necessary and then calculate forces, virials,.. // Copy nbor list from host if necessary and then calculate forces, virials,..
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
template <class numtyp, class acctyp> template <class numtyp, class acctyp>
void TersoffZT::compute(const int f_ago, const int nlocal, const int nall, void TersoffZT::compute(const int f_ago, const int inum_full, const int nall,
const int nlist, double **host_x, int *host_type, const int nlist, double **host_x, int *host_type,
int *ilist, int *numj, int **firstneigh, int *ilist, int *numj, int **firstneigh,
const bool eflag, const bool vflag, const bool eatom, const bool eflag, const bool vflag, const bool eatom,
const bool vatom, int &host_start, const bool vatom, int &host_start,
const double cpu_time, bool &success) { const double cpu_time, bool &success) {
this->acc_timers(); this->acc_timers();
if (nlist==0) { if (inum_full==0) {
host_start=0; host_start=0;
// Make sure textures are correct if realloc by a different hybrid style // Make sure textures are correct if realloc by a different hybrid style
this->resize_atom(0,nall,success); this->resize_atom(0,nall,success);
@ -264,7 +264,7 @@ void TersoffZT::compute(const int f_ago, const int nlocal, const int nall,
} }
int ago=this->hd_balancer.ago_first(f_ago); int ago=this->hd_balancer.ago_first(f_ago);
int inum=this->hd_balancer.balance(ago,nlocal,cpu_time); int inum=this->hd_balancer.balance(ago,inum_full,cpu_time);
this->ans->inum(inum); this->ans->inum(inum);
#ifdef THREE_CONCURRENT #ifdef THREE_CONCURRENT
this->ans2->inum(inum); this->ans2->inum(inum);