Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix 2 d perp #346

Merged
merged 3 commits into from
Jan 24, 2023
Merged

Fix 2 d perp #346

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
493f262
add perp label to defer application of perp operator until after subj…
jshipton Jan 20, 2023
391de30
merging
jshipton Jan 23, 2023
dc3ce62
check linearisation of coriolis is required before adding it
jshipton Jan 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 11 additions & 6 deletions gusto/equations.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
from gusto.fml.form_manipulation_labelling import Term, all_terms, keep, drop, Label
from gusto.labels import (subject, time_derivative, transport, prognostic,
transporting_velocity, replace_subject, linearisation,
name, pressure_gradient, coriolis,
name, pressure_gradient, coriolis, perp,
replace_trial_function, hydrostatic)
from gusto.thermodynamics import exner_pressure
from gusto.transport_forms import (advection_form, continuity_form,
Expand Down Expand Up @@ -663,12 +663,17 @@ 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)
coriolis_form = coriolis(
subject(prognostic(f*inner(domain.perp(u), w)*dx, "u"), self.X))
coriolis_form = perp(
coriolis(
subject(prognostic(f*inner(u, w)*dx, "u"), self.X)
), domain.perp)
# Add linearisation
linear_coriolis = coriolis(
subject(prognostic(f*inner(domain.perp(u_trial), w)*dx, "u"), self.X))
coriolis_form = linearisation(coriolis_form, linear_coriolis)
if self.linearisation_map(coriolis_form.terms[0]):
linear_coriolis = perp(
coriolis(
subject(prognostic(f*inner(u_trial, w)*dx, "u"), self.X)
), domain.perp)
coriolis_form = linearisation(coriolis_form, linear_coriolis)
residual += coriolis_form

if bexpr is not None:
Expand Down
10 changes: 9 additions & 1 deletion gusto/labels.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from firedrake import Function, split, MixedElement
from gusto.configuration import IntegrateByParts, TransportEquationType
from gusto.fml.form_manipulation_labelling import Term, Label, LabelledForm
from types import MethodType
from types import MethodType, LambdaType


def replace_test_function(new_test):
Expand Down Expand Up @@ -164,6 +164,13 @@ def repl(t):

new_form = ufl.replace(t.form, replace_dict)

# this is necessary to defer applying the perp until after the
# subject is replaced because otherwise replace cannot find
# the subject
if t.has_label(perp):
perp_function = t.get(perp)
new_form = ufl.replace(new_form, {split(new)[0]: perp_function(split(new)[0])})

return Term(new_form, t.labels)

return repl
Expand All @@ -186,3 +193,4 @@ def repl(t):
name = Label("name", validator=lambda value: type(value) == str)
ibp_label = Label("ibp", validator=lambda value: type(value) == IntegrateByParts)
hydrostatic = Label("hydrostatic", validator=lambda value: type(value) in [LabelledForm, Term])
perp = Label("perp", validator=lambda value: isinstance(value, LambdaType))