+Add option to use Hybgen regridding #101
Merged
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
This commit adds the ability to use Hybgen regridding, derived from Hycom code. There are two new files, MOM_hybgen_regrid.F90 and MOM_hybgen_unmix.F90, which in turn add 15 new runtime parameters (with names like HYBGEN_...) to control the hybgen code. This new regridding option is specified via REGRIDDING_COORDINATE_MODE="HYBGEN", and this new option is listed in the MOM_parameter_doc files for cases that have USE_REGRIDDING=True. There is also a new publicly visible parameter, REGRIDDING_HYBGEN, in regrid_consts.F90. In addition, the new routine regridding_preadjust_reqs is provided in MOM_regridding to specify whether convective adjustment or hybgen_unmixing should be done before regridding. This is used along with the optional argument conv_adjust to regridding_main to move these pre-adjustment steps out of regridding_main. The unused routine ALE_build_grid was eliminated, and comments were added describing a few undocumented internal real variables. All answers are bitwise identical, but there are several new public interfaces and there will be new lines in the comments in some MOM_parameter_doc files.
Eliminated the option to do convective adjustment within regridding_main, including making the optional argument conv_adjust mandatory, with an error message if it is set to .true., so that there will not be the possibility of this code change silently changing the code behavior or solutions. After a decent interval, this argument can be safely eliminated. As a result of these changes, the intent of two key arguments to regridding_main() could be changed from intent(inout) to intent(in), which should help clarify the purpose of this routine. All answers are bitwise identical, but there are interface changes.
Codecov Report
@@ Coverage Diff @@
## dev/gfdl #101 +/- ##
============================================
- Coverage 28.98% 28.75% -0.24%
============================================
Files 246 248 +2
Lines 72344 72970 +626
============================================
+ Hits 20966 20979 +13
- Misses 51378 51991 +613
Continue to review full report at Codecov.
|
|
Gaea regression: https://gitlab.gfdl.noaa.gov/ogrp/MOM6/-/pipelines/15189 ✔️ The |
marshallward
approved these changes
Apr 9, 2022
This was referenced May 16, 2022
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 adds the ability to use Hybgen regridding, derived from Hycom
code. There are two new files, MOM_hybgen_regrid.F90 and MOM_hybgen_unmix.F90,
which in turn add 15 new runtime parameters (with names like HYBGEN_...) to
control the hybgen code. This new regridding option is specified by setting
REGRIDDING_COORDINATE_MODE="HYBGEN", and this new option is listed in the
MOM_parameter_doc files for cases that have USE_REGRIDDING=True. There is also
a new publicly visible parameter, REGRIDDING_HYBGEN, in regrid_consts.F90.
In addition, the new routine regridding_preadjust_reqs is provided in
MOM_regridding.F90 to specify whether convective adjustment or hybgen_unmixing
should be done before regridding. These pre-adjustment steps are no longer in
regridding_main. Instead the calls do this occur outside of regridding_main if
they are needed.
The unused routine ALE_build_grid was eliminated, and comments were added
describing a few undocumented internal real variables.
All answers are bitwise identical, but there are several new or modified
public interfaces and there will be new lines in the comments in some
MOM_parameter_doc files.
The commits in this PR include: