Diffusion lammps f83f55aac1de

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

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Mar 28 2015, 13:10.

Description

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

Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
doc/fix_temp_csvr.txt
src/fix_temp_csvr.cpp

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Mar 28 2015, 13:10

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS77996f48fb1a: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13327 f3b2605a-c512-4ea7…
rLAMMPSd78bc59e0645: alternative bugfix for the reset_box() issue reported by kasra

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPSf83f55aac1de: Merge remote-tracking branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Mar 28 2015, 13:10

Merged Changes

Commit	Author	Details	Committed
77996f48fb1a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13327 f3b2605a-c512-4ea7…	Mar 27 2015
bff784b313ce	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13326 f3b2605a-c512-4ea7…	Mar 27 2015
d78fd732234d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13324 f3b2605a-c512-4ea7…	Mar 27 2015
5e65993d98b0	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13323 f3b2605a-c512-4ea7…	Mar 27 2015
48d0d2a7b609	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13322 f3b2605a-c512-4ea7…	Mar 27 2015
8d1033f0d982	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13321 f3b2605a-c512-4ea7…	Mar 27 2015
9435c9dcb15a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13320 f3b2605a-c512-4ea7…	Mar 27 2015
bc06bcf854c1	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13318 f3b2605a-c512-4ea7…	Mar 27 2015
514c7c313f8c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13317 f3b2605a-c512-4ea7…	Mar 27 2015
507adef0787f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13316 f3b2605a-c512-4ea7…	Mar 27 2015
c56fbcd1a38d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13315 f3b2605a-c512-4ea7…	Mar 27 2015
fd1e7078b4e7	stamoor	Fixing Kokkos issue	Mar 27 2015
43d48e60ed6f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13312 f3b2605a-c512-4ea7…	Mar 27 2015
b3d89e0b4264	stamoor	Fixing another Kokkos issue	Mar 27 2015
f314fbc9cdba	stamoor	Fixing some Kokkos issues	Mar 27 2015
fc64a9a443d6	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13308 f3b2605a-c512-4ea7…	Mar 27 2015
118418eb14d1	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13307 f3b2605a-c512-4ea7…	Mar 27 2015
550b6b0a973a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13306 f3b2605a-c512-4ea7…	Mar 27 2015
f1acd4762f16	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13305 f3b2605a-c512-4ea7…	Mar 27 2015
185b8197d5cc	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13304 f3b2605a-c512-4ea7…	Mar 27 2015
d72fcf5acca3	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13303 f3b2605a-c512-4ea7…	Mar 27 2015
7ba8d96ddb2d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13302 f3b2605a-c512-4ea7…	Mar 27 2015

