forked from mom-ocean/MOM6
-
Notifications
You must be signed in to change notification settings - Fork 63
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
Rescale 6 ice shelf variables #805
Merged
Hallberg-NOAA
merged 1 commit into
NOAA-GFDL:dev/gfdl
from
Hallberg-NOAA:more_ice_shelf_rescaling
Jan 24, 2025
Merged
Rescale 6 ice shelf variables #805
Hallberg-NOAA
merged 1 commit into
NOAA-GFDL:dev/gfdl
from
Hallberg-NOAA:more_ice_shelf_rescaling
Jan 24, 2025
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
Hallberg-NOAA
added
the
refactor
Code cleanup with no changes in functionality or results
label
Jan 17, 2025
alex-huth
reviewed
Jan 22, 2025
alex-huth
reviewed
Jan 22, 2025
alex-huth
reviewed
Jan 22, 2025
alex-huth
reviewed
Jan 22, 2025
Changed the rescaling of 7 ice shelf variables to cancel out common conversion factors that appear in several expressions. The C_basal_friction argument to initialize_ice_C_basal_friction is now in partially rescaled units, reflecting the portion that does not cancel out fractional-power units from a power law fit with an arbitrary power. The C_basal_friction array in ice_shelf_dyn_CS and the C_friction variable in initialize_ice_C_basal_friction were similarly rescaled. There are new scale factors in a get_param_call and a MOM_read_data call and a conversion factor in register_restart_field call that reflect these changes. The KE_tot and mass_tot variables in write_ice_shelf_energy, are kept in scaled units until they are written. The internal variable fN in calc_shelf_taub is kept in scaled units, but there is now a scaling factor of US%L_to_N in the expression for fB. This latter could be folded into the CF_Max element of ice_shelf_dyn_CS, but I am unsure whether this would be physically sensible. All answers should be bitwise identical and no output should change, but this has not been extensively tested yet.
Hallberg-NOAA
force-pushed
the
more_ice_shelf_rescaling
branch
from
January 23, 2025 16:43
d308d24
to
29642ad
Compare
Thank you for the detailed review @alex-huth . This PR has now been updated in line with all of the suggestions. |
alex-huth
approved these changes
Jan 23, 2025
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
These changes are correct. Thank you
This PR has passed pipeline testing at https://gitlab.gfdl.noaa.gov/ogrp/mom6ci/MOM6/-/pipelines/26171. |
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.
Changed the rescaling of 6 ice shelf variables to cancel out common conversion factors that appear in several expressions.
The
C_basal_friction
argument toinitialize_ice_C_basal_friction()
is now in partially rescaled units, reflecting the portion that does not cancel out fractional-power units from a power law fit with an arbitrary power. TheC_basal_friction
array inice_shelf_dyn_CS
and theC_friction
variable ininitialize_ice_C_basal_friction()
were similarly rescaled. There are new scale factors in aget_param()
call and aMOM_read_data()
call and a conversion factor in aregister_restart_field()
call that reflect these changes.The
KE_tot
andmass_tot
variables inwrite_ice_shelf_energy()
, are kept in scaled units until they are written.The internal variable
fN
in calc_shelf_taub()is kept in scaled units, but there is now a scaling factor of
US%Z_to_Lin the expression for
fB. This latter could be folded into the
CF_Maxelement of
ice_shelf_dyn_CS`, but I am unsure whether this would be physically sensible.All answers should be bitwise identical and no output should change, but this has not been extensively tested yet.