Merge branch 'ModifiedCamClayNLE-Notebook' into 'master'

Isotropic test Notebook for the Modified Cam-Clay model See merge request ogs/ogs!4664
ufz · Jul 27, 2023 · f392bab · f392bab
2 parents 971308b + b4d4345
commit f392bab
Show file tree

Hide file tree

Showing 6 changed files with 479 additions and 3 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -1,6 +1,7 @@
 stages:
   - preparation
   - build
+  - test
   - check
   - release
   - package
@@ -69,6 +70,6 @@ include:
   - local: "/scripts/ci/pipelines/win.yml"
     rules:
       - if: $CI_MERGE_REQUEST_LABELS =~ /.*ci::win only.*/
-  - local: "/scripts/ci/pipelines/wheels.yml"
+  - local: "/scripts/ci/jobs/build-wheels.yml"
     rules:
       - if: $CI_MERGE_REQUEST_LABELS =~ /.*ci::wheels only.*/
diff --git a/MaterialLib/SolidModels/MFront/CMakeLists.txt b/MaterialLib/SolidModels/MFront/CMakeLists.txt
@@ -46,7 +46,7 @@ set(_mfront_behaviours
     ThermoPoroElasticity
 )
 
-if(OGS_BUILD_WHEEL)
+if(OGS_BUILD_WHEEL AND NOT APPLE_ARM)
     # Build behaviours lib with mfront executable
     foreach(behaviour ${_mfront_behaviours})
         list(APPEND _mfront_behaviour_files