Merge branch 'master' of https://github.com/oywg11/lammps into ilp-update (918030bf) · 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

918030bf

Commit 918030bf authored 6 years ago by Axel Kohlmeyer

Downloads
- Plain Diff

Merge branch 'master' of https://github.com/oywg11/lammps into ilp-update

parents de010551 70548009

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

doc/src/pair_coul_shield.txt 7 additions, 1 deletion

doc/src/pair_coul_shield.txt
doc/src/pair_ilp_graphene_hbn.txt 18 additions, 15 deletions

doc/src/pair_ilp_graphene_hbn.txt
doc/src/pair_kolmogorov_crespi_full.txt 20 additions, 17 deletions

doc/src/pair_kolmogorov_crespi_full.txt
potentials/BNCH.ILP 1 addition, 1 deletion

potentials/BNCH.ILP
potentials/CH.KC 2 additions, 2 deletions

potentials/CH.KC
potentials/CH_taper.KC 10 additions, 0 deletions

potentials/CH_taper.KC
src/USER-MISC/pair_ilp_graphene_hbn.cpp 12 additions, 15 deletions

src/USER-MISC/pair_ilp_graphene_hbn.cpp
src/USER-MISC/pair_kolmogorov_crespi_full.cpp 12 additions, 15 deletions

src/USER-MISC/pair_kolmogorov_crespi_full.cpp

with 82 additions and 66 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