Merge branch 'master' of github.com:lammps/lammps into granular-kokkos (e5c6b698) · 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

e5c6b698

Commit e5c6b698 authored 6 years ago by Stan Moore

Downloads
- Plain Diff

Merge branch 'master' of github.com:lammps/lammps into granular-kokkos

parents 3d0722b9 7faa48b4

No related branches found

No related tags found

Loading

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

src/.gitignore 6 additions, 2 deletions

src/.gitignore
src/Makefile 1 addition, 1 deletion

src/Makefile
src/USER-MISC/compute_stress_mop.cpp 3 additions, 3 deletions

src/USER-MISC/compute_stress_mop.cpp
src/USER-MISC/compute_stress_mop_profile.cpp 1 addition, 1 deletion

src/USER-MISC/compute_stress_mop_profile.cpp
src/USER-SMD/smd_math.h 1 addition, 1 deletion

src/USER-SMD/smd_math.h

with 12 additions and 8 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