Merge remote branch 'lammps-ro/master' into lammps-icms
6553258ee993
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Jun 30 2013, 12:41.

Description

Merge remote branch 'lammps-ro/master' into lammps-icms

Resolved Conflicts:
doc/Manual.txt
src/DIPOLE/pair_lj_cut_dipole_long.h
src/MAKE/Makefile.openmpi-omp

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Jun 30 2013, 12:41

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS6553258ee993: Merge remote branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Jun 30 2013, 12:41

Commit	Author	Details	Committed
31f46ba04573	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10206 f3b2605a-c512-4ea7…	Jun 29 2013
64a5e8313f22	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10204 f3b2605a-c512-4ea7…	Jun 29 2013
8d14cb6542f1	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10203 f3b2605a-c512-4ea7…	Jun 29 2013
f665d2d520de	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10202 f3b2605a-c512-4ea7…	Jun 29 2013
f6b6aae21b6a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10201 f3b2605a-c512-4ea7…	Jun 29 2013
d2c3a96a9a26	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10200 f3b2605a-c512-4ea7…	Jun 29 2013
b0007d45b732	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10199 f3b2605a-c512-4ea7…	Jun 29 2013
e954b14d996f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10198 f3b2605a-c512-4ea7…	Jun 29 2013
ce91adefc17b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10197 f3b2605a-c512-4ea7…	Jun 29 2013
d694b0dee0fc	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10196 f3b2605a-c512-4ea7…	Jun 29 2013
576141444409	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10195 f3b2605a-c512-4ea7…	Jun 29 2013
c13317478943	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10194 f3b2605a-c512-4ea7…	Jun 29 2013

				Path
	A			doc/JPG/rhodo_staggered.jpg
	M			doc/Manual.html
	M			doc/Manual.txt
	M			doc/Section_accelerate.html
	M			doc/Section_accelerate.txt
	M			doc/pair_nb3b_harmonic.html
	M			doc/pair_nb3b_harmonic.txt
	M			src/DIPOLE/pair_lj_cut_dipole_long.h
	M			src/DIPOLE/pair_lj_long_dipole_long.cpp
	M			src/DIPOLE/pair_lj_long_dipole_long.h
	M			src/GPU/pair_gayberne_gpu.h
	M			src/GRANULAR/fix_pour.h
	M			src/KSPACE/ewald_disp.h
	M			src/KSPACE/msm.h
	M			src/KSPACE/pair_lj_long_coul_long.cpp
	M			src/KSPACE/pair_lj_long_coul_long.h
	M			src/KSPACE/pppm.cpp
	M			src/KSPACE/pppm.h
	M			src/KSPACE/pppm_disp.h
	M			src/KSPACE/pppm_old.h
	M			src/MOLECULE/pair_lj_cut_tip4p_cut.h
	M			src/PERI/pair_peri_lps.h
	M			src/PERI/pair_peri_pmb.h
	M			src/RIGID/fix_rigid.h
	M			src/RIGID/fix_rigid_small.h
	M			src/SHOCK/fix_append_atoms.h
	M			src/SHOCK/fix_wall_piston.h
	M			src/SRD/fix_srd.h
	M			src/SRD/fix_wall_srd.h
	A			src/USER-OMP/pair_eam_alloy_omp.cpp.orig
	A			src/USER-OMP/pair_eam_fs_omp.cpp.orig
	A			src/USER-OMP/pair_tersoff_zbl_omp.cpp.orig
	M			src/change_box.h
	M			src/compute_temp_ramp.h
	M			src/create_atoms.h
	M			src/displace_atoms.h
	M			src/dump.h
	M			src/fix_ave_spatial.h
	M			src/fix_deform.h
	M			src/fix_deposit.h
	M			src/fix_dt_reset.h
	M			src/fix_indent.h
	M			src/fix_langevin.h
	M			src/fix_move.h
	M			src/fix_recenter.h
	M			src/fix_shear_history.cpp
	M			src/fix_store.h
	M			src/fix_wall.h
	M			src/fix_wall_reflect.h
	M			src/force.h
	M			src/input.h
	M			src/kspace.h
	M			src/pair.h
	M			src/read_data.h
	M			src/region.h
	M			src/thermo.h
	M			src/variable.h
	M			src/velocity.h
	M			src/version.h
	M			src/write_data.h