Diffusion lammps 8c56f954bc96

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

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Mar 22 2016, 11:26.

Description

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

Resolved Conflicts:
doc/Manual.txt
src/USER-INTEL/verlet_intel.cpp
src/domain.cpp

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Mar 22 2016, 11:26

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS13ae93dbdd97: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14769 f3b2605a-c512-4ea7…
rLAMMPSed3ced9c135b: correct NULL pointer dereference in parallel runs

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS8c56f954bc96: Merge remote-tracking branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Mar 22 2016, 11:26

Merged Changes

Commit	Author	Details	Committed
13ae93dbdd97	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14769 f3b2605a-c512-4ea7…	Mar 22 2016
eda01bfd1aab	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14768 f3b2605a-c512-4ea7…	Mar 22 2016
86fc7d455cac	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14767 f3b2605a-c512-4ea7…	Mar 22 2016
009f3564e0e0	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14766 f3b2605a-c512-4ea7…	Mar 22 2016
b50f71cd96d6	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14765 f3b2605a-c512-4ea7…	Mar 22 2016
a10c992e380a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14764 f3b2605a-c512-4ea7…	Mar 22 2016
a568a8741b28	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14761 f3b2605a-c512-4ea7…	Mar 21 2016
a3ad5b65d3a6	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14760 f3b2605a-c512-4ea7…	Mar 21 2016
847090cd89e2	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14759 f3b2605a-c512-4ea7…	Mar 21 2016
edb3f9559c51	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14758 f3b2605a-c512-4ea7…	Mar 21 2016
cea9e516a8d2	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14757 f3b2605a-c512-4ea7…	Mar 21 2016
36776f425b93	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14756 f3b2605a-c512-4ea7…	Mar 21 2016
784d8cc2f8a0	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14755 f3b2605a-c512-4ea7…	Mar 21 2016
6e3ea06b1173	stamoor	Allowing read_restart to use suffix style with pair style, etc	Mar 21 2016
1901b7b33e3b	stamoor	Allowing read_restart to use suffix style with avec	Mar 21 2016

Changes (48)

				Path
	M			doc/Manual.html
	M			doc/Manual.txt
	M			doc/Section_commands.html
	M			doc/Section_commands.txt
	M			doc/_sources/Manual.txt
	M			doc/_sources/Section_commands.txt
	M			doc/_sources/compute_tally.txt
	M			doc/_sources/compute_voronoi_atom.txt
	M			doc/_sources/pair_airebo.txt
	M			doc/_sources/pair_style.txt
	M			doc/compute_tally.html
	M			doc/compute_voronoi_atom.html
	M			doc/pair_airebo.html
	M			doc/pair_style.html
	M			doc/pair_style.txt
	M			doc/pair_thole.html
	M			doc/searchindex.js
	M			src/MAKE/OPTIONS/Makefile.intel_cpu
	M			src/MAKE/OPTIONS/Makefile.intel_phi
	M			src/MAKE/OPTIONS/Makefile.knl
	M			src/USER-INTEL/fix_intel.cpp
	M			src/USER-INTEL/fix_intel.h
	M			src/USER-INTEL/fix_nh_intel.cpp
	M			src/USER-INTEL/fix_nh_intel.h
	M			src/USER-INTEL/fix_nve_asphere_intel.cpp
	M			src/USER-INTEL/fix_nve_asphere_intel.h
	M			src/USER-INTEL/fix_nve_intel.cpp
	P			src/USER-INTEL/fix_nve_intel.h Copied to src/USER-INTEL/pppm_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/neigh_half_bin_intel.cpp
	M			src/USER-INTEL/pair_gayberne_intel.cpp
	M			src/USER-INTEL/pair_lj_cut_intel.cpp
	M			src/USER-INTEL/pair_tersoff_intel.cpp
	A			src/USER-INTEL/pppm_intel.cpp
	P			src/USER-INTEL/pppm_intel.h Copied from src/USER-INTEL/fix_nve_intel.h
	D			src/USER-INTEL/verlet_intel.cpp
	D			src/USER-INTEL/verlet_intel.h
	D			src/USER-INTEL/verlet_split_intel.cpp
	D			src/USER-INTEL/verlet_split_intel.h
	M			src/accelerator_intel.h
	M			src/input.cpp
	M			src/integrate.cpp
	M			src/min.cpp
	M			src/neighbor.cpp
	M			src/read_restart.cpp
	M			src/version.h