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

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

Description

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

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Apr 23 2016, 12:17

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

Commit	Author	Details	Committed
656f8ed97aaa	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14870 f3b2605a-c512-4ea7…	Apr 22 2016
baf8ad52e560	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14869 f3b2605a-c512-4ea7…	Apr 22 2016
08271a02000f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14868 f3b2605a-c512-4ea7…	Apr 22 2016
184d5dc0f0e7	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14867 f3b2605a-c512-4ea7…	Apr 22 2016
129796adc2aa	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14866 f3b2605a-c512-4ea7…	Apr 22 2016
8d5ca6c7cca6	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14865 f3b2605a-c512-4ea7…	Apr 22 2016
af63793e711e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14864 f3b2605a-c512-4ea7…	Apr 22 2016
cc0049dce54a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14863 f3b2605a-c512-4ea7…	Apr 22 2016
912ee9621af4	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14862 f3b2605a-c512-4ea7…	Apr 22 2016
f2a4058415cc	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14861 f3b2605a-c512-4ea7…	Apr 22 2016
f70a764d5ceb	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14860 f3b2605a-c512-4ea7…	Apr 22 2016
a4af037d1de0	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14859 f3b2605a-c512-4ea7…	Apr 22 2016
6b0a181facb8	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14858 f3b2605a-c512-4ea7…	Apr 22 2016

				Path
	M			doc/Manual.html
	M			doc/Manual.txt
	M			doc/Section_commands.html
	M			doc/Section_commands.txt
	M			doc/_sources/Manual.txt
	M			doc/_sources/Section_commands.txt
	M			doc/_sources/angle_zero.txt
	M			doc/_sources/bond_zero.txt
	M			doc/_sources/dihedral_zero.txt
	M			doc/_sources/improper_zero.txt
	M			doc/_sources/pair_zero.txt
	M			doc/_sources/read_data.txt
	M			doc/angle_zero.html
	M			doc/bond_zero.html
	P			doc/compute_dipole_chunk.html Copied from doc/compute_com_chunk.html
	M			doc/dihedral_zero.html
	M			doc/genindex.html
	M			doc/improper_zero.html
	M			doc/pair_zero.html
	M			doc/read_data.html
	M			doc/searchindex.js
	M			src/MAKE/OPTIONS/Makefile.intel_cpu_mpich
	M			src/MAKE/OPTIONS/Makefile.intel_cpu_openmpi
	M			src/MAKE/OPTIONS/Makefile.knl
	M			src/USER-FEP/Install.sh
	M			src/USER-INTEL/intel_simd.h
	M			src/USER-INTEL/pair_sw_intel.cpp
	M			src/USER-INTEL/pppm_intel.cpp
	M			src/USER-INTEL/pppm_intel.h
	M			src/version.h