Update humidity mixing ratio to work with pressure and height level data #2056
Conversation
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## master #2056 +/- ##
==========================================
- Coverage 98.39% 98.38% -0.01%
==========================================
Files 124 133 +9
Lines 12212 13087 +875
==========================================
+ Hits 12016 12876 +860
- Misses 196 211 +15 ☔ View full report in Codecov by Sentry. |
…xing_ratio_multi_levle
There was a problem hiding this comment.
This looks good to me. All the tests are passing and it seems to be doing what it's supposed to be doing. I let a comment on what looked like a confusing section of code. Please feel free to ignore my suggestion as it's such a minor style change. You have a comment explaining it anyway.
| self.pressure = cubes.extract_cube("surface_air_pressure") | ||
| except ConstraintMismatchError: | ||
| # If no pressure cube is provided, check if pressure is a coordinate in the temperature and relative humidity cubes | ||
| temp_coord = [ |
There was a problem hiding this comment.
This section seemed a little confusing to me. This is almost exactly the same thing but might be easier to understand/a tiny tiny bit faster:
temp_coord_flag = any(
coord.name() == "pressure"
for coord in self.temperature.coords()
)
rh_coord_flag = any(
coord.name() == "pressure"
for coord in self.rel_humidity.coords()
)
if temp_coord_flag & rh_coord_flag:
self.generate_pressure_cube()
else:
raise ValueError(
"No pressure cube called 'surface_air_pressure' found and no pressure coordinate found in temperature or relative humidity cubes"
)There was a problem hiding this comment.
I prefer your code to mine so I've updated it.
|
|
||
| Args: | ||
| cubes: | ||
| Cubes of temperature (K), pressure (Pa) and relative humidity (1) | ||
| Cubes of temperature (K) and relative humidity (1). A cube of pressure (Pa) must also | ||
| br provided unless there is a pressure coordinate in the temperature and relative humidity cubes. |
There was a problem hiding this comment.
small typo here "br" replace with be
Addresses https://metoffice.atlassian.net/browse/EPPT-1980
This PR updates the HumidityMixingRatio plugin to work with data on pressure levels or height levels.
As we are moving to using Dag runner and won't need a CLI I haven't included any acceptance tests or CLI's. This might need to be added later on after wider discussions with IMPROVER team and others about the working practices going forward.
Testing: