Merge develop into main for v1.14.0 release
#1120
Merged
Conversation
This file contains hidden or 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
…ries This alternative approach makes sure the constents are unique (and sorted) in the xtime variable. To reduce redundancy between the new approach and the old ncrcat approach (retained for comparison and in case the xarray approach is not performant), a new helper function for determining if we want to append to the existing datasets added.
Alternative xarray approach to computing convservation time series
Separate dependencies in `pyproject.toml`
This analysis task supports a custom list of variables on cells to be plotted at selected depths and on specified maps and over the desired seasons.
Add support for custom climatology maps
If not, delete climatology and start fresh
When recomputing the conservation analaysis (e.g. in a main vs. control run or if analysis successfully ran previously), we can end up with an empty list of remaining inputs to process. In this case, we should just move on rather than trying to print the empty list.
Fix conservation when list of inputs is empty
Check that all BSF projections are present
Set under/over indices for sea ice conc and thickness
Update to mpas tools 1.0.0 and pyremap 2.0.0
A recent change switched to using xarray to concatinate ocean conservation data together. However, recent testing showed hangs if the datasets are not manually loaded. This merge adds 2 places where such manual loads are included.
Fix hangs in ocean conservation
Switch to using barotropic streamfunction from `mpas_tools`
This seems to be necessary, at least at high res, to not run out of memory.
Co-authored-by: Xylar Asay-Davis <[email protected]>
It is not available in the test model run.
…suite Remove icebergFreshWaterFlux from test suite
Drop python 3.9 and clean up
The main advantage of tranche is just that it's a standalone repo so packages can use it without needing MPAS-Tools but it also provides more testing and some additional functionality beyond the MpasConfigParser like interpolation of enviornment variables.
This is more convenient for expressions that may involve numpy.
Switch from `MpasConfigParser` to `tranche` config parser
This ensures that both the area-weighted field (numerator) and the total area (denominator) include the same masking.
Time series edits
Remove @altheaden from reviewer lists
This is just in the name of the `main` run and has no actual bearing on the python version used to deploy Unified. But for clarity, it would be better if it is correct.
Update unified suite to use python 3.13
Update to v1.14.0
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.
No description provided.