Diffusion lammps 057bc649d9b5

Merge remote branch 'lammps-ro/master' into lammps-icms
057bc649d9b5
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Jan 30 2016, 16:44.

Description

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

Resolved Conflicts:
doc/Manual.txt
src/fix_store.cpp

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Jan 30 2016, 16:44

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS60ec76287666: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14529 f3b2605a-c512-4ea7…
rLAMMPS6303826d2969: Merge remote branch 'lammps-ro/master' into lammps-icms

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS057bc649d9b5: Merge remote branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Jan 30 2016, 16:44

Merged Changes

Commit	Author	Details	Committed
60ec76287666	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14529 f3b2605a-c512-4ea7…	Jan 29 2016
029faeb7f09e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14528 f3b2605a-c512-4ea7…	Jan 29 2016
3d7d897fe878	stamoor	Changing Kokkos default	Jan 29 2016
a8d0bf986fed	stamoor	Changing Kokkos default	Jan 29 2016
daaadcdd8677	stamoor	Adding Kokkos output and error checks	Jan 29 2016
7ae6db5a9846	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14523 f3b2605a-c512-4ea7…	Jan 29 2016
7b091eb65195	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14522 f3b2605a-c512-4ea7…	Jan 29 2016
0f877f6fdeac	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14521 f3b2605a-c512-4ea7…	Jan 29 2016
ccf5f31eb9c7	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14520 f3b2605a-c512-4ea7…	Jan 29 2016
dd2d454fc442	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14519 f3b2605a-c512-4ea7…	Jan 29 2016
ce471ffcdb39	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14518 f3b2605a-c512-4ea7…	Jan 29 2016

Changes (68)

				Path
	M			doc/Manual.html
	M			doc/Manual.txt
	M			doc/compute_smd_contact_radius.html
	M			doc/compute_smd_contact_radius.txt
	M			doc/compute_smd_hourglass_error.html
	M			doc/compute_smd_hourglass_error.txt
	M			doc/compute_smd_internal_energy.html
	M			doc/compute_smd_internal_energy.txt
	M			doc/compute_smd_plastic_strain.html
	M			doc/compute_smd_plastic_strain.txt
	M			doc/compute_smd_plastic_strain_rate.html
	M			doc/compute_smd_plastic_strain_rate.txt
	M			doc/compute_smd_rho.html
	M			doc/compute_smd_rho.txt
	M			doc/compute_smd_tlsph_defgrad.html
	M			doc/compute_smd_tlsph_defgrad.txt
	M			doc/compute_smd_tlsph_dt.html
	M			doc/compute_smd_tlsph_dt.txt
	M			doc/compute_smd_tlsph_num_neighs.html
	M			doc/compute_smd_tlsph_num_neighs.txt
	M			doc/compute_smd_tlsph_shape.html
	M			doc/compute_smd_tlsph_shape.txt
	M			doc/compute_smd_tlsph_strain.html
	M			doc/compute_smd_tlsph_strain.txt
	M			doc/compute_smd_tlsph_strain_rate.html
	M			doc/compute_smd_tlsph_strain_rate.txt
	M			doc/compute_smd_tlsph_stress.html
	M			doc/compute_smd_tlsph_stress.txt
	M			doc/compute_smd_triangle_mesh_vertices.html
	M			doc/compute_smd_triangle_mesh_vertices.txt
	M			doc/compute_smd_ulsph_num_neighs.html
	M			doc/compute_smd_ulsph_num_neighs.txt
	M			doc/compute_smd_ulsph_strain.html
	M			doc/compute_smd_ulsph_strain.txt
	M			doc/compute_smd_ulsph_strain_rate.html
	M			doc/compute_smd_ulsph_strain_rate.txt
	M			doc/compute_smd_ulsph_stress.html
	M			doc/compute_smd_ulsph_stress.txt
	M			doc/compute_smd_vol.html
	M			doc/compute_smd_vol.txt
	M			doc/genindex.html
	M			doc/package.txt
	M			doc/searchindex.js
	M			src/KOKKOS/kokkos.cpp
	M			src/USER-SMD/compute_smd_contact_radius.h
	M			src/USER-SMD/compute_smd_hourglass_error.h
	M			src/USER-SMD/compute_smd_internal_energy.h
	M			src/USER-SMD/compute_smd_plastic_strain.h
	M			src/USER-SMD/compute_smd_plastic_strain_rate.h
	M			src/USER-SMD/compute_smd_tlsph_defgrad.h
	M			src/USER-SMD/compute_smd_tlsph_dt.h
	M			src/USER-SMD/compute_smd_tlsph_num_neighs.h
	M			src/USER-SMD/compute_smd_tlsph_shape.h
	M			src/USER-SMD/compute_smd_tlsph_strain.h
	M			src/USER-SMD/compute_smd_tlsph_strain_rate.h
	M			src/USER-SMD/compute_smd_tlsph_stress.h
	M			src/USER-SMD/compute_smd_triangle_mesh_vertices.h
	M			src/USER-SMD/compute_smd_ulsph_effm.h
	M			src/USER-SMD/compute_smd_ulsph_num_neighs.h
	M			src/USER-SMD/compute_smd_ulsph_strain.h
	M			src/USER-SMD/compute_smd_ulsph_strain_rate.h
	M			src/USER-SMD/compute_smd_ulsph_stress.h
	M			src/fix_store.cpp
	M			src/lammps.cpp
	M			src/neighbor.cpp
	M			src/neighbor.h
	M			src/read_data.cpp
	M			src/version.h