Diffusion lammps f9f7283fa5c5

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

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on May 14 2014, 13:18.

Description

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

Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
src/accelerator_cuda.h

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

May 14 2014, 13:18

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPSd989a9d950a8: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11990 f3b2605a-c512-4ea7…
rLAMMPS8d4a991b75ac: Merge remote-tracking branch 'lammps-ro/master' into lammps-icms

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPSf9f7283fa5c5: Merge remote-tracking branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).May 14 2014, 13:18

Merged Changes

Commit	Author	Details	Committed
d989a9d950a8	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11990 f3b2605a-c512-4ea7…	May 14 2014
948e75318d95	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11989 f3b2605a-c512-4ea7…	May 13 2014
c948a2bcb788	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11987 f3b2605a-c512-4ea7…	May 13 2014
7d72f89ee83d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11986 f3b2605a-c512-4ea7…	May 13 2014
8a9ba2d05037	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11985 f3b2605a-c512-4ea7…	May 13 2014
94831bf7a4b0	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11984 f3b2605a-c512-4ea7…	May 13 2014
f9864c81e0eb	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11983 f3b2605a-c512-4ea7…	May 13 2014
2fcb1094f5e2	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11982 f3b2605a-c512-4ea7…	May 13 2014
4d2e42e3ed51	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11981 f3b2605a-c512-4ea7…	May 13 2014
1efa4988034c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11980 f3b2605a-c512-4ea7…	May 13 2014
d8258f732814	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11979 f3b2605a-c512-4ea7…	May 13 2014
6c06a66ae7b1	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11978 f3b2605a-c512-4ea7…	May 13 2014
d17e06c479e9	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11976 f3b2605a-c512-4ea7…	May 13 2014
d07b9f70e441	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11975 f3b2605a-c512-4ea7…	May 13 2014
80a5640cc29e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11974 f3b2605a-c512-4ea7…	May 13 2014

Changes (74)

				Path
	M			doc/Manual.html
	D			doc/Manual.html.html
	M			doc/Manual.txt
	M			doc/Section_commands.html
	M			doc/Section_commands.txt
	M			doc/balance.html
	M			doc/balance.txt
	V			doc/{comm_modify.html ← communicate.html}
	V			doc/{comm_modify.txt ← communicate.txt}
	A			doc/comm_style.html
	A			doc/comm_style.txt
	V			doc/{communicate.html → comm_modify.html}
	V			doc/{communicate.txt → comm_modify.txt}
	M			doc/create_box.html
	M			doc/create_box.txt
	M			doc/fix_balance.html
	M			doc/fix_balance.txt
	M			doc/processors.html
	M			doc/processors.txt
	M			doc/read_data.html
	M			doc/read_data.txt
	M			doc/read_restart.html
	M			doc/read_restart.txt
	M			doc/replicate.html
	M			doc/replicate.txt
	M			examples/USER/awpmd/H/in.h_atom
	M			examples/USER/awpmd/H/in.h_molecule
	M			examples/USER/cg-cmm/sds-monolayer/in.sds-hybrid
	M			examples/USER/phonon/1-1D-mono/in.Ana
	M			examples/USER/phonon/2-1D-diatomic/in.Ana
	M			examples/colloid/in.colloid
	M			examples/pour/in.pour
	M			examples/pour/in.pour.2d
	M			examples/pour/in.pour.2d.molecule
	M			examples/srd/in.srd.mixture
	M			examples/srd/in.srd.pure
	M			examples/voronoi/in.voronoi
	V			src/KSPACE/{commgrid.cpp → gridcomm.cpp}
	V			src/KSPACE/{commgrid.h → gridcomm.h}
	V			src/KSPACE/{gridcomm.cpp ← commgrid.cpp}
	V			src/KSPACE/{gridcomm.h ← commgrid.h}
	M			src/KSPACE/msm.cpp
	M			src/KSPACE/msm.h
	M			src/KSPACE/msm_cg.cpp
	M			src/KSPACE/pppm.cpp
	M			src/KSPACE/pppm.h
	M			src/KSPACE/pppm_cg.cpp
	M			src/KSPACE/pppm_disp.cpp
	M			src/KSPACE/pppm_disp.h
	M			src/KSPACE/pppm_stagger.cpp
	M			src/MC/fix_bond_swap.cpp
	M			src/Purge.list
	M			src/USER-CUDA/comm_cuda.cpp
	M			src/USER-CUDA/comm_cuda.h
	M			src/USER-REAXC/fix_qeq_reax.cpp
	M			src/USER-REAXC/reaxc_tool_box.cpp
	M			src/accelerator_cuda.h
	M			src/accelerator_kokkos.h
	M			src/balance.cpp
	M			src/balance.h
	V			src/{comm.cpp → comm_brick.cpp}
	V			src/{comm.h → comm_brick.h}
	V			src/{comm_brick.cpp ← comm.cpp}
	V			src/{comm_brick.h ← comm.h}
	A			src/comm_tiled.cpp
	A			src/comm_tiled.h
	M			src/fix_balance.cpp
	M			src/fix_balance.h
	M			src/force.cpp
	M			src/input.cpp
	M			src/input.h
	M			src/lammps.cpp
	M			src/modify.cpp
	M			src/version.h