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

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Jun 7 2013, 14:49.

Description

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

Resolved Conflicts:
doc/Manual.txt
src/DIPOLE/pair_lj_cut_dipole_cut.cpp
src/USER-MISC/pair_lj_sf_dipole_sf.cpp
src/USER-MISC/pair_lj_sf_dipole_sf.h

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Jun 7 2013, 14:49

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPSaa1ebc844479: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10047 f3b2605a-c512-4ea7…
rLAMMPS3d664382ae72: update version number

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPSc9710e0c20ad: Merge remote branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Jun 7 2013, 14:49

Merged Changes

Commit	Author	Details	Committed
aa1ebc844479	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10047 f3b2605a-c512-4ea7…	Jun 6 2013
51814ba9bd20	athomps	Added GJF Langevin method	Jun 6 2013
fe716277767a	athomps	Added GJF Langevin method	Jun 6 2013
8f2bc5c721c0	athomps	Just a few tweaks	Jun 6 2013
fcf628fab6a1	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10043 f3b2605a-c512-4ea7…	Jun 6 2013
acd168812e09	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10042 f3b2605a-c512-4ea7…	Jun 6 2013
ca981d4e9b0f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10039 f3b2605a-c512-4ea7…	Jun 6 2013
e342c864a81d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10038 f3b2605a-c512-4ea7…	Jun 6 2013
e61a6b225051	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10036 f3b2605a-c512-4ea7…	Jun 6 2013
451b01d769b3	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10035 f3b2605a-c512-4ea7…	Jun 6 2013
5b7440bf64de	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10034 f3b2605a-c512-4ea7…	Jun 6 2013
5a7652a8b4e6	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10033 f3b2605a-c512-4ea7…	Jun 6 2013
b1e4e5593be6	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10032 f3b2605a-c512-4ea7…	Jun 6 2013
af5a33fd1691	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10031 f3b2605a-c512-4ea7…	Jun 6 2013
c3d6358742c2	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10030 f3b2605a-c512-4ea7…	Jun 6 2013
94d3ef27449e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10029 f3b2605a-c512-4ea7…	Jun 6 2013

Changes (54)

				Path
	M			doc/Manual.html
	M			doc/Manual.txt
	M			doc/Section_commands.html
	M			doc/Section_commands.txt
	M			doc/Section_intro.html
	M			doc/Section_intro.txt
	M			doc/fix_langevin.html
	M			doc/fix_langevin.txt
	M			doc/kspace_style.html
	M			doc/kspace_style.txt
	M			doc/pair_dipole.html
	M			doc/pair_dipole.txt
	M			doc/pair_lj_long.html
	M			doc/pair_lj_long.txt
	V			src/DIPOLE/{pair_dipole_cut.cpp → pair_lj_cut_dipole_cut.cpp}
	P			src/DIPOLE/pair_dipole_cut.h Deleted after being copied to multiple locations: src/DIPOLE/pair_lj_cut_dipole_cut.h src/DIPOLE/pair_lj_cut_dipole_long.h
	V			src/DIPOLE/{pair_lj_cut_dipole_cut.cpp ← pair_dipole_cut.cpp}
	P			src/DIPOLE/pair_lj_cut_dipole_cut.h Copied from src/DIPOLE/pair_dipole_cut.h
	A			src/DIPOLE/pair_lj_cut_dipole_long.cpp
	V			src/DIPOLE/{pair_lj_cut_dipole_long.h ← pair_dipole_cut.h}
	A			src/DIPOLE/pair_lj_long_dipole_long.cpp
	P			src/DIPOLE/pair_lj_long_dipole_long.h Copied from src/KSPACE/pair_lj_long_coul_long.h
	M			src/GPU/Install.sh
	V			src/GPU/{pair_dipole_cut_gpu.cpp → pair_lj_cut_dipole_cut_gpu.cpp}
	V			src/GPU/{pair_dipole_cut_gpu.h → pair_lj_cut_dipole_cut_gpu.h}
	V			src/GPU/{pair_dipole_sf_gpu.cpp → pair_lj_sf_dipole_sf_gpu.cpp}
	V			src/GPU/{pair_dipole_sf_gpu.h → pair_lj_sf_dipole_sf_gpu.h}
	V			src/GPU/{pair_lj_cut_dipole_cut_gpu.cpp ← pair_dipole_cut_gpu.cpp}
	V			src/GPU/{pair_lj_cut_dipole_cut_gpu.h ← pair_dipole_cut_gpu.h}
	V			src/GPU/{pair_lj_sf_dipole_sf_gpu.cpp ← pair_dipole_sf_gpu.cpp}
	V			src/GPU/{pair_lj_sf_dipole_sf_gpu.h ← pair_dipole_sf_gpu.h}
	M			src/KSPACE/ewald_disp.cpp
	M			src/KSPACE/ewald_disp.h
	M			src/MAKE/Makefile.mac_mpi
	V			src/USER-MISC/{pair_dipole_sf.cpp → pair_lj_sf_dipole_sf.cpp}
	V			src/USER-MISC/{pair_dipole_sf.h → pair_lj_sf_dipole_sf.h}
	V			src/USER-MISC/{pair_lj_sf_dipole_sf.cpp ← pair_dipole_sf.cpp}
	V			src/USER-MISC/{pair_lj_sf_dipole_sf.h ← pair_dipole_sf.h}
	V			src/USER-OMP/{pair_dipole_cut_omp.cpp → pair_lj_cut_dipole_cut_omp.cpp}
	D			src/USER-OMP/pair_dipole_cut_omp.h
	V			src/USER-OMP/{pair_dipole_sf_omp.cpp → pair_lj_sf_dipole_sf_omp.cpp}
	D			src/USER-OMP/pair_dipole_sf_omp.h
	V			src/USER-OMP/{pair_lj_cut_dipole_cut_omp.cpp ← pair_dipole_cut_omp.cpp}
	P			src/USER-OMP/pair_lj_cut_dipole_cut_omp.h Copied from src/USER-OMP/pair_lj_cut_coul_debye_omp.h
	V			src/USER-OMP/{pair_lj_sf_dipole_sf_omp.cpp ← pair_dipole_sf_omp.cpp}
	P			src/USER-OMP/pair_lj_sf_dipole_sf_omp.h Copied from src/USER-OMP/pair_born_coul_wolf_omp.h
	M			src/fix_ave_correlate.cpp
	M			src/fix_langevin.cpp
	M			src/fix_langevin.h
	M			src/kspace.cpp
	M			src/kspace.h
	M			src/pair.cpp
	M			src/pair.h
	M			src/version.h