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.

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

Finally adding shallow and barotropic models to the Isca master #268

Merged
merged 41 commits into from
Aug 5, 2024

Conversation

sit23
Copy link
Contributor

@sit23 sit23 commented Aug 5, 2024

Previous p/rs have been submitted for the shallow and barotropic code in #197 and #227, but haven't been closed due to a lack of time for code review. This is the most up to date version of both of these codes, and so this p/r superceeds both of those two. Once testing has completed I'll merge this in.

sit23 added 30 commits May 14, 2019 16:15
… options in shallow water to get in line with Isca modifications.
… it defining grid for output. This should make it possible to use stirring in the shallow water model.
…irring, we can output stirring variables from within shallow water framework.
…cs and in PV definition, which I previously modified incorrectly.
Conflicts:
	.gitignore
	src/extra/python/isca/__init__.py
…t cases. This prevents the code from compiling each time a different trip test is run, thus making the trip tests much faster.
…trip tests. Requires the tests to be more specific about which codebase each test case is using, and also requires a new simple diag table for the 2D cases.
…to be specified from an netcdf input file. As yet untested. Had to add extra fortran files to path-names as the interpolator function uses a lot of other modules.
… the h term passed in is the perturbation to the mean, and so should have an area mean of zero. This means that the h-0 parameter in the code is what sets the mean depth.
@sit23
Copy link
Contributor Author

sit23 commented Aug 5, 2024

All checks have passed, and so I'm going to merge this now.

@sit23 sit23 merged commit 8e45135 into ExeClim:master Aug 5, 2024
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant