Diffusion lammps 07554c8efe48

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

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Oct 23 2015, 13:08.

Description

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

Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
lib/colvars/colvarmodule.h
src/Makefile
src/min_cg.cpp
src/min_fire.cpp
src/min_quickmin.cpp
src/min_sd.cpp
src/respa.cpp
src/version.h

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Oct 23 2015, 13:08

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS46755d0c7d49: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14195 f3b2605a-c512-4ea7…
rLAMMPS537eb1c96490: Merge branch 'lammps-icms' of bitbucket.org:akohlmey/lammps-icms into lammps…

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS07554c8efe48: Merge remote-tracking branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Oct 23 2015, 13:08

Merged Changes

Commit	Author	Details	Committed
46755d0c7d49	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14195 f3b2605a-c512-4ea7…	Oct 23 2015
df128b06e85b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14194 f3b2605a-c512-4ea7…	Oct 23 2015
7a9ae37e028c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14192 f3b2605a-c512-4ea7…	Oct 23 2015
021a327e851a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14191 f3b2605a-c512-4ea7…	Oct 23 2015
8d4d51741ab2	sjplimp	''	Oct 23 2015
238c17e0c7b3	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14188 f3b2605a-c512-4ea7…	Oct 23 2015
9057c423506f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14187 f3b2605a-c512-4ea7…	Oct 23 2015
58c70ec9e461	sjplimp	''	Oct 23 2015
a165a3c43051	sjplimp	''	Oct 23 2015
0a19b07d8e44	sjplimp	''	Oct 23 2015
d3096fc949b0	sjplimp	''	Oct 23 2015
9e92038756b7	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14182 f3b2605a-c512-4ea7…	Oct 23 2015
336aa4093e41	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14181 f3b2605a-c512-4ea7…	Oct 23 2015
b45a8bb7e3d9	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14180 f3b2605a-c512-4ea7…	Oct 23 2015
b72306641cfe	sjplimp	''	Oct 23 2015
439af71a6add	sjplimp	''	Oct 23 2015
bcf560477a80	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14177 f3b2605a-c512-4ea7…	Oct 23 2015
9cf48b934967	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14176 f3b2605a-c512-4ea7…	Oct 23 2015
d815b390baf1	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14175 f3b2605a-c512-4ea7…	Oct 23 2015
f8d13ac85323	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14174 f3b2605a-c512-4ea7…	Oct 23 2015
cfbe572aa5a7	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14173 f3b2605a-c512-4ea7…	Oct 23 2015
0eb2e8f9cb98	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14172 f3b2605a-c512-4ea7…	Oct 23 2015
d8c16fb28dfc	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14171 f3b2605a-c512-4ea7…	Oct 23 2015
01acc9302925	sjplimp	''	Oct 23 2015
0a4b0ced3336	sjplimp	''	Oct 23 2015
36b3880e392a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14167 f3b2605a-c512-4ea7…	Oct 23 2015
0068c45c803d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14166 f3b2605a-c512-4ea7…	Oct 23 2015
449f373db533	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14165 f3b2605a-c512-4ea7…	Oct 23 2015
cee848f94865	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14164 f3b2605a-c512-4ea7…	Oct 23 2015
b229c719d0d3	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14163 f3b2605a-c512-4ea7…	Oct 22 2015
1eeeb028f914	stamoor	Small tweak for compatibility with different versions of lscpu	Oct 22 2015

Changes (114)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

		Path
