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

4907b29a

Commit 4907b29a authored 8 years ago by Axel Kohlmeyer

Downloads
- Plain Diff

Merge branch 'USER-DPD_bugfixes' of...

Merge branch 'USER-DPD_bugfixes' of https://github.com/timattox/lammps_USER-DPD into corrections-and-bugfixes

This closes #302

parents da2ad5b6 126fb22e

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

src/USER-DPD/fix_eos_cv.h 4 additions, 0 deletions

src/USER-DPD/fix_eos_cv.h
src/USER-DPD/fix_eos_table.h 4 additions, 0 deletions

src/USER-DPD/fix_eos_table.h
src/USER-DPD/fix_eos_table_rx.cpp 9 additions, 7 deletions

src/USER-DPD/fix_eos_table_rx.cpp
src/USER-DPD/fix_eos_table_rx.h 4 additions, 0 deletions

src/USER-DPD/fix_eos_table_rx.h
src/USER-DPD/fix_rx.cpp 30 additions, 26 deletions

src/USER-DPD/fix_rx.cpp
src/USER-DPD/fix_rx.h 1 addition, 0 deletions

src/USER-DPD/fix_rx.h
src/USER-DPD/pair_exp6_rx.cpp 36 additions, 10 deletions

src/USER-DPD/pair_exp6_rx.cpp
src/USER-DPD/pair_multi_lucy.h 1 addition, 1 deletion

src/USER-DPD/pair_multi_lucy.h
src/USER-DPD/pair_multi_lucy_rx.h 1 addition, 1 deletion

src/USER-DPD/pair_multi_lucy_rx.h

with 90 additions and 45 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