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

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on May 3 2014, 14:13.

Description

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

Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
src/MAKE/Makefile.ubuntu
src/USER-REAXC/pair_reax_c.cpp
src/USER-REAXC/reaxc_allocate.cpp
src/USER-REAXC/reaxc_init_md.cpp
src/USER-REAXC/reaxc_list.cpp
src/USER-REAXC/reaxc_multi_body.cpp
src/USER-REAXC/reaxc_reset_tools.cpp
src/USER-REAXC/reaxc_tool_box.cpp
src/USER-REAXC/reaxc_traj.cpp
src/USER-REAXC/reaxc_types.h
src/USER-REAXC/reaxc_vector.cpp
src/write_data.cpp

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

May 3 2014, 14:13

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS3a046a66ad78: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11910 f3b2605a-c512-4ea7…
rLAMMPS873c7104016c: Merge remote-tracking branch 'lammps-ro/master' into lammps-icms

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS4fbf7105d6be: Merge remote-tracking branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).May 3 2014, 14:13

Merged Changes

Commit	Author	Details	Committed
3a046a66ad78	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11910 f3b2605a-c512-4ea7…	May 3 2014
d147665906ec	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11909 f3b2605a-c512-4ea7…	May 3 2014
3b7123bec2a2	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11908 f3b2605a-c512-4ea7…	May 3 2014
8bee4ef5966a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11907 f3b2605a-c512-4ea7…	May 2 2014
19267785f56a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11906 f3b2605a-c512-4ea7…	May 2 2014
5e0c91dc3e81	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11905 f3b2605a-c512-4ea7…	May 2 2014
ddcab1268e97	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11904 f3b2605a-c512-4ea7…	May 2 2014
1fb340721503	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11903 f3b2605a-c512-4ea7…	May 2 2014
ec54a1281593	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11902 f3b2605a-c512-4ea7…	May 2 2014
fbe748457392	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11901 f3b2605a-c512-4ea7…	May 2 2014
6883b645faa3	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11898 f3b2605a-c512-4ea7…	May 2 2014
9a0d1c765b87	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11897 f3b2605a-c512-4ea7…	May 2 2014
95ee355671e0	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11895 f3b2605a-c512-4ea7…	May 2 2014
6cef8f16c412	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11894 f3b2605a-c512-4ea7…	May 2 2014
e6b6c17db4ce	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11893 f3b2605a-c512-4ea7…	May 2 2014
45f7542271fa	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11892 f3b2605a-c512-4ea7…	May 2 2014
15af21908675	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11891 f3b2605a-c512-4ea7…	May 2 2014
770c6e6092b0	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11890 f3b2605a-c512-4ea7…	May 2 2014
9db54ceb9888	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11889 f3b2605a-c512-4ea7…	May 2 2014
48b8860e4391	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11888 f3b2605a-c512-4ea7…	May 2 2014
fd5b627cf03b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11887 f3b2605a-c512-4ea7…	May 2 2014
38f1fe19c961	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11886 f3b2605a-c512-4ea7…	May 2 2014
7ce22765cf40	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11884 f3b2605a-c512-4ea7…	May 2 2014
a2ed39ad0c2c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11883 f3b2605a-c512-4ea7…	May 2 2014
54633e6252d0	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11882 f3b2605a-c512-4ea7…	May 2 2014
8e760279f741	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11881 f3b2605a-c512-4ea7…	May 2 2014
c1eedcacfd98	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11880 f3b2605a-c512-4ea7…	May 2 2014
eddd7b148fe5	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11879 f3b2605a-c512-4ea7…	May 2 2014
9130641820c5	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11878 f3b2605a-c512-4ea7…	May 2 2014
a643d5695ea2	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11877 f3b2605a-c512-4ea7…	May 2 2014
a1c6c99ccc74	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11876 f3b2605a-c512-4ea7…	May 2 2014
af5d91115f4b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11875 f3b2605a-c512-4ea7…	May 2 2014

Changes (187)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

		Path
