Merge branch 'master' into lammps-icms
01830d476bc0
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Aug 14 2012, 09:35.

Description

Merge branch 'master' into lammps-icms

Resolved Conflicts:
python/lammps.py
src/MAKE/Makefile.mingw
src/MAKE/Makefile.openmpi
src/MAKE/Makefile.serial
src/MAKE/Makefile.serial_debug
src/USER-CUDA/verlet_cuda.cpp

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Aug 14 2012, 09:35

Pushed

junge

Oct 6 2016, 16:49

Parents

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

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS01830d476bc0: Merge branch 'master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Aug 14 2012, 09:35

Merged Changes

Commit	Author	Details	Committed
3fea520ef980	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8614 f3b2605a-c512-4ea7…	Aug 11 2012
f699bd6ca813	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8613 f3b2605a-c512-4ea7…	Aug 11 2012
45ccb34ac32d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8612 f3b2605a-c512-4ea7…	Aug 11 2012
bb21105aa0c6	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8611 f3b2605a-c512-4ea7…	Aug 11 2012
f44c7cdc3810	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8610 f3b2605a-c512-4ea7…	Aug 11 2012
92549d638fa7	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8609 f3b2605a-c512-4ea7…	Aug 11 2012
c78fd4c91fed	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8608 f3b2605a-c512-4ea7…	Aug 11 2012
19986f631dda	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8607 f3b2605a-c512-4ea7…	Aug 11 2012
eb86735df2d0	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8606 f3b2605a-c512-4ea7…	Aug 11 2012
01b7ac9e2056	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8605 f3b2605a-c512-4ea7…	Aug 11 2012
58443251c31f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8604 f3b2605a-c512-4ea7…	Aug 11 2012
ee7f12334d6f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8603 f3b2605a-c512-4ea7…	Aug 11 2012
c6878811f01c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8602 f3b2605a-c512-4ea7…	Aug 11 2012
9d3193011b59	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8601 f3b2605a-c512-4ea7…	Aug 11 2012
5004a8385b52	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8600 f3b2605a-c512-4ea7…	Aug 11 2012
dafe40374bb0	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8599 f3b2605a-c512-4ea7…	Aug 11 2012
59cce1ca8a83	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8598 f3b2605a-c512-4ea7…	Aug 11 2012
6356cc0d182b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8596 f3b2605a-c512-4ea7…	Aug 10 2012
2c0647456fd7	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8595 f3b2605a-c512-4ea7…	Aug 10 2012
d1ebba665244	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8593 f3b2605a-c512-4ea7…	Aug 10 2012
9ca22112e8d9	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8592 f3b2605a-c512-4ea7…	Aug 10 2012
6dbd12107376	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8591 f3b2605a-c512-4ea7…	Aug 10 2012
b93e856411d2	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8590 f3b2605a-c512-4ea7…	Aug 9 2012
6f73e8470de9	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8589 f3b2605a-c512-4ea7…	Aug 9 2012

Changes (176)

		Path
