From 0ac857599c3a1dac9ade08f0b7cb7c280e6d5857 Mon Sep 17 00:00:00 2001
From: Martin Diehl <mail@martin-diehl.net>
Date: Thu, 28 Oct 2021 21:36:04 +0200
Subject: [PATCH] simplified

we don't test multiple versions anymore
---
 .gitlab-ci.yml | 31 ++++++++++---------------------
 1 file changed, 10 insertions(+), 21 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d4124411a..8680b2873 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -46,29 +46,18 @@ variables:
   # Names of module files to load
   # ===============================================================================================
   # ++++++++++++ Compiler +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-  IntelCompiler19_1:               "Compiler/Intel/19.1.2 Libraries/IMKL/2020"
-  GNUCompiler10:                   "Compiler/GNU/10"
-  # ------------ Defaults ----------------------------------------------
-  IntelCompiler:                   "$IntelCompiler19_1"
-  GNUCompiler:                     "$GNUCompiler10"
+  IntelCompiler:  "Compiler/Intel/19.1.2 Libraries/IMKL/2020"
+  GNUCompiler:    "Compiler/GNU/10"
   # ++++++++++++ MPI ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-  IMPI2020Intel19_1:               "MPI/Intel/19.1.2/IntelMPI/2019"
-  OMPI4_1GNU10:                    "MPI/GNU/10/OpenMPI/4.1.1"
-  # ------------ Defaults ----------------------------------------------
-  MPI_Intel:                       "$IMPI2020Intel19_1"
-  MPI_GNU:                         "$OMPI4_1GNU10"
+  MPI_Intel:      "MPI/Intel/19.1.2/IntelMPI/2019"
+  MPI_GNU:        "MPI/GNU/10/OpenMPI/4.1.1"
   # ++++++++++++ PETSc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-  PETSc3_16_0IMPI2020Intel19_1:    "Libraries/PETSc/3.16.0/Intel-19.1.2-IntelMPI-2019"
-  PETSc3_16_0OMPI4_1GNU10:         "Libraries/PETSc/3.16.0/GNU-10-OpenMPI-4.1.1"
-  # ------------ Defaults ----------------------------------------------
-  PETSc_Intel:                     "$PETSc3_16_0IMPI2020Intel19_1"
-  PETSc_GNU:                       "$PETSc3_16_0OMPI4_1GNU10"
-  # ++++++++++++ commercial FEM ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-  MSC2021:                         "FEM/MSC/2021.2"
-  # ------------ Defaults ----------------------------------------------
-  MSC:                             "$MSC2021"
-  IntelMarc:                       "$IntelCompiler19_1"
-  HDF5Marc:                        "HDF5/1.12.1/Intel-19.1.2"
+  PETSc_Intel:    "Libraries/PETSc/3.16.0/Intel-19.1.2-IntelMPI-2019"
+  PETSc_GNU:      "Libraries/PETSc/3.16.0/GNU-10-OpenMPI-4.1.1"
+  # ++++++++++++ MSC Marc +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+  MSC:            "FEM/MSC/2021.2"
+  IntelMarc:      "Compiler/Intel/19.1.2 Libraries/IMKL/2020"
+  HDF5Marc:       "HDF5/1.12.1/Intel-19.1.2"
 
 ###################################################################################################
 checkout: