Homec4science
Diffusion lammps 01830d476bc0

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
jungeOct 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

CommitAuthorDetailsCommitted
3fea520ef980sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8614 f3b2605a-c512-4ea7… 
Aug 11 2012
f699bd6ca813sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8613 f3b2605a-c512-4ea7… 
Aug 11 2012
45ccb34ac32dsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8612 f3b2605a-c512-4ea7… 
Aug 11 2012
bb21105aa0c6sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8611 f3b2605a-c512-4ea7… 
Aug 11 2012
f44c7cdc3810sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8610 f3b2605a-c512-4ea7… 
Aug 11 2012
92549d638fa7sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8609 f3b2605a-c512-4ea7… 
Aug 11 2012
c78fd4c91fedsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8608 f3b2605a-c512-4ea7… 
Aug 11 2012
19986f631ddasjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8607 f3b2605a-c512-4ea7… 
Aug 11 2012
eb86735df2d0sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8606 f3b2605a-c512-4ea7… 
Aug 11 2012
01b7ac9e2056sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8605 f3b2605a-c512-4ea7… 
Aug 11 2012
58443251c31fsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8604 f3b2605a-c512-4ea7… 
Aug 11 2012
ee7f12334d6fsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8603 f3b2605a-c512-4ea7… 
Aug 11 2012
c6878811f01csjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8602 f3b2605a-c512-4ea7… 
Aug 11 2012
9d3193011b59sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8601 f3b2605a-c512-4ea7… 
Aug 11 2012
5004a8385b52sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8600 f3b2605a-c512-4ea7… 
Aug 11 2012
dafe40374bb0sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8599 f3b2605a-c512-4ea7… 
Aug 11 2012
59cce1ca8a83sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8598 f3b2605a-c512-4ea7… 
Aug 11 2012
6356cc0d182bsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8596 f3b2605a-c512-4ea7… 
Aug 10 2012
2c0647456fd7sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8595 f3b2605a-c512-4ea7… 
Aug 10 2012
d1ebba665244sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8593 f3b2605a-c512-4ea7… 
Aug 10 2012
9ca22112e8d9sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8592 f3b2605a-c512-4ea7… 
Aug 10 2012
6dbd12107376sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8591 f3b2605a-c512-4ea7… 
Aug 10 2012
b93e856411d2sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8590 f3b2605a-c512-4ea7… 
Aug 9 2012
6f73e8470de9sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8589 f3b2605a-c512-4ea7… 
Aug 9 2012

Changes (176)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.
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
Dcouple/lammps_spparks
V{couple → examples/COUPLE}/lammps_spparks/Makefile.g++
V{couple → examples/COUPLE}/lammps_spparks/README
Dcouple/lammps_spparks/image.lammps.1.png
Dcouple/lammps_spparks/image.lammps.10.png
Dcouple/lammps_spparks/image.lammps.20.png
Dcouple/lammps_spparks/image.spparks.1.png
Dcouple/lammps_spparks/image.spparks.10.png
Dcouple/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
Mdoc/Section_howto.html
Mdoc/Section_howto.txt
Mdoc/Section_python.html
Mdoc/Section_python.txt
Mdoc/Section_start.html
Mdoc/Section_start.txt
Mdoc/compute_property_local.html
Mdoc/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
Aexamples/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
Mexamples/README
Mpython/README
Mpython/lammps.py
Dpython/setup.py
Dpython/setup_serial.py
Msrc/MAKE/Makefile.altix
Msrc/MAKE/Makefile.bgl
Msrc/MAKE/Makefile.cygwin
Msrc/MAKE/Makefile.encanto
Msrc/MAKE/Makefile.fink
Msrc/MAKE/Makefile.g++
Msrc/MAKE/Makefile.g++3
Msrc/MAKE/Makefile.glory
Msrc/MAKE/Makefile.jaguar
Msrc/MAKE/Makefile.lam
Msrc/MAKE/Makefile.linux
Msrc/MAKE/Makefile.mac
Msrc/MAKE/Makefile.mac_mpi
Msrc/MAKE/Makefile.mingw
Msrc/MAKE/Makefile.mkl
Msrc/MAKE/Makefile.odin
Msrc/MAKE/Makefile.openmpi
Msrc/MAKE/Makefile.pgi
Msrc/MAKE/Makefile.power5
Msrc/MAKE/Makefile.qed
Msrc/MAKE/Makefile.redsky
Msrc/MAKE/Makefile.sdsc
Msrc/MAKE/Makefile.seaborg
Msrc/MAKE/Makefile.serial
Msrc/MAKE/Makefile.serial_debug
Msrc/MAKE/Makefile.sgi
Msrc/MAKE/Makefile.solaris
Msrc/MAKE/Makefile.spirit
Msrc/MAKE/Makefile.storm
Msrc/MAKE/Makefile.tacc
Msrc/MAKE/Makefile.tbird
Msrc/MAKE/Makefile.tesla
Msrc/MAKE/Makefile.tunnison
Msrc/MAKE/Makefile.xe6
Msrc/MAKE/Makefile.xt3
Msrc/MAKE/Makefile.xt5
Msrc/Make.sh
Msrc/Makefile
Msrc/Makefile.lib
Asrc/Makefile.shlib
Msrc/STUBS/Makefile
Msrc/USER-CUDA/pppm_cuda.cpp
Msrc/USER-CUDA/verlet_cuda.cpp
Msrc/compute_property_local.cpp
Msrc/compute_property_local.h
Msrc/input.cpp
Msrc/thermo.cpp
Msrc/version.h

