Merge remote branch release-2018 into release-2019

Change-Id: Ie5a4add2fe010bc94c00418a728f01d3aac6cb9d

diff --combined src/gromacs/simd/tests/simd_floatingpoint_util.cpp
index 72912172a33f97575d5d9c98a71024aadc84006c,472808fb7346f299de28ae8141b3644166a0e56d..fe4eece00196dca4501327b4328aefdb1138fa3e
--- 1/src/gromacs/simd/tests/simd_floatingpoint_util.cpp
--- 2/src/gromacs/simd/tests/simd_floatingpoint_util.cpp
+++ b/src/gromacs/simd/tests/simd_floatingpoint_util.cpp
@@@ -1,7 -1,7 +1,7 @@@
  /*
   * This file is part of the GROMACS molecular simulation package.
   *
-  * Copyright (c) 2015,2017,2018, by the GROMACS development team, led by
 - * Copyright (c) 2015,2017,2019, by the GROMACS development team, led by
++ * Copyright (c) 2015,2017,2018,2019, by the GROMACS development team, led by
   * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
   * and including many others, as listed in the AUTHORS file in the
   * top-level source directory and at http://www.gromacs.org.
@@@ -467,6 -467,9 +467,9 @@@ TEST_F(SimdFloatingpointUtilTest, trans
          mem0_[j] = refmem[j] = (1000.0 + j) * (1.0 + 100*GMX_REAL_EPS);
      }
  
+ #ifdef __INTEL_COMPILER  //Bug in (at least) 19u1 and 18u5 (03424712)
+     #pragma novector
+ #endif
      for (std::size_t j = 0; j < GMX_SIMD_REAL_WIDTH; j++)
      {
          // Subtract values from _reference_ memory (we will then test with mem0_, and compare)
@@@ -991,6 -994,6 +994,6 @@@ TEST_F(SimdFloatingpointUtilTest, loadU
  /*! \} */
  /*! \endcond */
  
 -}      // namespace
 -}      // namespace
 -}      // namespace
 +}  // namespace
 +}  // namespace test
 +}  // namespace gmx