← Back to branch summary

~liggghts-dev/+junk/liggghts-dev

~liggghts-dev/+junk/liggghts-dev

« back to all changes in this revision

Viewing changes to src/compute_pair_gran_local.cpp

Committer: Anton Gladky
Date: 2011-12-03 07:21:52 UTC
Revision ID: gladky.anton@gmail.com-20111203072152-kuse4ike0ac0g8fx

New upstream version

files modified:
doc/Section_commands.html

doc/fix_insert.html

doc/fix_insert.txt

doc/pair_gran.html

src/compute_pair_gran_local.cpp

src/create_atoms.cpp

src/dump_stl.cpp

src/fix_insert.cpp

src/fix_insert.h

src/fix_insert_pack.cpp

src/fix_insert_pack.h

src/fix_insert_stream.cpp

src/fix_insert_stream.h

src/fix_particledistribution_discrete.cpp

src/fix_particledistribution_discrete.h

src/fix_pour.cpp

src/fix_rigid.h

src/fix_template_sphere.cpp

src/fix_template_sphere.h

src/fix_wall_gran_hooke_history.cpp

src/modify.cpp

src/modify.h

src/modify_liggghts.cpp

src/pair_gran.h

src/pair_gran_hooke_history.cpp

src/particleToInsert.cpp

src/particleToInsert.h

src/region.cpp

src/region_tetmesh.cpp

src/style_fix.h

src/version.h

Show diffs side-by-side

added added

removed removed

src/compute_pair_gran_local.cpp

324

324

if (!(atom->mask[i] & groupbit)) return;

325

325

if (!(atom->mask[j] & groupbit)) return;

326

326

327

nlocal = atom->nlocal;

328

327

329

if (newton_pair == 0 && j >= nlocal && atom->tag[i] <= atom->tag[j]) return;

328

330

329

nlocal = atom->nlocal;

330

331

xi = atom->x[i];

331

332

xj = atom->x[j];

332

333

Older »