Merge branch 'release-2016'
commit7798d7486bf6fa3281c2e8852d64f13fbddd4b1d
authorSzilárd Páll <pall.szilard@gmail.com>
Mon, 11 Sep 2017 17:33:09 +0000 (11 19:33 +0200)
committerBerk Hess <hess@kth.se>
Tue, 12 Sep 2017 06:47:39 +0000 (12 08:47 +0200)
treed78746066d59a62e0388f2da40b41e80804258cd
parent3fd80b78cb49c45eab7242e546f4df9fe7201042
parentbb4128daf630719a670dc795b2cf2cc937c2c8f1
Merge branch 'release-2016'

Note that changes to the simd_math module/tests from the 2016 branch
were omitted in favor of the current code in master.

Conflicts:
src/gromacs/fileio/oenv.cpp
src/gromacs/fileio/oenv.h
src/gromacs/gmxlib/nonbonded/CMakeLists.txt
src/gromacs/hardware/cpuinfo.cpp
src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernel.cuh
src/gromacs/simd/simd_math.h
src/gromacs/simd/tests/simd_math.cpp
src/gromacs/swap/swapcoords.cpp

Change-Id: I357e40f97fd53a34ff900f40bb3fdeb20d864c13
16 files changed:
CMakeLists.txt
cmake/gmxManageFFTLibraries.cmake
docs/install-guide/index.rst
docs/user-guide/environment-variables.rst
src/gromacs/fileio/oenv.cpp
src/gromacs/fileio/oenv.h
src/gromacs/fileio/trxio.cpp
src/gromacs/gmxlib/nonbonded/CMakeLists.txt
src/gromacs/hardware/cpuinfo.cpp
src/gromacs/hardware/cpuinfo.h
src/gromacs/mdlib/md_support.cpp
src/gromacs/mdlib/nbnxn_cuda/nbnxn_cuda_kernel.cuh
src/gromacs/simd/simd_math.h
src/gromacs/swap/swapcoords.cpp
src/gromacs/tables/forcetable.cpp
src/gromacs/utility/sysinfo.cpp