Workaround for ICC 19u5 and 20initial

Change-Id: I34f4215f2112579b1a92c87aca28b270b4aca09e

diff --git a/docs/release-notes/2019/2019.6.rst b/docs/release-notes/2019/2019.6.rst
index 68cb9a827bcbb857840836e92d4ec09cf33e0958..5218a809e991b2b3b02441cbd8fcfb66d1104bf2 100644 (file)
--- a/docs/release-notes/2019/2019.6.rst
+++ b/docs/release-notes/2019/2019.6.rst
@@ -22,6 +22,11 @@ Fixes for ``gmx`` tools
 Fixes that affect portability
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+Fix compiler errors with Intel compiler
+"""""""""""""""""""""""""""""""""""""""
+
+Fix compiler error with Intel compiler 2019 update 5 and 2020 initial release.
+Compilation was failing with ``mcpcom: core dumped`` for the file :file:`pullutil.cpp`.
 
 Miscellaneous
 ^^^^^^^^^^^^^

diff --git a/src/gromacs/pulling/pullutil.cpp b/src/gromacs/pulling/pullutil.cpp
index 40c2247f93a9624a75026b0ec9a6848a01674666..ad33117e18f20f577a320c80c9cb1dd3bab55635 100644 (file)
--- a/src/gromacs/pulling/pullutil.cpp
+++ b/src/gromacs/pulling/pullutil.cpp
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 1991-2000, University of Groningen, The Netherlands.
  * Copyright (c) 2001-2004, The GROMACS development team.
- * Copyright (c) 2013,2014,2015,2016,2017,2018,2019, by the GROMACS development team, led by
+ * Copyright (c) 2013,2014,2015,2016,2017,2018,2019,2020, 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.
@@ -526,6 +526,10 @@ static void sum_com_part_cosweight(const pull_group_work_t *pgrp,
 }
 
 /* calculates center of mass of selection index from all coordinates x */
+// Compiler segfault with 2019_update_5 and 2020_initial
+#if defined(__INTEL_COMPILER) && ((__INTEL_COMPILER == 1900 && __INTEL_COMPILER_UPDATE >= 5) || __INTEL_COMPILER >= 1910)
+#pragma intel optimization_level 2
+#endif
 void pull_calc_coms(const t_commrec *cr,
                     pull_t *pull,
                     const t_mdatoms *md,