Merge branch release-2021
authorMark Abraham <mark.j.abraham@gmail.com>
Fri, 18 Dec 2020 07:23:07 +0000 (08:23 +0100)
committerMark Abraham <mark.j.abraham@gmail.com>
Fri, 18 Dec 2020 07:41:23 +0000 (08:41 +0100)
commit252cfee1253d5c78e8eca9243b03ecdcc542ae1a
tree1789febea8a11229f8f45bb7d649c368c2b4d440
parentfdfc58342a6911b18a3d2916f3c07f45b9a204a2
parentc1a0727c81b010ef83b8c878513b8d58299b236c
Merge branch release-2021

Some reformatting changes needed for the difference in
.clang-format in the two branches
34 files changed:
CMakeLists.txt
admin/gitlab-ci/global.gitlab-ci.yml
admin/gitlab-ci/gromacs.gitlab-ci.yml
admin/gitlab-ci/python-gmxapi02.gitlab-ci.yml
admin/gitlab-ci/python-gmxapi03.gitlab-ci.yml
api/CMakeLists.txt
api/nblib/gmxsetup.cpp
cmake/gmxVersionInfo.cmake
docs/release-notes/2021/major/deprecated-functionality.rst
python_packaging/src/setup.py
src/gromacs/ewald/pme_load_balancing.cpp
src/gromacs/fileio/checkpoint.cpp
src/gromacs/fileio/tests/CMakeLists.txt
src/gromacs/gmxlib/nonbonded/nb_free_energy.cpp
src/gromacs/mdlib/forcerec.cpp
src/gromacs/mdrun/runner.cpp
src/gromacs/mdtypes/checkpointdata.h
src/gromacs/modularsimulator/checkpointhelper.h
src/gromacs/modularsimulator/energydata.cpp
src/gromacs/modularsimulator/freeenergyperturbationdata.cpp
src/gromacs/modularsimulator/modularsimulator.cpp
src/gromacs/modularsimulator/statepropagatordata.cpp
src/gromacs/nbnxm/benchmark/bench_setup.cpp
src/gromacs/nbnxm/cuda/nbnxm_cuda_kernel.cuh
src/gromacs/nbnxm/opencl/nbnxm_ocl_kernel.clh
src/gromacs/simd/impl_arm_sve/impl_arm_sve_simd_double.h
src/gromacs/simd/impl_arm_sve/impl_arm_sve_simd_float.h
src/gromacs/utility/keyvaluetree.cpp
src/programs/CMakeLists.txt
src/programs/mdrun/tests/CMakeLists.txt
src/programs/mdrun/tests/checkpoint.cpp
src/programs/mdrun/tests/exactcontinuation.cpp
src/programs/mdrun/tests/freeenergy.cpp
src/programs/mdrun/tests/simulator.cpp