From 9aeea986d5fe040ce51d7f6006bf361626884b3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lorenz=20H=C3=BCdepohl?= <lorenz.huedepohl@rzg.mpg.de>
Date: Mon, 10 Feb 2020 14:06:09 +0100
Subject: [PATCH] Support pgi + openmpi combination

---
 mpcdf_common.py | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/mpcdf_common.py b/mpcdf_common.py
index 94df2c6..aa0145e 100644
--- a/mpcdf_common.py
+++ b/mpcdf_common.py
@@ -120,11 +120,16 @@ def mpi_module(mpi_repo):
 
 
 def valid_pgi_mpi(pgi, mpi):
-    if "impi" not in mpi:
-        return False
-    if "2017" in mpi:
-        return False
-    return True
+    if "impi" in mpi:
+        if "2017" in mpi:
+            return False
+        else:
+            return True
+
+    if "openmpi_4" == mpi:
+        return True
+
+    return False
 
 
 def valid_mpi(compiler, mpi):
-- 
GitLab