+Argument cleanup in vertical diffusivity code#1533
Merged
marshallward merged 4 commits intoNov 9, 2021
Conversation
Cleaned up 26 falsely optional or unused arguments in the vertical diffusivity code, and related changes. Several descriptive comments were also corrected, including the correction of the units of 10 variables related to CVMix_KPP. This commit includes: - Made the Kd_int arguments to set_diffusivity() and 3 subsidiary routines mandatory and reordered the arguments so that the non-optional arguments come before the grid types - Made the halo_TS and double_diffuse arguments to set_diffusivity_init() mandatory. - Made the Time argument to ALE_sponge() mandatory. - Made the Kd and Kv arguments to calculate_CVMIX_conv() mandatory. - Removed the unused halo argument to adjust_salt(). - Removed the unused Kddt_convect argument to full_convection(). - Made the halo arguments to full_convection()and smoothed_dRdT_dRdS() mandatory. - Made the useALEalgorithm argument to geothermal_init() mandatory. - Removed the unused initialize_all arguments to Calculate_kappa_shear() and Calc_kappa_shear_vertex(). - Removed the unused I_Ld2_1d and dz_Int_1d arguments to kappa_shear_column(). - Made 3 arguments to calculate_projected_state() mandatory and reordered the arguments accordingly. - Eliminating the unused skip_diags arguments to calculateBuoyancyFlux() and extractFluxes(), which are now effectively always false. All answers are bitwise identical, and no output is changed.
Codecov Report
@@ Coverage Diff @@
## dev/gfdl #1533 +/- ##
=========================================
Coverage 29.15% 29.15%
=========================================
Files 239 239
Lines 71533 71467 -66
=========================================
- Hits 20855 20837 -18
+ Misses 50678 50630 -48
Continue to review full report at Codecov.
|
Collaborator
|
Gaea regression: https://gitlab.gfdl.noaa.gov/ogrp/MOM6/-/jobs/71256 ✔️ 🟡 Parameter update required, presumably from an older PR. |
marshallward
approved these changes
Nov 9, 2021
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Cleaned up 26 falsely optional or unused arguments in the vertical
diffusivity code, and related changes. Several descriptive comments were
also corrected, including the correction of the units of 10 variables related
to CVMix_KPP. This commit includes:
mandatory and reordered the arguments so that the non-optional arguments
come before the grid types
mandatory.
mandatory.
Calc_kappa_shear_vertex().
arguments accordingly.
extractFluxes(), which are now effectively always false.
All answers are bitwise identical, and no output is changed.