Merge remote-tracking branch 'origin/release-2021' into master
authorAndrey Alekseenko <al42and@gmail.com>
Tue, 14 Sep 2021 17:16:06 +0000 (20:16 +0300)
committerAndrey Alekseenko <al42and@gmail.com>
Tue, 14 Sep 2021 17:20:56 +0000 (20:20 +0300)
commitf5975e9ff9d7ecfb83e4943fd45e321c2f036708
tree1e0af99ed508817a4e09824f1ab39f3702ae69dd
parent2436419e537701ae0d611c4c9a3ff5d5665e72fa
parent3a78d26fe27ef5f3ea5617c83071a4f218c67d2c
Merge remote-tracking branch 'origin/release-2021' into master

Conflicts:
cmake/gmxVersionInfo.cmake
src/gromacs/ewald/pme_gather.cu
src/gromacs/ewald/pme_gpu_calculate_splines.cuh
src/gromacs/ewald/pme_gpu_internal.cpp
src/gromacs/ewald/tests/pmetestcommon.cpp
src/gromacs/gmxana/gmx_cluster.cpp
src/gromacs/gmxpreprocess/gen_vsite.cpp
src/gromacs/simd/support.cpp
src/gromacs/tools/trjconv.cpp
19 files changed:
cmake/gmxVersionInfo.cmake
docs/user-guide/mdrun-performance.rst
src/gromacs/analysisdata/modules/histogram.h
src/gromacs/ewald/pme_gather.cu
src/gromacs/ewald/pme_gpu_calculate_splines.cuh
src/gromacs/ewald/pme_gpu_internal.cpp
src/gromacs/ewald/pme_spread.clh
src/gromacs/ewald/pme_spread.cu
src/gromacs/ewald/tests/pmetestcommon.cpp
src/gromacs/gmxana/gmx_dielectric.cpp
src/gromacs/gmxana/gmx_rmsf.cpp
src/gromacs/gmxana/gmx_wham.cpp
src/gromacs/gmxpreprocess/gen_vsite.cpp
src/gromacs/gmxpreprocess/readir.cpp
src/gromacs/linearalgebra/eigensolver.cpp
src/gromacs/simd/support.cpp
src/gromacs/tools/eneconv.cpp
src/gromacs/tools/trjconv.cpp
src/gromacs/utility/coolstuff.cpp