Merge commit d30f2cb6 from release-2020 into master
authorPaul Bauer <paul.bauer.q@gmail.com>
Tue, 7 Jan 2020 10:01:22 +0000 (11:01 +0100)
committerPaul Bauer <paul.bauer.q@gmail.com>
Tue, 7 Jan 2020 10:16:32 +0000 (11:16 +0100)
commit343c908495c27277ba46f21b66c26da8fe7e808a
tree55b65df49d8d72f18af21a0d3430d565e686f7c6
parentfae195879bdd587b374c0876af1aa272759618c3
parentd30f2cb6d8ef17d2bfffdfff5f2a79ef1e605fe3
Merge commit d30f2cb6 from release-2020 into master

Merging the release-2020 branch in stages to allow update to TPR format
to be cherry-picked in.

Change-Id: I36c0861d0cb6f17a3f4ff739fa868867844f2944
69 files changed:
admin/ci-templates/.regressiontest-template.yml
admin/copyright.py
cmake/gmxCPackUtilities.cmake
cmake/gmxVersionInfo.cmake
docs/CMakeLists.txt
docs/conf.py
docs/dev-manual/tools.rst
docs/release-notes/index.rst
docs/user-guide/environment-variables.rst
docs/user-guide/mdp-options.rst
docs/user-guide/mdrun-performance.rst
python_packaging/documentation/conf.py
python_packaging/src/gmxapi/_logging.py
python_packaging/src/gmxapi/commandline.py
python_packaging/src/gmxapi/datamodel.py
python_packaging/src/gmxapi/export_tprfile.cpp
python_packaging/src/gmxapi/operation.py
python_packaging/src/gmxapi/version.py
python_packaging/src/setup.py
src/api/CMakeLists.txt
src/api/cpp/CMakeLists.txt
src/gromacs/applied_forces/densityfittingforceprovider.cpp
src/gromacs/domdec/domdec.cpp
src/gromacs/domdec/domdec.h
src/gromacs/ewald/pme_load_balancing.cpp
src/gromacs/ewald/pme_load_balancing.h
src/gromacs/ewald/pme_only.cpp
src/gromacs/ewald/tests/pmetestcommon.cpp
src/gromacs/fileio/pdbio.cpp
src/gromacs/gmxana/anadih.cpp
src/gromacs/gmxana/angle_correction.cpp
src/gromacs/gmxana/angle_correction.h
src/gromacs/gmxana/cmat.cpp
src/gromacs/gmxana/gmx_angle.cpp
src/gromacs/gmxpreprocess/readir.cpp
src/gromacs/mdlib/energyoutput.cpp
src/gromacs/mdlib/energyoutput.h
src/gromacs/mdlib/forcerec.cpp
src/gromacs/mdlib/sim_util.cpp
src/gromacs/mdlib/tests/energyoutput.cpp
src/gromacs/mdlib/trajectory_writing.cpp
src/gromacs/mdrun/md.cpp
src/gromacs/mdrun/mimic.cpp
src/gromacs/mdrun/minimize.cpp
src/gromacs/mdrun/rerun.cpp
src/gromacs/mdrun/runner.cpp
src/gromacs/mdtypes/commrec.h
src/gromacs/mdtypes/state_propagator_data_gpu.h
src/gromacs/mdtypes/state_propagator_data_gpu_impl.cpp
src/gromacs/mdtypes/state_propagator_data_gpu_impl.h
src/gromacs/mdtypes/state_propagator_data_gpu_impl_gpu.cpp
src/gromacs/modularsimulator/computeglobalselement.cpp
src/gromacs/modularsimulator/energyelement.cpp
src/gromacs/modularsimulator/modularsimulator.cpp
src/gromacs/modularsimulator/modularsimulatorinterfaces.h
src/gromacs/modularsimulator/pmeloadbalancehelper.cpp
src/gromacs/modularsimulator/statepropagatordata.cpp
src/gromacs/modularsimulator/statepropagatordata.h
src/gromacs/nbnxm/cuda/nbnxm_buffer_ops_kernels.cuh
src/gromacs/nbnxm/cuda/nbnxm_cuda.cu
src/gromacs/pulling/pull.cpp
src/gromacs/pulling/pull.h
src/gromacs/taskassignment/decidegpuusage.cpp
src/gromacs/taskassignment/decidegpuusage.h
src/gromacs/timing/wallcycle.cpp
src/gromacs/timing/wallcycle.h
src/programs/mdrun/tests/CMakeLists.txt
src/programs/mdrun/tests/outputfiles.cpp
tests/CMakeLists.txt