Skip to content

Commit eb2d857

Browse files
Merge into a single workflow. Fix arguments.
1 parent f9530b2 commit eb2d857

File tree

2 files changed

+54
-69
lines changed

2 files changed

+54
-69
lines changed

.github/workflows/precice-3-nighly.yml

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

.github/workflows/precice-3.yml

Lines changed: 54 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
- introduce-ci
66

77
jobs:
8-
run_experiments:
8+
run_experiments_v3_1:
99
strategy:
1010
matrix:
1111
experiment:
@@ -20,13 +20,13 @@ jobs:
2020
args: '-tss radauIIA radauIIA -o convergence-studies/higher-order/precice_3_radauIIA.csv'
2121
# Subcycling
2222
- name: Subcycling Newmark_beta
23-
args: 'python3 doConvergenceStudy.py precice-config-template.xml -s 5 -sb 1 1 -sf 2 1 -w 1 -tss Newmark_beta Newmark_beta -o convergence-studies/subcycling/precice_3_Newmark_beta.csv'
23+
args: '-s 5 -sb 1 1 -sf 2 1 -w 1 -tss Newmark_beta Newmark_beta -o convergence-studies/subcycling/precice_3_Newmark_beta.csv'
2424
- name: Subcycling generalized_alpha
25-
args: 'python3 doConvergenceStudy.py precice-config-template.xml -s 5 -sb 1 1 -sf 2 1 -w 1 -tss generalized_alpha generalized_alpha -o convergence-studies/subcycling/precice_3_generalized_alpha.csv'
25+
args: '-s 5 -sb 1 1 -sf 2 1 -w 1 -tss generalized_alpha generalized_alpha -o convergence-studies/subcycling/precice_3_generalized_alpha.csv'
2626
- name: Subcycling runge_kutta_4
27-
args: 'python3 doConvergenceStudy.py precice-config-template.xml -s 5 -sb 1 1 -sf 2 1 -w 1 -tss runge_kutta_4 runge_kutta_4 -o convergence-studies/subcycling/precice_3_runge_kutta_4.csv'
27+
args: '-s 5 -sb 1 1 -sf 2 1 -w 1 -tss runge_kutta_4 runge_kutta_4 -o convergence-studies/subcycling/precice_3_runge_kutta_4.csv'
2828
- name: Subcycling radauIIA
29-
args: 'python3 doConvergenceStudy.py precice-config-template.xml -s 5 -sb 1 1 -sf 2 1 -w 1 -tss radauIIA radauIIA -o convergence-studies/subcycling/precice_3_radauIIA.csv'
29+
args: '-s 5 -sb 1 1 -sf 2 1 -w 1 -tss radauIIA radauIIA -o convergence-studies/subcycling/precice_3_radauIIA.csv'
3030
# Runge Kutta 4
3131
- name: runge_kutta_4 degree 1
3232
args: '-tss runge_kutta_4 runge_kutta_4 -wd 1 -dt 0.2 -sb 5 5 -o convergence-studies/runge-kutta-4/precice_3_runge_kutta_4_degree1.csv'
@@ -41,7 +41,7 @@ jobs:
4141
args: '-tss radauIIA radauIIA -wd 2 -dt 0.2 -sb 5 5 -o convergence-studies/radauIIA/precice_3_radauIIA_degree2.csv'
4242
- name: radauIIA degree 3
4343
args: '-tss radauIIA radauIIA -wd 3 -dt 0.2 -sb 5 5 -o convergence-studies/radauIIA/precice_3_radauIIA_degree3.csv'
44-
# degree > 3 only allowed for precice > 3.2; see .github/workflows/precice-3-nighly.yml
44+
# degree > 3 only allowed for precice > 3.2; see run_experiments_v3_nightly below
4545
# - name: radauIIA degree 4
4646
# args: '-tss radauIIA radauIIA -wd 4 -dt 0.2 -sb 5 5 -o convergence-studies/radauIIA/precice_3_radauIIA_degree4.csv'
4747
# - name: radauIIA degree 5
@@ -85,6 +85,54 @@ jobs:
8585
path: |
8686
# working directory is ignored by actions/upload-artifact
8787
./precice-3/convergence-studies
88+
run_experiments_v3_nightly:
89+
strategy:
90+
matrix:
91+
experiment:
92+
# RadauIIA
93+
- name: radauIIA degree 4
94+
args: '-tss radauIIA radauIIA -wd 4 -dt 0.2 -sb 5 5 -o convergence-studies/radauIIA/precice_3_radauIIA_degree4.csv'
95+
- name: radauIIA degree 5
96+
args: '-tss radauIIA radauIIA -wd 5 -dt 0.2 -sb 5 5 -o convergence-studies/radauIIA/precice_3_radauIIA_degree5.csv'
97+
runs-on: ubuntu-latest
98+
defaults:
99+
run:
100+
working-directory: ./precice-3
101+
container: precice/precice:nightly
102+
steps:
103+
- name: Checkout Repository
104+
uses: actions/checkout@v4
105+
- name: Install Dependencies
106+
run: |
107+
apt-get -qq update
108+
apt-get -qq install python3-venv git pkg-config g++
109+
rm -rf /var/lib/apt/lists/*
110+
- name: Create venv
111+
run: |
112+
./make-venv.sh
113+
- name: Activate venv
114+
# see https://stackoverflow.com/a/74669486
115+
run: |
116+
. .venv/bin/activate
117+
echo PATH=$PATH >> $GITHUB_ENV
118+
- name: Run tutorial
119+
run: |
120+
python3 doConvergenceStudy.py precice-config-template.xml --silent --executor Github ${{ matrix.experiment.args }}
121+
- name: Store logs
122+
if: always()
123+
uses: actions/upload-artifact@v4
124+
with:
125+
name: precice-3 logs ${{ matrix.experiment.name }}
126+
path: |
127+
# working directory is ignored by actions/upload-artifact
128+
./precice-3/*.log
129+
- name: Store results
130+
uses: actions/upload-artifact@v4
131+
with:
132+
name: precice-3 ${{ matrix.experiment.name }}
133+
path: |
134+
# working directory is ignored by actions/upload-artifact
135+
./precice-3/convergence-studies
88136
merge:
89137
runs-on: ubuntu-latest
90138
needs: run_experiments

0 commit comments

Comments
 (0)