V		{couple → examples/COUPLE}/README
V	(dir)	{couple/fortran/ → examples/COUPLE/fortran}
V		{couple → examples/COUPLE}/fortran/README
V		{couple → examples/COUPLE}/fortran/libfwrapper.c
V	(dir)	{couple/lammps_quest/ → examples/COUPLE/lammps_quest}
V		{couple → examples/COUPLE}/lammps_quest/Makefile.g++
V		{couple → examples/COUPLE}/lammps_quest/README
V		{couple → examples/COUPLE}/lammps_quest/in.lammps
V		{couple → examples/COUPLE}/lammps_quest/lmppath.h
V		{couple → examples/COUPLE}/lammps_quest/lmpqst.cpp
V		{couple → examples/COUPLE}/lammps_quest/log.lammps.1
V		{couple → examples/COUPLE}/lammps_quest/log.lammps.4
V		{couple → examples/COUPLE}/lammps_quest/qstexe.h
V		{couple → examples/COUPLE}/lammps_quest/si_111.in
D		couple/lammps_spparks
V		{couple → examples/COUPLE}/lammps_spparks/Makefile.g++
V		{couple → examples/COUPLE}/lammps_spparks/README
D		couple/lammps_spparks/image.lammps.1.png
D		couple/lammps_spparks/image.lammps.10.png
D		couple/lammps_spparks/image.lammps.20.png
D		couple/lammps_spparks/image.spparks.1.png
D		couple/lammps_spparks/image.spparks.10.png
D		couple/lammps_spparks/image.spparks.20.png
V		{couple → examples/COUPLE}/lammps_spparks/in.spparks
V		{couple → examples/COUPLE}/lammps_spparks/lmppath.h
V		{couple → examples/COUPLE}/lammps_spparks/lmpspk.cpp
V		{couple → examples/COUPLE}/lammps_spparks/log.lammps.1
V		{couple → examples/COUPLE}/lammps_spparks/log.lammps.4
V		{couple → examples/COUPLE}/lammps_spparks/log.spparks.1
V		{couple → examples/COUPLE}/lammps_spparks/log.spparks.4
V		{couple → examples/COUPLE}/lammps_spparks/spkpath.h
V	(dir)	{couple/library/ → examples/COUPLE/library}
V		{couple → examples/COUPLE}/library/Makefile.g++
V		{couple → examples/COUPLE}/library/README
V		{couple → examples/COUPLE}/library/error.cpp
V		{couple → examples/COUPLE}/library/error.h
V		{couple → examples/COUPLE}/library/files.cpp
V		{couple → examples/COUPLE}/library/files.h
V		{couple → examples/COUPLE}/library/irregular.cpp
V		{couple → examples/COUPLE}/library/irregular.h
V		{couple → examples/COUPLE}/library/lammps_data_write.cpp
V		{couple → examples/COUPLE}/library/lammps_data_write.h
V		{couple → examples/COUPLE}/library/many2many.cpp
V		{couple → examples/COUPLE}/library/many2many.h
V		{couple → examples/COUPLE}/library/many2one.cpp
V		{couple → examples/COUPLE}/library/many2one.h
V		{couple → examples/COUPLE}/library/memory.cpp
V		{couple → examples/COUPLE}/library/memory.h
V		{couple → examples/COUPLE}/library/one2many.cpp
V		{couple → examples/COUPLE}/library/one2many.h
V		{couple → examples/COUPLE}/library/send2one.cpp
V		{couple → examples/COUPLE}/library/send2one.h
V		{couple → examples/COUPLE}/simple/README
V		{couple → examples/COUPLE}/simple/in.lj
V		{couple → examples/COUPLE}/simple/log.simple.c++.1
V		{couple → examples/COUPLE}/simple/log.simple.c++.4
V		{couple → examples/COUPLE}/simple/simple.c
V		{couple → examples/COUPLE}/simple/simple.cpp
V		{couple → examples/COUPLE}/simple/simple.f90
M		doc/Section_howto.html
M		doc/Section_howto.txt
M		doc/Section_python.html
M		doc/Section_python.txt
M		doc/Section_start.html
M		doc/Section_start.txt
M		doc/compute_property_local.html
M		doc/compute_property_local.txt
A	(dir)	examples/COUPLE/
V		{examples/COUPLE ← couple}/README
V	(dir)	{examples/COUPLE/fortran/ ← couple/fortran}
V		{examples/COUPLE ← couple}/fortran/README
V		{examples/COUPLE ← couple}/fortran/libfwrapper.c
V	(dir)	{examples/COUPLE/lammps_quest/ ← couple/lammps_quest}
V		{examples/COUPLE ← couple}/lammps_quest/Makefile.g++
V		{examples/COUPLE ← couple}/lammps_quest/README
V		{examples/COUPLE ← couple}/lammps_quest/in.lammps
V		{examples/COUPLE ← couple}/lammps_quest/lmppath.h
V		{examples/COUPLE ← couple}/lammps_quest/lmpqst.cpp
V		{examples/COUPLE ← couple}/lammps_quest/log.lammps.1
V		{examples/COUPLE ← couple}/lammps_quest/log.lammps.4
V		{examples/COUPLE ← couple}/lammps_quest/qstexe.h
V		{examples/COUPLE ← couple}/lammps_quest/si_111.in
A	(dir)	examples/COUPLE/lammps_spparks/
V		{examples/COUPLE ← couple}/lammps_spparks/Makefile.g++
V		{examples/COUPLE ← couple}/lammps_spparks/README
A		examples/COUPLE/lammps_spparks/in.lammps
V		{examples/COUPLE ← couple}/lammps_spparks/in.spparks
V		{examples/COUPLE ← couple}/lammps_spparks/lmppath.h
V		{examples/COUPLE ← couple}/lammps_spparks/lmpspk.cpp
V		{examples/COUPLE ← couple}/lammps_spparks/log.lammps.1
V		{examples/COUPLE ← couple}/lammps_spparks/log.lammps.4
V		{examples/COUPLE ← couple}/lammps_spparks/log.spparks.1
V		{examples/COUPLE ← couple}/lammps_spparks/log.spparks.4
V		{examples/COUPLE ← couple}/lammps_spparks/spkpath.h
V	(dir)	{examples/COUPLE/library/ ← couple/library}
V		{examples/COUPLE ← couple}/library/Makefile.g++
V		{examples/COUPLE ← couple}/library/README
V		{examples/COUPLE ← couple}/library/error.cpp
V		{examples/COUPLE ← couple}/library/error.h
V		{examples/COUPLE ← couple}/library/files.cpp
V		{examples/COUPLE ← couple}/library/files.h
V		{examples/COUPLE ← couple}/library/irregular.cpp
V		{examples/COUPLE ← couple}/library/irregular.h
V		{examples/COUPLE ← couple}/library/lammps_data_write.cpp
V		{examples/COUPLE ← couple}/library/lammps_data_write.h
V		{examples/COUPLE ← couple}/library/many2many.cpp
V		{examples/COUPLE ← couple}/library/many2many.h
V		{examples/COUPLE ← couple}/library/many2one.cpp
V		{examples/COUPLE ← couple}/library/many2one.h
V		{examples/COUPLE ← couple}/library/memory.cpp
V		{examples/COUPLE ← couple}/library/memory.h
V		{examples/COUPLE ← couple}/library/one2many.cpp
V		{examples/COUPLE ← couple}/library/one2many.h
V		{examples/COUPLE ← couple}/library/send2one.cpp
V		{examples/COUPLE ← couple}/library/send2one.h
A	(dir)	examples/COUPLE/simple/
V		{examples/COUPLE ← couple}/simple/README
V		{examples/COUPLE ← couple}/simple/in.lj
V		{examples/COUPLE ← couple}/simple/log.simple.c++.1
V		{examples/COUPLE ← couple}/simple/log.simple.c++.4
V		{examples/COUPLE ← couple}/simple/simple.c
V		{examples/COUPLE ← couple}/simple/simple.cpp
V		{examples/COUPLE ← couple}/simple/simple.f90
M		examples/README
M		python/README
M		python/lammps.py
D		python/setup.py
D		python/setup_serial.py
M		src/MAKE/Makefile.altix
M		src/MAKE/Makefile.bgl
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.jaguar
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.mingw
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_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
M		src/Make.sh
M		src/Makefile
M		src/Makefile.lib
A		src/Makefile.shlib
M		src/STUBS/Makefile
M		src/USER-CUDA/pppm_cuda.cpp
M		src/USER-CUDA/verlet_cuda.cpp
M		src/compute_property_local.cpp
M		src/compute_property_local.h
M		src/input.cpp
M		src/thermo.cpp
M		src/version.h