diff --git a/.github/workflows/oscillator-overlap.yml b/.github/workflows/4-1-partitioned-oscillator.yml similarity index 65% rename from .github/workflows/oscillator-overlap.yml rename to .github/workflows/4-1-partitioned-oscillator.yml index 3b9c7e71..f1a54aa9 100644 --- a/.github/workflows/oscillator-overlap.yml +++ b/.github/workflows/4-1-partitioned-oscillator.yml @@ -1,4 +1,4 @@ -name: Run oscillator-overlap experiments +name: Section 4.1 partitioned oscillator on: release: types: [published] @@ -9,22 +9,22 @@ jobs: strategy: matrix: experiment: - - name: Optimal dt relationship (FP) - args: 'precice-config-template-FP.xml --silent --executor Github --config optimal_dt.csv -tss runge_kutta_4 generalized_alpha -wd 3 --exchange-substeps -o convergence-studies/optimal_dt_FP.csv' - - name: Optimal dt relationship (rQN) - args: 'precice-config-template-rQN.xml --silent --executor Github --config optimal_dt.csv -tss runge_kutta_4 generalized_alpha -wd 3 --exchange-substeps -o convergence-studies/optimal_dt_rQN.csv' - - name: Optimal dt relationship (fQN) - args: 'precice-config-template-fQN.xml --silent --executor Github --config optimal_dt.csv -tss runge_kutta_4 generalized_alpha -wd 3 --exchange-substeps -o convergence-studies/optimal_dt_fQN.csv' - - name: Fig 1a) Constant Interpolation - args: 'precice-config-template-FP.xml --silent --executor Github --config fig1_dts.csv -tss runge_kutta_4 generalized_alpha -wd 0 -o convergence-studies/fig1a.csv' - - name: Fig 1b) Linear Interpolation - args: 'precice-config-template-FP.xml --silent --executor Github --config fig1_dts.csv -tss runge_kutta_4 generalized_alpha -wd 1 -o convergence-studies/fig1b.csv' - - name: Fig 1c) Piecewise Linear Interpolation - args: 'precice-config-template-FP.xml --silent --executor Github --config fig1_dts.csv -tss runge_kutta_4 generalized_alpha -wd 1 --exchange-substeps -o convergence-studies/fig1c.csv' - - name: Fig 1d) B-spline Interpolation - args: 'precice-config-template-FP.xml --silent --executor Github --config fig1_dts.csv -tss runge_kutta_4 generalized_alpha -wd 3 --exchange-substeps -o convergence-studies/fig1d.csv' - - name: Figure 12 - args: 'precice-config-template-FP.xml --silent --executor Github --config fig12.csv -tss runge_kutta_4 generalized_alpha -wd 3 --exchange-substeps -o convergence-studies/contour_data.csv' + - name: Figure 10 constant + args: 'precice-config-template-FP.xml --silent --executor Github --config fig1_dts.csv -tss runge_kutta_4 generalized_alpha -wd 0 -o results/Fig10/data/constant.csv' + - name: Figure 10 linear + args: 'precice-config-template-FP.xml --silent --executor Github --config fig1_dts.csv -tss runge_kutta_4 generalized_alpha -wd 1 -o convergence-studies/Fig10/data/linear.csv' + - name: Figure 10 piecewise linear + args: 'precice-config-template-FP.xml --silent --executor Github --config fig1_dts.csv -tss runge_kutta_4 generalized_alpha -wd 1 --exchange-substeps -o convergence-studies/Fig10/data/piecewise_linear.csv' + - name: Figure 10 third-order B-spline + args: 'precice-config-template-FP.xml --silent --executor Github --config fig1_dts.csv -tss runge_kutta_4 generalized_alpha -wd 3 --exchange-substeps -o convergence-studies/Fig10/data/third_order_b-spline.csv' + - name: Figure 11 + args: 'precice-config-template-FP.xml --silent --executor Github --config fig12.csv -tss runge_kutta_4 generalized_alpha -wd 3 --exchange-substeps -o convergence-studies/Fig11/data/contour_data.csv' + - name: Table 1 fixed-point (shown) + args: 'precice-config-template-FP.xml --silent --executor Github --config optimal_dt.csv -tss runge_kutta_4 generalized_alpha -wd 3 --exchange-substeps -o convergence-studies/Tab1/data/FP.csv' + - name: Table 1 reduced quasi-Newton (not shown) + args: 'precice-config-template-rQN.xml --silent --executor Github --config optimal_dt.csv -tss runge_kutta_4 generalized_alpha -wd 3 --exchange-substeps -o convergence-studies/Tab1/data/rQN.csv' + - name: Table 1 full quasi-Newton (not shown) + args: 'precice-config-template-fQN.xml --silent --executor Github --config optimal_dt.csv -tss runge_kutta_4 generalized_alpha -wd 3 --exchange-substeps -o convergence-studies/Tab1/data/fQN.csv' runs-on: ubuntu-latest defaults: run: @@ -49,14 +49,6 @@ jobs: - name: Run tutorial run: | python3 doConvergenceStudy.py ${{matrix.experiment.args}} - - name: Store logs - if: always() - uses: actions/upload-artifact@v4 - with: - name: oscillator-overlap logs ${{ matrix.experiment.name }} - path: | - perpendicular-flap/fluid-openfoam/stdout-Fluid.log - perpendicular-flap/solid-fenics/stdout-Solid.log - name: Store results if: always() uses: actions/upload-artifact@v4 @@ -64,7 +56,7 @@ jobs: name: oscillator-overlap ${{ matrix.experiment.name }} path: | # working directory is ignored by actions/upload-artifact - ./oscillator-overlap/convergence-studies + ./oscillator-overlap/results merge: runs-on: ubuntu-latest needs: run_experiments diff --git a/perpendicular-flap/fluid-openfoam/system/controlDict-template b/perpendicular-flap/fluid-openfoam/system/controlDict-template index 9b524f1f..05ab6368 100644 --- a/perpendicular-flap/fluid-openfoam/system/controlDict-template +++ b/perpendicular-flap/fluid-openfoam/system/controlDict-template @@ -17,7 +17,10 @@ stopAt endTime; endTime 5; -deltaT {{ deltaT }}; +deltaT 0.00001; // initial dt +maxDeltaT 0.001; // maximum allowed dt, make a parameter and set to value similar to window size? +adjustTimeStep yes; +maxCo 0.5; writeControl adjustableRunTime;