Merge pull request #2615 from wmbrownIntel/user-intel-hyb-fix

Fix for hybrid pair style with certain combinations of USER-INTEL styles
2021-02-20 07:48:09 -05:00
parent 231a495129 a40db8ddf1
commit f0f5962676
1 changed files with 1 additions and 2 deletions
--- a/src/USER-INTEL/fix_intel.cpp
+++ b/src/USER-INTEL/fix_intel.cpp
@ -318,8 +318,7 @@ void FixIntel::init()
  _zero_master = 0;

  if (_pair_hybrid_flag && _hybrid_nonpair)
-    if (_pair_hybrid_flag > 1 || force->newton_pair == 0)
-      _pair_hybrid_zero = 1;
+    _pair_hybrid_zero = 1;
  _hybrid_nonpair = 0;

  _pair_intel_count = 0;