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

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Jul 25 2015, 13:38.

Description

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

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Jul 25 2015, 13:38

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

Commit	Author	Details	Committed
2a05c2eaec21	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13723 f3b2605a-c512-4ea7…	Jul 25 2015
bbef0a814a8c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13722 f3b2605a-c512-4ea7…	Jul 25 2015
bc6253847324	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13719 f3b2605a-c512-4ea7…	Jul 25 2015
8aa285efc021	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13718 f3b2605a-c512-4ea7…	Jul 25 2015
4af554621208	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13716 f3b2605a-c512-4ea7…	Jul 25 2015
643f2bfa54e7	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13715 f3b2605a-c512-4ea7…	Jul 24 2015
9dbde794414f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13714 f3b2605a-c512-4ea7…	Jul 24 2015
c6c44b5fe065	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13713 f3b2605a-c512-4ea7…	Jul 24 2015
052f644d130d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13712 f3b2605a-c512-4ea7…	Jul 24 2015
e91bd244af3b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13708 f3b2605a-c512-4ea7…	Jul 24 2015
303d9b9f54bb	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13706 f3b2605a-c512-4ea7…	Jul 24 2015

				Path
	M			doc/Manual.html
	M			doc/Manual.txt
	M			doc/Section_commands.html
	M			doc/Section_commands.txt
	M			doc/compute_reduce.html
	M			doc/compute_reduce.txt
	A			doc/compute_temp_drude.html
	A			doc/compute_temp_drude.txt
	A			doc/fix_drude.html
	A			doc/fix_drude.txt
	A			doc/fix_drude_transform.html
	A			doc/fix_drude_transform.txt
	A			doc/fix_langevin_drude.html
	A			doc/fix_langevin_drude.txt
	M			doc/pair_bop.html
	M			doc/pair_bop.txt
	M			doc/pair_born.html
	M			doc/pair_born.txt
	M			doc/pair_buck.html
	M			doc/pair_buck.txt
	M			doc/pair_coul.html
	M			doc/pair_coul.txt
	A			doc/tutorial_drude.html
	A			doc/tutorial_drude.txt
	D			potentials/CCu_v1.bop.table
	M			src/CORESHELL/Install.sh
	P			src/CORESHELL/pair_coul_long_cs.cpp Copied from src/KSPACE/pair_coul_msm.cpp
	P			src/CORESHELL/pair_coul_long_cs.h Copied from src/pair_dpd_tstat.h
	M			src/Makefile
	M			src/USER-LB/README
	M			src/USER-LB/fix_lb_fluid.cpp
	M			src/USER-LB/fix_lb_fluid.h
	M			src/USER-LB/fix_lb_momentum.cpp
	M			src/USER-LB/fix_lb_momentum.h
	M			src/USER-LB/fix_lb_pc.cpp
	M			src/USER-LB/fix_lb_pc.h
	M			src/USER-LB/fix_lb_rigid_pc_sphere.cpp
	M			src/USER-LB/fix_lb_rigid_pc_sphere.h
	M			src/USER-LB/fix_lb_viscous.h
	M			src/USER-MISC/fix_pimd.cpp
	M			src/USER-MISC/fix_pimd.h
	M			src/compute_chunk_atom.cpp
	M			src/compute_reduce.cpp
	M			src/fix.cpp
	M			src/fix.h
	M			src/neighbor.cpp
	M			src/special.cpp
	M			src/special.h
	M			src/version.h