Diffusion lammps ef3307c36988

Merge branch 'master' into lammps-icms
ef3307c36988
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Sep 2 2010, 15:36.

Description

Merge branch 'master' into lammps-icms

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Sep 2 2010, 15:36

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPSa52763382e4f: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4660 f3b2605a-c512-4ea7…
rLAMMPS39aea46e4c58: Merge branch 'master' into lammps-icms

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPSef3307c36988: Merge branch 'master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Sep 2 2010, 15:36

Merged Changes

Commit	Author	Details	Committed
a52763382e4f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4660 f3b2605a-c512-4ea7…	Sep 2 2010
2a4596c5291d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4659 f3b2605a-c512-4ea7…	Sep 2 2010
745d19c08a8f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4658 f3b2605a-c512-4ea7…	Sep 2 2010
87e39e7610bc	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4657 f3b2605a-c512-4ea7…	Sep 1 2010
1c3580cd06ca	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4655 f3b2605a-c512-4ea7…	Sep 1 2010
386524da388d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4654 f3b2605a-c512-4ea7…	Sep 1 2010
cc0f92226ac5	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4653 f3b2605a-c512-4ea7…	Sep 1 2010
ed40d271455d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4652 f3b2605a-c512-4ea7…	Sep 1 2010
d6a892f2460c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4650 f3b2605a-c512-4ea7…	Sep 1 2010
73573bf2372e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4649 f3b2605a-c512-4ea7…	Sep 1 2010
6ce7d46695c7	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4648 f3b2605a-c512-4ea7…	Sep 1 2010
7d832b4db101	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4647 f3b2605a-c512-4ea7…	Sep 1 2010
333c561d2271	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4646 f3b2605a-c512-4ea7…	Sep 1 2010
b6ce16eee459	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4645 f3b2605a-c512-4ea7…	Sep 1 2010
99b660db7938	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4643 f3b2605a-c512-4ea7…	Sep 1 2010

Changes (131)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

		Path
