Tracer conservative transport #469
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…Almost working (but we don't have consistency!)
New explicit Runge-Kutta schemes
tommbendall
requested changes
Mar 18, 2024
There was a problem hiding this comment.
Thanks so much Tim. I think this looks really good and it's very exciting to have this working.
I've got two very small requests. I think it would also be helpful to have @atb1995 look over the changes to time discretisation to ensure that he's happy
gusto/transport_methods.py
Outdated
| # Extract associated density variable: | ||
| # This does assume the same ordering of tracers and fields... | ||
| tracer_idx = self.equation.field_names.index(variable) | ||
| tracer = self.equation.active_tracers[tracer_idx] |
There was a problem hiding this comment.
Is there a way that we can avoid this assumption?
There was a problem hiding this comment.
These two lines have been replaced with: tracer = next(x for x in self.equation.active_tracers if x.name == variable).
…mal flow BCs Co-authored-by: Thomas Bendall <[email protected]>
atb1995
reviewed
Mar 19, 2024
gusto/time_discretisation.py
Outdated
| if self.limiter is not None: | ||
| self.limiter.apply(self.field_i[stage]) | ||
|
|
||
| # Obtain field_ip1 = field_n - dt* sum_m{c_im*F[field_m]} |
There was a problem hiding this comment.
Switch to a_im to be in keeping with previous comments
gusto/time_discretisation.py
Outdated
Comment on lines
934
to
938
| for stage in range(self.nStages): | ||
| r = self.residual.label_map( | ||
| lambda t: t.has_label(time_derivative), | ||
| map_if_true=replace_subject(self.field_i[0], old_idx=self.idx), | ||
| map_if_false=replace_subject(self.field_i[0], old_idx=self.idx)) |
There was a problem hiding this comment.
Suggested change
| for stage in range(self.nStages): | |
| r = self.residual.label_map( | |
| lambda t: t.has_label(time_derivative), | |
| map_if_true=replace_subject(self.field_i[0], old_idx=self.idx), | |
| map_if_false=replace_subject(self.field_i[0], old_idx=self.idx)) | |
| for stage in range(self.nStages): | |
| r = self.residual.label_map( | |
| all_terms, | |
| map_if_true=replace_subject(self.field_i[0], old_idx=self.idx)) |
tommbendall
previously approved these changes
Mar 19, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This pull request enables the conservative transport of tracers.
Mixing ratios are transported using a conservative equation, as opposed to the previous advective version. This is requires an additional transport equation type (
tracer_conservative), form (tracer_conservative_form) and upwind transport method (upwind_tracer_conservative form). A reference density needs to be specified when using this transport form.The equation class
CoupledTransportEquationhas been changed to generate the correct mass terms when usingtracer_conservative. A conservative transport test of this equation has been added tointegration-tests/equations/test_coupled_transport.py.To work with the
tracer_conservativeform timestepping equation, the explicit multistage schemes need to have the gradient evaluation divided by the reference density. TheExplicitMultistageclass now has an additional option ofincrement_form, which defaults toTrue, but should be set toFalsefor use with the conservative transport scheme. A test of this scheme is added.