Diffusion lammps 1cf0e40793db

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

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Mar 11 2016, 12:45.

Description

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

#Resolved Conflicts:

doc/Manual.txt
src/MAKE/MACHINES/Makefile.mingw32-cross
src/MAKE/MACHINES/Makefile.mingw32-cross-mpi
src/MAKE/MACHINES/Makefile.mingw64-cross
src/MAKE/MACHINES/Makefile.mingw64-cross-mpi
src/MAKE/MINE/Makefile.g++
src/MAKE/Makefile.mpi
src/MAKE/Makefile.serial
src/Make.py
src/Makefile

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Mar 11 2016, 12:45

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPSa946de0b0395: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14738 f3b2605a-c512-4ea7…
rLAMMPS93af809806c0: reduce 4 MPI tasks to 2 to for docker based TravisCI. try to use parallel make.

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS1cf0e40793db: Merge remote-tracking branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Mar 11 2016, 12:45

Merged Changes

Commit	Author	Details	Committed
a946de0b0395	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14738 f3b2605a-c512-4ea7…	Mar 10 2016
7c9022e3d5c4	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14737 f3b2605a-c512-4ea7…	Mar 10 2016
f5ceb5b292fd	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14736 f3b2605a-c512-4ea7…	Mar 10 2016
109b9bab2811	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14735 f3b2605a-c512-4ea7…	Mar 10 2016
f620bcc4f97f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14734 f3b2605a-c512-4ea7…	Mar 10 2016
047c55383acc	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14732 f3b2605a-c512-4ea7…	Mar 10 2016
b3890e80cb0a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14731 f3b2605a-c512-4ea7…	Mar 10 2016
8412d4a96cd9	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14730 f3b2605a-c512-4ea7…	Mar 10 2016
52f20bbbd510	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14729 f3b2605a-c512-4ea7…	Mar 10 2016
247bf33d63c1	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14728 f3b2605a-c512-4ea7…	Mar 10 2016

Changes (90)

		Path
