Diffusion lammps 6c8830b82800

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

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

Description

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

Conflicts:
doc/Manual.html
doc/Manual.txt

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Jul 28 2015, 19:26

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPSc0354ea1b50c: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13747 f3b2605a-c512-4ea7…
rLAMMPS94c795af4206: fix typo in comments

Branches

Unknown

Tags

Unknown

Event Timeline

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

Merged Changes

Commit	Author	Details	Committed
c0354ea1b50c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13747 f3b2605a-c512-4ea7…	Jul 28 2015
fc4c6b0856e6	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13746 f3b2605a-c512-4ea7…	Jul 27 2015
633d506e591f	athomps	Edited quip text	Jul 27 2015
317744626c55	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13739 f3b2605a-c512-4ea7…	Jul 27 2015
9ed741e90404	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13738 f3b2605a-c512-4ea7…	Jul 27 2015
1a40739a6b14	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13735 f3b2605a-c512-4ea7…	Jul 27 2015
687247bee6e9	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13734 f3b2605a-c512-4ea7…	Jul 27 2015
f52410537879	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13733 f3b2605a-c512-4ea7…	Jul 27 2015
059f719d6220	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13732 f3b2605a-c512-4ea7…	Jul 27 2015
218bd7cec7cb	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13731 f3b2605a-c512-4ea7…	Jul 27 2015
d58afbcc48fa	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13730 f3b2605a-c512-4ea7…	Jul 27 2015
3dfb44659028	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13729 f3b2605a-c512-4ea7…	Jul 27 2015
6d83f5ed01a5	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13728 f3b2605a-c512-4ea7…	Jul 27 2015
8936e677c459	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13727 f3b2605a-c512-4ea7…	Jul 27 2015
8fe1cd9879c4	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13726 f3b2605a-c512-4ea7…	Jul 27 2015
fa048e5f37a1	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13725 f3b2605a-c512-4ea7…	Jul 27 2015

Changes (80)

		Path
M		doc/Manual.html
M		doc/Manual.txt
M		doc/Section_howto.html
M		doc/Section_howto.txt
M		doc/Section_intro.html
M		doc/Section_intro.txt
M		doc/Section_packages.html
M		doc/Section_packages.txt
M		doc/accelerate_kokkos.html
M		doc/accelerate_kokkos.txt
M		doc/compute_saed.html
M		doc/compute_saed.txt
M		doc/compute_temp_drude.html
M		doc/compute_temp_drude.txt
M		doc/compute_xrd.html
M		doc/compute_xrd.txt
M		doc/fix_ave_histo.html
M		doc/fix_ave_histo.txt
M		doc/fix_drude_transform.html
M		doc/fix_drude_transform.txt
M		doc/fix_langevin_drude.html
M		doc/fix_langevin_drude.txt
M		doc/fix_saed_vtk.html
M		doc/fix_saed_vtk.txt
M		doc/pair_bop.html
M		doc/pair_bop.txt
A		doc/pair_thole.html
A		doc/pair_thole.txt
M		doc/tutorial_drude.html
M		doc/tutorial_drude.txt
M		examples/USER/diffraction/BulkNi.in
A	(dir)	examples/USER/drude/
A		examples/USER/drude/README
A	(dir)	examples/USER/drude/butane/
A		examples/USER/drude/butane/data.butane
A		examples/USER/drude/butane/in.butane.lang
A		examples/USER/drude/butane/in.butane.nh
A		examples/USER/drude/butane/log.butane.lang.18Jul15.linux.1
A		examples/USER/drude/butane/log.butane.lang.18Jul15.linux.4
A		examples/USER/drude/butane/log.butane.nh.18Jul15.linux.3
A		examples/USER/drude/butane/log.butane.nh.18Jul15.linux.4
A	(dir)	examples/USER/drude/ethanol/
A		examples/USER/drude/ethanol/data.ethanol
A		examples/USER/drude/ethanol/in.ethanol.lang
A		examples/USER/drude/ethanol/in.ethanol.nh
A		examples/USER/drude/ethanol/log.ethanol.lang.8Jul15.linux.1
A		examples/USER/drude/ethanol/log.ethanol.lang.8Jul15.linux.4
A		examples/USER/drude/ethanol/log.ethanol.nh.8Jul15.linux.1
A		examples/USER/drude/ethanol/log.ethanol.nh.8Jul15.linux.4
A	(dir)	examples/USER/drude/swm4-ndp/
A		examples/USER/drude/swm4-ndp/data.swm4-ndp
A		examples/USER/drude/swm4-ndp/in.swm4-ndp.lang
A		examples/USER/drude/swm4-ndp/in.swm4-ndp.nh
A		examples/USER/drude/swm4-ndp/log.swm4-ndp.lang.8Jul15.linux.1
A		examples/USER/drude/swm4-ndp/log.swm4-ndp.lang.8Jul15.linux.4
A		examples/USER/drude/swm4-ndp/log.swm4-ndp.nh.8Jul15.linux.1
A		examples/USER/drude/swm4-ndp/log.swm4-ndp.nh.8Jul15.linux.4
M		src/MAKE/OPTIONS/Makefile.kokkos_cuda
M		src/Make.py
M		src/Makefile
A	(dir)	src/USER-DRUDE/
A		src/USER-DRUDE/README
A		src/USER-DRUDE/compute_temp_drude.cpp
A		src/USER-DRUDE/compute_temp_drude.h
A		src/USER-DRUDE/fix_drude.cpp
A		src/USER-DRUDE/fix_drude.h
A		src/USER-DRUDE/fix_drude_transform.cpp
A		src/USER-DRUDE/fix_drude_transform.h
A		src/USER-DRUDE/fix_langevin_drude.cpp
A		src/USER-DRUDE/fix_langevin_drude.h
A		src/USER-DRUDE/pair_lj_cut_thole_long.cpp
A		src/USER-DRUDE/pair_lj_cut_thole_long.h
A		src/USER-DRUDE/pair_thole.cpp
A		src/USER-DRUDE/pair_thole.h
M		src/version.h
M		tools/README
A	(dir)	tools/drude/
A		tools/drude/drude.dff
A		tools/drude/polarizer.py
A		tools/drude/schwerdtfeger.dff