From bc56087314ddab84fae3aed9d7a189de1902760a Mon Sep 17 00:00:00 2001
From: Martin Diehl <mail@martin-diehl.net>
Date: Thu, 26 Nov 2020 08:12:35 +0100
Subject: [PATCH] [skip ci] versions on matesting

---
 .gitlab-ci.yml | 33 ++++++++++++++++-----------------
 env/CONFIG     |  2 +-
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 99c309419..508869d7e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -48,30 +48,29 @@ variables:
   # Names of module files to load
   # ===============================================================================================
   # ++++++++++++ Compiler +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-  IntelCompiler17_8:               "Compiler/Intel/17.8 Libraries/IMKL/2017"
-  IntelCompiler18_4:               "Compiler/Intel/18.4 Libraries/IMKL/2018"
-  GNUCompiler8_2:                  "Compiler/GNU/8.2"
+  IntelCompiler19_1:               "Compiler/Intel/19.1.2 Libraries/IMKL/2020"
+  GNUCompiler10:                   "Compiler/GNU/10"
   # ------------ Defaults ----------------------------------------------
-  IntelCompiler:                   "$IntelCompiler18_4"
-  GNUCompiler:                     "$GNUCompiler8_2"
+  IntelCompiler:                   "$IntelCompiler19_1"
+  GNUCompiler:                     "$GNUCompiler10"
   # ++++++++++++ MPI ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-  IMPI2018Intel18_4:               "MPI/Intel/18.4/IntelMPI/2018"
-  MPICH3_3GNU8_2:                  "MPI/GNU/8.2/MPICH/3.3"
+  IMPI2020Intel19_1:               "MPI/Intel/19.1/IntelMPI/2020"
+  OMPI4_0GNU10:                    "MPI/GNU/10/OpenMPI/4.0.5"
   # ------------ Defaults ----------------------------------------------
-  MPICH_Intel:                     "$IMPI2018Intel18_4"
-  MPICH_GNU:                       "$MPICH3_3GNU8_2"
+  MPI_Intel:                       "$IMPI2020Intel19_1"
+  MPI_GNU:                         "$OMPI4_0GNU10"
   # ++++++++++++ PETSc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-  PETSc3_10_3IMPI2018Intel18_4:    "Libraries/PETSc/3.10.3/Intel-18.4-IntelMPI-2018"
-  PETSc3_10_3MPICH3_3GNU8_2:       "Libraries/PETSc/3.10.3/GNU-8.2-MPICH-3.3"
+  PETSc3_14_0IMPI2020Intel19_1:    "Libraries/PETSc/3.14.0/Intel-19.1-IntelMPI-2020"
+  PETSc3_14_0OMPI4_0GNU10:         "Libraries/PETSc/3.14.0/GNU-10-OpenMPI-4.0.5"
   # ------------ Defaults ----------------------------------------------
-  PETSc_MPICH_Intel:               "$PETSc3_10_3IMPI2018Intel18_4"
-  PETSc_MPICH_GNU:                 "$PETSc3_10_3MPICH3_3GNU8_2"
+  PETSc_MPICH_Intel:               "$PETSc3_14_0IMPI2020Intel19_1"
+  PETSc_MPICH_GNU:                 "$PETSc3_14_0OMPI4_0GNU10"
   # ++++++++++++ commercial FEM ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-  MSC2019_1:                       "FEM/MSC/2019.1"
+  MSC2020:                         "FEM/MSC/2020"
   # ------------ Defaults ----------------------------------------------
-  MSC:                             "$MSC2019_1"
-  IntelMarc:                       "$IntelCompiler17_8"
-  HDF5Marc:                        "HDF5/1.10.5/Intel-17.8"
+  MSC:                             "$MSC2020"
+  IntelMarc:                       "$IntelCompiler19_1"
+  HDF5Marc:                        "HDF5/1.12.0/Intel-19.1.2"
 
 ###################################################################################################
 checkout:
diff --git a/env/CONFIG b/env/CONFIG
index 5d92af7fa..52057526a 100644
--- a/env/CONFIG
+++ b/env/CONFIG
@@ -2,4 +2,4 @@
 set DAMASK_NUM_THREADS  = 4
 
 set MSC_ROOT            = /opt/msc
-set MSC_VERSION         = 2019.1
+set MSC_VERSION         = 2020