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

Updates to temperature - binned heat budget diagnostics #223

Merged
merged 3 commits into from Jun 7, 2018

Conversation

rmholmes
Copy link
Contributor

@rmholmes rmholmes commented Jun 7, 2018

These commits update the previous neutrho_is_temp changes (#202) to:
1. Fix a bug in the GM temperature-binned diagnostic
2. Add a diagnostic to bin the mixdownslope term (on in ACCESS-OM2)
3. Clean up the neutral_rho_equal_theta option in ocean_density to be consistent with neutral_rho_potrho option and provide proper messages to mom.out

Has been tested on a MOM-SIS 1/4-degree config and the new ACCESS-OM2-1degree (with yatm).

Note that I have not yet included diagnostics to bin the following heat budget terms:
temp_sigma_diff, temp_xlandmix, temp_xlandinsert, temp_runoffmix, temp_calvingmix, geo_heat
These are not active in the configurations I am using. I'm happy to do this if anyone would like these terms in the future, just point me at a test case.

Note also that this pull request reverts some unintentional changes to the neutral_rho_equal_theta option (now neutral_density_theta) introduced by APE changes #210 (#211).

Usage is now consistent with neutral_density_omega and neutral_density_potrho usage in ocean_density.F90. Also, corrected .out messages and neutral_rho diagnostic label + units when this option is active.
@StephenGriffies
Copy link
Contributor

This is very useful diagnostic code. Please test that nothing is broken and then I suggest it be merged as soon as cleared.

@rmholmes
Copy link
Contributor Author

rmholmes commented Jun 7, 2018

Thanks Steve. I've tested it in MOM-SIS025 and ACCESS-OM2, and also just now in the wind-driven gyre test case. No problems. Happy for someone else to check as well if needed.

@StephenGriffies StephenGriffies merged commit bd8d2f3 into mom-ocean:master Jun 7, 2018
@StephenGriffies
Copy link
Contributor

I just merged this code into the main branch. Thanks for the contribution!

@rmholmes rmholmes deleted the neutrho_is_temp branch June 18, 2018 06:07
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.

None yet

2 participants