M		doc/Manual.html
M		doc/Manual.txt
M		doc/Section_python.html
M		doc/compute_modify.html
M		doc/compute_modify.txt
M		doc/compute_property_atom.html
M		doc/compute_vacf.html
M		doc/dump.html
M		doc/dump_modify.html
M		doc/fix_bond_break.html
M		doc/fix_bond_break.txt
M		doc/fix_bond_create.html
M		doc/fix_bond_create.txt
M		doc/fix_deposit.html
M		doc/fix_deposit.txt
M		doc/fix_evaporate.html
M		doc/fix_evaporate.txt
M		doc/fix_gcmc.html
M		doc/fix_gcmc.txt
M		doc/fix_pour.html
M		doc/fix_pour.txt
M		doc/fix_reaxc_species.html
M		doc/fix_reaxc_species.txt
M		doc/fix_restrain.html
M		doc/fix_thermal_conductivity.html
M		doc/fix_thermal_conductivity.txt
M		doc/group.html
M		doc/group.txt
M		doc/pair_coul_diel.html
M		doc/pair_lj_long.html
M		doc/pair_reax_c.html
M		doc/pair_reax_c.txt
M		doc/variable.html
M		doc/variable.txt
M		examples/README
A	(dir)	examples/nb3b/
A		examples/nb3b/MOH.nb3b.harmonic
A		examples/nb3b/data.nb3b
A		examples/nb3b/in.nb3b
A		examples/nb3b/log.nb3b.1Feb14.linux.1
A		examples/nb3b/log.nb3b.1Feb14.linux.4
M		src/ASPHERE/compute_temp_asphere.cpp
M		src/CLASS2/dihedral_class2.cpp
M		src/MAKE/Makefile.ubuntu
M		src/MISC/fix_efield.cpp
M		src/MISC/fix_evaporate.cpp
M		src/MISC/fix_oneway.cpp
M		src/USER-EFF/compute_temp_region_eff.cpp
M		src/USER-EFF/compute_temp_region_eff.h
M		src/USER-REAXC/fix_qeq_reax.cpp
M		src/USER-REAXC/fix_qeq_reax.h
M		src/USER-REAXC/fix_reaxc_species.cpp
M		src/USER-REAXC/pair_reax_c.cpp
M		src/USER-REAXC/pair_reax_c.h
M		src/USER-REAXC/reaxc_allocate.cpp
M		src/USER-REAXC/reaxc_basic_comm.cpp
M		src/USER-REAXC/reaxc_bond_orders.cpp
M		src/USER-REAXC/reaxc_bonds.cpp
M		src/USER-REAXC/reaxc_control.cpp
M		src/USER-REAXC/reaxc_defs.h
M		src/USER-REAXC/reaxc_ffield.cpp
M		src/USER-REAXC/reaxc_forces.cpp
M		src/USER-REAXC/reaxc_hydrogen_bonds.cpp
M		src/USER-REAXC/reaxc_init_md.cpp
M		src/USER-REAXC/reaxc_io_tools.cpp
M		src/USER-REAXC/reaxc_list.cpp
M		src/USER-REAXC/reaxc_lookup.cpp
M		src/USER-REAXC/reaxc_multi_body.cpp
M		src/USER-REAXC/reaxc_nonbonded.cpp
M		src/USER-REAXC/reaxc_reset_tools.cpp
M		src/USER-REAXC/reaxc_system_props.cpp
M		src/USER-REAXC/reaxc_tool_box.cpp
M		src/USER-REAXC/reaxc_torsion_angles.cpp
M		src/USER-REAXC/reaxc_traj.cpp
M		src/USER-REAXC/reaxc_types.h
M		src/USER-REAXC/reaxc_valence_angles.cpp
M		src/USER-REAXC/reaxc_vector.cpp
M		src/compute.cpp
M		src/compute.h
M		src/compute_reduce_region.cpp
M		src/compute_temp_region.cpp
M		src/compute_temp_region.h
M		src/compute_temp_sphere.cpp
M		src/create_atoms.cpp
M		src/delete_atoms.cpp
M		src/dump_custom.cpp
M		src/fix.cpp
M		src/fix.h
M		src/fix_addforce.cpp
M		src/fix_ave_spatial.cpp
M		src/fix_aveforce.cpp
M		src/fix_heat.cpp
M		src/fix_nh.cpp
M		src/fix_nve.cpp
M		src/fix_setforce.cpp
M		src/fix_wall_region.cpp
M		src/group.cpp
M		src/modify.cpp
M		src/region.cpp
M		src/region.h
M		src/set.cpp
M		src/thermo.cpp
M		src/variable.cpp
M		src/variable.h
M		src/version.h
M		src/write_data.cpp
M		tools/moltemplate/common/amber/README.TXT
M		tools/moltemplate/common/amber/amberparm2lt.sh
M		tools/moltemplate/common/amber/amberparm_improper_to_lt.py
M		tools/moltemplate/common/amber/amberparm_pair_to_lt.py
M		tools/moltemplate/common/gaff.lt
M		tools/moltemplate/common/oplsaa/README.TXT
A	(dir)	tools/moltemplate/common/oplsaa/alternate_oplsaa_file/
A		tools/moltemplate/common/oplsaa/alternate_oplsaa_file/README_alternate_atom_numbers.txt
V		tools/moltemplate/common/oplsaa/{alternate_oplsaa_file ← }/oplsaa.txt
V		tools/moltemplate/common/oplsaa/{ → alternate_oplsaa_file}/oplsaa.txt
M		tools/moltemplate/common/oplsaa/oplsaa_moltemplate.py
M		tools/moltemplate/examples/CG_biomolecules/membrane+protein/moltemplate_files/system.lt
M		tools/moltemplate/examples/CG_misc/2bead_heteropolymer/moltemplate_files/2bead.lt
M		tools/moltemplate/examples/all_atom_examples/AMBER_force_field_examples/WARNING.TXT
P		tools/moltemplate/examples/all_atom_examples/AMBER_force_field_examples/hexadecane/README_setup.sh Copied from tools/moltemplate/examples/all_atom_examples/OPLSAA_force_field_examples/ethylene/README_setup.sh
M		tools/moltemplate/examples/all_atom_examples/AMBER_force_field_examples/hexadecane/moltemplate_files/ch2group.lt
M		tools/moltemplate/examples/all_atom_examples/AMBER_force_field_examples/hexadecane/moltemplate_files/ch3group.lt
M		tools/moltemplate/examples/all_atom_examples/AMBER_force_field_examples/hexadecane/moltemplate_files/hexadecane.lt
A	(dir)	tools/moltemplate/examples/all_atom_examples/AMBER_force_field_examples/hexadecane/optional_cleanup/
A		tools/moltemplate/examples/all_atom_examples/AMBER_force_field_examples/hexadecane/optional_cleanup/README_remove_irrelevant_info.sh
M		tools/moltemplate/examples/all_atom_examples/AMBER_force_field_examples/hexadecane/run.in.npt
M		tools/moltemplate/examples/all_atom_examples/AMBER_force_field_examples/waterTIP3P+isobutane/README.TXT
P		tools/moltemplate/examples/all_atom_examples/AMBER_force_field_examples/waterTIP3P+isobutane/README_setup.sh Copied from tools/moltemplate/examples/all_atom_examples/OPLSAA_force_field_examples/ethylene/README_setup.sh
M		tools/moltemplate/examples/all_atom_examples/AMBER_force_field_examples/waterTIP3P+isobutane/moltemplate_files/isobutane.lt
A	(dir)	tools/moltemplate/examples/all_atom_examples/AMBER_force_field_examples/waterTIP3P+isobutane/optional_cleanup/
A		tools/moltemplate/examples/all_atom_examples/AMBER_force_field_examples/waterTIP3P+isobutane/optional_cleanup/README_remove_irrelevant_info.sh
M		tools/moltemplate/examples/all_atom_examples/AMBER_force_field_examples/waterTIP3P+isobutane/run.in.npt
M		tools/moltemplate/examples/all_atom_examples/OPLSAA_force_field_examples/WARNING.TXT
A	(dir)	tools/moltemplate/examples/all_atom_examples/OPLSAA_force_field_examples/ethylene+benzene_PACKMOL/
A		tools/moltemplate/examples/all_atom_examples/OPLSAA_force_field_examples/ethylene+benzene_PACKMOL/README.TXT
A		tools/moltemplate/examples/all_atom_examples/OPLSAA_force_field_examples/ethylene+benzene_PACKMOL/README_run.sh
P		tools/moltemplate/examples/all_atom_examples/OPLSAA_force_field_examples/ethylene+benzene_PACKMOL/README_setup.sh Copied from tools/moltemplate/examples/all_atom_examples/OPLSAA_force_field_examples/ethylene/README_setup.sh
A		tools/moltemplate/examples/all_atom_examples/OPLSAA_force_field_examples/ethylene+benzene_PACKMOL/README_visualize.txt
A	(dir)	tools/moltemplate/examples/all_atom_examples/OPLSAA_force_field_examples/ethylene+benzene_PACKMOL/images/
A		tools/moltemplate/examples/all_atom_examples/OPLSAA_force_field_examples/ethylene+benzene_PACKMOL/images/benzene.jpg
A		tools/moltemplate/examples/all_atom_examples/OPLSAA_force_field_examples/ethylene+benzene_PACKMOL/images/ethylene+benzene_box80x80x80_LR.jpg
A		tools/moltemplate/examples/all_atom_examples/OPLSAA_force_field_examples/ethylene+benzene_PACKMOL/images/ethylene.jpg
A	(dir)	tools/moltemplate/examples/all_atom_examples/OPLSAA_force_field_examples/ethylene+benzene_PACKMOL/moltemplate_files/
A		tools/moltemplate/examples/all_atom_examples/OPLSAA_force_field_examples/ethylene+benzene_PACKMOL/moltemplate_files/benzene.lt
A		tools/moltemplate/examples/all_atom_examples/OPLSAA_force_field_examples/ethylene+benzene_PACKMOL/moltemplate_files/ethylene.lt
A	(dir)	tools/moltemplate/examples/all_atom_examples/OPLSAA_force_field_examples/ethylene+benzene_PACKMOL/moltemplate_files/oplsaa_lt_generator/
A		tools/moltemplate/examples/all_atom_examples/OPLSAA_force_field_examples/ethylene+benzene_PACKMOL/moltemplate_files/oplsaa_lt_generator/AUTHOR.TXT
A		tools/moltemplate/examples/all_atom_examples/OPLSAA_force_field_examples/ethylene+benzene_PACKMOL/moltemplate_files/oplsaa_lt_generator/README.TXT
A	(dir)	tools/moltemplate/examples/all_atom_examples/OPLSAA_force_field_examples/ethylene+benzene_PACKMOL/moltemplate_files/oplsaa_lt_generator/minimal_versions/
A		tools/moltemplate/examples/all_atom_examples/OPLSAA_force_field_examples/ethylene+benzene_PACKMOL/moltemplate_files/oplsaa_lt_generator/minimal_versions/README.TXT
A		tools/moltemplate/examples/all_atom_examples/OPLSAA_force_field_examples/ethylene+benzene_PACKMOL/moltemplate_files/oplsaa_lt_generator/minimal_versions/oplsaa_subset_minimal.prm
A		tools/moltemplate/examples/all_atom_examples/OPLSAA_force_field_examples/ethylene+benzene_PACKMOL/moltemplate_files/oplsaa_lt_generator/minimal_versions/oplsaa_subset_simplified.prm
A		tools/moltemplate/examples/all_atom_examples/OPLSAA_force_field_examples/ethylene+benzene_PACKMOL/moltemplate_files/oplsaa_lt_generator/oplsaa_moltemplate.py
A		tools/moltemplate/examples/all_atom_examples/OPLSAA_force_field_examples/ethylene+benzene_PACKMOL/moltemplate_files/oplsaa_lt_generator/oplsaa_subset.prm
A		tools/moltemplate/examples/all_atom_examples/OPLSAA_force_field_examples/ethylene+benzene_PACKMOL/moltemplate_files/system.lt
A	(dir)	tools/moltemplate/examples/all_atom_examples/OPLSAA_force_field_examples/ethylene+benzene_PACKMOL/packmol_files/
A		tools/moltemplate/examples/all_atom_examples/OPLSAA_force_field_examples/ethylene+benzene_PACKMOL/packmol_files/README.TXT
A		tools/moltemplate/examples/all_atom_examples/OPLSAA_force_field_examples/ethylene+benzene_PACKMOL/packmol_files/benzene.xyz
A		tools/moltemplate/examples/all_atom_examples/OPLSAA_force_field_examples/ethylene+benzene_PACKMOL/packmol_files/ethylene.xyz
A		tools/moltemplate/examples/all_atom_examples/OPLSAA_force_field_examples/ethylene+benzene_PACKMOL/packmol_files/mix_ethylene+benzene.inp
A		tools/moltemplate/examples/all_atom_examples/OPLSAA_force_field_examples/ethylene+benzene_PACKMOL/run.in.npt
A		tools/moltemplate/examples/all_atom_examples/OPLSAA_force_field_examples/ethylene+benzene_PACKMOL/run.in.nvt
P		tools/moltemplate/examples/all_atom_examples/OPLSAA_force_field_examples/ethylene/README_setup.sh Copied to multiple locations: tools/moltemplate/examples/all_atom_examples/AMBER_force_field_examples/hexadecane/README_setup.sh tools/moltemplate/examples/all_atom_examples/AMBER_force_field_examples/waterTIP3P+isobutane/README_setup.sh tools/moltemplate/examples/all_atom_examples/OPLSAA_force_field_examples/ethylene+benzene_PACKMOL/README_setup.sh
M		tools/moltemplate/examples/all_atom_examples/OPLSAA_force_field_examples/ethylene/moltemplate_files/ethylene.lt
M		tools/moltemplate/examples/all_atom_examples/OPLSAA_force_field_examples/ethylene/moltemplate_files/oplsaa_lt_generator/README.TXT
A	(dir)	tools/moltemplate/examples/all_atom_examples/OPLSAA_force_field_examples/ethylene/moltemplate_files/oplsaa_lt_generator/minimal_versions/
A		tools/moltemplate/examples/all_atom_examples/OPLSAA_force_field_examples/ethylene/moltemplate_files/oplsaa_lt_generator/minimal_versions/README.TXT
A		tools/moltemplate/examples/all_atom_examples/OPLSAA_force_field_examples/ethylene/moltemplate_files/oplsaa_lt_generator/minimal_versions/oplsaa_subset_minimal.prm
A		tools/moltemplate/examples/all_atom_examples/OPLSAA_force_field_examples/ethylene/moltemplate_files/oplsaa_lt_generator/minimal_versions/oplsaa_subset_simplified.prm
D		tools/moltemplate/examples/all_atom_examples/OPLSAA_force_field_examples/ethylene/moltemplate_files/oplsaa_lt_generator/oplsaa.txt
M		tools/moltemplate/examples/all_atom_examples/OPLSAA_force_field_examples/ethylene/moltemplate_files/oplsaa_lt_generator/oplsaa_moltemplate.py
A		tools/moltemplate/examples/all_atom_examples/OPLSAA_force_field_examples/ethylene/moltemplate_files/oplsaa_lt_generator/oplsaa_subset.prm
D		tools/moltemplate/examples/all_atom_examples/OPLSAA_force_field_examples/ethylene/moltemplate_files/oplsaa_lt_generator/oplsaa_subset.txt
M		tools/moltemplate/examples/all_atom_examples/OPLSAA_force_field_examples/ethylene/moltemplate_files/system.lt
D		tools/moltemplate/examples/all_atom_examples/convert_LAMMPS_to_LT_examples/cnad-cnt/cnt.lt
M		tools/moltemplate/examples/all_atom_examples/hexadecane/WARNING.TXT
M		tools/moltemplate/examples/all_atom_examples/hexadecane/moltemplate_files/alkanes.lt
M		tools/moltemplate/examples/all_atom_examples/hexadecane/moltemplate_files/ch2group.lt
M		tools/moltemplate/examples/all_atom_examples/hexadecane/moltemplate_files/ch3group.lt
M		tools/moltemplate/examples/all_atom_examples/hexadecane/moltemplate_files/hexadecane.lt
M		tools/moltemplate/examples/all_atom_examples/hexadecane/run.in.npt
M		tools/moltemplate/src/moltemplate.sh
M		tools/moltemplate/src/nbody_by_type.py
M		tools/moltemplate/src/nbody_by_type_lib.py
M		tools/moltemplate/src/ttree_lex.py
M		tools/moltemplate/src/ttree_matrix_stack.py

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

