Diffusion lammps 52aa90b7e416

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

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Apr 27 2016, 12:16.

Description

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

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Apr 27 2016, 12:16

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS579b61641ec8: Fixing restart error
rLAMMPS7b0034cb7a8f: need to properly initialize ke_target or valgrind gets very unhappy

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS52aa90b7e416: Merge remote-tracking branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Apr 27 2016, 12:16

Merged Changes

Commit	Author	Details	Committed
579b61641ec8	stamoor	Fixing restart error	Apr 27 2016
6b582d19a277	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14891 f3b2605a-c512-4ea7…	Apr 27 2016
cab3fef91326	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14890 f3b2605a-c512-4ea7…	Apr 27 2016
0da53bb3e391	stamoor	Fixing compile error	Apr 27 2016
92b45d01631e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14888 f3b2605a-c512-4ea7…	Apr 27 2016
d91aced28bbe	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14886 f3b2605a-c512-4ea7…	Apr 26 2016
b3732e76f83d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14885 f3b2605a-c512-4ea7…	Apr 26 2016
5d6b6a0a0ac6	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14883 f3b2605a-c512-4ea7…	Apr 26 2016
d004bfef608d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14882 f3b2605a-c512-4ea7…	Apr 26 2016
e7363b47640b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14881 f3b2605a-c512-4ea7…	Apr 26 2016
325295bfaa4f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14880 f3b2605a-c512-4ea7…	Apr 26 2016
446d3b305a74	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14879 f3b2605a-c512-4ea7…	Apr 26 2016
1ce42845a98f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14878 f3b2605a-c512-4ea7…	Apr 26 2016
e405f015f93b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14877 f3b2605a-c512-4ea7…	Apr 26 2016
4314ef01f60b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14876 f3b2605a-c512-4ea7…	Apr 26 2016
98ed24437dfe	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14875 f3b2605a-c512-4ea7…	Apr 26 2016
a7ce7207f916	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14874 f3b2605a-c512-4ea7…	Apr 26 2016
e6ba3ccd3333	stamoor	Fixing Kokkos compile errors	Apr 26 2016

Changes (28)

				Path
	M			doc/Manual.html
	M			doc/Manual.txt
	M			doc/Section_commands.html
	M			doc/Section_commands.txt
	M			doc/Section_howto.html
	M			doc/_sources/Manual.txt
	M			doc/_sources/Section_commands.txt
	M			doc/_sources/Section_howto.txt
	A			doc/_sources/compute_dipole_chunk.txt
	A			doc/_sources/write_coeff.txt
	M			doc/genindex.html
	M			doc/searchindex.js
	A			doc/write_coeff.html
	M			src/KOKKOS/pair_sw_kokkos.cpp
	M			src/KOKKOS/pair_tersoff_kokkos.cpp
	M			src/KOKKOS/pair_tersoff_mod_kokkos.cpp
	M			src/KOKKOS/pair_tersoff_zbl_kokkos.cpp
	M			src/MAKE/OPTIONS/Makefile.g++_openmpi
	M			src/MAKE/OPTIONS/Makefile.icc_openmpi
	V			src/MAKE/OPTIONS/{Makefile.intel_coprocessor ← Makefile.intel_phi}
	M			src/MAKE/OPTIONS/Makefile.intel_cpu_openmpi
	D			src/MAKE/OPTIONS/Makefile.intel_knl
	V			src/MAKE/OPTIONS/{Makefile.intel_phi → Makefile.intel_coprocessor}
	M			src/MAKE/OPTIONS/Makefile.kokkos_cuda_openmpi
	M			src/MAKE/README
	M			src/Make.py
	M			src/math_special.h
	M			src/version.h