rLAMMPS01830d476bc0

View Options

couple/fortran/README

View Options

couple/fortran/libfwrapper.c

View Options

couple/lammps_quest/Makefile.g++

View Options

couple/lammps_quest/README

View Options

couple/lammps_quest/in.lammps

View Options

couple/lammps_quest/lmppath.h

View Options

couple/lammps_quest/lmpqst.cpp

View Options

couple/lammps_quest/log.lammps.1

View Options

couple/lammps_quest/log.lammps.4

View Options

couple/lammps_quest/qstexe.h

View Options

couple/lammps_quest/si_111.in

View Options

couple/lammps_spparks

View Options

couple/lammps_spparks/Makefile.g++

View Options

couple/lammps_spparks/README

View Options

couple/lammps_spparks/image.lammps.1.png

View Options

couple/lammps_spparks/image.lammps.10.png

View Options

couple/lammps_spparks/image.lammps.20.png

View Options

couple/lammps_spparks/image.spparks.1.png

View Options

couple/lammps_spparks/image.spparks.10.png

View Options

couple/lammps_spparks/image.spparks.20.png

View Options

couple/lammps_spparks/in.spparks

View Options

couple/lammps_spparks/lmppath.h

View Options

couple/lammps_spparks/lmpspk.cpp

View Options

couple/lammps_spparks/log.lammps.1

View Options

couple/lammps_spparks/log.lammps.4

View Options

couple/lammps_spparks/log.spparks.1

View Options

couple/lammps_spparks/log.spparks.4

View Options

couple/lammps_spparks/spkpath.h

View Options

couple/library/Makefile.g++

View Options

couple/library/README

View Options

couple/library/error.cpp

View Options

couple/library/error.h

View Options

couple/library/files.cpp

View Options

couple/library/files.h

View Options

couple/library/irregular.cpp

View Options

couple/library/irregular.h

View Options

couple/library/lammps_data_write.cpp

View Options

couple/library/lammps_data_write.h

View Options

couple/library/many2many.cpp

View Options

couple/library/many2many.h

View Options

couple/library/many2one.cpp

View Options

couple/library/many2one.h

View Options

couple/library/memory.cpp

View Options

couple/library/memory.h

View Options

couple/library/one2many.cpp

View Options

couple/library/one2many.h

View Options

couple/library/send2one.cpp

View Options

couple/library/send2one.h

View Options

couple/simple/README

View Options

couple/simple/in.lj

View Options

couple/simple/log.simple.c++.1

View Options

couple/simple/log.simple.c++.4

View Options

couple/simple/simple.c

View Options

couple/simple/simple.cpp

View Options

couple/simple/simple.f90

View Options

doc/Section_howto.html

View Options

doc/Section_howto.txt

View Options

doc/Section_python.html

View Options

doc/Section_python.txt

View Options

doc/Section_start.html

View Options

doc/Section_start.txt

View Options

doc/compute_property_local.html

View Options

doc/compute_property_local.txt

View Options

examples/COUPLE/README

View Options

examples/COUPLE/fortran/README

View Options

examples/COUPLE/fortran/libfwrapper.c

View Options

examples/COUPLE/lammps_quest/Makefile.g++

View Options

examples/COUPLE/lammps_quest/README

View Options

examples/COUPLE/lammps_quest/in.lammps

View Options

examples/COUPLE/lammps_quest/lmppath.h

View Options

examples/COUPLE/lammps_quest/lmpqst.cpp

View Options

examples/COUPLE/lammps_quest/log.lammps.1

View Options

examples/COUPLE/lammps_quest/log.lammps.4

View Options

examples/COUPLE/lammps_quest/qstexe.h

View Options

