Diffusion lammps 01881e6fcc2d

Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
01881e6fcc2d
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Jul 23 2016, 12:28.

Description

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

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Jul 23 2016, 12:28

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS08ac3d54dd94: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15364 f3b2605a-c512-4ea7…
rLAMMPS06761ff09bee: re-enable forcing using ccache with a workaround for clang

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS01881e6fcc2d: Merge remote-tracking branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Jul 23 2016, 12:28

Merged Changes

Commit	Author	Details	Committed
08ac3d54dd94	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15364 f3b2605a-c512-4ea7…	Jul 23 2016
caf9483a0a7c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15362 f3b2605a-c512-4ea7…	Jul 23 2016
c04c7756318e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15361 f3b2605a-c512-4ea7…	Jul 23 2016
7dc6873c513c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15360 f3b2605a-c512-4ea7…	Jul 23 2016
952a0d1fb776	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15359 f3b2605a-c512-4ea7…	Jul 23 2016
778f4d338c78	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15358 f3b2605a-c512-4ea7…	Jul 23 2016
2f936d5e564b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15357 f3b2605a-c512-4ea7…	Jul 23 2016
87a6c1368f6f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15356 f3b2605a-c512-4ea7…	Jul 23 2016
cff65b956adc	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15355 f3b2605a-c512-4ea7…	Jul 23 2016
87bfe1941b6f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15354 f3b2605a-c512-4ea7…	Jul 23 2016
e519cfb1dccb	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15353 f3b2605a-c512-4ea7…	Jul 23 2016
5abac962ed66	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15352 f3b2605a-c512-4ea7…	Jul 23 2016
0659a1fc5a1c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15351 f3b2605a-c512-4ea7…	Jul 23 2016
ff10357ef205	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15350 f3b2605a-c512-4ea7…	Jul 23 2016
f9a4b697a49e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15349 f3b2605a-c512-4ea7…	Jul 22 2016
0f71c66b6fe5	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15348 f3b2605a-c512-4ea7…	Jul 22 2016
f7c2fdf33543	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15347 f3b2605a-c512-4ea7…	Jul 22 2016
137f19ba9fbb	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15346 f3b2605a-c512-4ea7…	Jul 22 2016

Changes (43)

				Path
	M			doc/html/Manual.html
	M			doc/html/_sources/Manual.txt
	M			doc/html/_sources/compute_angle_local.txt
	M			doc/html/_sources/compute_bond_local.txt
	M			doc/html/_sources/compute_dihedral_local.txt
	M			doc/html/_sources/compute_improper_local.txt
	M			doc/html/_sources/compute_pair_local.txt
	M			doc/html/_sources/compute_property_local.txt
	M			doc/html/_sources/compute_sna_atom.txt
	M			doc/html/compute_angle_local.html
	M			doc/html/compute_bond_local.html
	M			doc/html/compute_dihedral_local.html
	M			doc/html/compute_improper_local.html
	M			doc/html/compute_pair_local.html
	M			doc/html/compute_property_local.html
	M			doc/html/compute_sna_atom.html
	M			doc/html/searchindex.js
	M			doc/src/Manual.txt
	M			doc/src/compute_angle_local.txt
	M			doc/src/compute_bond_local.txt
	M			doc/src/compute_dihedral_local.txt
	M			doc/src/compute_improper_local.txt
	M			doc/src/compute_pair_local.txt
	M			doc/src/compute_property_local.txt
	P			python/examples/ipython/interface_usage.ipynb.orig Copied from doc/html/_sources/fix_smd_tlsph_reference_configuration.txt
	P			python/examples/ipython/interface_usage_bonds.ipynb.orig Copied from doc/html/_sources/fix_smd_tlsph_reference_configuration.txt
	P			python/examples/ipython/simple.ipynb.orig Copied from doc/html/_sources/fix_smd_tlsph_reference_configuration.txt
	M			python/lammps.py
	M			src/compute_pair_local.cpp
	M			src/compute_pair_local.h
	M			src/compute_property_local.cpp
	M			src/compute_property_local.h
	M			src/create_bonds.cpp
	M			src/delete_atoms.cpp
	M			src/fix_shear_history.cpp
	M			src/force.cpp
	M			src/force.h
	M			src/library.cpp
	M			src/neigh_request.h
	M			src/neighbor.cpp
	M			src/neighbor.h
	M			src/update.cpp
	M			src/version.h