Skip to content

Commit

Permalink
lint fix + firedrake fml move
Browse files Browse the repository at this point in the history
  • Loading branch information
alexbrown1995 committed Nov 1, 2023
1 parent cccc433 commit 5878f23
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion gusto/common_forms.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
5 changes: 3 additions & 2 deletions integration-tests/model/test_IMEX.py
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -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)

Expand Down

0 comments on commit 5878f23

Please sign in to comment.