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

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Jun 23 2016, 18:01.

Description

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

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Jun 23 2016, 18:01

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

	Commit			Author	Details	Committed
	fa7c2cea4d38			stamoor	Adding Kokkos mpi-only Makefile	Jun 22 2016

				Path
	M			src/MAKE/OPTIONS/Makefile.kokkos_cuda_openmpi
	P			src/MAKE/OPTIONS/Makefile.kokkos_mpi_only Copied from src/MAKE/OPTIONS/Makefile.kokkos_omp
	P			src/MAKE/OPTIONS/Makefile.kokkos_omp Copied to src/MAKE/OPTIONS/Makefile.kokkos_mpi_only
	M			src/MAKE/OPTIONS/Makefile.kokkos_phi