Merge branch release-2018
authorMark Abraham <mark.j.abraham@gmail.com>
Wed, 28 Mar 2018 11:19:26 +0000 (13:19 +0200)
committerMark Abraham <mark.j.abraham@gmail.com>
Wed, 28 Mar 2018 11:28:03 +0000 (13:28 +0200)
commitafae302cfb3746319ea8b312936a5f4c3b7615f2
tree29e2e65fdc4830c3b329b9fdb3a005d4fc541f26
parentf6fce14e784a893865451f70590788935ede6229
parentf1712c3766eb80b52d1aab55b54d8b22cacfd68b
Merge branch release-2018

Some meaningful conflicts in init_multisim associated with multisim
fixes and clarifications in release-2018 combining with reorganization
in master branch.

Preserved the master-branch pre-submit matrix, since all branches have
separate changes that cope with gpu_id=2 no longer being valid.

Change-Id: Idefe4f1ec3bbbc76dfedf03a81abef8233328de2
cmake/gmxVersionInfo.cmake
docs/CMakeLists.txt
docs/user-guide/mdrun-performance.rst
src/gromacs/fileio/checkpoint.cpp
src/gromacs/mdlib/main.cpp
src/gromacs/pulling/pull.cpp
src/programs/mdrun/md.cpp