Skip to content

Commit 8abcd65

Browse files
22 integrate the kratos computation into the same snakefile for example linear elastic plate with hole (#23)
* outsource fenics into a subworkflow * add kratos into the same Snakefile as fenics, still WIP due to a single python function * decompose workflow of kratos into 4 substeps * bug fix * fix environment names * restructure the location of files * bug fix * update Readme and enforce strict channel priority in github ci * fix pattern to store all field data into zip file * remove comments and print --------- Co-authored-by: srosenbu <sjard-mathis.rosenbusch@bam.de>
1 parent 4208737 commit 8abcd65

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+870
-783
lines changed

.github/workflows/run-benchmark.yml

Lines changed: 12 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,17 @@ jobs:
3232
activate-environment: model-validation
3333
use-mamba: true
3434

35+
- name: Set strict channel priority
36+
run: conda config --set channel_priority strict
37+
3538
- name: Update environment
3639
run: mamba env update -n model-validation -f environment_benchmarks.yml
3740

38-
- name: run-fenics-benchmarks
41+
- name: run-linear-elastic-plate-with-hole-benchmarks
3942
shell: bash -l {0}
4043
run: |
41-
cd $GITHUB_WORKSPACE/benchmarks/linear-elastic-plate-with-hole/FEniCS/
44+
cd $GITHUB_WORKSPACE/benchmarks/linear-elastic-plate-with-hole/
45+
python generate_config.py
4246
snakemake --use-conda --force --cores 'all'
4347
snakemake --use-conda --force --cores 'all' --reporter metadata4ing
4448
@@ -48,32 +52,20 @@ jobs:
4852
cd $GITHUB_WORKSPACE/benchmarks/linear-elastic-plate-with-hole/FEniCS_nextflow/
4953
nextflow run main.nf -plugins nf-prov@1.4.0
5054
51-
- name: run-Kratos-benchmarks
52-
shell: bash -l {0}
53-
run: |
54-
cd $GITHUB_WORKSPACE/benchmarks/linear-elastic-plate-with-hole/Kratos/
55-
snakemake --use-conda --force --cores 'all'
56-
57-
- name: Archive fenics data
55+
- name: Archive Linear Elastic plate with a hole benchmark data from snakemake
5856
uses: actions/upload-artifact@v4
5957
with:
60-
name: fenics-output
58+
name: linear-elastic-plate-with-hole_snakemake
6159
path: |
62-
benchmarks/linear-elastic-plate-with-hole/fenics/snakemake_results/
60+
benchmarks/linear-elastic-plate-with-hole/snakemake_results/
6361
64-
- name: Archive fenics snakemake provenance
62+
- name: Archive Linear Elastic plate with a hole benchmark data from snakemake provenance
6563
uses: actions/upload-artifact@v4
6664
with:
67-
name: fenics-snakemake-provenance
65+
name: linear-elastic-plate-with-hole_snakemake_provenance
6866
path: |
69-
benchmarks/linear-elastic-plate-with-hole/FEniCS/*.zip
67+
benchmarks/linear-elastic-plate-with-hole/*.zip
7068
71-
- name: Archive kratos data
72-
uses: actions/upload-artifact@v4
73-
with:
74-
name: kratos-output
75-
path: |
76-
benchmarks/linear-elastic-plate-with-hole/Kratos/data
7769
7870
- name: Archive fenics nextflow data
7971
uses: actions/upload-artifact@v4

benchmarks/linear-elastic-plate-with-hole/FEniCS/README.md

Lines changed: 0 additions & 9 deletions
This file was deleted.

benchmarks/linear-elastic-plate-with-hole/FEniCS/Snakefile

Lines changed: 0 additions & 111 deletions
This file was deleted.

benchmarks/linear-elastic-plate-with-hole/FEniCS/plateWithHoleSolution.py

Lines changed: 0 additions & 57 deletions
This file was deleted.

benchmarks/linear-elastic-plate-with-hole/Kratos/README.md

Lines changed: 0 additions & 11 deletions
This file was deleted.

benchmarks/linear-elastic-plate-with-hole/Kratos/Snakefile

Lines changed: 0 additions & 60 deletions
This file was deleted.

0 commit comments

Comments
 (0)