Merge branch release-2019 into master
authorPaul Bauer <paul.bauer.q@gmail.com>
Mon, 23 Sep 2019 07:44:00 +0000 (09:44 +0200)
committerPaul Bauer <paul.bauer.q@gmail.com>
Tue, 24 Sep 2019 14:59:39 +0000 (16:59 +0200)
commit824eca4e8ffea4525ddb0703e98f17aae1339eff
tree7d727b49e44b5f8fd98355fd516b16ab2662b44f
parent57466565687dcf86b6867fff52f45d2305d80f6b
parentdbb8f7cc4b39f998a3cae9baf80e488e37d0927f
Merge branch release-2019 into master

Resolved Conflicts:
cmake/gmxDetectCpu.cmake
src/gromacs/gmxpreprocess/topshake.cpp
src/gromacs/listed-forces/bonded.cpp
src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_data_mgmt.cu
src/gromacs/mdlib/nbnxn_gpu.h
src/gromacs/mdlib/nbnxn_ocl/nbnxn_ocl.cpp
src/gromacs/mdlib/nbnxn_ocl/nbnxn_ocl_data_mgmt.cpp

This does not include the change to the MPI_COMPILE flags handling,
as the code in master has been reorganized in a way that is incompatible
to that.

Change-Id: Idb1da69ce68f3121442859e8cbe24495c7894726
cmake/gmxManageMPI.cmake
src/gromacs/gmxpreprocess/topshake.cpp
src/gromacs/listed_forces/bonded.cpp
src/gromacs/nbnxm/cuda/nbnxm_cuda_data_mgmt.cu
src/gromacs/nbnxm/nbnxm_gpu.h
src/gromacs/nbnxm/opencl/nbnxm_ocl.cpp
src/gromacs/nbnxm/opencl/nbnxm_ocl_data_mgmt.cpp
src/gromacs/simd/support.cpp