Diffusion lammps df8af5e1d75b

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

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Apr 21 2016, 12:21.

Description

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

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Apr 21 2016, 12:21

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS2ce937a07090: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14857 f3b2605a-c512-4ea7…
rLAMMPSda6585d247c4: fix equation for improper umbrella

Branches

Unknown

Tags

Unknown

Event Timeline

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

Merged Changes

Commit	Author	Details	Committed
2ce937a07090	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14857 f3b2605a-c512-4ea7…	Apr 21 2016
95c1623665e7	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14856 f3b2605a-c512-4ea7…	Apr 21 2016
93bc5c8be6c8	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14855 f3b2605a-c512-4ea7…	Apr 21 2016
99209263b541	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14854 f3b2605a-c512-4ea7…	Apr 21 2016
83cd2e5932ef	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14853 f3b2605a-c512-4ea7…	Apr 21 2016
778165ed4bd6	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14852 f3b2605a-c512-4ea7…	Apr 21 2016
6bab5880f529	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14851 f3b2605a-c512-4ea7…	Apr 21 2016
cc11bb9de8eb	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14850 f3b2605a-c512-4ea7…	Apr 20 2016
268d59866f0a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14849 f3b2605a-c512-4ea7…	Apr 20 2016
b1ab6b98e61a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14848 f3b2605a-c512-4ea7…	Apr 20 2016

Changes (41)

				Path
	M			src/MAKE/Makefile.mpi
	D			src/MAKE/Makefile.mpi.old
	M			src/MAKE/Makefile.serial
	D			src/MAKE/Makefile.serial.old
	P			src/MAKE/OPTIONS/Makefile.big Copied from src/MAKE/OPTIONS/Makefile.opt
	M			src/MAKE/OPTIONS/Makefile.fftw
	V			src/MAKE/OPTIONS/{Makefile.g++_mpich ← Makefile.mpich_g++}
	V			src/MAKE/OPTIONS/{Makefile.g++_mpich_link ← Makefile.mpich_native_g++}
	V			src/MAKE/OPTIONS/{Makefile.g++_openmpi ← Makefile.ompi_g++}
	V			src/MAKE/OPTIONS/{Makefile.g++_openmpi_link ← Makefile.ompi_native_g++}
	P			src/MAKE/OPTIONS/Makefile.g++_serial Copied from src/MAKE/OPTIONS/Makefile.serial_icc
	P			src/MAKE/OPTIONS/Makefile.gpu Copied from src/MAKE/OPTIONS/Makefile.opt
	V			src/MAKE/OPTIONS/{Makefile.icc_mpich ← Makefile.mpich_icc}
	P			src/MAKE/OPTIONS/Makefile.icc_mpich_link Copied from src/MAKE/OPTIONS/Makefile.mpich_native_icc
	V			src/MAKE/OPTIONS/{Makefile.icc_openmpi ← Makefile.ompi_icc}
	V			src/MAKE/OPTIONS/{Makefile.icc_openmpi_link ← Makefile.ompi_native_icc}
	V			src/MAKE/OPTIONS/{Makefile.icc_serial ← Makefile.serial_icc}
	P			src/MAKE/OPTIONS/Makefile.intel_cpu Deleted after being copied to multiple locations: src/MAKE/OPTIONS/Makefile.intel_cpu_intelmpi src/MAKE/OPTIONS/Makefile.intel_cpu_openmpi
	P			src/MAKE/OPTIONS/Makefile.intel_cpu_intelmpi Copied from src/MAKE/OPTIONS/Makefile.intel_cpu
	V			src/MAKE/OPTIONS/{Makefile.intel_cpu_mpich ← Makefile.mpich_native_icc}
	V			src/MAKE/OPTIONS/{Makefile.intel_cpu_openmpi ← Makefile.intel_cpu}
	P			src/MAKE/OPTIONS/Makefile.kokkos_cuda Deleted after being copied to multiple locations: src/MAKE/OPTIONS/Makefile.kokkos_cuda_mpich src/MAKE/OPTIONS/Makefile.kokkos_cuda_openmpi
	P			src/MAKE/OPTIONS/Makefile.kokkos_cuda_mpich Copied from src/MAKE/OPTIONS/Makefile.kokkos_cuda
	V			src/MAKE/OPTIONS/{Makefile.kokkos_cuda_openmpi ← Makefile.kokkos_cuda}
	P			src/MAKE/OPTIONS/Makefile.kokkos_omp Copied to src/MAKE/OPTIONS/Makefile.mgptfast
	P			src/MAKE/OPTIONS/Makefile.mgptfast Copied from src/MAKE/OPTIONS/Makefile.kokkos_omp
	D			src/MAKE/OPTIONS/Makefile.mpi_fastmgpt
	V			src/MAKE/OPTIONS/{Makefile.mpich_g++ → Makefile.g++_mpich}
	V			src/MAKE/OPTIONS/{Makefile.mpich_icc → Makefile.icc_mpich}
	V			src/MAKE/OPTIONS/{Makefile.mpich_native_g++ → Makefile.g++_mpich_link}
	P			src/MAKE/OPTIONS/Makefile.mpich_native_icc Deleted after being copied to multiple locations: src/MAKE/OPTIONS/Makefile.icc_mpich_link src/MAKE/OPTIONS/Makefile.intel_cpu_mpich
	M			src/MAKE/OPTIONS/Makefile.omp
	V			src/MAKE/OPTIONS/{Makefile.ompi_g++ → Makefile.g++_openmpi}
	V			src/MAKE/OPTIONS/{Makefile.ompi_icc → Makefile.icc_openmpi}
	V			src/MAKE/OPTIONS/{Makefile.ompi_native_g++ → Makefile.g++_openmpi_link}
	V			src/MAKE/OPTIONS/{Makefile.ompi_native_icc → Makefile.icc_openmpi_link}
	P			src/MAKE/OPTIONS/Makefile.opt Copied to multiple locations: src/MAKE/OPTIONS/Makefile.big src/MAKE/OPTIONS/Makefile.gpu
	V			src/MAKE/OPTIONS/{Makefile.pgi → Makefile.pgi_mpich_link}
	V			src/MAKE/OPTIONS/{Makefile.pgi_mpich_link ← Makefile.pgi}
	P			src/MAKE/OPTIONS/Makefile.serial_icc Deleted after being copied to multiple locations: src/MAKE/OPTIONS/Makefile.g++_serial src/MAKE/OPTIONS/Makefile.icc_serial
	M			src/MAKE/README