diff --git a/gusto/common_forms.py b/gusto/common_forms.py index 5d0d2b740..17183ae02 100644 --- a/gusto/common_forms.py +++ b/gusto/common_forms.py @@ -4,10 +4,10 @@ from firedrake import (dx, dot, grad, div, inner, outer, cross, curl, split, TestFunctions) +from firedrake.fml import subject, drop from gusto.configuration import TransportEquationType from gusto.labels import (transport, transporting_velocity, diffusion, prognostic) -from gusto.fml import subject, drop __all__ = ["advection_form", "continuity_form", "vector_invariant_form", "kinetic_energy_form", "advection_equation_circulation_form", diff --git a/integration-tests/model/test_IMEX.py b/integration-tests/model/test_IMEX.py index 9320a70cb..d4ce82c22 100644 --- a/integration-tests/model/test_IMEX.py +++ b/integration-tests/model/test_IMEX.py @@ -7,7 +7,8 @@ def run(timestepper, tmax, f_end): timestepper.run(0, tmax) return norm(timestepper.fields("f") - f_end) / norm(f_end) -@pytest.mark.parametrize("scheme", ["ssp3","ark2","ars3", "trap2", "euler"]) + +@pytest.mark.parametrize("scheme", ["ssp3", "ark2", "ars3", "trap2", "euler"]) def test_time_discretisation(tmpdir, scheme, tracer_setup): setup = tracer_setup(tmpdir, "sphere") @@ -16,7 +17,7 @@ def test_time_discretisation(tmpdir, scheme, tracer_setup): eqn = ContinuityEquation(domain, V, "f") # Split continuity term eqn = split_continuity_form(eqn) - #Label terms are implicit and explicit + # Label terms are implicit and explicit eqn.label_terms(lambda t: not any(t.has_label(time_derivative, transport)), implicit) eqn.label_terms(lambda t: t.has_label(transport), explicit)