From 40ab85ae698bfbd983837e279a0a84fa3a1a04a1 Mon Sep 17 00:00:00 2001 From: Thomas Baumann <39156931+brownbaerchen@users.noreply.github.com> Date: Tue, 4 Feb 2025 10:38:30 +0000 Subject: [PATCH 1/2] Updating to latest Firedrake docker container in CI --- .github/workflows/ci_pipeline.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_pipeline.yml b/.github/workflows/ci_pipeline.yml index 2bfbdfe52..3487393df 100644 --- a/.github/workflows/ci_pipeline.yml +++ b/.github/workflows/ci_pipeline.yml @@ -173,7 +173,7 @@ jobs: user_firedrake_tests: runs-on: ubuntu-latest container: - image: firedrakeproject/firedrake-vanilla:2025-01 + image: firedrakeproject/firedrake-vanilla:latest options: --user root volumes: - ${{ github.workspace }}:/repositories From a7f41c05f49063c00e5e910a4ce0d4de1106ea5c Mon Sep 17 00:00:00 2001 From: Thomas Baumann <39156931+brownbaerchen@users.noreply.github.com> Date: Tue, 4 Feb 2025 10:58:50 +0000 Subject: [PATCH 2/2] Linting after black update.. --- pySDC/projects/GPU/paper_plots.py | 2 +- pySDC/projects/Resilience/AC.py | 2 +- pySDC/tests/test_convergence_controllers/test_adaptivity.py | 4 +--- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pySDC/projects/GPU/paper_plots.py b/pySDC/projects/GPU/paper_plots.py index b56b1f36b..607bd8d2d 100644 --- a/pySDC/projects/GPU/paper_plots.py +++ b/pySDC/projects/GPU/paper_plots.py @@ -1,4 +1,4 @@ -""" Make plots for publications """ +"""Make plots for publications""" import matplotlib.pyplot as plt from pySDC.helpers.plot_helper import setup_mpl, figsize_by_journal diff --git a/pySDC/projects/Resilience/AC.py b/pySDC/projects/Resilience/AC.py index 7579f0f71..a44b39d80 100644 --- a/pySDC/projects/Resilience/AC.py +++ b/pySDC/projects/Resilience/AC.py @@ -339,7 +339,7 @@ def post_step(self, step, level_number): self.dt += [step.dt] self.axs[2].plot(self.t, self.dt) self.axs[2].set_yscale('log') - self.axs[2].axhline(step.levels[level_number].prob.eps ** 2, label=r'$\epsilon^2$', color='black', ls='--') + self.axs[2].axhline(step.levels[level_number].prob.eps**2, label=r'$\epsilon^2$', color='black', ls='--') self.axs[2].legend(frameon=False) self.axs[2].set_xlim([0, 0.03]) self.axs[2].set_title(r'$\Delta t$') diff --git a/pySDC/tests/test_convergence_controllers/test_adaptivity.py b/pySDC/tests/test_convergence_controllers/test_adaptivity.py index 10b478c66..eca1b73f7 100644 --- a/pySDC/tests/test_convergence_controllers/test_adaptivity.py +++ b/pySDC/tests/test_convergence_controllers/test_adaptivity.py @@ -197,9 +197,7 @@ def multiple_tests(adaptivity, e_tol_range, num_nodes, **kwargs): not_passed += [(4, f'Expected order wrt e_tol {expected_order_error_e_tol}, but got {order_e_tol}!')] if not np.isclose(np.median(order_estimate_e_tol), expected_order_estimate_e_tol, atol=0.4): not_passed += [ - ( - f'Expected order wrt e_tol {expected_order_estimate_e_tol} in the estimate, but got {order_estimate_e_tol}!' - ) + f'Expected order wrt e_tol {expected_order_estimate_e_tol} in the estimate, but got {order_estimate_e_tol}!' ] return not_passed