Diffusion lammps 4a197537c015

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

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Aug 7 2014, 14:24.

Description

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

Resolved Conflicts:
doc/Manual.html
doc/Manual.txt

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Aug 7 2014, 14:24

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPSefcdb479482b: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12270 f3b2605a-c512-4ea7…
rLAMMPSad4d9d88b873: include optimized matrix-matrix multiplication

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS4a197537c015: Merge remote-tracking branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Aug 7 2014, 14:24

Merged Changes

Commit	Author	Details	Committed
efcdb479482b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12270 f3b2605a-c512-4ea7…	Aug 7 2014
fd5116990806	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12269 f3b2605a-c512-4ea7…	Aug 7 2014
d8728db35a1c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12268 f3b2605a-c512-4ea7…	Aug 7 2014
f58ea4fdc0a6	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12267 f3b2605a-c512-4ea7…	Aug 7 2014
1177fd9af33b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12266 f3b2605a-c512-4ea7…	Aug 7 2014
d1148fd1ee5a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12265 f3b2605a-c512-4ea7…	Aug 7 2014
c7454ea146a7	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12264 f3b2605a-c512-4ea7…	Aug 7 2014
edb0fc0def5e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12263 f3b2605a-c512-4ea7…	Aug 7 2014
0e4940441e55	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12262 f3b2605a-c512-4ea7…	Aug 6 2014
2861c9dfd304	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12261 f3b2605a-c512-4ea7…	Aug 6 2014
2f8e551ce1a3	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12260 f3b2605a-c512-4ea7…	Aug 6 2014
bec3e6224173	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12259 f3b2605a-c512-4ea7…	Aug 6 2014
3e41b24e065d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12258 f3b2605a-c512-4ea7…	Aug 6 2014
d0a2f7f57a72	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12257 f3b2605a-c512-4ea7…	Aug 6 2014
6bd64d5aabc7	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12256 f3b2605a-c512-4ea7…	Aug 6 2014
f50d366df70b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12255 f3b2605a-c512-4ea7…	Aug 6 2014
583c7de117b3	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12254 f3b2605a-c512-4ea7…	Aug 6 2014
2cca37351548	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12253 f3b2605a-c512-4ea7…	Aug 6 2014

Changes (96)

				Path
	M			doc/Manual.html
	M			doc/Manual.txt
	M			doc/pair_kim.html
	M			doc/pair_kim.txt
	V			examples/kim/{log.kim.lj.23Jun14.ubuntu.1 → log.kim.lj.27Jul14.ubuntu.1}
	V			examples/kim/{log.kim.lj.23Jun14.ubuntu.4 → log.kim.lj.27Jul14.ubuntu.4}
	V			examples/kim/{log.kim.lj.27Jul14.ubuntu.1 ← log.kim.lj.23Jun14.ubuntu.1}
	V			examples/kim/{log.kim.lj.27Jul14.ubuntu.4 ← log.kim.lj.23Jun14.ubuntu.4}
	V			examples/kim/{log.kim.lj.lmp.23Jun14.ubuntu.1 → log.kim.lj.lmp.27Jul14.ubuntu.1}
	V			examples/kim/{log.kim.lj.lmp.23Jun14.ubuntu.4 → log.kim.lj.lmp.27Jul14.ubuntu.4}
	V			examples/kim/{log.kim.lj.lmp.27Jul14.ubuntu.1 ← log.kim.lj.lmp.23Jun14.ubuntu.1}
	V			examples/kim/{log.kim.lj.lmp.27Jul14.ubuntu.4 ← log.kim.lj.lmp.23Jun14.ubuntu.4}
	M			src/FLD/pair_lubricate.cpp
	M			src/FLD/pair_lubricate.h
	M			src/FLD/pair_lubricateU.cpp
	M			src/FLD/pair_lubricateU.h
	M			src/GPU/pair_eam_gpu.cpp
	M			src/GPU/pair_eam_gpu.h
	M			src/GRANULAR/pair_gran_hooke_history.cpp
	M			src/GRANULAR/pair_gran_hooke_history.h
	M			src/KIM/Makefile.lammps
	M			src/KIM/pair_kim.cpp
	M			src/KIM/pair_kim.h
	M			src/MANYBODY/fix_qeq_comb.cpp
	M			src/MANYBODY/fix_qeq_comb.h
	M			src/MANYBODY/pair_adp.cpp
	M			src/MANYBODY/pair_adp.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_eam.cpp
	M			src/MANYBODY/pair_eam.h
	M			src/MANYBODY/pair_eim.cpp
	M			src/MANYBODY/pair_eim.h
	M			src/MC/fix_bond_break.cpp
	M			src/MC/fix_bond_break.h
	M			src/MC/fix_bond_create.cpp
	M			src/MC/fix_bond_create.h
	M			src/MEAM/pair_meam.cpp
	M			src/MEAM/pair_meam.h
	M			src/MISC/fix_orient_fcc.cpp
	M			src/MISC/fix_orient_fcc.h
	M			src/PERI/fix_peri_neigh.cpp
	M			src/PERI/fix_peri_neigh.h
	M			src/PERI/pair_peri_eps.cpp
	M			src/PERI/pair_peri_eps.h
	M			src/PERI/pair_peri_lps.cpp
	M			src/PERI/pair_peri_lps.h
	M			src/PERI/pair_peri_ves.cpp
	M			src/PERI/pair_peri_ves.h
	M			src/REAX/pair_reax.cpp
	M			src/REAX/pair_reax.h
	M			src/RIGID/fix_rigid_small.cpp
	M			src/RIGID/fix_rigid_small.h
	M			src/RIGID/fix_shake.cpp
	M			src/RIGID/fix_shake.h
	M			src/SRD/fix_srd.cpp
	M			src/USER-ATC/fix_atc.cpp
	M			src/USER-ATC/fix_atc.h
	M			src/USER-CUDA/comm_cuda.cpp
	M			src/USER-CUDA/fix_shake_cuda.cpp
	M			src/USER-CUDA/fix_shake_cuda.h
	M			src/USER-CUDA/pair_eam_cuda.cpp
	M			src/USER-CUDA/pair_eam_cuda.h
	M			src/USER-MISC/pair_cdeam.cpp
	M			src/USER-MISC/pair_cdeam.h
	M			src/USER-MISC/pair_meam_spline.cpp
	M			src/USER-MISC/pair_meam_spline.h
	M			src/USER-MISC/pair_meam_sw_spline.cpp
	M			src/USER-MISC/pair_meam_sw_spline.h
	M			src/USER-REAXC/fix_qeq_reax.cpp
	M			src/USER-REAXC/fix_qeq_reax.h
	M			src/USER-REAXC/fix_reax_c.cpp
	M			src/USER-REAXC/fix_reax_c.h
	M			src/USER-REAXC/fix_reaxc_species.cpp
	M			src/USER-REAXC/fix_reaxc_species.h
	M			src/USER-SPH/pair_sph_rhosum.cpp
	M			src/USER-SPH/pair_sph_rhosum.h
	M			src/balance.cpp
	M			src/comm_brick.cpp
	M			src/comm_tiled.cpp
	M			src/comm_tiled.h
	M			src/compute.h
	M			src/compute_cluster_atom.cpp
	M			src/compute_cluster_atom.h
	M			src/compute_contact_atom.cpp
	M			src/compute_pe_atom.cpp
	M			src/compute_stress_atom.cpp
	M			src/dump.h
	M			src/dump_image.cpp
	M			src/dump_image.h
	M			src/fix.h
	M			src/input.cpp
	M			src/pair.h
	M			src/version.h