forked from mom-ocean/MOM6
-
Notifications
You must be signed in to change notification settings - Fork 62
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
+(*)Pseudo_salt_tracer and forcing%netSalt #16
Merged
marshallward
merged 4 commits into
NOAA-GFDL:dev/gfdl
from
Hallberg-NOAA:refactor_pseudo_salt_tracer
Dec 4, 2021
Merged
+(*)Pseudo_salt_tracer and forcing%netSalt #16
marshallward
merged 4 commits into
NOAA-GFDL:dev/gfdl
from
Hallberg-NOAA:refactor_pseudo_salt_tracer
Dec 4, 2021
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
Refactored the pseudo_salt_tracer code to avoid using fluxes%netSalt, instead calculating the surface fluxes directly from fluxes%saltFlux, in preparation to get rid of the largely redundant fluxes%netSalt element, but also to correct for the fact that fluxes%netSalt does not have proper scaling to pass dimensional consistency testing. Also made the CS%diff element of pseudo_salt_tracer_CS into an allocatable instead of it being a pointer, and changed the tests for whether it is allocated appropriately. Several unused variables were eliminated, and some comments corrected or reformated. This does not impact solutions, but the pseudo_salt and pseudo_salt_diff diagnostics are now invariant to dimensional rescaling, whereas before they were not. All solutions and output in MOM6-examples are bitwise identical.
Eliminated the no-longer used and previously improperly rescaled netSalt element from the forcing type. Also added the missing deallocate statements for fluxes%netMassOut and fluxes%netMassIn in deallocate_forcing_type(). All answers and output are bitwise identical, although an element has been removed from a transparent type.
Codecov Report
@@ Coverage Diff @@
## dev/gfdl #16 +/- ##
============================================
- Coverage 29.17% 29.16% -0.01%
============================================
Files 240 240
Lines 71489 71496 +7
============================================
- Hits 20856 20854 -2
- Misses 50633 50642 +9
Continue to review full report at Codecov.
|
marshallward
approved these changes
Dec 3, 2021
Gaea regression: https://gitlab.gfdl.noaa.gov/ogrp/MOM6/-/pipelines/14254 ✔️ |
This was referenced Jan 29, 2022
Hallberg-NOAA
added
the
refactor
Code cleanup with no changes in functionality or results
label
Feb 1, 2022
theresa-morrison
added a commit
to theresa-morrison/MOM6
that referenced
this pull request
Aug 22, 2024
* Calculate a photoacclimation MLD in MOM6 Using the diagnose MLD routines calculate a MLD that can be used in COBALTv3. * Update interfaces for diagnoseMLD Some previously optional arguments were made nonoptinal in the final version merged into dev/gfdl. So these areguents have been added to the call in MOM_generic_tracers. * Add unset variable in diagnoseMLDbyenergy * Remove timescale variable This parameter seems unneeded at this time. * Change paramter name and though up PR Change "MLD_PHA_FIXED" to "MLD_PHA_CALC" which is default false. Touch up a few formatting issues. Add initialization and comment for mld_pha. * Add fatal errors Add fatal errors if PHA_MLD_CALC is true, but a method is not specified. * Add additional argument to generic tracer stub Add the photo_acc_mld argument to the generic tracer stub in MOM6. --------- Co-authored-by: Theresa Morrison <Theresa.Morrison@gaea57.ncrc.gov> Co-authored-by: Theresa Morrison <Theresa.Morrison@gaea56.ncrc.gov>
theresa-morrison
added a commit
to theresa-morrison/MOM6
that referenced
this pull request
Nov 18, 2024
* Calculate a photoacclimation MLD in MOM6 Using the diagnose MLD routines calculate a MLD that can be used in COBALTv3. * Update interfaces for diagnoseMLD Some previously optional arguments were made nonoptinal in the final version merged into dev/gfdl. So these areguents have been added to the call in MOM_generic_tracers. * Add unset variable in diagnoseMLDbyenergy * Remove timescale variable This parameter seems unneeded at this time. * Change paramter name and though up PR Change "MLD_PHA_FIXED" to "MLD_PHA_CALC" which is default false. Touch up a few formatting issues. Add initialization and comment for mld_pha. * Add fatal errors Add fatal errors if PHA_MLD_CALC is true, but a method is not specified. * Add additional argument to generic tracer stub Add the photo_acc_mld argument to the generic tracer stub in MOM6. --------- Co-authored-by: Theresa Morrison <Theresa.Morrison@gaea57.ncrc.gov> Co-authored-by: Theresa Morrison <Theresa.Morrison@gaea56.ncrc.gov>
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 a problem with the dimensional rescaling of the tracers in the
pseudo_salt_tracer package and eliminates the essentially redundant netSalt
element from the forcing type. This could change the output of some passive
tracer diagnostics when dimensional rescaling is in use, and it eliminates an
element from a transparent type, but all answers and output in the MOM6-examples
regression suite are bitwise identical.
The commits in this PR include: