223031012
/
DAMASK_EICMD
mirror of https://github.com/achalhp/DAMASK_EICMD.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

use newest Marc release (2021.2)

This commit is contained in:
Franz Roters 2021-07-13 16:43:23 +02:00
parent c3e94cf1fe
commit 741f81455b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitlab-ci.yml
View File

@ -64,9 +64,9 @@ variables:
PETSc_Intel: "$PETSc3_14_2IMPI2020Intel19_1" PETSc_Intel: "$PETSc3_14_2IMPI2020Intel19_1"
PETSc_GNU: "$PETSc3_14_2OMPI4_0GNU10" PETSc_GNU: "$PETSc3_14_2OMPI4_0GNU10"
# ++++++++++++ commercial FEM ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ # ++++++++++++ commercial FEM ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
MSC2020: "FEM/MSC/2020" MSC2021: "FEM/MSC/2021.2"
# ------------ Defaults ---------------------------------------------- # ------------ Defaults ----------------------------------------------
MSC: "$MSC2020" MSC: "$MSC2021"
IntelMarc: "$IntelCompiler19_1" IntelMarc: "$IntelCompiler19_1"
HDF5Marc: "HDF5/1.12.0/Intel-19.1.2" HDF5Marc: "HDF5/1.12.0/Intel-19.1.2"

2
python/damask/solver/_marc.py
View File

@ -3,7 +3,7 @@ import shlex
import re import re
from pathlib import Path from pathlib import Path
_msc_version = 2020 _msc_version = 2021.2
_msc_root = '/opt/msc' _msc_root = '/opt/msc'
_damask_root = str(Path(__file__).parents[3]) _damask_root = str(Path(__file__).parents[3])