Diffusion lammps 8ccb8bfd6668

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

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Sep 25 2015, 15:52.

Description

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

Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
doc/variable.txt
src/reader_xyz.cpp

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Sep 25 2015, 15:52

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS27c4accd4fee: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14077 f3b2605a-c512-4ea7…
rLAMMPS5002d8357e5a: roll back potentially broken correction for compute rdf

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS8ccb8bfd6668: Merge remote-tracking branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Sep 25 2015, 15:52

Merged Changes

Commit	Author	Details	Committed
27c4accd4fee	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14077 f3b2605a-c512-4ea7…	Sep 25 2015
f384db5c2eee	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14076 f3b2605a-c512-4ea7…	Sep 25 2015
61649b57d0ed	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14075 f3b2605a-c512-4ea7…	Sep 25 2015
8fd8c25e7c3f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14074 f3b2605a-c512-4ea7…	Sep 25 2015
663551ee9f0f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14073 f3b2605a-c512-4ea7…	Sep 25 2015
d2a2124b5678	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14072 f3b2605a-c512-4ea7…	Sep 25 2015
ef4e8f288aa4	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14071 f3b2605a-c512-4ea7…	Sep 24 2015
df7687fcc18e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14069 f3b2605a-c512-4ea7…	Sep 24 2015
9bdec3026069	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14068 f3b2605a-c512-4ea7…	Sep 24 2015
87025c6770fd	sjplimp	''	Sep 24 2015
aec30b07c2c3	sjplimp	''	Sep 24 2015
d2ee16c936ce	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14065 f3b2605a-c512-4ea7…	Sep 24 2015
546186739cec	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14064 f3b2605a-c512-4ea7…	Sep 24 2015
c622ab1e6df4	sjplimp	''	Sep 24 2015
ac2ab62f03f9	sjplimp	''	Sep 24 2015
53a8a038e82b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14061 f3b2605a-c512-4ea7…	Sep 24 2015
44c8bb9cbf2c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14060 f3b2605a-c512-4ea7…	Sep 24 2015
6f39a0a78d86	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14059 f3b2605a-c512-4ea7…	Sep 24 2015
448b9f66f0fa	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14058 f3b2605a-c512-4ea7…	Sep 24 2015
2ed7d366a693	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14057 f3b2605a-c512-4ea7…	Sep 24 2015
ea547aaf79c9	sjplimp	''	Sep 24 2015
787cc145e8e0	sjplimp	''	Sep 24 2015
70128bfb92ac	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14054 f3b2605a-c512-4ea7…	Sep 24 2015
a6ff24caa3fb	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14053 f3b2605a-c512-4ea7…	Sep 24 2015

Changes (95)

		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/accelerate_kokkos.html
M		doc/accelerate_kokkos.txt
P		doc/compute_pe.html Copied to doc/pair_zbl.html
M		doc/compute_pe.txt
M		doc/compute_pressure.html
M		doc/compute_pressure.txt
P		doc/compute_temp.html Copied to doc/compute_temp_region.html
M		doc/compute_temp.txt
M		doc/compute_temp_partial.html
M		doc/compute_temp_partial.txt
P		doc/compute_temp_region.html Copied from doc/compute_temp.html
M		doc/doc2/Section_commands.html
M		doc/doc2/accelerate_kokkos.html
M		doc/doc2/compute_pe.html
M		doc/doc2/compute_pressure.html
M		doc/doc2/compute_temp.html
M		doc/doc2/compute_temp_partial.html
M		doc/doc2/compute_temp_region.html
M		doc/doc2/dump_modify.html
M		doc/doc2/fix_atom_swap.html
M		doc/doc2/fix_deform.html
M		doc/doc2/fix_nh.html
M		doc/doc2/fix_wall_reflect.html
M		doc/doc2/pair_zbl.html
M		doc/doc2/variable.html
M		doc/dump_modify.html
M		doc/fix_atom_swap.html
M		doc/fix_deform.html
M		doc/fix_deform.txt
M		doc/fix_nh.html
M		doc/fix_nh.txt
M		doc/fix_wall_reflect.html
M		doc/fix_wall_reflect.txt
P		doc/pair_zbl.html Copied from doc/compute_pe.html
M		doc/searchindex.js
M		doc/variable.html
M		doc/variable.txt
M		examples/COUPLE/README
A	(dir)	examples/COUPLE/multiple/
A		examples/COUPLE/multiple/README
A		examples/COUPLE/multiple/data.chain
A		examples/COUPLE/multiple/in.chain
A		examples/COUPLE/multiple/multiple.cpp
M		examples/COUPLE/simple/README
M		src/KOKKOS/Install.sh
A		src/KOKKOS/compute_temp_kokkos.cpp
A		src/KOKKOS/compute_temp_kokkos.h
M		src/KOKKOS/domain_kokkos.cpp
P		src/KOKKOS/domain_kokkos.h Copied to multiple locations: src/KOKKOS/fix_nph_kokkos.h src/KOKKOS/fix_npt_kokkos.h src/KOKKOS/fix_nvt_kokkos.h
A		src/KOKKOS/fix_deform_kokkos.cpp
P		src/KOKKOS/fix_deform_kokkos.h Copied from src/fix_deform.h
A		src/KOKKOS/fix_nh_kokkos.cpp
A		src/KOKKOS/fix_nh_kokkos.h
A		src/KOKKOS/fix_nph_kokkos.cpp
P		src/KOKKOS/fix_nph_kokkos.h Copied from src/KOKKOS/domain_kokkos.h
A		src/KOKKOS/fix_npt_kokkos.cpp
P		src/KOKKOS/fix_npt_kokkos.h Copied from src/KOKKOS/domain_kokkos.h
A		src/KOKKOS/fix_nvt_kokkos.cpp
P		src/KOKKOS/fix_nvt_kokkos.h Copied from src/KOKKOS/domain_kokkos.h
A		src/KOKKOS/fix_wall_reflect_kokkos.cpp
A		src/KOKKOS/fix_wall_reflect_kokkos.h
M		src/MAKE/OPTIONS/Makefile.kokkos_cuda
M		src/USER-INTEL/README
M		src/USER-INTEL/fix_intel.cpp
M		src/USER-INTEL/fix_intel.h
M		src/USER-INTEL/intel_preprocess.h
M		src/USER-INTEL/neigh_half_bin_intel.cpp
M		src/USER-INTEL/pair_gayberne_intel.cpp
M		src/USER-INTEL/pair_lj_charmm_coul_long_intel.cpp
M		src/USER-INTEL/pair_lj_cut_intel.cpp
M		src/USER-INTEL/pair_sw_intel.cpp
M		src/accelerator_intel.h
M		src/compute.cpp
M		src/compute.h
M		src/compute_temp.cpp
M		src/compute_temp.h
M		src/domain.cpp
M		src/domain.h
P		src/fix_deform.h Copied to src/KOKKOS/fix_deform_kokkos.h
M		src/fix_nh.cpp
M		src/fix_nh.h
M		src/fix_wall_reflect.cpp
M		src/input.cpp
M		src/pair_lj_cut_coul_dsf.cpp
M		src/reader_xyz.cpp
M		src/version.h
M		tools/moltemplate/examples/file_conversion_examples/convert_LAMMPS_to_LT_examples/cnad-cnt/README_step2_run_moltemplate.sh
M		tools/moltemplate/examples/file_conversion_examples/convert_LAMMPS_to_LT_examples/cnad-cnt/cnad-cnt.in
M		tools/moltemplate/src/ltemplify.py
M		tools/moltemplate/src/moltemplate.sh