Diffusion lammps 823cc16bdf78

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

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

Description

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

Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
doc/Section_start.txt
doc/pair_hybrid.txt
doc/pair_reax.html
src/CORESHELL/pair_lj_cut_coul_long_cs.cpp
src/KSPACE/pair_lj_cut_coul_long.cpp
src/KSPACE/pair_lj_cut_coul_msm.cpp
src/MC/fix_bond_break.cpp
src/MC/fix_bond_break.h
src/MC/fix_bond_create.cpp
src/MC/fix_bond_create.h
src/USER-FEP/pair_lj_cut_soft.cpp
src/USER-MISC/README
src/USER-MISC/fix_ti_spring.cpp
src/output.cpp

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Oct 22 2015, 14:17

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS066e7598c9b6: Fixed problem with box flips under NVT
rLAMMPS4006a3302abd: Merge remote-tracking branch 'lammps-ro/master' into lammps-icms

Branches

Unknown

Tags

Unknown

Event Timeline

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

Merged Changes

Commit	Author	Details	Committed
066e7598c9b6	athomps	Fixed problem with box flips under NVT	Oct 22 2015
d75b4730d9b6	sjplimp	''	Oct 22 2015
7a68ceb57a2d	sjplimp	''	Oct 22 2015
e512ca27a7e6	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14158 f3b2605a-c512-4ea7…	Oct 22 2015
46e7b6417603	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14157 f3b2605a-c512-4ea7…	Oct 22 2015
4ce32a301c7d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14156 f3b2605a-c512-4ea7…	Oct 21 2015
bc1cf9965e75	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14155 f3b2605a-c512-4ea7…	Oct 21 2015
069e25a84b57	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14153 f3b2605a-c512-4ea7…	Oct 21 2015
a2604e221e48	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14152 f3b2605a-c512-4ea7…	Oct 21 2015
5775cf2f9355	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14151 f3b2605a-c512-4ea7…	Oct 21 2015
636a6903dbbc	sjplimp	''	Oct 21 2015
219997462e60	sjplimp	''	Oct 21 2015
50733f2482ae	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14148 f3b2605a-c512-4ea7…	Oct 21 2015
3830813864c4	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14147 f3b2605a-c512-4ea7…	Oct 21 2015
869b8f9d3ac6	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14145 f3b2605a-c512-4ea7…	Oct 21 2015
87ae4919a958	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14144 f3b2605a-c512-4ea7…	Oct 21 2015
1953fd7feea0	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14143 f3b2605a-c512-4ea7…	Oct 21 2015
7163eaf6005f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14142 f3b2605a-c512-4ea7…	Oct 21 2015
bc33be3ede3f	sjplimp	''	Oct 21 2015
1a488ad50aaa	sjplimp	''	Oct 21 2015
8a10c55a3b2c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14139 f3b2605a-c512-4ea7…	Oct 21 2015
abe4c06219b8	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14138 f3b2605a-c512-4ea7…	Oct 21 2015
cb6baee0b1e3	sjplimp	''	Oct 21 2015
a5abe2a3301e	sjplimp	''	Oct 21 2015
b036260091bd	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14135 f3b2605a-c512-4ea7…	Oct 21 2015
d145ae099ed8	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14134 f3b2605a-c512-4ea7…	Oct 21 2015
45e18fe12868	sjplimp	''	Oct 21 2015
2ea1457e5c5b	sjplimp	''	Oct 21 2015
cd078405e003	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14131 f3b2605a-c512-4ea7…	Oct 21 2015
c4af165bbaee	sjplimp	''	Oct 21 2015
ef82677cb25c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14129 f3b2605a-c512-4ea7…	Oct 21 2015
9a878cdd6718	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14128 f3b2605a-c512-4ea7…	Oct 21 2015
ddfb996d8e3f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14127 f3b2605a-c512-4ea7…	Oct 21 2015
b2c2e38ba396	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14126 f3b2605a-c512-4ea7…	Oct 21 2015

