MSC.Marc 2018.x requires python3

2018-11-14 23:43:08 +01:00 · 2018-11-14 23:43:08 +01:00 · 4e1dc73fc9
parent c32671c205
commit 4e1dc73fc9
2 changed files with 3 additions and 4 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -8,7 +8,6 @@ stages:
  - prepareSpectral
  - spectral
  - compileMarc2017
-  - compileMarc2018_1
  - marc
  - compileAbaqus2017
  - example
@ -78,8 +77,8 @@ variables:
  MSC2017:                         "FEM/MSC/2017"
  # ------------ Defaults ----------------------------------------------
  Abaqus:                          "$Abaqus2017"
-  MSC:                             "$MSC2018_1"
-  IntelMarc:                       "IntelCompiler17_0"
+  MSC:                             "$MSC2017"
+  IntelMarc:                       "IntelCompiler16_4"
  # ++++++++++++ Documentation +++++++++++++++++++++++++++++++++++++++++
  Doxygen1_8_13:                   "Documentation/Doxygen/1.8.13"
  # ------------ Defaults ----------------------------------------------
--- a/2
+++ b/2
@ -8,6 +8,6 @@ set DAMASK_NUM_THREADS    = 4
 set MSC_ROOT              = /opt/msc
 set MARC_VERSION          = 2018.1

-set ABAQUS_VERSION        = 2018.1
+set ABAQUS_VERSION        = 2017

 set DAMASK_HDF5           = OFF