A		doc/Eqs/pair_mgpt.jpg
A		doc/Eqs/pair_mgpt.tex
A		doc/Eqs/pair_smtbq1.jpg
A		doc/Eqs/pair_smtbq1.tex
A		doc/Eqs/pair_smtbq2.jpg
A		doc/Eqs/pair_smtbq2.tex
A		doc/Eqs/pair_smtbq3.jpg
A		doc/Eqs/pair_smtbq3.tex
P		doc/Manual.html Copied from doc/doc2/Manual.html.html
M		doc/Manual.html.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
A		doc/_images/pair_mgpt.jpg
A		doc/_images/pair_smtbq1.jpg
A		doc/_images/pair_smtbq2.jpg
A		doc/_images/pair_smtbq3.jpg
A		doc/_images/pair_vashishta.jpg
A		doc/_images/polymorphic3.jpg
A		doc/doc2/Eqs/pair_mgpt.jpg
A		doc/doc2/Eqs/pair_mgpt.tex
A		doc/doc2/Eqs/pair_smtbq1.jpg
A		doc/doc2/Eqs/pair_smtbq1.tex
A		doc/doc2/Eqs/pair_smtbq2.jpg
A		doc/doc2/Eqs/pair_smtbq2.tex
A		doc/doc2/Eqs/pair_smtbq3.jpg
A		doc/doc2/Eqs/pair_smtbq3.tex
A		doc/doc2/Eqs/pair_vashishta.jpg
A		doc/doc2/Eqs/pair_vashishta.tex
A		doc/doc2/Eqs/polymorphic1.tex
A		doc/doc2/Eqs/polymorphic2.tex
A		doc/doc2/Eqs/polymorphic3.tex
A		doc/doc2/Eqs/polymorphic4.tex
A		doc/doc2/Eqs/polymorphic5.tex
A		doc/doc2/Eqs/polymorphic6.tex
A		doc/doc2/Eqs/polymorphic7.tex
A		doc/doc2/Eqs/polymorphic8.tex
A		doc/doc2/Eqs/polymorphic9.tex
P		doc/doc2/Manual.html.html Copied to doc/Manual.html
M		doc/doc2/Section_commands.html
M		doc/doc2/Section_packages.html
M		doc/doc2/genindex.html
A		doc/doc2/pair_mgpt.html
A		doc/doc2/pair_smtbq.html
M		doc/doc2/temper.html
M		doc/genindex.html
A		doc/pair_mgpt.html
A		doc/pair_mgpt.txt
A		doc/pair_smtbq.html
A		doc/pair_smtbq.txt
M		doc/searchindex.js
M		doc/temper.html
M		doc/temper.txt
A	(dir)	examples/USER/mgpt/
A		examples/USER/mgpt/Ta6.8x.mgpt.README
A		examples/USER/mgpt/Ta6.8x.mgpt.parmin
A		examples/USER/mgpt/Ta6.8x.mgpt.potin
A		examples/USER/mgpt/in.bcc0
A		examples/USER/mgpt/in.vac0-bcc
A		examples/USER/mgpt/in.vacmin-bcc
A		examples/USER/mgpt/log.bcc0
A		examples/USER/mgpt/log.lammps
A		examples/USER/mgpt/log.vac0-bcc
A		examples/USER/mgpt/log.vacmin-bcc
A	(dir)	examples/USER/smtbq/
A		examples/USER/smtbq/data.Alpha
A		examples/USER/smtbq/ffield.smtbq.Al
A		examples/USER/smtbq/ffield.smtbq.Al2O3
A		examples/USER/smtbq/ffield.smtbq.TiO2
A		examples/USER/smtbq/in.smtbq.Al
A		examples/USER/smtbq/in.smtbq.Al2O3
A		examples/USER/smtbq/in.smtbq.TiO2
A		examples/USER/smtbq/log.smtbq.Al
A		examples/USER/smtbq/log.smtbq.Al2O3
A		examples/USER/smtbq/log.smtbq.TiO2
M		potentials/README
A		potentials/ffield.smtbq.Al
A		potentials/ffield.smtbq.Al2O3
A		potentials/ffield.smtbq.TiO2
M		src/Makefile
A	(dir)	src/USER-MGPT/
A		src/USER-MGPT/README
A		src/USER-MGPT/mgpt_bgmul_7.c.h
A		src/USER-MGPT/mgpt_linalg.cpp
A		src/USER-MGPT/mgpt_linalg.h
A		src/USER-MGPT/mgpt_mmul3_538.c.h
A		src/USER-MGPT/mgpt_mmul3_748.c.h
A		src/USER-MGPT/mgpt_mmul3d_526.c.h
A		src/USER-MGPT/mgpt_mmul3d_744.c.h
A		src/USER-MGPT/mgpt_mmul_bg_552.c.h
A		src/USER-MGPT/mgpt_mmul_bg_722.c.h
A		src/USER-MGPT/mgpt_mmul_bgq_n5_lda8_2x8.c.h
A		src/USER-MGPT/mgpt_mmul_bgq_n7_lda8_4x8.c.h
A		src/USER-MGPT/mgpt_readpot.cpp
A		src/USER-MGPT/mgpt_readpot.h
A		src/USER-MGPT/mgpt_splinetab.cpp
A		src/USER-MGPT/mgpt_splinetab.h
A		src/USER-MGPT/mgpt_ttr_5022.c.h
A		src/USER-MGPT/mgpt_ttr_5042.c.h
A		src/USER-MGPT/mgpt_ttr_5123.c.h
A		src/USER-MGPT/mgpt_ttr_5141.c.h
A		src/USER-MGPT/mgpt_ttr_7022.c.h
A		src/USER-MGPT/mgpt_ttr_7042.c.h
A		src/USER-MGPT/mgpt_ttr_7123.c.h
A		src/USER-MGPT/mgpt_ttr_7141.c.h
A		src/USER-MGPT/pair_mgpt.cpp
A		src/USER-MGPT/pair_mgpt.h
A	(dir)	src/USER-SMTBQ/
A		src/USER-SMTBQ/README
A		src/USER-SMTBQ/pair_smtbq.cpp
A		src/USER-SMTBQ/pair_smtbq.h
M		src/version.h