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

Branches

Unknown

Tags

Unknown

[HTTP/500] Internal Server Error FilesystemException: Failed to create a temporary directory: the disk is full.[HTTP/500] Internal Server Error FilesystemException: Failed to create a temporary directory: the disk is full.[HTTP/500] Internal Server Error FilesystemException: Failed to create a temporary directory: the disk is full.

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

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

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

Description

Details

Event Timeline

Changes (68)

rLAMMPS057bc649d9b5

doc/Manual.html

doc/Manual.txt

doc/compute_smd_contact_radius.html

doc/compute_smd_contact_radius.txt

doc/compute_smd_hourglass_error.html

doc/compute_smd_hourglass_error.txt

doc/compute_smd_internal_energy.html

doc/compute_smd_internal_energy.txt

doc/compute_smd_plastic_strain.html

doc/compute_smd_plastic_strain.txt

doc/compute_smd_plastic_strain_rate.html

doc/compute_smd_plastic_strain_rate.txt

doc/compute_smd_rho.html

doc/compute_smd_rho.txt

doc/compute_smd_tlsph_defgrad.html

doc/compute_smd_tlsph_defgrad.txt

doc/compute_smd_tlsph_dt.html

doc/compute_smd_tlsph_dt.txt

doc/compute_smd_tlsph_num_neighs.html

doc/compute_smd_tlsph_num_neighs.txt

doc/compute_smd_tlsph_shape.html

doc/compute_smd_tlsph_shape.txt

doc/compute_smd_tlsph_strain.html

doc/compute_smd_tlsph_strain.txt

doc/compute_smd_tlsph_strain_rate.html

doc/compute_smd_tlsph_strain_rate.txt

doc/compute_smd_tlsph_stress.html

doc/compute_smd_tlsph_stress.txt

doc/compute_smd_triangle_mesh_vertices.html

doc/compute_smd_triangle_mesh_vertices.txt

doc/compute_smd_ulsph_num_neighs.html

doc/compute_smd_ulsph_num_neighs.txt

doc/compute_smd_ulsph_strain.html

doc/compute_smd_ulsph_strain.txt

doc/compute_smd_ulsph_strain_rate.html

doc/compute_smd_ulsph_strain_rate.txt

doc/compute_smd_ulsph_stress.html

doc/compute_smd_ulsph_stress.txt

doc/compute_smd_vol.html

doc/compute_smd_vol.txt

doc/genindex.html

doc/package.txt

doc/searchindex.js

src/KOKKOS/kokkos.cpp

src/USER-SMD/compute_smd_contact_radius.h

src/USER-SMD/compute_smd_hourglass_error.h

src/USER-SMD/compute_smd_internal_energy.h

src/USER-SMD/compute_smd_plastic_strain.h

src/USER-SMD/compute_smd_plastic_strain_rate.h

src/USER-SMD/compute_smd_tlsph_defgrad.h

src/USER-SMD/compute_smd_tlsph_dt.h

src/USER-SMD/compute_smd_tlsph_num_neighs.h

src/USER-SMD/compute_smd_tlsph_shape.h

src/USER-SMD/compute_smd_tlsph_strain.h

src/USER-SMD/compute_smd_tlsph_strain_rate.h

src/USER-SMD/compute_smd_tlsph_stress.h

src/USER-SMD/compute_smd_triangle_mesh_vertices.h

src/USER-SMD/compute_smd_ulsph_effm.h

src/USER-SMD/compute_smd_ulsph_num_neighs.h

src/USER-SMD/compute_smd_ulsph_strain.h

src/USER-SMD/compute_smd_ulsph_strain_rate.h

src/USER-SMD/compute_smd_ulsph_stress.h

src/fix_store.cpp

src/lammps.cpp

src/neighbor.cpp

src/neighbor.h

src/read_data.cpp

src/version.h

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