Merge remote branch 'lammps-ro/master' into lammps-icms
6303826d2969
Actions

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

Description

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

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Jan 29 2016, 13:59

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

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

Commit	Author	Details	Committed
cf77d882eba7	stamoor	Adding error checks for Kokkos-incompatible features	Jan 29 2016
def0d4ed8099	stamoor	Fixing logic error with suffix styles	Jan 29 2016
f86a9f428330	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14515 f3b2605a-c512-4ea7…	Jan 28 2016
bc15585acd5b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14514 f3b2605a-c512-4ea7…	Jan 28 2016
237743e6fd0b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14513 f3b2605a-c512-4ea7…	Jan 28 2016
997ce626ac62	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14512 f3b2605a-c512-4ea7…	Jan 28 2016
7e67afad7baa	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14511 f3b2605a-c512-4ea7…	Jan 28 2016
d42ebe4e5ea8	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14510 f3b2605a-c512-4ea7…	Jan 28 2016
db773d752edb	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14509 f3b2605a-c512-4ea7…	Jan 28 2016
b355fa25f455	stamoor	Squelching annoying kokkos output	Jan 28 2016

				Path
	M			doc/Section_commands.html
	M			doc/Section_commands.txt
	M			doc/angle_charmm.html
	M			doc/compute_meso_e_atom.html
	M			doc/compute_meso_e_atom.txt
	M			doc/compute_meso_rho_atom.html
	M			doc/compute_meso_rho_atom.txt
	M			doc/compute_meso_t_atom.html
	M			doc/compute_meso_t_atom.txt
	M			doc/dihedral_charmm.html
	M			doc/dump_image.html
	M			doc/dump_image.txt
	M			doc/fix_pour.html
	M			doc/fix_pour.txt
	M			doc/genindex.html
	M			doc/searchindex.js
	M			doc/set.html
	M			doc/set.txt
	M			examples/USER/smd/aluminum_strip_pull/aluminum_strip_pull.lmp
	M			examples/USER/smd/fluid_structure_interaction/fluid_structure_interaction.lmp
	M			examples/USER/smd/funnel_flow/funnel_flow.lmp
	M			examples/USER/smd/rubber_rings_3d/rubber_rings_3d.lmp
	M			examples/USER/sph/cavity_flow/cavity_flow.lmp
	M			examples/USER/sph/heatconduction/sph_heat_conduction_2d.lmp
	M			examples/USER/sph/heatconduction/sph_heat_conduction_3d.lmp
	M			examples/USER/sph/shock_tube/shock2d.lmp
	M			examples/USER/sph/shock_tube/shock3d.lmp
	M			examples/USER/sph/water_collapse/water_collapse.lmp
	M			lib/kokkos/core/src/impl/Kokkos_AllocationTracker.cpp
	M			src/USER-LB/fix_lb_viscous.cpp
	M			src/USER-SPH/compute_meso_e_atom.cpp
	M			src/USER-SPH/compute_meso_e_atom.h
	M			src/USER-SPH/compute_meso_rho_atom.cpp
	M			src/USER-SPH/compute_meso_rho_atom.h
	M			src/USER-SPH/compute_meso_t_atom.cpp
	M			src/USER-SPH/compute_meso_t_atom.h
	M			src/atom.cpp
	M			src/atom.h
	M			src/library.cpp
	M			src/minimize.cpp
	M			src/minimize.h
	M			src/neigh_request.cpp
	M			src/neigh_request.h
	M			src/pair.cpp
	M			src/pair.h
	M			src/pair_hybrid.cpp
	M			src/pair_hybrid.h
	M			src/set.cpp