Description

Details

Event Timeline

Merged Changes

Changes (187)Show All Changes

Very Large Commit

rLAMMPS4fbf7105d6be

doc/Manual.html

doc/Manual.txt

doc/Section_python.html

doc/compute_modify.html

doc/compute_modify.txt

doc/compute_property_atom.html

doc/compute_vacf.html

doc/dump.html

doc/dump_modify.html

doc/fix_bond_break.html

doc/fix_bond_break.txt

doc/fix_bond_create.html

doc/fix_bond_create.txt

doc/fix_deposit.html

doc/fix_deposit.txt

doc/fix_evaporate.html

doc/fix_evaporate.txt

doc/fix_gcmc.html

doc/fix_gcmc.txt

doc/fix_pour.html

doc/fix_pour.txt

doc/fix_reaxc_species.html

doc/fix_reaxc_species.txt

doc/fix_restrain.html

doc/fix_thermal_conductivity.html

doc/fix_thermal_conductivity.txt

doc/group.html

doc/group.txt

doc/pair_coul_diel.html

doc/pair_lj_long.html

doc/pair_reax_c.html

doc/pair_reax_c.txt

doc/variable.html

doc/variable.txt

examples/README

examples/nb3b/MOH.nb3b.harmonic

examples/nb3b/data.nb3b