Changes (90)

				Path
	M			doc/Manual.html
	M			doc/Manual.html.html
	M			doc/Manual.txt
	M			doc/Section_accelerate.html
	M			doc/Section_accelerate.txt
	M			doc/Section_commands.html
	M			doc/Section_commands.txt
	M			doc/Section_example.html
	M			doc/Section_howto.html
	M			doc/Section_howto.txt
	M			doc/Section_packages.html
	M			doc/Section_packages.txt
	M			doc/Section_start.html
	M			doc/Section_start.txt
	M			doc/accelerate_intel.html
	M			doc/accelerate_intel.txt
	M			doc/accelerate_kokkos.html
	M			doc/accelerate_kokkos.txt
	M			doc/accelerate_omp.html
	M			doc/accelerate_omp.txt
	M			doc/accelerate_opt.html
	M			doc/accelerate_opt.txt
	M			doc/compute_temp_cs.html
	M			doc/compute_temp_cs.txt
	M			doc/doc2/Manual.html.html
	M			doc/doc2/Section_accelerate.html
	M			doc/doc2/Section_commands.html
	M			doc/doc2/Section_example.html
	M			doc/doc2/Section_howto.html
	M			doc/doc2/Section_packages.html
	M			doc/doc2/Section_start.html
	M			doc/doc2/accelerate_intel.html
	M			doc/doc2/accelerate_kokkos.html
	M			doc/doc2/accelerate_omp.html
	M			doc/doc2/accelerate_opt.html
	M			doc/doc2/compute_temp_cs.html
	M			doc/doc2/fix_adapt.html
	M			doc/doc2/fix_ave_correlate.html
	A			doc/doc2/fix_ave_correlate_long.html
	M			doc/doc2/fix_gcmc.html
	M			doc/doc2/genindex.html
	M			doc/doc2/molecule.html
	M			doc/doc2/pair_hybrid.html
	M			doc/doc2/pair_reax.html
	M			doc/doc2/pair_srp.html
	M			doc/doc2/pair_style.html
	P			doc/doc2/pair_vashishta.html Copied from doc/pair_vashishta.html
	M			doc/fix_adapt.html
	M			doc/fix_adapt.txt
	M			doc/fix_ave_correlate.html
	M			doc/fix_ave_correlate.txt
	A			doc/fix_ave_correlate_long.html
	A			doc/fix_ave_correlate_long.txt
	M			doc/fix_gcmc.html
	M			doc/genindex.html
	M			doc/molecule.html
	M			doc/molecule.txt
	M			doc/pair_hybrid.html
	M			doc/pair_hybrid.txt
	M			doc/pair_srp.html
	M			doc/pair_srp.txt
	M			doc/pair_style.html
	P			doc/pair_vashishta.html Copied to doc/doc2/pair_vashishta.html
	M			doc/searchindex.js
	P			examples/USER/lb/polymer/in.polymer Deleted after being copied to multiple locations: examples/USER/lb/polymer/in.polymer_default_gamma examples/USER/lb/polymer/in.polymer_setgamma
	P			examples/USER/lb/polymer/in.polymer_default_gamma Copied from examples/USER/lb/polymer/in.polymer
	V			examples/USER/lb/polymer/{in.polymer_setgamma ← in.polymer}
	D			examples/USER/lb/polymer/out.polymer
	A			examples/USER/lb/polymer/out.polymer_default_gamma
	A			examples/USER/lb/polymer/out.polymer_setgamma
	M			src/CORESHELL/compute_temp_cs.cpp
	A			src/MAKE/MINE/Makefile.intel
	M			src/MC/fix_bond_break.cpp
	M			src/MC/fix_bond_break.h
	M			src/MC/fix_bond_create.cpp
	M			src/MC/fix_bond_create.h
	M			src/RIGID/fix_shake.cpp
	M			src/USER-DRUDE/fix_drude.cpp
	M			src/USER-INTEL/fix_intel.cpp
	M			src/USER-MISC/README
	A			src/USER-MISC/fix_ave_correlate_long.cpp
	A			src/USER-MISC/fix_ave_correlate_long.h
	M			src/compute_msd_chunk.cpp
	M			src/fix_adapt.cpp
	M			src/fix_nh.cpp
	M			src/fix_wall_region.cpp
	M			src/force.cpp
	M			src/force.h
	M			src/output.cpp
	M			src/version.h