A		doc/JPG/tutorial_branch.png
A		doc/JPG/tutorial_fork.png
A		doc/JPG/tutorial_https_block.png
A		doc/JPG/tutorial_merged.png
A		doc/JPG/tutorial_pull_request2.png
A		doc/JPG/tutorial_pull_request3.png
A		doc/JPG/tutorial_pull_request4.png
A		doc/JPG/tutorial_pull_request_feature_branch1.png
M		doc/Manual.html
M		doc/Manual.txt
M		doc/Section_modify.html
M		doc/Section_modify.txt
A		doc/_images/tutorial_branch.png
A		doc/_images/tutorial_fork.png
A		doc/_images/tutorial_https_block.png
A		doc/_images/tutorial_merged.png
A		doc/_images/tutorial_pull_request2.png
A		doc/_images/tutorial_pull_request3.png
A		doc/_images/tutorial_pull_request4.png
A		doc/_images/tutorial_pull_request_feature_branch1.png
M		doc/_sources/Section_modify.txt
M		doc/_sources/create_atoms.txt
M		doc/create_atoms.html
M		doc/create_atoms.txt
M		doc/searchindex.js
A		doc/tutorial_github.html
A		doc/tutorial_github.txt
A	(dir)	src/DEPEND/
P		src/DEPEND/fastdep.c Copied from tools/fastdep.c
M		src/MAKE/MACHINES/Makefile.beacon
M		src/MAKE/MACHINES/Makefile.bgl
M		src/MAKE/MACHINES/Makefile.bgq
M		src/MAKE/MACHINES/Makefile.bgq.details
M		src/MAKE/MACHINES/Makefile.chama
M		src/MAKE/MACHINES/Makefile.cygwin
M		src/MAKE/MACHINES/Makefile.glory
M		src/MAKE/MACHINES/Makefile.jaguar
M		src/MAKE/MACHINES/Makefile.mac
M		src/MAKE/MACHINES/Makefile.mac_mpi
M		src/MAKE/MACHINES/Makefile.mingw32-cross
M		src/MAKE/MACHINES/Makefile.mingw32-cross-mpi
M		src/MAKE/MACHINES/Makefile.mingw64-cross
M		src/MAKE/MACHINES/Makefile.mingw64-cross-mpi
M		src/MAKE/MACHINES/Makefile.myrinet
M		src/MAKE/MACHINES/Makefile.power
M		src/MAKE/MACHINES/Makefile.redsky
M		src/MAKE/MACHINES/Makefile.serial
M		src/MAKE/MACHINES/Makefile.stampede
M		src/MAKE/MACHINES/Makefile.storm
M		src/MAKE/MACHINES/Makefile.tacc
M		src/MAKE/MACHINES/Makefile.ubuntu
M		src/MAKE/MACHINES/Makefile.ubuntu_simple
M		src/MAKE/MACHINES/Makefile.xe6
M		src/MAKE/MACHINES/Makefile.xt3
M		src/MAKE/MACHINES/Makefile.xt5
P		src/MAKE/MINE/Makefile.auto Copied from src/MAKE/OPTIONS/Makefile.mpich_native_g++
M		src/MAKE/MINE/Makefile.g++
P		src/MAKE/MINE/Makefile.icc Copied from src/MAKE/OPTIONS/Makefile.mpich_native_icc
P		src/MAKE/MINE/Makefile.openmpi_g++ Copied from src/MAKE/Makefile.serial
P		src/MAKE/MINE/Makefile.openmpi_icc Copied from src/MAKE/Makefile.serial
M		src/MAKE/Makefile.mpi
P		src/MAKE/Makefile.mpi.old Copied from src/MAKE/OPTIONS/Makefile.opt
P		src/MAKE/Makefile.serial Copied to multiple locations: src/MAKE/MINE/Makefile.openmpi_g++ src/MAKE/MINE/Makefile.openmpi_icc
P		src/MAKE/Makefile.serial.old Copied from src/MAKE/OPTIONS/Makefile.serial_icc
M		src/MAKE/OPTIONS/Makefile.fftw
M		src/MAKE/OPTIONS/Makefile.intel_cpu
M		src/MAKE/OPTIONS/Makefile.intel_knl
M		src/MAKE/OPTIONS/Makefile.intel_phi
M		src/MAKE/OPTIONS/Makefile.jpeg
M		src/MAKE/OPTIONS/Makefile.knl
M		src/MAKE/OPTIONS/Makefile.kokkos_cuda
M		src/MAKE/OPTIONS/Makefile.kokkos_omp
M		src/MAKE/OPTIONS/Makefile.kokkos_phi
M		src/MAKE/OPTIONS/Makefile.mpi_fastmgpt
M		src/MAKE/OPTIONS/Makefile.mpich_g++
M		src/MAKE/OPTIONS/Makefile.mpich_icc
P		src/MAKE/OPTIONS/Makefile.mpich_native_g++ Copied to src/MAKE/MINE/Makefile.auto
P		src/MAKE/OPTIONS/Makefile.mpich_native_icc Copied to src/MAKE/MINE/Makefile.icc
M		src/MAKE/OPTIONS/Makefile.omp
M		src/MAKE/OPTIONS/Makefile.ompi_g++
M		src/MAKE/OPTIONS/Makefile.ompi_icc
M		src/MAKE/OPTIONS/Makefile.ompi_native_g++
M		src/MAKE/OPTIONS/Makefile.ompi_native_icc
P		src/MAKE/OPTIONS/Makefile.opt Copied to src/MAKE/Makefile.mpi.old
M		src/MAKE/OPTIONS/Makefile.pgi
M		src/MAKE/OPTIONS/Makefile.png
P		src/MAKE/OPTIONS/Makefile.serial_icc Copied to src/MAKE/Makefile.serial.old
M		src/Make.py
M		src/Makefile
M		src/version.h