+Add RESTORE_FLUX_RHO and set tau_mag#451
Merged
marshallward merged 5 commits intoAug 19, 2023
Merged
Conversation
Hallberg-NOAA
added
enhancement
Codecov Report
@@ Coverage Diff @@
## dev/gfdl #451 +/- ##
============================================
- Coverage 38.05% 38.04% -0.01%
============================================
Files 269 269
Lines 77406 77417 +11
Branches 14294 14300 +6
============================================
+ Hits 29454 29457 +3
- Misses 42608 42617 +9
+ Partials 5344 5343 -1
... and 1 file with indirect coverage changes 📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more |
Hallberg-NOAA
force-pushed
the
nonBous_restore_flux
branch
from
2fe659e to
2f201d4
Compare
Member
Author
|
The initial problems with the rotational symmetry testing with this PR were corrected by rebasing it on top of PR #452, which should be handled before this one. |
Added the new runtime parameters RESTORE_FLUX_RHO and TKE_TIDAL_RHO to specify the densities that are used to convert the piston velocities into restoring heat or salt fluxes and to translate tidal velocities into tidal TKE input. Their defaults are set to RHO_0 to reproduce previous answers. Also added tau_mag arguments to 2 calls to allocate_forcing_type() and 4 calls to allocate_mech_forcing() in the FMS_cap and solo_driver code. There are new rho_restore elements in the FMS and solo_driver versions of surface_forcing_CS and in MESO_surface_forcing_CS and user_surface_forcing_CS. By default, all answers are bitwise identical, but there are new entries in some MOM_parameter_doc files.
Add tau_mag argument to calls to allocate_forcing_type() in initialize_ice_shelf_fluxes and the mct_cap and noupc_cap versions of convert_IOB_to_fluxes and to calls to allocate_mech_forcing() in initialize_ice_shelf_forces and the mct_cap and noupc_cap versions of convert_IOB_to_forces. All answers are bitwise identical.
Calculate forces%tau_mag in idealized_hurricane_wind_forcing() and SCM_idealized_hurricane_wind_forcing(), and call allocate_mech_forcing with the new tau_mag argument so that this array is sure to be allocated. All answers are bitwise identical in existing test cases, but this step was necessary for this code to work in fully non-Boussinesq configurations.
Use RESTORE_FLUX_RHO in SCM_CVMix_tests and dumbbell_surface_forcing to specify the density that are used to convert the piston velocities into restoring heat or salt fluxes. As with other analogous changes, the default is set to RHO_0 to reproduce previous answers. Also set forces%tau_mag in SCM_CVMix_tests_wind_forcing if it is associated. There is a new rho_restore element in the control structures for the SCM_CVMix_tests two module, while the units of an element in the dumbbell_surface_forcing module are changed. By default, all existing answers are bitwise identical, but there are new entries in some MOM_parameter_doc files.
Hallberg-NOAA
force-pushed
the
nonBous_restore_flux
branch
from
2f201d4 to
9de95bb
Compare
marshallward
approved these changes
Aug 18, 2023
Member
marshallward
left a comment
marshallward
left a comment
There was a problem hiding this comment.
All looks good, tau_mag is integrated into the drivers and user configs.
Member
|
Gaea regression: https://gitlab.gfdl.noaa.gov/ogrp/MOM6/-/jobs/109561 ✔️ |
This was referenced Nov 13, 2023
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
3 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.
This PR includes a series of commits that set the new runtime parameters RESTORE_FLUX_RHO and TKE_TIDAL_RHO when in non-Boussinesq mode to reduce the dependency on the Boussinesq reference density, and also ensure that tau_mag is being allocated and set properly with some cases where it had been omitted previously. The specific changes include:
Added the new runtime parameters RESTORE_FLUX_RHO and TKE_TIDAL_RHO to specify the densities that are used to convert the piston velocities into restoring heat or salt fluxes and to translate tidal velocities into tidal TKE input. Their defaults are set to RHO_0 to reproduce previous answers. There are new rho_restore elements in the FMS and solo_driver versions of surface_forcing_CS and in MESO_surface_forcing_CS, user_surface_forcing_CS, SCM_CVMix_tests_CS, and changes to the units of the Flux_const element of dumbbell_surface_forcing_CS.
Added tau_mag arguments to 6 calls to allocate_forcing_type() and 9 calls to allocate_mech_forcing() in the FMS_cap, solo_driver, mct_cap, nuopc_cap Idealized_hurricane and initalize_ice_shelf code.
Calculate forces%tau_mag in idealized_hurricane_wind_forcing(), SCM_idealized_hurricane_wind_forcing() and SCM_CVMix_tests_wind_forcing() if forces%tau_mag is associated.
By default, all existing answers are bitwise identical in any cases that worked previously, but there are new entries in some MOM_parameter_doc files, and some non-Boussinesq versions of existing Boussinesq test cases are now
working properly.