Merge remote branch 'lammps-ro/master' into lammps-icms
cad4e3266db9
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Oct 31 2013, 11:30.

Description

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

Resolved Conflicts:
doc/Manual.txt
doc/Section_start.txt
doc/shell.txt
doc/variable.txt
src/USER-OMP/pair_coul_dsf_omp.cpp
src/USER-OMP/pair_lj_cut_coul_dsf_omp.cpp
src/USER-OMP/pair_nm_cut_coul_cut_omp.cpp
src/USER-OMP/pair_nm_cut_coul_long_omp.cpp
src/USER-OMP/pair_nm_cut_omp.cpp
src/USER-OMP/pair_tersoff_mod_omp.cpp
src/USER-OMP/pair_zbl_omp.cpp
src/USER-OMP/thr_data.cpp
src/image.cpp
tools/msi2lmp/src/msi2lmp.c

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Oct 31 2013, 11:30

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS2f2661844089: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10911 f3b2605a-c512-4ea7…
rLAMMPS98b493e5bd77: simplify isdef() variable function semantics and add documentation

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPScad4e3266db9: Merge remote branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Oct 31 2013, 11:30

Merged Changes

Commit	Author	Details	Committed
2f2661844089	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10911 f3b2605a-c512-4ea7…	Oct 30 2013
e2c68d977991	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10910 f3b2605a-c512-4ea7…	Oct 30 2013
9c0fc4ba8d02	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10909 f3b2605a-c512-4ea7…	Oct 30 2013
0fa3867f3437	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10907 f3b2605a-c512-4ea7…	Oct 30 2013
15b7374ff0a2	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10906 f3b2605a-c512-4ea7…	Oct 30 2013
a886c8450a0f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10905 f3b2605a-c512-4ea7…	Oct 30 2013
0f1efa0c79d6	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10904 f3b2605a-c512-4ea7…	Oct 30 2013
3285598d8dab	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10903 f3b2605a-c512-4ea7…	Oct 30 2013
5ec1f8057e6d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10902 f3b2605a-c512-4ea7…	Oct 30 2013
6f90642fb89f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10900 f3b2605a-c512-4ea7…	Oct 30 2013
d07827a3bca5	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10899 f3b2605a-c512-4ea7…	Oct 30 2013
08a89693cc5a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10898 f3b2605a-c512-4ea7…	Oct 30 2013
029edc7a0129	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10896 f3b2605a-c512-4ea7…	Oct 30 2013
44da721c39cc	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10895 f3b2605a-c512-4ea7…	Oct 30 2013
3bb94fd4435d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10894 f3b2605a-c512-4ea7…	Oct 30 2013
64614a165723	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10893 f3b2605a-c512-4ea7…	Oct 30 2013
86e30ba171a4	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10892 f3b2605a-c512-4ea7…	Oct 30 2013
ee61fe304376	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10891 f3b2605a-c512-4ea7…	Oct 30 2013
166d6df67e91	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10890 f3b2605a-c512-4ea7…	Oct 30 2013
46d431811d9e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10889 f3b2605a-c512-4ea7…	Oct 30 2013
bb3809f5903a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10888 f3b2605a-c512-4ea7…	Oct 30 2013
6792813662c7	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10887 f3b2605a-c512-4ea7…	Oct 30 2013
6eff71257378	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10886 f3b2605a-c512-4ea7…	Oct 30 2013
85d15b93bc21	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10885 f3b2605a-c512-4ea7…	Oct 30 2013
e7946a6269c0	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10884 f3b2605a-c512-4ea7…	Oct 30 2013
129cbde709ae	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10883 f3b2605a-c512-4ea7…	Oct 29 2013
7e2670cf6dfb	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10882 f3b2605a-c512-4ea7…	Oct 29 2013
a8ef38ce7d14	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10881 f3b2605a-c512-4ea7…	Oct 29 2013

