From e31912307bc8cc28dca34ee1cd2d647e9a7fd73e Mon Sep 17 00:00:00 2001 From: Witt-D Date: Fri, 16 Aug 2024 14:15:22 +0100 Subject: [PATCH] flake8 fixes --- gusto/equations/boussinesq_equations.py | 2 +- gusto/equations/compressible_euler_equations.py | 2 +- gusto/equations/shallow_water_equations.py | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gusto/equations/boussinesq_equations.py b/gusto/equations/boussinesq_equations.py index a842be4f..50c6adec 100644 --- a/gusto/equations/boussinesq_equations.py +++ b/gusto/equations/boussinesq_equations.py @@ -1,6 +1,6 @@ """Defines the Boussinesq equations.""" -from firedrake import inner, dx, div, cross, split +from firedrake import inner, dx, div, cross, split, as_vector from firedrake.fml import subject from gusto.core.labels import ( time_derivative, transport, prognostic, linearisation, diff --git a/gusto/equations/compressible_euler_equations.py b/gusto/equations/compressible_euler_equations.py index 9ecc9905..b5d6f84a 100644 --- a/gusto/equations/compressible_euler_equations.py +++ b/gusto/equations/compressible_euler_equations.py @@ -2,7 +2,7 @@ from firedrake import ( sin, pi, inner, dx, div, cross, FunctionSpace, FacetNormal, jump, avg, dS_v, - conditional, SpatialCoordinate, split, Constant + conditional, SpatialCoordinate, split, Constant, as_vector ) from firedrake.fml import subject, replace_subject from gusto.core.labels import ( diff --git a/gusto/equations/shallow_water_equations.py b/gusto/equations/shallow_water_equations.py index 7e745365..2b9f58d3 100644 --- a/gusto/equations/shallow_water_equations.py +++ b/gusto/equations/shallow_water_equations.py @@ -165,13 +165,13 @@ def __init__(self, domain, parameters, fexpr=None, bexpr=None, if fexpr is not None: V = FunctionSpace(domain.mesh, 'CG', 1) - f = self.prescribed_fields('coriolis', V).interpolate(fexpr) + self.f = self.prescribed_fields('coriolis', V).interpolate(fexpr) coriolis_form = coriolis(subject( - prognostic(f*inner(domain.perp(u), w)*dx, "u"), self.X)) + prognostic(self.f*inner(domain.perp(u), w)*dx, "u"), self.X)) # Add linearisation if self.linearisation_map(coriolis_form.terms[0]): linear_coriolis = coriolis( - subject(prognostic(f*inner(domain.perp(u_trial), w)*dx, 'u'), self.X)) + subject(prognostic(self.f*inner(domain.perp(u_trial), w)*dx, 'u'), self.X)) coriolis_form = linearisation(coriolis_form, linear_coriolis) residual += coriolis_form