Merge origin/release-2020 into master
authorPaul Bauer <paul.bauer.q@gmail.com>
Sat, 30 Nov 2019 10:58:42 +0000 (11:58 +0100)
committerPaul Bauer <paul.bauer.q@gmail.com>
Sat, 30 Nov 2019 10:58:42 +0000 (11:58 +0100)
commit6edce54dff1102ed59b8ab1c671b18c1702640bd
tree3fc3185180c76e13381e61f7e7acf529c28bf3e0
parent223a55d0a016c30b22fa619290745cc7432e84ea
parent6d99340aaa26cb242a0e5b6ac30b67194c0b1552
Merge origin/release-2020 into master

Resolved Conflicts:
src/gromacs/mdlib/update.cpp
src/gromacs/mdrun/md.cpp

Change-Id: Ibf1c632cc3096121dccd6c1c1af9bff3d590d18f
src/gromacs/mdlib/leapfrog_cuda.cu
src/gromacs/mdlib/leapfrog_cuda.cuh
src/gromacs/mdlib/lincs_cuda.cu
src/gromacs/mdlib/sim_util.cpp
src/gromacs/mdlib/update_constrain_cuda_impl.cu
src/gromacs/mdrun/runner.cpp
src/gromacs/mdtypes/state_propagator_data_gpu_impl_gpu.cpp