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@15217 f3b2605a-c512-4ea7-a41b-209d697bcdaa

Browse Source
This commit is contained in:
sjplimp
2016-06-27 22:19:57 +00:00
parent ffc252e784
commit b58e008cae
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/neigh_gran.cpp
View File

@ -162,6 +162,7 @@ void Neighbor::granular_nsq_no_newton(NeighList *list)
/* ---------------------------------------------------------------------- /* ----------------------------------------------------------------------
granular particles granular particles
N^2 / 2 search for neighbor pairs with full Newton's 3rd law N^2 / 2 search for neighbor pairs with full Newton's 3rd law
shear history must be accounted for when a neighbor pair is added
pair added to list if atoms i and j are both owned and i < j pair added to list if atoms i and j are both owned and i < j
if j is ghost only me or other proc adds pair if j is ghost only me or other proc adds pair
decision based on itag,jtag tests decision based on itag,jtag tests
@ -468,6 +469,7 @@ void Neighbor::granular_bin_no_newton(NeighList *list)
/* ---------------------------------------------------------------------- /* ----------------------------------------------------------------------
granular particles granular particles
binned neighbor list construction with full Newton's 3rd law binned neighbor list construction with full Newton's 3rd law
shear history must be accounted for when a neighbor pair is added
each owned atom i checks its own bin and other bins in Newton stencil each owned atom i checks its own bin and other bins in Newton stencil
every pair stored exactly once by some processor every pair stored exactly once by some processor
------------------------------------------------------------------------- */ ------------------------------------------------------------------------- */
@ -664,6 +666,7 @@ void Neighbor::granular_bin_newton(NeighList *list)
/* ---------------------------------------------------------------------- /* ----------------------------------------------------------------------
granular particles granular particles
binned neighbor list construction with Newton's 3rd law for triclinic binned neighbor list construction with Newton's 3rd law for triclinic
shear history must be accounted for when a neighbor pair is added
each owned atom i checks its own bin and other bins in triclinic stencil each owned atom i checks its own bin and other bins in triclinic stencil
every pair stored exactly once by some processor every pair stored exactly once by some processor
------------------------------------------------------------------------- */ ------------------------------------------------------------------------- */

5
src/pair_coul_wolf.cpp
View File

@ -34,7 +34,10 @@ using namespace MathConst;
/* ---------------------------------------------------------------------- */ /* ---------------------------------------------------------------------- */
PairCoulWolf::PairCoulWolf(LAMMPS *lmp) : Pair(lmp) {} PairCoulWolf::PairCoulWolf(LAMMPS *lmp) : Pair(lmp)
{
single_enable = 0; // NOTE: single() method below is not yet correct
}
/* ---------------------------------------------------------------------- */ /* ---------------------------------------------------------------------- */