Merge branch origin/release-2020 into master
authorPaul Bauer <paul.bauer.q@gmail.com>
Tue, 28 Jan 2020 10:11:22 +0000 (11:11 +0100)
committerPaul Bauer <paul.bauer.q@gmail.com>
Tue, 28 Jan 2020 10:11:22 +0000 (11:11 +0100)
commite74ff75bf1d0dacb0c7a0f7565dfef5e090af82f
tree649b8ba53ada04f53878c712e26bb547423979d5
parent85d9a0aa677544c9a53d205ab715a662566169be
parent133c12ee12284879ed75c910de3887bbc3dab68f
Merge branch origin/release-2020 into master

Resolved Conflicts:
admin/copyright.py
cmake/gmxCPackUtilities.cmake
cmake/gmxManageFFTLibraries.cmake
cmake/gmxManageMPI.cmake
cmake/gmxTestMPI_IN_PLACE.cmake
docs/dev-manual/jenkins.rst
src/gromacs/domdec/domdec.cpp
src/gromacs/ewald/pme_load_balancing.cpp
src/gromacs/gmxlib/network.cpp
src/gromacs/gmxlib/network.h
src/gromacs/gmxpreprocess/readir.cpp
src/gromacs/pulling/pullutil.cpp
src/gromacs/taskassignment/decidegpuusage.cpp
src/gromacs/topology/mtop_util.cpp
src/gromacs/topology/mtop_util.h

Change-Id: Ie41c4a18cc79368eba613a093cda9c8782eead2c
20 files changed:
cmake/gmxCPackUtilities.cmake
cmake/gmxManageFFTLibraries.cmake
cmake/gmxManageMPI.cmake
cmake/gmxTestMPI_IN_PLACE.cmake
docs/CMakeLists.txt
docs/user-guide/mdrun-performance.rst
src/gromacs/domdec/domdec.cpp
src/gromacs/domdec/domdec_setup.cpp
src/gromacs/ewald/pme_load_balancing.cpp
src/gromacs/gmxlib/network.cpp
src/gromacs/gmxlib/network.h
src/gromacs/gmxpreprocess/readir.cpp
src/gromacs/mdrun/runner.cpp
src/gromacs/mdrun/shellfc.cpp
src/gromacs/modularsimulator/modularsimulator.cpp
src/gromacs/pulling/pullutil.cpp
src/gromacs/taskassignment/decidegpuusage.cpp
src/gromacs/topology/mtop_util.cpp
src/gromacs/topology/mtop_util.h
src/gromacs/utility/coolstuff.cpp