Diffusion lammps ac19c2ea2ea3

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

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Jan 21 2015, 17:14.

Description

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

Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
src/USER-CUDA/pppm_cuda.cpp

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Jan 21 2015, 17:14

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS5b0ba7980c01: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12982 f3b2605a-c512-4ea7…
rLAMMPSd931df54fe33: need to delete some dependencies when uninstalling USER-CUDA and USER-OMP

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPSac19c2ea2ea3: Merge remote-tracking branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Jan 21 2015, 17:14

Merged Changes

Commit	Author	Details	Committed
5b0ba7980c01	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12982 f3b2605a-c512-4ea7…	Jan 21 2015
f1f525204ca4	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12981 f3b2605a-c512-4ea7…	Jan 21 2015
46e8853d12e4	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12980 f3b2605a-c512-4ea7…	Jan 21 2015
e59417b0f71b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12979 f3b2605a-c512-4ea7…	Jan 21 2015
1833a9abc4f8	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12978 f3b2605a-c512-4ea7…	Jan 21 2015
31731fd1cef1	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12977 f3b2605a-c512-4ea7…	Jan 21 2015
600f26467523	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12976 f3b2605a-c512-4ea7…	Jan 21 2015
b3a0ee76a09b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12972 f3b2605a-c512-4ea7…	Jan 20 2015
c5ea04961d27	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12971 f3b2605a-c512-4ea7…	Jan 20 2015
106b16942e26	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12970 f3b2605a-c512-4ea7…	Jan 20 2015
3a9f39d1763c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12969 f3b2605a-c512-4ea7…	Jan 20 2015
0bf4d0a91a1a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12968 f3b2605a-c512-4ea7…	Jan 20 2015
774cd794a5de	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12967 f3b2605a-c512-4ea7…	Jan 20 2015
7361c8d0a3d2	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12966 f3b2605a-c512-4ea7…	Jan 20 2015
417e5c5caac3	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12965 f3b2605a-c512-4ea7…	Jan 20 2015
db1b2197168f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12964 f3b2605a-c512-4ea7…	Jan 20 2015
4e87fa9fd2f9	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12963 f3b2605a-c512-4ea7…	Jan 20 2015
d3b5ebeb2397	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12962 f3b2605a-c512-4ea7…	Jan 20 2015
2b939d80f1fc	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12961 f3b2605a-c512-4ea7…	Jan 20 2015

Changes (35)

				Path
	M			doc/Manual.html
	M			doc/Manual.txt
	M			doc/Section_commands.html
	M			doc/Section_commands.txt
	M			doc/Section_howto.html
	M			doc/Section_howto.txt
	M			doc/Section_start.html
	M			doc/Section_start.txt
	M			doc/compute_temp_asphere.html
	M			doc/compute_temp_asphere.txt
	M			doc/compute_temp_region.html
	M			doc/compute_temp_region.txt
	M			doc/compute_temp_sphere.html
	M			doc/compute_temp_sphere.txt
	A			doc/create_bonds.html
	A			doc/create_bonds.txt
	M			doc/delete_atoms.html
	M			doc/delete_atoms.txt
	M			doc/dump_modify.html
	M			doc/dump_modify.txt
	P			examples/balance/in.balance Copied to multiple locations: examples/balance/in.balance.bond.fast examples/balance/in.balance.bond.slow
	P			examples/balance/in.balance.bond.fast Copied from examples/balance/in.balance
	P			examples/balance/in.balance.bond.slow Copied from examples/balance/in.balance
	A			examples/balance/log.balance.bond.fast.21Jan15.linux.1
	A			examples/balance/log.balance.bond.fast.21Jan15.linux.4
	A			examples/balance/log.balance.bond.slow.21Jan15.linux.1
	A			examples/balance/log.balance.bond.slow.21Jan15.linux.4
	M			src/USER-CUDA/pppm_cuda.cpp
	M			src/USER-FEP/fix_adapt_fep.cpp
	A			src/create_bonds.cpp
	A			src/create_bonds.h
	M			src/delete_atoms.cpp
	M			src/fix_adapt.cpp
	M			src/special.cpp
	M			src/version.h