examples/COUPLE/lammps_quest/si_111.in

View Options

examples/COUPLE/lammps_spparks/Makefile.g++

View Options

examples/COUPLE/lammps_spparks/README

View Options

examples/COUPLE/lammps_spparks/in.lammps

View Options

examples/COUPLE/lammps_spparks/in.spparks

View Options

examples/COUPLE/lammps_spparks/lmppath.h

View Options

examples/COUPLE/lammps_spparks/lmpspk.cpp

View Options

examples/COUPLE/lammps_spparks/log.lammps.1

View Options

examples/COUPLE/lammps_spparks/log.lammps.4

View Options

examples/COUPLE/lammps_spparks/log.spparks.1

View Options

examples/COUPLE/lammps_spparks/log.spparks.4

View Options

examples/COUPLE/lammps_spparks/spkpath.h

View Options

examples/COUPLE/library/Makefile.g++

View Options

examples/COUPLE/library/README

View Options

examples/COUPLE/library/error.cpp

View Options

examples/COUPLE/library/error.h

View Options

examples/COUPLE/library/files.cpp

View Options

examples/COUPLE/library/files.h

View Options

examples/COUPLE/library/irregular.cpp

View Options

examples/COUPLE/library/irregular.h

View Options

examples/COUPLE/library/lammps_data_write.cpp

View Options

examples/COUPLE/library/lammps_data_write.h

View Options

examples/COUPLE/library/many2many.cpp

View Options

examples/COUPLE/library/many2many.h

View Options

examples/COUPLE/library/many2one.cpp

View Options

examples/COUPLE/library/many2one.h

View Options

examples/COUPLE/library/memory.cpp

View Options

examples/COUPLE/library/memory.h

View Options

examples/COUPLE/library/one2many.cpp

View Options

examples/COUPLE/library/one2many.h

View Options

examples/COUPLE/library/send2one.cpp

View Options

examples/COUPLE/library/send2one.h

View Options

examples/COUPLE/simple/README

View Options

examples/COUPLE/simple/in.lj

View Options

examples/COUPLE/simple/log.simple.c++.1

View Options

examples/COUPLE/simple/log.simple.c++.4

View Options

examples/COUPLE/simple/simple.c

View Options

examples/COUPLE/simple/simple.cpp

View Options

examples/COUPLE/simple/simple.f90

View Options

examples/README

View Options

python/lammps.py

View Options

python/setup.py

View Options

python/setup_serial.py

View Options

src/MAKE/Makefile.altix

View Options

src/MAKE/Makefile.bgl

View Options

src/MAKE/Makefile.cygwin

View Options

src/MAKE/Makefile.encanto

View Options

src/MAKE/Makefile.fink

View Options

src/MAKE/Makefile.g++

View Options

src/MAKE/Makefile.g++3

View Options

src/MAKE/Makefile.glory

View Options

src/MAKE/Makefile.jaguar

View Options

src/MAKE/Makefile.lam

View Options

src/MAKE/Makefile.linux

View Options

src/MAKE/Makefile.mac

View Options

src/MAKE/Makefile.mac_mpi

View Options

src/MAKE/Makefile.mingw

View Options

src/MAKE/Makefile.mkl

View Options

src/MAKE/Makefile.odin

View Options

src/MAKE/Makefile.openmpi

View Options

src/MAKE/Makefile.pgi

View Options

src/MAKE/Makefile.power5

View Options

src/MAKE/Makefile.qed

View Options

src/MAKE/Makefile.redsky

View Options

src/MAKE/Makefile.sdsc

View Options

src/MAKE/Makefile.seaborg

View Options

src/MAKE/Makefile.serial

View Options

src/MAKE/Makefile.serial_debug

View Options

src/MAKE/Makefile.sgi

View Options

src/MAKE/Makefile.solaris

View Options

src/MAKE/Makefile.spirit

View Options

src/MAKE/Makefile.storm

View Options

src/MAKE/Makefile.tacc

View Options

src/MAKE/Makefile.tbird

View Options

src/MAKE/Makefile.tesla

View Options

src/MAKE/Makefile.tunnison

View Options

src/MAKE/Makefile.xe6

View Options

src/MAKE/Makefile.xt3

View Options

src/MAKE/Makefile.xt5

View Options

src/Makefile.lib

View Options

src/Makefile.shlib

View Options

src/STUBS/Makefile

View Options

src/USER-CUDA/pppm_cuda.cpp

View Options

src/USER-CUDA/verlet_cuda.cpp

View Options

src/compute_property_local.cpp

View Options

src/compute_property_local.h

View Options

src/thermo.cpp

c4science · Help