A		doc/Eqs/eff_KE.jpg
A		doc/Eqs/eff_KE.tex
A		doc/Eqs/eff_NN.jpg
A		doc/Eqs/eff_NN.tex
A		doc/Eqs/eff_Ne.jpg
A		doc/Eqs/eff_Ne.tex
A		doc/Eqs/eff_Pauli.jpg
A		doc/Eqs/eff_Pauli.tex
A		doc/Eqs/eff_ee.jpg
A		doc/Eqs/eff_ee.tex
A		doc/Eqs/eff_energy_expression.jpg
A		doc/Eqs/eff_energy_expression.tex
M		doc/Eqs/pair_tersoff_1.jpg
M		doc/Section_commands.html
M		doc/Section_commands.txt
M		doc/Section_intro.html
M		doc/Section_intro.txt
M		doc/compute_damage_atom.html
M		doc/compute_damage_atom.txt
A		doc/compute_ke_atom_eff.html
A		doc/compute_ke_atom_eff.txt
A		doc/compute_ke_eff.html
A		doc/compute_ke_eff.txt
A		doc/compute_temp_deform_eff.html
A		doc/compute_temp_deform_eff.txt
A		doc/compute_temp_eff.html
A		doc/compute_temp_eff.txt
A		doc/compute_temp_region_eff.html
A		doc/compute_temp_region_eff.txt
A		doc/fix_langevin_eff.html
A		doc/fix_langevin_eff.txt
A		doc/fix_nh_eff.html
A		doc/fix_nh_eff.txt
A		doc/fix_nve_eff.html
A		doc/fix_nve_eff.txt
M		doc/fix_nvt_sllod.html
M		doc/fix_nvt_sllod.txt
A		doc/fix_nvt_sllod_eff.html
A		doc/fix_nvt_sllod_eff.txt
A		doc/fix_temp_rescale_eff.html
A		doc/fix_temp_rescale_eff.txt
M		doc/pair_comb.html
M		doc/pair_comb.txt
A		doc/pair_eff.html
A		doc/pair_eff.txt
M		examples/USER/eff/Auger-Adamantane/README
M		examples/USER/eff/Auger-Adamantane/data.adamantane
M		examples/USER/eff/Auger-Adamantane/data.adamantane_ionized
D		examples/USER/eff/Auger-Adamantane/in.adamantane.min
D		examples/USER/eff/Auger-Adamantane/in.adamantane.nvt
D		examples/USER/eff/Auger-Adamantane/in.adamantane.spe
M		examples/USER/eff/Auger-Adamantane/in.adamantane_ionized.nve
D		examples/USER/eff/Auger-Adamantane/in.adamantane_ionized.nvt
M		examples/USER/eff/Be-solid/README
M		examples/USER/eff/Be-solid/data.Be-solid
M		examples/USER/eff/Be-solid/in.Be-solid.spe
M		examples/USER/eff/CH4/README
M		examples/USER/eff/CH4/data.ch4
M		examples/USER/eff/CH4/data.ch4_ionized
A		examples/USER/eff/CH4/in.ch4.dynamics
D		examples/USER/eff/CH4/in.ch4.min
D		examples/USER/eff/CH4/in.ch4.nve
D		examples/USER/eff/CH4/in.ch4.nvt
D		examples/USER/eff/CH4/in.ch4.spe
V		examples/USER/eff/CH4/{in.ch4_ionized.dynamics ← in.ch4_ionized.nvt}
D		examples/USER/eff/CH4/in.ch4_ionized.min
D		examples/USER/eff/CH4/in.ch4_ionized.nve
V		examples/USER/eff/CH4/{in.ch4_ionized.nvt → in.ch4_ionized.dynamics}
D		examples/USER/eff/CH4/radii.vmd
M		examples/USER/eff/H/data.h_atom
M		examples/USER/eff/H/in.h_atom.min
M		examples/USER/eff/H/in.h_atom.spe
A	(dir)	examples/USER/eff/H2/
A		examples/USER/eff/H2/README
A		examples/USER/eff/H2/data.h2
A		examples/USER/eff/H2/in.h2
M		examples/USER/eff/H_plasma/data.h2bulk
D		examples/USER/eff/H_plasma/in.h2bulk.min
M		examples/USER/eff/H_plasma/in.h2bulk.npt
M		examples/USER/eff/H_plasma/in.h2bulk.nve
D		examples/USER/eff/H_plasma/in.h2bulk.nvt
M		examples/USER/eff/Li-dendritic/data.Li-dendritic
M		examples/USER/eff/Li-dendritic/in.Li-dendritic.min
M		examples/USER/eff/Li-dendritic/in.Li-dendritic.nvt
D		examples/USER/eff/Li-shock
D		examples/USER/eff/Li-shock/README
D		examples/USER/eff/Li-shock/data.lishock
D		examples/USER/eff/Li-shock/in.lishock
A	(dir)	examples/USER/eff/Li-solid/
A		examples/USER/eff/Li-solid/README
A		examples/USER/eff/Li-solid/data.Li
A		examples/USER/eff/Li-solid/in.Li
M		examples/USER/eff/README
M		src/MANYBODY/Install.sh
M		src/Makefile
A	(dir)	src/USER-EFF/
A		src/USER-EFF/Install.sh
A		src/USER-EFF/README
A		src/USER-EFF/atom_vec_electron.cpp
A		src/USER-EFF/atom_vec_electron.h
A		src/USER-EFF/compute_ke_atom_eff.cpp
P		src/USER-EFF/compute_ke_atom_eff.h Copied from src/fix_temp_rescale.h
A		src/USER-EFF/compute_ke_eff.cpp
P		src/USER-EFF/compute_ke_eff.h Copied from src/fix_temp_rescale.h
A		src/USER-EFF/compute_temp_deform_eff.cpp
P		src/USER-EFF/compute_temp_deform_eff.h Copied from src/fix_temp_rescale.h
A		src/USER-EFF/compute_temp_eff.cpp
P		src/USER-EFF/compute_temp_eff.h Copied from src/fix_temp_rescale.h
A		src/USER-EFF/compute_temp_region_eff.cpp
P		src/USER-EFF/compute_temp_region_eff.h Copied from src/fix_temp_rescale.h
A		src/USER-EFF/fix_langevin_eff.cpp
P		src/USER-EFF/fix_langevin_eff.h Copied from src/fix_temp_rescale.h
A		src/USER-EFF/fix_nh_eff.cpp
P		src/USER-EFF/fix_nh_eff.h Copied from src/fix_temp_rescale.h
A		src/USER-EFF/fix_nph_eff.cpp
P		src/USER-EFF/fix_nph_eff.h Copied from src/fix_temp_rescale.h
A		src/USER-EFF/fix_npt_eff.cpp
P		src/USER-EFF/fix_npt_eff.h Copied from src/fix_temp_rescale.h
A		src/USER-EFF/fix_nve_eff.cpp
P		src/USER-EFF/fix_nve_eff.h Copied from src/fix_temp_rescale.h
A		src/USER-EFF/fix_nvt_eff.cpp
P		src/USER-EFF/fix_nvt_eff.h Copied from src/fix_temp_rescale.h
A		src/USER-EFF/fix_nvt_sllod_eff.cpp
P		src/USER-EFF/fix_nvt_sllod_eff.h Copied from src/fix_temp_rescale.h
A		src/USER-EFF/fix_temp_rescale_eff.cpp
P		src/USER-EFF/fix_temp_rescale_eff.h Copied from src/fix_temp_rescale.h
A		src/USER-EFF/pair_eff_cut.cpp
A		src/USER-EFF/pair_eff_cut.h
A		src/USER-EFF/pair_eff_inline.h
P		src/fix_temp_rescale.h Copied to multiple locations: src/USER-EFF/compute_ke_atom_eff.h src/USER-EFF/compute_ke_eff.h src/USER-EFF/compute_temp_deform_eff.h src/USER-EFF/compute_temp_eff.h src/USER-EFF/compute_temp_region_eff.h src/USER-EFF/fix_langevin_eff.h src/USER-EFF/fix_nh_eff.h src/USER-EFF/fix_nph_eff.h src/USER-EFF/fix_npt_eff.h src/USER-EFF/fix_nve_eff.h src/USER-EFF/fix_nvt_eff.h src/USER-EFF/fix_nvt_sllod_eff.h src/USER-EFF/fix_temp_rescale_eff.h
M		src/version.h