Merge branch 'master' into user-cgdna (4e625325) · Commits · multiscale / lammps · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

L

lammps
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

4e625325

Commit 4e625325 authored 6 years ago by Oliver Henrich

Downloads
- Plain Diff

Merge branch 'master' into user-cgdna

parents 562296bd 91c4ef6f

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

doc/src/fix_bond_break.txt 2 additions, 2 deletions

doc/src/fix_bond_break.txt
doc/src/fix_bond_create.txt 2 additions, 2 deletions

doc/src/fix_bond_create.txt
doc/src/fix_bond_react.txt 27 additions, 17 deletions

doc/src/fix_bond_react.txt
doc/src/group.txt 1 addition, 2 deletions

doc/src/group.txt
examples/USER/misc/bond_react/nylon,6-6_melt/in.large_nylon_melt 1 addition, 1 deletion

...s/USER/misc/bond_react/nylon,6-6_melt/in.large_nylon_melt
examples/USER/misc/bond_react/tiny_nylon/in.tiny_nylon 1 addition, 1 deletion

examples/USER/misc/bond_react/tiny_nylon/in.tiny_nylon
src/SPIN/fix_nve_spin.cpp 3 additions, 0 deletions

src/SPIN/fix_nve_spin.cpp
src/USER-MISC/fix_bond_react.cpp 113 additions, 71 deletions

src/USER-MISC/fix_bond_react.cpp
src/USER-MISC/fix_bond_react.h 6 additions, 3 deletions

src/USER-MISC/fix_bond_react.h

with 156 additions and 99 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment