Merge remote-tracking branch 'GFDL/main' into test/update-to-GFDL-202…#3
Closed
jiandewang wants to merge 1 commit into
Closed
Conversation
jiandewang
pushed a commit
that referenced
this pull request
Feb 1, 2022
* reads in porous topography parameters from CHANNEL_LIST_FILE *new module to compute curve fit for porous topography *porous constraints used to modify continuity_PPM, CoriolisAdv, and Rayleigh bottom channel drag
jiandewang
pushed a commit
that referenced
this pull request
Feb 1, 2022
(+) porous topography implementation
jiandewang
pushed a commit
that referenced
this pull request
Feb 1, 2022
Use the por_face_area[UV] in the effective thickness calculations in zonal_face_thickness and merid_face_thickness, so that they are more consistent with their use elsewhere in the code for the relative weights in calculating the barotropic accelerations. Because these por_face_area arrays are still 1 in all test cases, the answers are unchanged in any test cases from before a few weeks ago, but there could be answer changes in cases that are using the very recently added capability (in PR #3) to set fractional face areas. This change was discussed with Sam Ditkovsky, and agreed that there is no reason to keep the ability to recover the previous answers in any cases that use the recently added partial face width option. This commit also expanded the comments describing the h_u and h_v arguments to btcalc(), zonal_face_thickness(), and merid_face_thickness() routines, the diag_h[uv] elements of the accel_diag_ptrs type and the h_u and h_v elements of the BT_cont_type. All answers and output are bitwise identical in the MOM6-examples test suite and TC tests, but answer changes are possible in cases using a very recently added code option.
jiandewang
pushed a commit
that referenced
this pull request
May 5, 2025
* Commit for coupling of land to ocean adot * Remove unused ice sheet enabled flag * add adot to Shelf restart * Register sfc mass flux outside of initialize fluxes * Gfdl cryo merge (#3) * Removed second registration of sfc_mass_flux with register_diag_field. * Registered sfc_mass_flux to runs with static and dynamic ice sheets. * This commit removed the second registration of 'sfc_mass_flux' in 'register_diag_field()' * Testing shelf_sfc_mass_flux restart. * The earlier removed 'register_diag_field()' for 'mass_flux' has been added back and 'register_restart_field()' of 'fluxes_in%shelf_sfc_mass_flux' is moved before 'restore_state()' * Corrected the line length error. * Added back 'CS%id_mass_flux = register_diag_field()' --------- Co-authored-by: NJSchlegel <nschlegel@gmail.com>
jiandewang
pushed a commit
that referenced
this pull request
Aug 1, 2025
Replaces the approach that set the restart filename from within the MOM\_stochastics module with a more appropriate approach within the NUOPC cap.
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
1 participant
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.
…10308-rev-test2