Diffusion lammps 7af18596a18f

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

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Jul 23 2015, 12:26.

Description

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

Conflicts:
doc/Manual.html
doc/Manual.txt
src/fix_ave_histo.cpp

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Jul 23 2015, 12:26

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPSf89f6a08db2e: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13691 f3b2605a-c512-4ea7…
rLAMMPS0a85a6cd1f9b: additional cleanups/fixes suggested by shawn coleman

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS7af18596a18f: Merge remote-tracking branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Jul 23 2015, 12:26

Merged Changes

Commit	Author	Details	Committed
f89f6a08db2e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13691 f3b2605a-c512-4ea7…	Jul 22 2015
0b9c5a0dc6fa	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13689 f3b2605a-c512-4ea7…	Jul 22 2015
261249d33e6c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13688 f3b2605a-c512-4ea7…	Jul 22 2015
cd9d7e46aee6	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13686 f3b2605a-c512-4ea7…	Jul 22 2015
ead2e3aeec41	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13685 f3b2605a-c512-4ea7…	Jul 22 2015
50b42108f797	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13684 f3b2605a-c512-4ea7…	Jul 22 2015
a5a4d41fe4b9	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13683 f3b2605a-c512-4ea7…	Jul 22 2015
6864dfa2d184	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13682 f3b2605a-c512-4ea7…	Jul 22 2015
92b5c350d82d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13681 f3b2605a-c512-4ea7…	Jul 22 2015
ca5d4d8f27b8	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13680 f3b2605a-c512-4ea7…	Jul 22 2015
a8a64b81922c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13678 f3b2605a-c512-4ea7…	Jul 22 2015
50e9b17a6b0b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13677 f3b2605a-c512-4ea7…	Jul 22 2015
5a7749e31a44	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13675 f3b2605a-c512-4ea7…	Jul 22 2015
63802b7688c7	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13674 f3b2605a-c512-4ea7…	Jul 22 2015
60cd71620a54	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13673 f3b2605a-c512-4ea7…	Jul 22 2015
b4a8019ee8da	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13672 f3b2605a-c512-4ea7…	Jul 22 2015
8ee843d1bd0a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13671 f3b2605a-c512-4ea7…	Jul 22 2015
6e40300d26bf	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13670 f3b2605a-c512-4ea7…	Jul 22 2015
f9b75020798f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13669 f3b2605a-c512-4ea7…	Jul 22 2015

Changes (58)

		Path
A		doc/JPG/qbmsst_init.jpg
A		doc/JPG/qbmsst_shock.jpg
M		doc/Manual.html
M		doc/Manual.txt
M		doc/Section_commands.html
M		doc/Section_commands.txt
M		doc/Section_packages.html
M		doc/Section_packages.txt
M		doc/compute_saed.html
M		doc/compute_saed.txt
M		doc/compute_xrd.html
M		doc/compute_xrd.txt
M		doc/fix_ave_histo.html
M		doc/fix_ave_histo.txt
A		doc/fix_qbmsst.html
A		doc/fix_qbmsst.txt
A		doc/fix_qtb.html
A		doc/fix_qtb.txt
M		doc/fix_saed_vtk.html
M		doc/fix_saed_vtk.txt
A	(dir)	examples/USER/diffraction/
A		examples/USER/diffraction/BulkNi.in
A	(dir)	examples/USER/diffraction/Output/
A		examples/USER/diffraction/Output/BulkNi.in
A		examples/USER/diffraction/Output/bulkNi.hist.xrd.correct
A		examples/USER/diffraction/Output/bulkNi.log.correct
A		examples/USER/diffraction/Output/bulkNi_001.saed.0.vtk.correct
A		examples/USER/diffraction/Output/bulkNi_001.saed.0_VisIt_Image.png
A		examples/USER/diffraction/Output/log.cite
A		examples/USER/diffraction/README
A	(dir)	examples/USER/qtb/
A		examples/USER/qtb/README
A	(dir)	examples/USER/qtb/alpha_quartz_qbmsst/
A		examples/USER/qtb/alpha_quartz_qbmsst/alpha_quartz_potential.mod
A		examples/USER/qtb/alpha_quartz_qbmsst/alpha_quartz_qbmsst.in
A		examples/USER/qtb/alpha_quartz_qbmsst/alpha_quartz_qtb.mod
A		examples/USER/qtb/alpha_quartz_qbmsst/potential_SiO2.TPF
A	(dir)	examples/USER/qtb/alpha_quartz_qtb/
A		examples/USER/qtb/alpha_quartz_qtb/alpha_quartz_qtb.in
A	(dir)	examples/USER/qtb/methane_qbmsst/
A		examples/USER/qtb/methane_qbmsst/ffield.reax
A		examples/USER/qtb/methane_qbmsst/methane_qbmsst.in
A		examples/USER/qtb/methane_qbmsst/methane_qtb.mod
A	(dir)	examples/USER/qtb/methane_qtb/
A		examples/USER/qtb/methane_qtb/ffield.reax
A		examples/USER/qtb/methane_qtb/methane_qtb.in
M		src/Makefile
A	(dir)	src/USER-QTB/
A		src/USER-QTB/README
A		src/USER-QTB/fix_qbmsst.cpp
A		src/USER-QTB/fix_qbmsst.h
A		src/USER-QTB/fix_qtb.cpp
A		src/USER-QTB/fix_qtb.h
M		src/fix_ave_histo.cpp
P		src/fix_ave_histo.h Copied to src/fix_ave_histo_weight.h
A		src/fix_ave_histo_weight.cpp
P		src/fix_ave_histo_weight.h Copied from src/fix_ave_histo.h
M		src/version.h