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

Merge branch 'development' into 31_consistent_wd

This commit is contained in:
Martin Diehl 2018-07-10 06:23:25 +02:00
parent cd4dc25513 497a18b149
commit db8eadff60
2 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.gitlab-ci.yml
View File

@ -9,7 +9,6 @@ stages:
- spectral
- compileMarc2017
- marc
- compileAbaqus2016
- compileAbaqus2017
- example
- performance
@ -67,7 +66,6 @@ variables:
PETSc_MPICH_Intel: "$PETSc3_9_1MPICH3_2Intel18_1"
PETSc_MPICH_GNU: "$PETSc3_9_1MPICH3_2GNU7_3"
# ++++++++++++ FEM +++++++++++++++++++++++++++++++++++++++++++++++++++
Abaqus2016: "FEM/Abaqus/2016"
Abaqus2017: "FEM/Abaqus/2017"
MSC2017: "FEM/MSC/2017"
# ------------ Defaults ----------------------------------------------
@ -373,16 +371,6 @@ J2_plasticBehavior:
- master
- release
###################################################################################################
Abaqus_compile2016:
stage: compileAbaqus2016
script:
- module load $IntelCompiler16_0 $Abaqus2016
- Abaqus_compileIfort/test.py -a 2016
except:
- master
- release
###################################################################################################
Abaqus_compile2017:
stage: compileAbaqus2017

2
PRIVATE

@ -1 +1 @@
Subproject commit 26ddcdcdeb9d4d8d17dff48a7bd5898395c3dfca
Subproject commit 114f2bd9c2025b30c0c6200709bd4b3b0cc1963a