Diffusion lammps d2e0d83dbd01

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

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Sep 9 2015, 12:23.

Description

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

Resolved Conflicts:
doc/Manual.html
doc/Manual.txt

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Sep 9 2015, 12:23

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS819dbd184ae6: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14017 f3b2605a-c512-4ea7…
rLAMMPS0b09895596a6: recognize more flags in Info::is_active()

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPSd2e0d83dbd01: Merge remote-tracking branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Sep 9 2015, 12:23

Merged Changes

Commit	Author	Details	Committed
819dbd184ae6	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14017 f3b2605a-c512-4ea7…	Sep 9 2015
556bde6dc1b0	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14016 f3b2605a-c512-4ea7…	Sep 9 2015
abbf8d2878c8	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14015 f3b2605a-c512-4ea7…	Sep 9 2015
11fea8576926	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14014 f3b2605a-c512-4ea7…	Sep 9 2015
71054c590af3	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14013 f3b2605a-c512-4ea7…	Sep 9 2015
9aac00e7ed5c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14012 f3b2605a-c512-4ea7…	Sep 9 2015
fafba07dffc9	sjplimp	''	Sep 9 2015
63759a1e8583	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14010 f3b2605a-c512-4ea7…	Sep 9 2015
c3e333c217cd	sjplimp	''	Sep 9 2015
ab7ff21f9b30	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14008 f3b2605a-c512-4ea7…	Sep 9 2015
3cf2e3fa2ef3	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14007 f3b2605a-c512-4ea7…	Sep 9 2015
9a80425dcc2f	sjplimp	''	Sep 9 2015
807cb7200d25	sjplimp	''	Sep 9 2015
942cce877bf8	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14004 f3b2605a-c512-4ea7…	Sep 9 2015
11d819482c2d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14003 f3b2605a-c512-4ea7…	Sep 9 2015
6f4af86222d6	stamoor	Updating minimum gcc version for kokkos	Sep 9 2015
c7303a1c1d12	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14001 f3b2605a-c512-4ea7…	Sep 8 2015

Changes (29)

				Path
	M			doc/Manual.html
	M			doc/Manual.html.html
	M			doc/Manual.txt
	M			doc/Section_commands.html
	M			doc/Section_commands.txt
	M			doc/Section_howto.html
	M			doc/Section_howto.txt
	M			doc/accelerate_kokkos.txt
	M			doc/compute_temp_cs.html
	M			doc/compute_temp_cs.txt
	M			doc/doc2/Manual.html.html
	M			doc/doc2/PDF/colvars-refman-lammps.pdf
	M			doc/doc2/Section_commands.html
	M			doc/doc2/Section_howto.html
	M			doc/doc2/compute_temp_cs.html
	M			doc/doc2/pair_lj.html
	M			doc/pair_lj.html
	M			doc/pair_lj.txt
	M			doc/searchindex.js
	M			src/CORESHELL/Install.sh
	M			src/CORESHELL/pair_born_coul_long_cs.cpp
	M			src/CORESHELL/pair_born_coul_long_cs.h
	M			src/CORESHELL/pair_buck_coul_long_cs.cpp
	M			src/CORESHELL/pair_buck_coul_long_cs.h
	M			src/CORESHELL/pair_coul_long_cs.cpp
	P			src/CORESHELL/pair_coul_long_cs.h Copied to src/CORESHELL/pair_lj_cut_coul_long_cs.h
	P			src/CORESHELL/pair_lj_cut_coul_long_cs.cpp Copied from src/KSPACE/pair_lj_cut_coul_msm.cpp
	P			src/CORESHELL/pair_lj_cut_coul_long_cs.h Copied from src/CORESHELL/pair_coul_long_cs.h
	M			src/version.h