Merge branch 'master' into openmp-master
21e591dba113
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Dec 1 2011, 16:48.

Description

Merge branch 'master' into openmp-master

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Dec 1 2011, 16:48

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS21e591dba113: Merge branch 'master' into openmp-master (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Dec 1 2011, 16:48

Commit	Author	Details	Committed
263875b6fd01	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7249 f3b2605a-c512-4ea7…	Dec 1 2011
1c808e707526	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7248 f3b2605a-c512-4ea7…	Dec 1 2011
f823c6e4fc2d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7247 f3b2605a-c512-4ea7…	Dec 1 2011
68ddd409e158	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7245 f3b2605a-c512-4ea7…	Dec 1 2011
21c24459c92c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7244 f3b2605a-c512-4ea7…	Dec 1 2011
4badd69f3ea5	athomps	Added settings for glory Intel v.11	Nov 30 2011

				Path
	M			doc/compute_pair_local.html
	M			doc/compute_pair_local.txt
	M			doc/pair_gran.html
	M			doc/pair_gran.txt
	P			lib/meam/Makefile.lammps.glory Copied from lib/meam/Makefile.lammps.ifort
	M			src/GRANULAR/pair_gran_hertz_history.cpp
	M			src/GRANULAR/pair_gran_hertz_history.h
	M			src/GRANULAR/pair_gran_hooke.cpp
	M			src/GRANULAR/pair_gran_hooke.h
	M			src/GRANULAR/pair_gran_hooke_history.cpp
	M			src/GRANULAR/pair_gran_hooke_history.h
	M			src/compute_pair_local.cpp
	M			src/compute_pair_local.h
	M			src/fix_dt_reset.cpp
	M			src/fix_dt_reset.h
	M			src/pair.cpp
	M			src/pair.h
	M			src/pair_hybrid.cpp
	M			src/random_mars.cpp
	M			src/random_park.cpp
	M			src/version.h