examples/nb3b/in.nb3b

examples/nb3b/log.nb3b.1Feb14.linux.1

examples/nb3b/log.nb3b.1Feb14.linux.4

src/ASPHERE/compute_temp_asphere.cpp

src/CLASS2/dihedral_class2.cpp

src/MAKE/Makefile.ubuntu

src/MISC/fix_efield.cpp

src/MISC/fix_evaporate.cpp

src/MISC/fix_oneway.cpp

src/USER-EFF/compute_temp_region_eff.cpp

src/USER-EFF/compute_temp_region_eff.h

src/USER-REAXC/fix_qeq_reax.cpp

src/USER-REAXC/fix_qeq_reax.h

src/USER-REAXC/fix_reaxc_species.cpp

src/USER-REAXC/pair_reax_c.cpp

src/USER-REAXC/pair_reax_c.h

src/USER-REAXC/reaxc_allocate.cpp

src/USER-REAXC/reaxc_basic_comm.cpp

src/USER-REAXC/reaxc_bond_orders.cpp

src/USER-REAXC/reaxc_bonds.cpp

src/USER-REAXC/reaxc_control.cpp

src/USER-REAXC/reaxc_defs.h

src/USER-REAXC/reaxc_ffield.cpp

src/USER-REAXC/reaxc_forces.cpp

src/USER-REAXC/reaxc_hydrogen_bonds.cpp

src/USER-REAXC/reaxc_init_md.cpp

src/USER-REAXC/reaxc_io_tools.cpp

src/USER-REAXC/reaxc_list.cpp

src/USER-REAXC/reaxc_lookup.cpp

src/USER-REAXC/reaxc_multi_body.cpp

src/USER-REAXC/reaxc_nonbonded.cpp

src/USER-REAXC/reaxc_reset_tools.cpp

src/USER-REAXC/reaxc_system_props.cpp

src/USER-REAXC/reaxc_tool_box.cpp

src/USER-REAXC/reaxc_torsion_angles.cpp

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

Changes (187)
Show All Changes