Merge branch 'master' into openmp-master
b3018aab48b4
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Oct 26 2011, 20:23.

Description

Merge branch 'master' into openmp-master

Resolved Conflicts:
doc/fix_wall_reflect.txt
src/MANYBODY/pair_airebo.cpp
src/MANYBODY/pair_airebo.h
src/MANYBODY/pair_comb.cpp
src/MANYBODY/pair_comb.h
src/neigh_list.cpp

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Oct 26 2011, 20:23

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS793b6ddcaa01: Merge branch 'openmp-step8' into openmp-master
rLAMMPS667fde6a9e91: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7199 f3b2605a-c512-4ea7…

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPSb3018aab48b4: Merge branch 'master' into openmp-master (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Oct 26 2011, 20:23

Merged Changes

Commit	Author	Details	Committed
667fde6a9e91	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7199 f3b2605a-c512-4ea7…	Oct 25 2011
e62a6b19bf33	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7198 f3b2605a-c512-4ea7…	Oct 25 2011
8a24e16c9123	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7197 f3b2605a-c512-4ea7…	Oct 25 2011
cbbb66194ceb	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7196 f3b2605a-c512-4ea7…	Oct 25 2011
51aef530dedd	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7195 f3b2605a-c512-4ea7…	Oct 25 2011
9e9dcf4f3bf0	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7193 f3b2605a-c512-4ea7…	Oct 25 2011
895680bd32e0	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7192 f3b2605a-c512-4ea7…	Oct 25 2011
f9847d811110	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7191 f3b2605a-c512-4ea7…	Oct 25 2011
c8a544cbaed8	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7190 f3b2605a-c512-4ea7…	Oct 25 2011
fdba4b962b7b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7189 f3b2605a-c512-4ea7…	Oct 25 2011
f4aa73f5d532	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7188 f3b2605a-c512-4ea7…	Oct 25 2011
b5d15e114ab3	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7187 f3b2605a-c512-4ea7…	Oct 25 2011
ac624c1f8259	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7186 f3b2605a-c512-4ea7…	Oct 25 2011
424fd114d75f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7185 f3b2605a-c512-4ea7…	Oct 25 2011

Changes (37)

				Path
	M			doc/Section_accelerate.html
	M			doc/Section_commands.html
	M			doc/Section_commands.txt
	M			doc/fix_wall_reflect.html
	M			doc/fix_wall_reflect.txt
	M			doc/fix_wall_srd.html
	M			src/ASPHERE/pair_line_lj.cpp
	M			src/ASPHERE/pair_tri_lj.cpp
	M			src/MAKE/Makefile.linux
	M			src/MANYBODY/pair_adp.cpp
	M			src/MANYBODY/pair_airebo.cpp
	M			src/MANYBODY/pair_airebo.h
	M			src/MANYBODY/pair_comb.cpp
	M			src/MANYBODY/pair_comb.h
	M			src/MANYBODY/pair_eam.cpp
	M			src/MANYBODY/pair_eim.cpp
	M			src/MANYBODY/pair_sw.cpp
	M			src/MANYBODY/pair_tersoff.cpp
	M			src/MEAM/pair_meam.cpp
	M			src/MOLECULE/pair_hbond_dreiding_lj.cpp
	M			src/REAX/pair_reax.cpp
	M			src/USER-MISC/pair_cdeam.cpp
	M			src/USER-MISC/pair_edip.cpp
	M			src/USER-REAXC/pair_reax_c.cpp
	M			src/USER-SPH/pair_sph_heatconduction.cpp
	M			src/USER-SPH/pair_sph_idealgas.cpp
	M			src/USER-SPH/pair_sph_lj.cpp
	M			src/USER-SPH/pair_sph_rhosum.cpp
	M			src/USER-SPH/pair_sph_taitwater.cpp
	M			src/USER-SPH/pair_sph_taitwater_morris.cpp
	M			src/force.cpp
	M			src/neigh_list.cpp
	M			src/pair.cpp
	M			src/pair.h
	M			src/read_data.cpp
	M			src/read_restart.cpp
	M			src/version.h