Diffusion lammps d075220c4728

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

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Apr 4 2015, 13:55.

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>

Apr 4 2015, 13:55

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS6a7dc0477fa2: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13391 f3b2605a-c512-4ea7…
rLAMMPSb34287719938: Merge remote-tracking branch 'lammps-ro/master' into lammps-icms

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPSd075220c4728: Merge remote-tracking branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Apr 4 2015, 13:55

Merged Changes

Commit	Author	Details	Committed
6a7dc0477fa2	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13391 f3b2605a-c512-4ea7…	Apr 3 2015
0051472c6a2e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13390 f3b2605a-c512-4ea7…	Apr 3 2015
c23200cfc00c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13388 f3b2605a-c512-4ea7…	Apr 3 2015
e162112551a1	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13387 f3b2605a-c512-4ea7…	Apr 3 2015
14614ea58bf0	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13386 f3b2605a-c512-4ea7…	Apr 3 2015
3a0aa84dc4f5	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13385 f3b2605a-c512-4ea7…	Apr 3 2015
33fd65949feb	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13383 f3b2605a-c512-4ea7…	Apr 3 2015
580c2314b8b1	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13382 f3b2605a-c512-4ea7…	Apr 3 2015
dc062643aaf4	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13381 f3b2605a-c512-4ea7…	Apr 3 2015
07f32f3cac8f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13380 f3b2605a-c512-4ea7…	Apr 3 2015
d0047ae75a9b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13379 f3b2605a-c512-4ea7…	Apr 3 2015
ff67c3f68f96	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13378 f3b2605a-c512-4ea7…	Apr 3 2015
65085e81c12a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13377 f3b2605a-c512-4ea7…	Apr 3 2015
deb4e7e74cc0	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13376 f3b2605a-c512-4ea7…	Apr 3 2015

Changes (56)

				Path
	M			doc/Manual.html
	M			doc/Manual.txt
	M			doc/Section_commands.html
	M			doc/Section_commands.txt
	M			doc/pair_sdk.html
	M			doc/pair_sdk.txt
	M			src/Depend.sh
	M			src/KOKKOS/Install.sh
	M			src/KOKKOS/angle_charmm_kokkos.h
	M			src/KOKKOS/angle_harmonic_kokkos.h
	M			src/KOKKOS/atom_kokkos.cpp
	M			src/KOKKOS/atom_vec_kokkos.h
	M			src/KOKKOS/bond_fene_kokkos.h
	M			src/KOKKOS/bond_harmonic_kokkos.h
	M			src/KOKKOS/comm_kokkos.h
	M			src/KOKKOS/dihedral_charmm_kokkos.h
	M			src/KOKKOS/dihedral_opls_kokkos.h
	M			src/KOKKOS/domain_kokkos.h
	M			src/KOKKOS/fix_langevin_kokkos.h
	M			src/KOKKOS/fix_nve_kokkos.h
	M			src/KOKKOS/improper_harmonic_kokkos.h
	M			src/KOKKOS/modify_kokkos.h
	M			src/KOKKOS/neigh_bond_kokkos.h
	M			src/KOKKOS/neighbor_kokkos.h
	M			src/KOKKOS/pair_buck_coul_cut_kokkos.h
	M			src/KOKKOS/pair_buck_coul_long_kokkos.h
	M			src/KOKKOS/pair_buck_kokkos.h
	M			src/KOKKOS/pair_coul_cut_kokkos.h
	M			src/KOKKOS/pair_coul_debye_kokkos.h
	M			src/KOKKOS/pair_coul_dsf_kokkos.h
	M			src/KOKKOS/pair_coul_long_kokkos.h
	M			src/KOKKOS/pair_coul_wolf_kokkos.h
	M			src/KOKKOS/pair_eam_kokkos.h
	M			src/KOKKOS/pair_lj_charmm_coul_charmm_implicit_kokkos.h
	M			src/KOKKOS/pair_lj_charmm_coul_charmm_kokkos.h
	M			src/KOKKOS/pair_lj_charmm_coul_long_kokkos.h
	M			src/KOKKOS/pair_lj_class2_coul_cut_kokkos.h
	M			src/KOKKOS/pair_lj_class2_coul_long_kokkos.h
	M			src/KOKKOS/pair_lj_class2_kokkos.h
	M			src/KOKKOS/pair_lj_cut_coul_cut_kokkos.h
	M			src/KOKKOS/pair_lj_cut_coul_debye_kokkos.h
	M			src/KOKKOS/pair_lj_cut_coul_dsf_kokkos.h
	M			src/KOKKOS/pair_lj_cut_coul_long_kokkos.h
	P			src/KOKKOS/pair_lj_cut_kokkos.h Copied to src/KOKKOS/pair_lj_sdk_kokkos.h
	M			src/KOKKOS/pair_lj_expand_kokkos.h
	M			src/KOKKOS/pair_lj_gromacs_coul_gromacs_kokkos.h
	M			src/KOKKOS/pair_lj_gromacs_kokkos.h
	P			src/KOKKOS/pair_lj_sdk_kokkos.cpp Copied from src/KOKKOS/pair_lj_cut_kokkos.cpp
	P			src/KOKKOS/pair_lj_sdk_kokkos.h Copied from src/KOKKOS/pair_lj_cut_kokkos.h
	M			src/KOKKOS/pair_table_kokkos.h
	M			src/KOKKOS/verlet_kokkos.h
	M			src/USER-CG-CMM/pair_lj_sdk.h
	M			src/lammps.h
	M			src/pointers.h
	M			src/replicate.cpp
	M			src/version.h