From 49a1cd68500e5a9ff7cf51c23f133dc3f4b10f74 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Mon, 15 Nov 2021 21:53:30 +0100 Subject: [PATCH] fix Marc and split for higher speedup --- .gitlab-ci.yml | 12 ++++++++++-- PRIVATE | 2 +- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 40fa541e0..bae5e3046 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -135,15 +135,23 @@ compile_Marc: - cd $(mktemp -d) - cp ${CI_PROJECT_DIR}/examples/Marc/* . - python3 -c "import damask;damask.solver.Marc().submit_job('r-value','texture',True,'h')" + - mkdir ${TESTROOT}/src + - mv ${CI_PROJECT_DIR}/src/DAMASK_Marc.marc ################################################################################################### -core: +open-source: stage: fortran script: - module load ${COMPILER_INTEL} ${MPI_INTEL} ${PETSC_INTEL} - cd PRIVATE/testing/pytest - - pytest -k 'not compile' --basetemp ${TESTROOT}/fortran -v + - pytest -k 'not compile and not Marc' --basetemp ${TESTROOT}/fortran -v + +Marc: + stage: fortran + script: + - cd PRIVATE/testing/pytest + - pytest -k 'not compile and Marc' --damask-root ${TESTROOT} --basetemp ${TESTROOT}/fortran -v # Needs closer look # Phenopowerlaw_singleSlip: diff --git a/PRIVATE b/PRIVATE index f730bcb8d..6b7dfd6e6 160000 --- a/PRIVATE +++ b/PRIVATE @@ -1 +1 @@ -Subproject commit f730bcb8ddd7224011e70c57d0a5c03068532d2d +Subproject commit 6b7dfd6e618cccba87ef6640dfd1f8556d235c23