Diffusion lammps 436f9457232b

Merge branch 'lammps-icms' into lammps-colvars
436f9457232b
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Jan 18 2013, 13:54.

Description

Merge branch 'lammps-icms' into lammps-colvars

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Jan 18 2013, 13:54

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPSe1709a44891d: Merge branch 'master' into lammps-icms
rLAMMPS295eec0a356e: Merge branch 'lammps-icms' into lammps-colvars

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS436f9457232b: Merge branch 'lammps-icms' into lammps-colvars (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Jan 18 2013, 13:54

Merged Changes

Commit	Author	Details	Committed
e1709a44891d	Axel Kohlmeyer	Merge branch 'master' into lammps-icms	Jan 18 2013
9639777677b4	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9291 f3b2605a-c512-4ea7…	Jan 17 2013
78aaed5f2215	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9290 f3b2605a-c512-4ea7…	Jan 17 2013
9cd44aec3346	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9288 f3b2605a-c512-4ea7…	Jan 17 2013
474bb7715443	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9287 f3b2605a-c512-4ea7…	Jan 17 2013
96d5a89f71a8	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9286 f3b2605a-c512-4ea7…	Jan 17 2013
f867e83a7767	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9285 f3b2605a-c512-4ea7…	Jan 17 2013
bd896f53f284	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9284 f3b2605a-c512-4ea7…	Jan 17 2013
806b7d4ad344	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9282 f3b2605a-c512-4ea7…	Jan 17 2013
c7de83772485	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9281 f3b2605a-c512-4ea7…	Jan 17 2013
56a3ae0ecad6	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9280 f3b2605a-c512-4ea7…	Jan 17 2013
b078dc5e0beb	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9279 f3b2605a-c512-4ea7…	Jan 17 2013
87f2415519d6	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9278 f3b2605a-c512-4ea7…	Jan 17 2013
f51ad982f602	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9277 f3b2605a-c512-4ea7…	Jan 17 2013
f70511be8768	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9276 f3b2605a-c512-4ea7…	Jan 17 2013
2cc946fdb5ba	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9275 f3b2605a-c512-4ea7…	Jan 17 2013
c0c44e028305	Axel Kohlmeyer	Merge branch 'master' into lammps-icms	Jan 17 2013
48fbb5605f1b	Axel Kohlmeyer	fix another merge bug	Jan 16 2013
100cafe5fffc	Axel Kohlmeyer	correct error from broken merge	Jan 16 2013
d39910bd4cf5	Axel Kohlmeyer	fix bug in energy accounting for hybrid pair styles	Jan 16 2013
0c292ed53383	athomps	Initialized force in default single()	Jan 15 2013
b95500d33047	athomps	Changed pre_exchange flag	Jan 15 2013

Changes (36)

				Path
	M			doc/fix_srd.html
	M			doc/fix_srd.txt
	M			examples/USER/atc/hardy/consistency.screen
	M			examples/USER/atc/hardy/eam_kernel_convergence.screen
	M			examples/USER/atc/hardy/eam_unistrain_cell.screen
	M			examples/USER/atc/hardy/eam_unistrain_mesh.screen
	M			examples/USER/atc/hardy/eam_unistrain_qcylinder.screen
	M			examples/USER/atc/hardy/eam_unistrain_qsphere.screen
	M			examples/USER/atc/hardy/eam_unistrain_step.screen
	M			examples/USER/atc/hardy/eam_volume_stretch.screen
	A			examples/USER/atc/hardy/eshelby_static.screen
	M			examples/USER/atc/hardy/in.consistency
	M			examples/USER/atc/hardy/in.eam_kernel_convergence
	M			examples/USER/atc/hardy/in.eam_unistrain_cell
	M			examples/USER/atc/hardy/in.eam_unistrain_mesh
	M			examples/USER/atc/hardy/in.eam_unistrain_qcylinder
	M			examples/USER/atc/hardy/in.eam_unistrain_qsphere
	M			examples/USER/atc/hardy/in.eam_unistrain_step
	M			examples/USER/atc/hardy/in.eam_volume_stretch
	A			examples/USER/atc/hardy/in.eshelby_static
	M			examples/USER/atc/hardy/in.nvt
	A			examples/USER/atc/hardy/nvt.data
	A			examples/USER/atc/hardy/nvt.screen
	M			lib/atc/ATC_TransferHardy.cpp
	M			lib/gpu/Nvidia.makefile
	M			src/SRD/fix_srd.cpp
	M			src/SRD/fix_srd.h
	M			src/USER-OMP/thr_omp.cpp
	M			src/fix_nh.cpp
	M			src/fix_nh.h
	M			src/input.cpp
	M			src/pair.h
	M			src/pair_hybrid.cpp
	M			src/pair_hybrid.h
	M			src/special.cpp
	M			src/version.h