Diag scaling p2 #1002
Merged
Diag scaling p2 #1002
Conversation
This file contains 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
The horizontal_average_diag_field function uses thickness when computing layer averages in some cases. Reproducibility requires that reproducible sums be calculated in MKS units. While the grids have been converted to MKS lengths, the thickeness have not. This patch rescales the thicknesses to volumes, which restores the reproducibility of the dimentionally scaled quantities involving H.
This fixes up the dimensional scaling of several diagnostics: * dynamics_h_tendency * MLD_Restrat * ea, eb * h_predia * frazil_h We also include a change to the flux_to_kg_per_s scaling factor. Previously, this was dynamically set the flux units to either m3 s-1 or kg s-1 depending on the Boussinesq mode. However, the units of the diagnostics using this factor (uhml, vhml) were always explicitly set to kg -1. Assuming that the scaled fluxes were H L2 T-1, this would have given the wrong scaling in non-Boussinesq mode. We resolve this by removing the conditional and always using GV%H_to_kg_m2 when defining this scaling factor.
This patch fixes the H dimensional scaling of several diagnostics. * h_preale * h_predia * Tflx_dia_diff * Tflx_dia_adv * Sflx_dia_diff * Sflx_dia_adv * diabatic_diff_h * boundary_forcing_h * frazil_h * internal_heat_h_tendency Two interface changes were introduced to complement these fixes. - The vertical grid struct (GV) was added to geothermal_init - We have introduced the H_to_MKS scaling factor, which is set to either H_to_m or H_to_kg_m2 based on whether the model is in Boussinesq mode. This to accommodate diagnostics whose units are based on the Boussinesq mode. The vert_remap_h diagnostic has also been partially rescaled and has been modified by this patch, but is not yet invariant to H scaling.
The dimensional scaling of three diagnostics has been amended: * dzRegrid * vert_remap_h_tendency * wd The spatial averaging function global_spatial_mean has also been modified to run entirely in MKS units, due to the reproducing_sum function requirement. A previous change fixed a bug in this function, where only part of the solution was being scaled. This new fix restores the original scaling, but de-scales the final result in order to retain reproducibility.
This patch fixes the dimensional scaling of the following diagnostics:
- massout_flux
- ideal_age
- various DOME derived tracers
- Derived tracer diagnostics:
- *_adx
- *_ady
- *_dfx
- *_dfx
- *h_tendency_2d
Many tracer fixes rely on the "flux_" and "conv_" arguments for
rescaling, which is probably not the original intended use, and should
probably be revised in the future.
Codecov Report
@@ Coverage Diff @@
## dev/gfdl #1002 +/- ##
============================================
+ Coverage 43.11% 43.16% +0.05%
============================================
Files 213 213
Lines 62351 62355 +4
============================================
+ Hits 26885 26918 +33
+ Misses 35466 35437 -29
Continue to review full report at Codecov.
|
|
Merging but MOM6-examples needs updating... |
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.
This PR fixes all of the diagnostic scaling issues in the current test cases (TC0-3).
Most consist of supplying the dimension conversions in register_diag_field, along with a few genuine fixes.
The main part worth mentioning is the fixes associated with tracer diagnostics. While all are now working, they were fixed used the
flux_scaleandconv_scalearguments in various places. In just about every case, it was following precedent in adjacent code. But it still seems that this isn't the ideal use of these arguments, which were defined for more specific purposes. For now, I think it's fine, but we may want to revisit this in the future.The PR does not fix the "negative zero" issues in one of the barotropic transport diagnostics, so we cannot yet enable the diagnostic checksum support in the test suite.