Diffusion lammps 66312fac551d

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

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Jun 15 2016, 12:19.

Description

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

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Jun 15 2016, 12:19

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS94242eb59153: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15178 f3b2605a-c512-4ea7…
rLAMMPS3e98d42a5a09: Merge branch 'merge-pull-95' into lammps-icms

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS66312fac551d: Merge remote-tracking branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Jun 15 2016, 12:19

Merged Changes

Commit	Author	Details	Committed
94242eb59153	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15178 f3b2605a-c512-4ea7…	Jun 15 2016
c2c73fd8a368	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15176 f3b2605a-c512-4ea7…	Jun 15 2016
58a091c77359	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15175 f3b2605a-c512-4ea7…	Jun 15 2016
4615a859c3cf	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15174 f3b2605a-c512-4ea7…	Jun 15 2016
0b92c9f075a1	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15173 f3b2605a-c512-4ea7…	Jun 15 2016
80aca27acd8b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15172 f3b2605a-c512-4ea7…	Jun 15 2016
a7633c422c54	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15171 f3b2605a-c512-4ea7…	Jun 15 2016
e8ea08fa8c8e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15170 f3b2605a-c512-4ea7…	Jun 15 2016
c6e7b0c8b956	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15169 f3b2605a-c512-4ea7…	Jun 14 2016
ffbce3c10c78	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15168 f3b2605a-c512-4ea7…	Jun 14 2016
422dfdc1f73e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15167 f3b2605a-c512-4ea7…	Jun 14 2016
2dbcfdc70c6b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15166 f3b2605a-c512-4ea7…	Jun 14 2016
ecffbbe53126	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15165 f3b2605a-c512-4ea7…	Jun 14 2016
0e719ed2ef22	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15164 f3b2605a-c512-4ea7…	Jun 14 2016
863a3d331930	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15163 f3b2605a-c512-4ea7…	Jun 14 2016
a4b82a95e9ec	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15162 f3b2605a-c512-4ea7…	Jun 14 2016

Changes (59)

				Path
	M			doc/html/Manual.html
	M			doc/html/Section_commands.html
	M			doc/html/Section_start.html
	M			doc/html/_sources/Manual.txt
	M			doc/html/_sources/Section_commands.txt
	M			doc/html/_sources/Section_start.txt
	M			doc/html/_sources/bond_fene.txt
	M			doc/html/_sources/compute_reduce.txt
	M			doc/html/_sources/displace_atoms.txt
	M			doc/html/_sources/fix.txt
	M			doc/html/_sources/fix_recenter.txt
	M			doc/html/_sources/fix_rigid.txt
	M			doc/html/_sources/fix_spring.txt
	A			doc/html/_sources/fix_spring_chunk.txt
	M			doc/html/_sources/kspace_modify.txt
	M			doc/html/_sources/pair_mgpt.txt
	P			doc/html/bond_fene.html Copied to doc/html/fix_spring_chunk.html
	M			doc/html/compute_reduce.html
	M			doc/html/displace_atoms.html
	M			doc/html/fix.html
	M			doc/html/fix_recenter.html
	M			doc/html/fix_rigid.html
	M			doc/html/fix_spring.html
	P			doc/html/fix_spring_chunk.html Copied from doc/html/bond_fene.html
	M			doc/html/genindex.html
	M			doc/html/kspace_modify.html
	M			doc/html/pair_mgpt.html
	M			doc/html/searchindex.js
	M			doc/src/Manual.txt
	M			doc/src/Section_commands.txt
	M			doc/src/Section_start.txt
	M			doc/src/bond_fene.txt
	M			doc/src/compute_reduce.txt
	M			doc/src/displace_atoms.txt
	M			doc/src/fix.txt
	M			doc/src/fix_recenter.txt
	M			doc/src/fix_rigid.txt
	M			doc/src/fix_spring.txt
	A			doc/src/fix_spring_chunk.txt
	M			doc/src/kspace_modify.txt
	M			doc/src/pair_mgpt.txt
	M			lib/gpu/lal_zbl.cpp
	M			src/MAKE/MACHINES/Makefile.beacon
	M			src/MAKE/MACHINES/Makefile.stampede
	M			src/Make.py
	M			src/USER-INTEL/README
	A			src/USER-INTEL/bond_fene_intel.cpp
	A			src/USER-INTEL/bond_fene_intel.h
	M			src/USER-INTEL/dihedral_charmm_intel.cpp
	M			src/USER-INTEL/intel_intrinsics.h
	M			src/USER-INTEL/intel_simd.h
	M			src/USER-INTEL/neigh_half_bin_intel.cpp
	M			src/USER-INTEL/pair_lj_cut_intel.cpp
	M			src/compute_chunk_atom.cpp
	P			src/compute_com_chunk.h Copied to src/fix_spring_chunk.h
	M			src/fix_spring.cpp
	A			src/fix_spring_chunk.cpp
	P			src/fix_spring_chunk.h Copied from src/compute_com_chunk.h
	M			src/version.h