Merge branch 'grem-feature' of https://github.com/dstelter92/lammps into grem-feature

Browse Source

Resolved merge conflicts and adapted logic to most recent changes in feature branch

Closes #46

...

This commit is contained in:

Axel Kohlmeyer

2016-11-16 16:11:53 -05:00

parent 683f514fac 16c8a307e5

commit 82364d10e3

6 changed files with 163 additions and 34 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

0

examples/USER/misc/grem/lj-single/in.gREM → examples/USER/misc/grem/lj-single/in.gREM-npt