Diffusion lammps cd01e5855d2c

Merge branch 'lammps-icms' into balance-refactor
cd01e5855d2c
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Aug 5 2016, 04:34.

Description

Merge branch 'lammps-icms' into balance-refactor

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Aug 5 2016, 04:34

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS0f2e7241900b: create/use a ke compute instead of converting from temperature
rLAMMPS2a90afe7e9a1: fix optional argument scanning bug

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPScd01e5855d2c: Merge branch 'lammps-icms' into balance-refactor (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Aug 5 2016, 04:34

Merged Changes

Commit	Author	Details	Committed
0f2e7241900b	Axel Kohlmeyer	create/use a ke compute instead of converting from temperature	Aug 4 2016
a19ea3ee5e16	Axel Kohlmeyer	remove unused variable	Aug 4 2016
f4f8ce57a53e	Axel Kohlmeyer	port changes to dump file formatting from upstream to COMPRESS package	Aug 4 2016
73368211c536	Axel Kohlmeyer	fix bug introduced by steve.	Aug 4 2016
88062030752a	Axel Kohlmeyer	Merge branch 'lammps-icms' of bitbucket.org:akohlmey/lammps-icms into lammps…	Aug 4 2016
ca1050f5875b	Axel Kohlmeyer	delete redundant code and add comment to avoid doing this in the future	Aug 4 2016
ad0633f7c142	Axel Kohlmeyer	Merge remote-tracking branch 'lammps-ro/master' into lammps-icms	Aug 4 2016
677da2ea52d9	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15432 f3b2605a-c512-4ea7…	Aug 3 2016
a93e6e83ed58	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15431 f3b2605a-c512-4ea7…	Aug 3 2016
efaa84a4eab8	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15430 f3b2605a-c512-4ea7…	Aug 3 2016
1f6518400e83	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15429 f3b2605a-c512-4ea7…	Aug 3 2016
be6c086cb4c1	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15428 f3b2605a-c512-4ea7…	Aug 3 2016
a6ade15e60bb	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15427 f3b2605a-c512-4ea7…	Aug 3 2016
b3664c217b1e	Axel Kohlmeyer	port code from serial implementation to /omp version	Aug 3 2016
c8072e95bb53	Axel Kohlmeyer	apply NEIGHMASK in inner loops	Aug 3 2016
38226b808685	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15426 f3b2605a-c512-4ea7…	Aug 3 2016

Changes (28)

				Path
	M			doc/html/Manual.html
	M			doc/html/_sources/Manual.txt
	M			doc/html/_sources/dump_modify.txt
	M			doc/html/_sources/thermo_modify.txt
	M			doc/html/dump_modify.html
	M			doc/html/searchindex.js
	M			doc/html/thermo_modify.html
	M			doc/src/Manual.txt
	M			doc/src/dump_modify.txt
	M			doc/src/thermo_modify.txt
	M			src/COLLOID/pair_lubricateU_poly.cpp
	M			src/COLLOID/pair_lubricate_poly.cpp
	M			src/COMPRESS/dump_custom_gz.cpp
	M			src/MPIIO/dump_atom_mpiio.cpp
	M			src/MPIIO/dump_custom_mpiio.cpp
	M			src/MPIIO/dump_xyz_mpiio.cpp
	M			src/USER-OMP/pair_lubricate_poly_omp.cpp
	M			src/dump.cpp
	M			src/dump.h
	M			src/dump_atom.cpp
	M			src/dump_custom.cpp
	M			src/dump_local.cpp
	M			src/dump_xyz.cpp
	M			src/input.cpp
	M			src/output.cpp
	M			src/thermo.cpp
	M			src/thermo.h
	M			src/version.h