Diffusion lammps 909a9ff697e2

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

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Jul 29 2014, 21:13.

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>

Jul 29 2014, 21:13

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPSe4915201dfcc: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12219 f3b2605a-c512-4ea7…
rLAMMPSf1052a189a23: small documentation updates for stable release

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS909a9ff697e2: Merge remote-tracking branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Jul 29 2014, 21:13

Merged Changes

Commit	Author	Details	Committed
e4915201dfcc	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12219 f3b2605a-c512-4ea7…	Jul 29 2014
24f79216b1d2	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12218 f3b2605a-c512-4ea7…	Jul 29 2014
3a8d10eb2f55	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12217 f3b2605a-c512-4ea7…	Jul 29 2014
2b9a3e843784	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12215 f3b2605a-c512-4ea7…	Jul 29 2014
d44b041d625f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12214 f3b2605a-c512-4ea7…	Jul 29 2014
33fe209a823b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12213 f3b2605a-c512-4ea7…	Jul 29 2014
7bce80b07e2a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12212 f3b2605a-c512-4ea7…	Jul 29 2014
0198cc71a958	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12211 f3b2605a-c512-4ea7…	Jul 29 2014
47de24ac4c5d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12210 f3b2605a-c512-4ea7…	Jul 29 2014
bab8ac74a001	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12209 f3b2605a-c512-4ea7…	Jul 28 2014
65a76deb45b1	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12208 f3b2605a-c512-4ea7…	Jul 28 2014
4455b66003ce	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12207 f3b2605a-c512-4ea7…	Jul 28 2014
3cc23720e97b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12206 f3b2605a-c512-4ea7…	Jul 28 2014
032632ee338b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12204 f3b2605a-c512-4ea7…	Jul 28 2014
2162e6d62e97	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12203 f3b2605a-c512-4ea7…	Jul 28 2014
d03dccfa0783	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12202 f3b2605a-c512-4ea7…	Jul 28 2014
33d9ff4bf445	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12201 f3b2605a-c512-4ea7…	Jul 28 2014
cf005551eafb	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12200 f3b2605a-c512-4ea7…	Jul 28 2014
16dc820a58b4	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12199 f3b2605a-c512-4ea7…	Jul 28 2014
6751f3508af0	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12198 f3b2605a-c512-4ea7…	Jul 28 2014

Changes (46)

				Path
	A			doc/JPG/sinusoid.jpg
	A			doc/JPG/sinusoid_small.jpg
	M			doc/Manual.html
	M			doc/Manual.txt
	M			doc/create_atoms.html
	M			doc/create_atoms.txt
	M			doc/pair_table.html
	M			doc/pair_table.txt
	M			doc/variable.html
	M			doc/variable.txt
	M			src/GRANULAR/fix_pour.cpp
	M			src/KSPACE/msm.cpp
	M			src/KSPACE/pppm.cpp
	M			src/KSPACE/pppm_disp.cpp
	M			src/MISC/fix_deposit.cpp
	M			src/REPLICA/verlet_split.cpp
	M			src/SHOCK/fix_append_atoms.cpp
	M			src/SRD/fix_srd.cpp
	M			src/USER-CUDA/pppm_cuda.cpp
	M			src/USER-LB/fix_lb_fluid.cpp
	M			src/atom.cpp
	M			src/balance.cpp
	M			src/balance.h
	M			src/comm.cpp
	M			src/comm.h
	M			src/comm_brick.cpp
	M			src/comm_brick.h
	M			src/comm_tiled.cpp
	M			src/comm_tiled.h
	M			src/create_atoms.cpp
	M			src/create_atoms.h
	M			src/domain.cpp
	M			src/fix_balance.cpp
	M			src/fix_deform.cpp
	M			src/fix_deform.h
	M			src/fix_nh.cpp
	M			src/fix_nh.h
	M			src/input.cpp
	M			src/irregular.cpp
	M			src/irregular.h
	A			src/rcb.cpp
	A			src/rcb.h
	M			src/replicate.cpp
	M			src/variable.cpp
	M			src/variable.h
	M			src/version.h