Diffusion lammps d8c3c99f546e

Merge remote-tracking branch 'upstream/lammps-icms' into user-vtk
d8c3c99f546e
Actions

Authored by Richard Berger <richard.berger@jku.at> on Jan 30 2016, 17:48.

Description

Merge remote-tracking branch 'upstream/lammps-icms' into user-vtk

Details

Committed

Richard Berger <richard.berger@jku.at>

Jan 30 2016, 17:48

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS61399437da90: Cleanup dump custom/vtk doc
rLAMMPS6303826d2969: Merge remote branch 'lammps-ro/master' into lammps-icms

Branches

Unknown

Tags

Unknown

Event Timeline

Richard Berger <richard.berger@jku.at> committed rLAMMPSd8c3c99f546e: Merge remote-tracking branch 'upstream/lammps-icms' into user-vtk (authored by Richard Berger <richard.berger@jku.at>).Jan 30 2016, 17:48

Merged Changes

Commit	Author	Details	Committed
6303826d2969	Axel Kohlmeyer	Merge remote branch 'lammps-ro/master' into lammps-icms	Jan 29 2016
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
fb98050682de	Axel Kohlmeyer	Merge remote branch 'lammps-ro/master' into lammps-icms	Jan 28 2016
ec1f2add11da	Axel Kohlmeyer	initialize possible uninitialized variables found by coverity scan	Jan 28 2016
ed17939b75d8	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14507 f3b2605a-c512-4ea7…	Jan 28 2016
fa7543b714e0	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14506 f3b2605a-c512-4ea7…	Jan 27 2016
20f719975141	Axel Kohlmeyer	enforce initialization for some class members	Jan 27 2016
16cb8e140aa4	Axel Kohlmeyer	fix incorrect code for deleting arrays	Jan 27 2016
dca90d44b7b6	stamoor	Fixing Kokkos bug	Jan 27 2016
d5fd3a670cfc	Axel Kohlmeyer	Merge branch 'lammps-icms' of bitbucket.org:akohlmey/lammps-icms into lammps…	Jan 27 2016
6641a633c4a1	Axel Kohlmeyer	Merge remote-tracking branch 'lammps-ro/master' into lammps-icms	Jan 27 2016
833f597b8182	Axel Kohlmeyer	Merge remote branch 'lammps-ro/master' into lammps-icms	Jan 27 2016
bcd2dba3a670	Axel Kohlmeyer	fix unitialized memory issue reported by coverity	Jan 27 2016
20c6860162e0	Axel Kohlmeyer	plug memory leaks in ndx2group reported by coverity scan	Jan 27 2016
0541d52c17a1	stamoor	Fixing Kokkos bug	Jan 27 2016
8c4d59261310	stamoor	Fixing Kokkos bug	Jan 26 2016
445807e1f36b	Axel Kohlmeyer	Merge remote branch 'lammps-ro/master' into lammps-icms	Jan 26 2016
5b9ef6349330	Axel Kohlmeyer	correct Purge.list mistake. we need to remove the /omp versions	Jan 26 2016
977a7a5461f7	Axel Kohlmeyer	Merge branch 'lammps-icms' of bitbucket.org:akohlmey/lammps-icms into lammps…	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
e18635c5181a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14496 f3b2605a-c512-4ea7…	Jan 26 2016
c25e43186491	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14495 f3b2605a-c512-4ea7…	Jan 26 2016
49051197a92e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14494 f3b2605a-c512-4ea7…	Jan 26 2016
2d78e1a21597	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14493 f3b2605a-c512-4ea7…	Jan 26 2016
0fbc48723eaa	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14492 f3b2605a-c512-4ea7…	Jan 25 2016
12858669c055	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14491 f3b2605a-c512-4ea7…	Jan 25 2016
bf9517b5623e	stamoor	Fixing Kokkos bugs	Jan 25 2016
92ae19e280bc	stamoor	Fixing Kokkos bugs	Jan 25 2016
9eb8702f2fe2	stamoor	Fixing Kokkos bugs	Jan 25 2016
775b163eaea0	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14487 f3b2605a-c512-4ea7…	Jan 25 2016
e5493e211593	Axel Kohlmeyer	fix typo	Jun 10 2015
f8ed7cbf90b5	Axel Kohlmeyer	Merge remote branch 'lammps-ro/master' into lammps-icms	Jun 10 2015

