Improve tracer density #492
Conversation
gusto/active_tracers.py
Outdated
|
|
||
|
|
||
| class Rain(ActiveTracer): | ||
| """An object encoding the details of rain as a tracer.""" | ||
| def __init__(self, name='rain', space='theta', | ||
| variable_type=TracerVariableType.mixing_ratio, | ||
| density_name=None, |
There was a problem hiding this comment.
should the density_name argument come after the transport_eqn argument for consistency?
There was a problem hiding this comment.
Oops, good spot, thanks!
gusto/diagnostics.py
Outdated
| m_X = state_fields(self.mixing_ratio_name) | ||
| rho_d = state_fields(self.density_name) | ||
|
|
||
| m_X_space = m_X.function_space() |
There was a problem hiding this comment.
I think we want all of this code to be protected behind an if self.space_defined is None -- currently this diagnostic allows the user to pass in a space (and we want the user to be able to do that) but it will be overridden by this code. I think we only want to override if space is None
There was a problem hiding this comment.
Cool, I've changed it to enable this, although I've used if self.space is None instead of self.space_defined
…gusto into improve_tracer_density
| @@ -1720,4 +1726,36 @@ def setup(self, domain, state_fields): | |||
| m_X = state_fields(self.mixing_ratio_name) | |||
| rho_d = state_fields(self.density_name) | |||
| self.expr = m_X*rho_d | |||
| super().setup(domain, state_fields) | |||
|
|
|||
| if self.space is None: | |||
There was a problem hiding this comment.
Final thing: could you add some comments to explain why we want to have a specific space for the tracer density? Thanks!
There was a problem hiding this comment.
Sure, I've added a few more comments.
Improving the tracer density diagnostic. This constructs a higher-order space for the tracer density based on the function spaces for the mixing ratio and density.
The active tracers of rain, cloud_water, water_vapour, have an added density_name argument to make them compatible with using conservative transport.