Changes (79)

				Path
	M			doc/Manual.html
	M			doc/Manual.txt
	M			doc/Section_commands.html
	M			doc/Section_commands.txt
	M			doc/atom_style.html
	M			doc/atom_style.txt
	M			doc/fix_balance.html
	M			doc/fix_temp_csvr.html
	M			doc/fix_temp_csvr.txt
	M			doc/pair_buck.html
	M			doc/pair_buck.txt
	M			doc/pair_class2.html
	M			doc/pair_class2.txt
	M			doc/pair_coul.html
	M			doc/pair_coul.txt
	M			doc/pair_lj.html
	M			doc/pair_lj.txt
	M			src/CLASS2/pair_lj_class2.cpp
	M			src/CLASS2/pair_lj_class2.h
	M			src/CLASS2/pair_lj_class2_coul_cut.cpp
	M			src/CLASS2/pair_lj_class2_coul_cut.h
	M			src/CLASS2/pair_lj_class2_coul_long.cpp
	M			src/CLASS2/pair_lj_class2_coul_long.h
	M			src/KOKKOS/Install.sh
	A			src/KOKKOS/pair_buck_coul_cut_kokkos.cpp
	P			src/KOKKOS/pair_buck_coul_cut_kokkos.h Copied from src/KOKKOS/pair_coul_cut_kokkos.h
	A			src/KOKKOS/pair_buck_coul_long_kokkos.cpp
	A			src/KOKKOS/pair_buck_coul_long_kokkos.h
	P			src/KOKKOS/pair_coul_cut_kokkos.h Copied to multiple locations: src/KOKKOS/pair_buck_coul_cut_kokkos.h src/KOKKOS/pair_coul_debye_kokkos.h src/KOKKOS/pair_lj_class2_coul_cut_kokkos.h src/KOKKOS/pair_lj_cut_coul_debye_kokkos.h src/KOKKOS/pair_lj_cut_coul_dsf_kokkos.h
	A			src/KOKKOS/pair_coul_debye_kokkos.cpp
	P			src/KOKKOS/pair_coul_debye_kokkos.h Copied from src/KOKKOS/pair_coul_cut_kokkos.h
	M			src/KOKKOS/pair_coul_dsf_kokkos.h
	A			src/KOKKOS/pair_coul_long_kokkos.cpp
	A			src/KOKKOS/pair_coul_long_kokkos.h
	M			src/KOKKOS/pair_coul_wolf_kokkos.h
	M			src/KOKKOS/pair_kokkos.h
	A			src/KOKKOS/pair_lj_charmm_coul_charmm_implicit_kokkos.cpp
	A			src/KOKKOS/pair_lj_charmm_coul_charmm_implicit_kokkos.h
	A			src/KOKKOS/pair_lj_charmm_coul_charmm_kokkos.cpp
	A			src/KOKKOS/pair_lj_charmm_coul_charmm_kokkos.h
	A			src/KOKKOS/pair_lj_charmm_coul_long_kokkos.cpp
	A			src/KOKKOS/pair_lj_charmm_coul_long_kokkos.h
	A			src/KOKKOS/pair_lj_class2_coul_cut_kokkos.cpp
	P			src/KOKKOS/pair_lj_class2_coul_cut_kokkos.h Copied from src/KOKKOS/pair_coul_cut_kokkos.h
	A			src/KOKKOS/pair_lj_class2_coul_long_kokkos.cpp
	A			src/KOKKOS/pair_lj_class2_coul_long_kokkos.h
	A			src/KOKKOS/pair_lj_class2_kokkos.cpp
	A			src/KOKKOS/pair_lj_class2_kokkos.h
	A			src/KOKKOS/pair_lj_cut_coul_debye_kokkos.cpp
	P			src/KOKKOS/pair_lj_cut_coul_debye_kokkos.h Copied from src/KOKKOS/pair_coul_cut_kokkos.h
	A			src/KOKKOS/pair_lj_cut_coul_dsf_kokkos.cpp
	P			src/KOKKOS/pair_lj_cut_coul_dsf_kokkos.h Copied from src/KOKKOS/pair_coul_cut_kokkos.h
	A			src/KOKKOS/pair_lj_expand_kokkos.cpp
	A			src/KOKKOS/pair_lj_expand_kokkos.h
	A			src/KOKKOS/pair_lj_gromacs_coul_gromacs_kokkos.cpp
	A			src/KOKKOS/pair_lj_gromacs_coul_gromacs_kokkos.h
	A			src/KOKKOS/pair_lj_gromacs_kokkos.cpp
	A			src/KOKKOS/pair_lj_gromacs_kokkos.h
	M			src/KOKKOS/pair_table_kokkos.h
	M			src/KSPACE/pair_buck_coul_long.cpp
	M			src/KSPACE/pair_buck_coul_long.h
	M			src/KSPACE/pair_coul_long.cpp
	M			src/KSPACE/pair_coul_long.h
	M			src/KSPACE/pair_lj_charmm_coul_long.cpp
	M			src/KSPACE/pair_lj_charmm_coul_long.h
	M			src/MOLECULE/pair_lj_charmm_coul_charmm.cpp
	M			src/MOLECULE/pair_lj_charmm_coul_charmm.h
	M			src/domain.cpp
	M			src/pair_buck_coul_cut.cpp
	M			src/pair_buck_coul_cut.h
	M			src/pair_lj_cut_coul_dsf.cpp
	M			src/pair_lj_cut_coul_dsf.h
	M			src/pair_lj_expand.cpp
	M			src/pair_lj_expand.h
	M			src/pair_lj_gromacs.cpp
	M			src/pair_lj_gromacs.h
	M			src/pair_lj_gromacs_coul_gromacs.cpp
	M			src/pair_lj_gromacs_coul_gromacs.h
	M			src/version.h