Diffusion lammps 607c4aa2a3e1

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

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Jan 12 2016, 13:02.

Description

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

Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
src/USER-SMTBQ/pair_smtbq.cpp

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Jan 12 2016, 13:02

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS05240f946760: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14427 f3b2605a-c512-4ea7…
rLAMMPSf5cf3008dd79: added new (fast/small) test example for PCFF with ignore flag set

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS607c4aa2a3e1: Merge remote-tracking branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Jan 12 2016, 13:02

Merged Changes

Commit	Author	Details	Committed
05240f946760	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14427 f3b2605a-c512-4ea7…	Jan 12 2016
0da05dcdf456	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14426 f3b2605a-c512-4ea7…	Jan 12 2016
20cc9e51cdea	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14425 f3b2605a-c512-4ea7…	Jan 12 2016
4e199dd5bdbc	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14424 f3b2605a-c512-4ea7…	Jan 12 2016
12c8aaf29d5c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14423 f3b2605a-c512-4ea7…	Jan 12 2016
681ebfaf8f72	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14422 f3b2605a-c512-4ea7…	Jan 12 2016
e72cef0c3ad3	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14421 f3b2605a-c512-4ea7…	Jan 11 2016
e24ed78dd114	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14420 f3b2605a-c512-4ea7…	Jan 11 2016
d3f534f5cc92	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14419 f3b2605a-c512-4ea7…	Jan 11 2016
f5946c73f74c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14418 f3b2605a-c512-4ea7…	Jan 11 2016
7ae65d4dcf24	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14417 f3b2605a-c512-4ea7…	Jan 11 2016
b5086e3d6970	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14416 f3b2605a-c512-4ea7…	Jan 11 2016
173d4861a2d4	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14415 f3b2605a-c512-4ea7…	Jan 11 2016
9e4140c9540d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14413 f3b2605a-c512-4ea7…	Jan 11 2016
eb20bcf1831f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14412 f3b2605a-c512-4ea7…	Jan 11 2016
eb063200bf1a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14411 f3b2605a-c512-4ea7…	Jan 11 2016
e86cfe431a28	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14410 f3b2605a-c512-4ea7…	Jan 11 2016
51745e2c95b7	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14409 f3b2605a-c512-4ea7…	Jan 11 2016

Changes (51)

				Path
	M			doc/Manual.html
	M			doc/Manual.txt
	M			doc/compute_chunk_atom.html
	M			doc/compute_chunk_atom.txt
	M			doc/compute_saed.html
	M			doc/compute_saed.txt
	M			doc/compute_xrd.html
	M			doc/compute_xrd.txt
	M			doc/fix_store_state.html
	M			doc/fix_store_state.txt
	M			doc/searchindex.js
	M			doc/set.html
	M			doc/set.txt
	V			examples/USER/smtbq/{log.smtbq.Al → log.smtbq.Al.g++.1}
	V			examples/USER/smtbq/{log.smtbq.Al.g++.1 ← log.smtbq.Al}
	A			examples/USER/smtbq/log.smtbq.Al.g++.4
	P			examples/USER/smtbq/log.smtbq.Al2O3 Deleted after being copied to multiple locations: examples/USER/smtbq/log.smtbq.Al2O3.g++.1 examples/USER/smtbq/log.smtbq.Al2O3.g++.4
	P			examples/USER/smtbq/log.smtbq.Al2O3.g++.1 Copied from examples/USER/smtbq/log.smtbq.Al2O3
	V			examples/USER/smtbq/{log.smtbq.Al2O3.g++.4 ← log.smtbq.Al2O3}
	P			examples/USER/smtbq/log.smtbq.TiO2 Deleted after being copied to multiple locations: examples/USER/smtbq/log.smtbq.TiO2.g++.1 examples/USER/smtbq/log.smtbq.TiO2.g++.4
	P			examples/USER/smtbq/log.smtbq.TiO2.g++.1 Copied from examples/USER/smtbq/log.smtbq.TiO2
	V			examples/USER/smtbq/{log.smtbq.TiO2.g++.4 ← log.smtbq.TiO2}
	M			src/BODY/body_nparticle.cpp
	M			src/BODY/body_nparticle.h
	M			src/CORESHELL/compute_temp_cs.cpp
	M			src/GRANULAR/fix_pour.cpp
	M			src/MISC/fix_deposit.cpp
	M			src/REPLICA/tad.cpp
	M			src/USER-FEP/fix_adapt_fep.cpp
	M			src/USER-SMTBQ/pair_smtbq.cpp
	M			src/atom.cpp
	M			src/atom_vec_body.cpp
	M			src/atom_vec_body.h
	M			src/body.h
	M			src/compute_chunk_atom.cpp
	M			src/compute_chunk_atom.h
	M			src/compute_displace_atom.cpp
	M			src/compute_msd.cpp
	M			src/compute_vacf.cpp
	M			src/create_atoms.cpp
	M			src/fix_adapt.cpp
	M			src/fix_store.cpp
	M			src/fix_store.h
	M			src/fix_store_state.cpp
	M			src/fix_store_state.h
	M			src/molecule.cpp
	M			src/molecule.h
	M			src/read_data.cpp
	M			src/set.cpp
	M			src/variable.cpp
	M			src/version.h