Changes (79)

				Path
	M			doc/Manual.html
	M			doc/Manual.txt
	M			doc/Section_commands.html
	M			doc/Section_start.html
	M			doc/Section_start.txt
	M			doc/compute_coord_atom.html
	M			doc/compute_coord_atom.txt
	M			doc/compute_rdf.html
	M			doc/compute_rdf.txt
	M			doc/dump_image.html
	M			doc/dump_image.txt
	M			doc/fix_append_atoms.html
	M			doc/fix_append_atoms.txt
	M			doc/fix_move.html
	M			doc/fix_move.txt
	M			doc/fix_nve_limit.html
	M			doc/fix_nve_limit.txt
	M			doc/pair_coul.html
	M			doc/pair_lj.html
	M			doc/pair_nb3b_harmonic.html
	M			doc/pair_nb3b_harmonic.txt
	M			doc/pair_nm.html
	M			doc/pair_tersoff_mod.html
	M			doc/pair_zbl.html
	M			doc/shell.html
	M			doc/shell.txt
	M			doc/variable.html
	M			doc/variable.txt
	M			src/ASPHERE/fix_nh_asphere.cpp
	M			src/MAKE/Makefile.altix
	M			src/MAKE/Makefile.bgl
	M			src/MAKE/Makefile.chama
	M			src/MAKE/Makefile.cygwin
	M			src/MAKE/Makefile.encanto
	M			src/MAKE/Makefile.fink
	M			src/MAKE/Makefile.g++
	M			src/MAKE/Makefile.g++3
	M			src/MAKE/Makefile.glory
	M			src/MAKE/Makefile.lam
	M			src/MAKE/Makefile.linux
	M			src/MAKE/Makefile.mac
	M			src/MAKE/Makefile.mac_mpi
	M			src/MAKE/Makefile.mkl
	M			src/MAKE/Makefile.odin
	M			src/MAKE/Makefile.openmpi
	M			src/MAKE/Makefile.pgi
	M			src/MAKE/Makefile.power5
	M			src/MAKE/Makefile.qed
	M			src/MAKE/Makefile.redsky
	M			src/MAKE/Makefile.sdsc
	M			src/MAKE/Makefile.seaborg
	M			src/MAKE/Makefile.serial
	M			src/MAKE/Makefile.serial-opt
	M			src/MAKE/Makefile.serial_debug
	M			src/MAKE/Makefile.sgi
	M			src/MAKE/Makefile.solaris
	M			src/MAKE/Makefile.spirit
	M			src/MAKE/Makefile.storm
	M			src/MAKE/Makefile.tacc
	M			src/MAKE/Makefile.tbird
	M			src/MAKE/Makefile.tesla
	M			src/MAKE/Makefile.tunnison
	M			src/MAKE/Makefile.xe6
	M			src/MAKE/Makefile.xt3
	M			src/MAKE/Makefile.xt5
	V			src/{MANYBODY ← USER-MISC}/pair_nb3b_harmonic.cpp
	V			src/{MANYBODY ← USER-MISC}/pair_nb3b_harmonic.h
	M			src/USER-MISC/README
	V			src/{USER-MISC → MANYBODY}/pair_nb3b_harmonic.cpp
	V			src/{USER-MISC → MANYBODY}/pair_nb3b_harmonic.h
	M			src/USER-OMP/pair_adp_omp.cpp
	M			src/USER-OMP/thr_data.cpp
	M			src/create_atoms.cpp
	M			src/dump_custom.cpp
	M			src/fix_nve_limit.cpp
	M			src/image.cpp
	M			src/pair_table.cpp
	M			src/set.cpp
	M			src/version.h

Merge remote branch 'lammps-ro/master' into lammps-icmscad4e3266db9Actions

Description

Details

Event Timeline

Merged Changes

Changes (79)

rLAMMPScad4e3266db9

doc/Manual.html

doc/Manual.txt

doc/Section_commands.html

doc/Section_start.html

doc/Section_start.txt

doc/compute_coord_atom.html

doc/compute_coord_atom.txt

doc/compute_rdf.html

doc/compute_rdf.txt

doc/dump_image.html

doc/dump_image.txt

doc/fix_append_atoms.html

doc/fix_append_atoms.txt

doc/fix_move.html

doc/fix_move.txt

doc/fix_nve_limit.html

doc/fix_nve_limit.txt

doc/pair_coul.html

doc/pair_lj.html

doc/pair_nb3b_harmonic.html

doc/pair_nb3b_harmonic.txt

doc/pair_nm.html

doc/pair_tersoff_mod.html

doc/pair_zbl.html

doc/shell.html

doc/shell.txt

doc/variable.html

doc/variable.txt

src/ASPHERE/fix_nh_asphere.cpp

src/MAKE/Makefile.altix

src/MAKE/Makefile.bgl

src/MAKE/Makefile.chama

src/MAKE/Makefile.cygwin

src/MAKE/Makefile.encanto

src/MAKE/Makefile.fink

src/MAKE/Makefile.g++

src/MAKE/Makefile.g++3

src/MAKE/Makefile.glory

src/MAKE/Makefile.lam

src/MAKE/Makefile.linux

src/MAKE/Makefile.mac

src/MAKE/Makefile.mac_mpi

src/MAKE/Makefile.mkl

src/MAKE/Makefile.odin

src/MAKE/Makefile.openmpi

src/MAKE/Makefile.pgi

src/MAKE/Makefile.power5

src/MAKE/Makefile.qed

src/MAKE/Makefile.redsky

src/MAKE/Makefile.sdsc

src/MAKE/Makefile.seaborg

src/MAKE/Makefile.serial

src/MAKE/Makefile.serial-opt

src/MAKE/Makefile.serial_debug

src/MAKE/Makefile.sgi

src/MAKE/Makefile.solaris

src/MAKE/Makefile.spirit

src/MAKE/Makefile.storm

src/MAKE/Makefile.tacc

src/MAKE/Makefile.tbird

src/MAKE/Makefile.tesla

src/MAKE/Makefile.tunnison

src/MAKE/Makefile.xe6

src/MAKE/Makefile.xt3

src/MAKE/Makefile.xt5

src/MANYBODY/pair_nb3b_harmonic.cpp

src/MANYBODY/pair_nb3b_harmonic.h

src/USER-MISC/README

src/USER-MISC/pair_nb3b_harmonic.cpp

src/USER-MISC/pair_nb3b_harmonic.h

src/USER-OMP/pair_adp_omp.cpp

src/USER-OMP/thr_data.cpp

src/create_atoms.cpp

Merge remote branch 'lammps-ro/master' into lammps-icms
cad4e3266db9
Actions