Changes (141)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

				Path
	M			doc/Manual.html
	M			doc/Manual.txt
	M			doc/Section_commands.html
	M			doc/Section_commands.txt
	M			doc/Section_python.txt
	M			doc/Section_start.html
	M			doc/Section_start.txt
	M			doc/angle_charmm.html
	M			doc/angle_charmm.txt
	M			doc/bond_harmonic.html
	M			doc/bond_harmonic.txt
	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/dihedral_charmm.txt
	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/improper_harmonic.html
	M			doc/improper_harmonic.txt
	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/containers/src/Kokkos_DualView.hpp
	M			lib/kokkos/core/src/impl/Kokkos_AllocationTracker.cpp
	M			src/GRANULAR/fix_pour.cpp
	M			src/GRANULAR/fix_pour.h
	M			src/KOKKOS/atom_kokkos.cpp
	M			src/KOKKOS/atom_kokkos.h
	M			src/KOKKOS/comm_kokkos.cpp
	M			src/KOKKOS/neigh_bond_kokkos.cpp
	M			src/KOKKOS/neigh_bond_kokkos.h
	M			src/KOKKOS/neighbor_kokkos.cpp
	M			src/KOKKOS/pair_sw_kokkos.cpp
	M			src/KOKKOS/pair_sw_kokkos.h
	M			src/KOKKOS/pair_tersoff_kokkos.cpp
	M			src/KOKKOS/pair_tersoff_kokkos.h
	M			src/KOKKOS/pair_tersoff_mod_kokkos.cpp
	M			src/KOKKOS/pair_tersoff_mod_kokkos.h
	M			src/KOKKOS/pair_tersoff_zbl_kokkos.cpp
	M			src/KOKKOS/pair_tersoff_zbl_kokkos.h
	M			src/MANYBODY/pair_comb.cpp
	M			src/MANYBODY/pair_comb.h
	M			src/MANYBODY/pair_comb3.cpp
	M			src/MANYBODY/pair_comb3.h
	M			src/MANYBODY/pair_nb3b_harmonic.cpp
	M			src/MANYBODY/pair_nb3b_harmonic.h
	M			src/MANYBODY/pair_polymorphic.cpp
	M			src/MANYBODY/pair_polymorphic.h
	M			src/MANYBODY/pair_sw.cpp
	M			src/MANYBODY/pair_sw.h
	M			src/MANYBODY/pair_tersoff.cpp
	M			src/MANYBODY/pair_tersoff.h
	M			src/MANYBODY/pair_tersoff_mod.cpp
	M			src/MANYBODY/pair_tersoff_mod.h
	M			src/MANYBODY/pair_vashishta.cpp
	M			src/MANYBODY/pair_vashishta.h
	M			src/Purge.list
	M			src/QEQ/fix_qeq_fire.cpp
	M			src/USER-COLVARS/ndx_group.cpp
	A			src/USER-INTEL/angle_charmm_intel.cpp
	A			src/USER-INTEL/angle_charmm_intel.h
	A			src/USER-INTEL/bond_harmonic_intel.cpp
	A			src/USER-INTEL/bond_harmonic_intel.h
	A			src/USER-INTEL/dihedral_charmm_intel.cpp
	A			src/USER-INTEL/dihedral_charmm_intel.h
	M			src/USER-INTEL/fix_intel.cpp
	M			src/USER-INTEL/fix_intel.h
	A			src/USER-INTEL/improper_harmonic_intel.cpp
	A			src/USER-INTEL/improper_harmonic_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/USER-LB/fix_lb_viscous.cpp
	M			src/USER-MISC/pair_edip.cpp
	M			src/USER-MISC/pair_edip.h
	M			src/USER-MISC/pair_tersoff_table.cpp
	M			src/USER-MISC/pair_tersoff_table.h
	M			src/USER-SMTBQ/pair_smtbq.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/atom_vec_tri.cpp
	M			src/atom_vec_tri.h
	M			src/displace_atoms.cpp
	M			src/dump_image.cpp
	M			src/dump_image.h
	M			src/fix_move.cpp
	M			src/fix_shear_history.h
	M			src/fix_store.cpp
	M			src/library.cpp
	M			src/minimize.cpp
	M			src/minimize.h
	M			src/neigh_request.cpp
	M			src/neigh_request.h
	M			src/neighbor.cpp
	M			src/neighbor.h
	M			src/pair.cpp
	M			src/pair.h
	M			src/pair_coul_streitz.cpp
	M			src/pair_coul_streitz.h
	M			src/pair_hybrid.cpp
	M			src/pair_hybrid.h
	M			src/set.cpp
	M			src/version.h