diff --git a/gusto/equations/common_forms.py b/gusto/equations/common_forms.py index 759912ad..8bb60651 100644 --- a/gusto/equations/common_forms.py +++ b/gusto/equations/common_forms.py @@ -14,7 +14,6 @@ "kinetic_energy_form", "advection_equation_circulation_form", "diffusion_form", "diffusion_form_1d", "linear_advection_form", "linear_continuity_form", - "linear_continuity_form_1d", "split_continuity_form", "tracer_conservative_form"] @@ -140,25 +139,6 @@ def linear_continuity_form(test, qbar, ubar): return transport(form, TransportEquationType.conservative) -def linear_continuity_form_1d(test, qbar, ubar): - """ - The form corresponding to the linearised continuity transport operator. - - Args: - test (:class:`TestFunction`): the test function. - qbar (:class:`ufl.Expr`): the variable to be transported. - ubar (:class:`ufl.Expr`): the transporting velocity. - - Returns: - :class:`LabelledForm`: a labelled transport form. - """ - - L = qbar*test*ubar.dx(0)*dx + qbar.dx(0)*test*ubar*dx - form = transporting_velocity(L, ubar) - - return transport(form, TransportEquationType.conservative) - - def vector_invariant_form(domain, test, q, ubar): u""" The form corresponding to the vector invariant transport operator. diff --git a/gusto/equations/shallow_water_equations.py b/gusto/equations/shallow_water_equations.py index cad6e12c..85426695 100644 --- a/gusto/equations/shallow_water_equations.py +++ b/gusto/equations/shallow_water_equations.py @@ -9,7 +9,7 @@ advection_form, advection_form_1d, continuity_form, continuity_form_1d, vector_invariant_form, kinetic_energy_form, advection_equation_circulation_form, diffusion_form_1d, - linear_continuity_form, linear_continuity_form_1d + linear_continuity_form ) from gusto.equations.prognostic_equations import PrognosticEquationSet @@ -361,7 +361,7 @@ def __init__(self, domain, parameters, # Transport term needs special linearisation if self.linearisation_map(D_adv.terms[0]): - linear_D_adv = linear_continuity_form_1d(phi, H, u_trial) + linear_D_adv = linear_continuity_form(phi, H, u_trial) # Add linearisation to D_adv D_adv = linearisation(D_adv, linear_D_adv)