Diffusion lammps 833f597b8182

Merge remote branch 'lammps-ro/master' into lammps-icms
833f597b8182
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Jan 27 2016, 13:57.

Description

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

Resolved Conflicts:
doc/Manual.txt

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Jan 27 2016, 13:57

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS0541d52c17a1: Fixing Kokkos bug
rLAMMPSbcd2dba3a670: fix unitialized memory issue reported by coverity

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS833f597b8182: Merge remote branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Jan 27 2016, 13:57

Merged Changes

Commit	Author	Details	Committed
0541d52c17a1	stamoor	Fixing Kokkos bug	Jan 27 2016
8c4d59261310	stamoor	Fixing Kokkos bug	Jan 26 2016
b5c90fac9cbe	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14501 f3b2605a-c512-4ea7…	Jan 26 2016
f7731ba58e88	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14500 f3b2605a-c512-4ea7…	Jan 26 2016
db9fe7ac9f67	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14499 f3b2605a-c512-4ea7…	Jan 26 2016
ef429798c095	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14498 f3b2605a-c512-4ea7…	Jan 26 2016

Changes (42)

				Path
	M			doc/Manual.html
	M			doc/Manual.txt
	M			doc/angle_charmm.html
	M			doc/angle_charmm.txt
	M			doc/bond_harmonic.html
	M			doc/bond_harmonic.txt
	M			doc/dihedral_charmm.html
	M			doc/dihedral_charmm.txt
	M			doc/improper_harmonic.html
	M			doc/improper_harmonic.txt
	M			doc/searchindex.js
	M			lib/kokkos/containers/src/Kokkos_DualView.hpp
	M			src/KOKKOS/neighbor_kokkos.cpp
	A			src/USER-INTEL/angle_charmm_intel.cpp
	P			src/USER-INTEL/angle_charmm_intel.h Copied from src/USER-INTEL/pair_lj_cut_intel.h
	A			src/USER-INTEL/bond_harmonic_intel.cpp
	P			src/USER-INTEL/bond_harmonic_intel.h Copied from src/USER-INTEL/pair_lj_cut_intel.h
	A			src/USER-INTEL/dihedral_charmm_intel.cpp
	P			src/USER-INTEL/dihedral_charmm_intel.h Copied from src/USER-INTEL/pair_lj_cut_intel.h
	M			src/USER-INTEL/fix_intel.cpp
	M			src/USER-INTEL/fix_intel.h
	A			src/USER-INTEL/improper_harmonic_intel.cpp
	P			src/USER-INTEL/improper_harmonic_intel.h Copied from src/USER-INTEL/pair_lj_cut_intel.h
	M			src/USER-INTEL/intel_buffers.cpp
	M			src/USER-INTEL/intel_buffers.h
	M			src/USER-INTEL/intel_preprocess.h
	M			src/USER-INTEL/intel_simd.h
	M			src/USER-INTEL/neigh_half_bin_intel.cpp
	M			src/USER-INTEL/pair_buck_coul_cut_intel.cpp
	M			src/USER-INTEL/pair_buck_coul_long_intel.cpp
	M			src/USER-INTEL/pair_buck_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_coul_long_intel.cpp
	M			src/USER-INTEL/pair_lj_cut_intel.cpp
	M			src/USER-INTEL/pair_sw_intel.cpp
	M			src/USER-INTEL/pair_tersoff_intel.cpp
	M			src/USER-INTEL/verlet_intel.cpp
	M			src/USER-INTEL/verlet_intel.h
	M			src/USER-INTEL/verlet_split_intel.cpp
	M			src/USER-INTEL/verlet_split_intel.h
	M			src/version.h