diff --git a/lib/gpu/lal_base_three.cpp b/lib/gpu/lal_base_three.cpp index 14f642e55b..f772e36295 100644 --- a/lib/gpu/lal_base_three.cpp +++ b/lib/gpu/lal_base_three.cpp @@ -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 double cpu_time, bool &success) { acc_timers(); - if (nlist==0) { + if (inum_full==0) { host_start=0; // Make sure textures are correct if realloc by a different hybrid style resize_atom(0,nall,success); diff --git a/lib/gpu/lal_tersoff.cpp b/lib/gpu/lal_tersoff.cpp index bf634cffc2..6b0b563d9f 100644 --- a/lib/gpu/lal_tersoff.cpp +++ b/lib/gpu/lal_tersoff.cpp @@ -223,14 +223,14 @@ double TersoffT::host_memory_usage() const { // Copy nbor list from host if necessary and then calculate forces, virials,.. // --------------------------------------------------------------------------- template -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, int *ilist, int *numj, int **firstneigh, const bool eflag, const bool vflag, const bool eatom, const bool vatom, int &host_start, const double cpu_time, bool &success) { this->acc_timers(); - if (nlist==0) { + if (inum_full==0) { host_start=0; // Make sure textures are correct if realloc by a different hybrid style 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 inum=this->hd_balancer.balance(ago,nlocal,cpu_time); + int inum=this->hd_balancer.balance(ago,inum_full,cpu_time); this->ans->inum(inum); #ifdef THREE_CONCURRENT this->ans2->inum(inum); diff --git a/lib/gpu/lal_tersoff_mod.cpp b/lib/gpu/lal_tersoff_mod.cpp index a01bcf63b1..553dad3583 100644 --- a/lib/gpu/lal_tersoff_mod.cpp +++ b/lib/gpu/lal_tersoff_mod.cpp @@ -223,14 +223,14 @@ double TersoffMT::host_memory_usage() const { // Copy nbor list from host if necessary and then calculate forces, virials,.. // --------------------------------------------------------------------------- template -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, int *ilist, int *numj, int **firstneigh, const bool eflag, const bool vflag, const bool eatom, const bool vatom, int &host_start, const double cpu_time, bool &success) { this->acc_timers(); - if (nlist==0) { + if (inum_full==0) { host_start=0; // Make sure textures are correct if realloc by a different hybrid style 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 inum=this->hd_balancer.balance(ago,nlocal,cpu_time); + int inum=this->hd_balancer.balance(ago,inum_full,cpu_time); this->ans->inum(inum); #ifdef THREE_CONCURRENT this->ans2->inum(inum); diff --git a/lib/gpu/lal_tersoff_zbl.cpp b/lib/gpu/lal_tersoff_zbl.cpp index c1f3f25c04..9cce8a802d 100644 --- a/lib/gpu/lal_tersoff_zbl.cpp +++ b/lib/gpu/lal_tersoff_zbl.cpp @@ -248,14 +248,14 @@ double TersoffZT::host_memory_usage() const { // Copy nbor list from host if necessary and then calculate forces, virials,.. // --------------------------------------------------------------------------- template -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, int *ilist, int *numj, int **firstneigh, const bool eflag, const bool vflag, const bool eatom, const bool vatom, int &host_start, const double cpu_time, bool &success) { this->acc_timers(); - if (nlist==0) { + if (inum_full==0) { host_start=0; // Make sure textures are correct if realloc by a different hybrid style 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 inum=this->hd_balancer.balance(ago,nlocal,cpu_time); + int inum=this->hd_balancer.balance(ago,inum_full,cpu_time); this->ans->inum(inum); #ifdef THREE_CONCURRENT this->ans2->inum(inum);