Skip to content
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.

Sign up for GitHub

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

Jump to bottom

update to MOM6 main branch 20220317 commit #87

Merged
merged 3 commits into from
Mar 23, 2022
Merged

update to MOM6 main branch 20220317 commit #87

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ee5003c
Add calls to restart_registry_lock when using ODA in MOM_state_initia…
abozec Mar 10, 2022
399a7db
Merge pull request #1559 from abozec/main
marshallward Mar 17, 2022
ba37f94
Merge remote-tracking branch 'FSU/main' into feature/update-to-main-2…
jiandewang Mar 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/initialization/MOM_state_initialization.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ module MOM_state_initialization
!use MOM_open_boundary, only : set_3D_OBC_data
use MOM_grid_initialize, only : initialize_masks, set_grid_metrics
use MOM_restart, only : restore_state, is_new_run, MOM_restart_CS
use MOM_restart, only : restart_registry_lock
use MOM_sponge, only : set_up_sponge_field, set_up_sponge_ML_density
use MOM_sponge, only : initialize_sponge, sponge_CS
use MOM_ALE_sponge, only : set_up_ALE_sponge_field, set_up_ALE_sponge_vel_field
Expand Down Expand Up @@ -515,7 +516,9 @@ subroutine MOM_initialize_state(u, v, h, tv, Time, G, GV, US, PF, dirs, &
"If true, oda incremental updates will be applied "//&
"everywhere in the domain.", default=.false.)
if (use_oda_incupd) then
call restart_registry_lock(restart_CS, unlocked=.true.)
call initialize_oda_incupd_fixed(G, GV, US, oda_incupd_CSp, restart_CS)
call restart_registry_lock(restart_CS)
endif

! This is the end of the block of code that might have initialized fields
Expand Down