Merge branch 'master' into lammps-icms
6214cf294416
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Feb 2 2012, 15:13.

Description

Merge branch 'master' into lammps-icms

Resolved Conflicts:
src/USER-CUDA/fix_npt_cuda.cpp
src/USER-CUDA/fix_nvt_cuda.cpp
src/USER-OMP/fix_omp.cpp
src/fix.h
src/memory.cpp
tools/restart2data.cpp

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Feb 2 2012, 15:13

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPSce633356ed94: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7670 f3b2605a-c512-4ea7…
rLAMMPS82f7e17e1b07: more benchmark/test inputs

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS6214cf294416: Merge branch 'master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Feb 2 2012, 15:13

Merged Changes

Commit	Author	Details	Committed
ce633356ed94	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7670 f3b2605a-c512-4ea7…	Feb 2 2012
910d6d7ee900	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7669 f3b2605a-c512-4ea7…	Feb 2 2012
8b9213e59699	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7667 f3b2605a-c512-4ea7…	Feb 2 2012
ef018cb7889b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7665 f3b2605a-c512-4ea7…	Feb 2 2012
9b9d771622c7	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7664 f3b2605a-c512-4ea7…	Feb 2 2012
29e502742417	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7663 f3b2605a-c512-4ea7…	Feb 2 2012
abbc8e663131	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7662 f3b2605a-c512-4ea7…	Feb 2 2012
879f4b1fefc8	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7659 f3b2605a-c512-4ea7…	Feb 2 2012
520041521236	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7657 f3b2605a-c512-4ea7…	Feb 1 2012
17d1e960e8ab	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7656 f3b2605a-c512-4ea7…	Feb 1 2012
40b3346da56f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7655 f3b2605a-c512-4ea7…	Feb 1 2012
7bef0cb6e898	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7654 f3b2605a-c512-4ea7…	Feb 1 2012
0b90874adb56	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7652 f3b2605a-c512-4ea7…	Feb 1 2012
9b7f6f63f010	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7651 f3b2605a-c512-4ea7…	Feb 1 2012
2403846a65fc	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7649 f3b2605a-c512-4ea7…	Feb 1 2012
832b55ae272c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7648 f3b2605a-c512-4ea7…	Feb 1 2012
f884a7ec8574	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7647 f3b2605a-c512-4ea7…	Feb 1 2012
0f4554b52b79	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7645 f3b2605a-c512-4ea7…	Feb 1 2012
2c42373bc8d0	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7644 f3b2605a-c512-4ea7…	Feb 1 2012
7e11d0e7baf0	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7643 f3b2605a-c512-4ea7…	Feb 1 2012
b282ba678179	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7642 f3b2605a-c512-4ea7…	Feb 1 2012
0b2c652aa97d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7641 f3b2605a-c512-4ea7…	Feb 1 2012
b5c44ab99aba	athomps	Added note about Apple sed	Feb 1 2012
44b7f26dd70f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7639 f3b2605a-c512-4ea7…	Feb 1 2012

Changes (39)

				Path
	A			doc/Eqs/pair_beck.jpg
	A			doc/Eqs/pair_beck.tex
	A			doc/Eqs/pair_meam_spline_1.png
	A			doc/Eqs/pair_meam_spline_2.png
	M			doc/Section_commands.html
	M			doc/Section_commands.txt
	A			doc/pair_beck.html
	A			doc/pair_beck.txt
	M			doc/pair_meam.html
	M			doc/pair_meam.txt
	A			doc/pair_meam_spline.html
	A			doc/pair_meam_spline.txt
	M			lib/gpu/lal_table.cpp
	M			potentials/README
	A			potentials/Si_1.meam.spline
	A			potentials/Si_2.meam.spline
	A			potentials/Ti.meam.spline
	M			src/DIPOLE/atom_vec_dipole.cpp
	M			src/GPU/Install.sh
	M			src/GPU/pair_buck_coul_long_gpu.cpp
	M			src/KIM/pair_kim.cpp
	M			src/KIM/pair_kim.h
	M			src/MEAM/Install.sh
	M			src/POEMS/Install.sh
	M			src/REAX/Install.sh
	M			src/USER-ATC/Install.sh
	M			src/USER-AWPMD/Install.sh
	M			src/USER-CUDA/Install.sh
	M			src/USER-MISC/Install.sh
	M			src/USER-MISC/README
	A			src/USER-MISC/pair_meam_spline.cpp
	A			src/USER-MISC/pair_meam_spline.h
	M			src/USER-OMP/Install.sh
	M			src/fix.h
	M			src/memory.cpp
	P			src/pair_beck.cpp Copied from src/pair_lj_smooth_linear.cpp
	P			src/pair_beck.h Copied from src/USER-MISC/pair_lj_sf.h
	M			src/pair_yukawa.cpp
	M			src/version.h