Skip to content

Fix ERS and DIMCS failures for when USE_CR_GRID is on #357

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

Merged
alperaltuntas merged 4 commits into from
Apr 28, 2025
Merged

Fix ERS and DIMCS failures for when USE_CR_GRID is on #357

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
56940b7
add missing scale arg when reading Cr_space
alperaltuntas Apr 25, 2025
6115e3f
register MLD and h_ML as restart fields when BODNER23 is on
alperaltuntas Apr 25, 2025
d959cf3
add dimensional scaling factor for sfc_buoy_flx when set to KPP_buoy_…
alperaltuntas Apr 26, 2025
993e74e
fix OMP directive in mixedlayer_restrat_Bodner
alperaltuntas Apr 28, 2025
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
4 changes: 2 additions & 2 deletions src/parameterizations/lateral/MOM_mixed_layer_restrat.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1013,7 +1013,7 @@ subroutine mixedlayer_restrat_Bodner(CS, G, GV, US, h, uhtr, vhtr, tv, forces, d
!$OMP default(shared) &
!$OMP private(i, j, k, keep_going, line_is_empty, dh, &
!$OMP grid_dsd, absf, h_sml, h_big, grd_b, r_wpup, psi_mag, IhTot, &
!$OMP sigint, muzb, muza, hAtVel, Rml_int, SpV_int)
!$OMP sigint, muzb, muza, hAtVel, Rml_int, SpV_int, rho_ml, SpV_ml, dmu )

!$OMP do
do j=js-1,je+1
Expand Down Expand Up @@ -1779,7 +1779,7 @@ logical function mixedlayer_restrat_init(Time, G, GV, US, param_file, diag, CS,
"The variable name for Cr field.", &
default="Cr")
filename = trim(inputdir) // "/" // trim(filename)
call MOM_read_data(filename, varname, CS%Cr_space, G%domain)
call MOM_read_data(filename, varname, CS%Cr_space, G%domain, scale=1.0)
call pass_var(CS%Cr_space, G%domain)
endif
call closeParameterBlock(param_file) ! The remaining parameters do not have MLE% prepended
Expand Down
2 changes: 1 addition & 1 deletion src/parameterizations/vertical/MOM_diabatic_driver.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1337,7 +1337,7 @@ subroutine diabatic_ALE(u, v, h, tv, BLD, fluxes, visc, ADp, CDp, dt, Time_end,
! If visc%MLD or visc%h_ML exist, copy KPP's BLD into them with appropriate conversions.
if (associated(visc%h_ML)) call convert_MLD_to_ML_thickness(BLD, h, visc%h_ML, tv, G, GV)
if (associated(visc%MLD)) visc%MLD(:,:) = BLD(:,:)
if (associated(visc%sfc_buoy_flx)) visc%sfc_buoy_flx(:,:) = KPP_buoy_flux(:,:,1)
if (associated(visc%sfc_buoy_flx)) visc%sfc_buoy_flx(:,:) = KPP_buoy_flux(:,:,1) * US%L_to_Z**2

if (showCallTree) call callTree_waypoint("done with KPP_calculate (diabatic)")
if (CS%debug) then
Expand Down
4 changes: 2 additions & 2 deletions src/parameterizations/vertical/MOM_set_viscosity.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2799,12 +2799,12 @@ subroutine set_visc_register_restarts(HI, G, GV, US, param_file, visc, restart_C
call safe_alloc_ptr(visc%h_ML, isd, ied, jsd, jed)
endif

if (MLE_use_PBL_MLD) then
if (MLE_use_PBL_MLD .or. MLE_use_Bodner) then
Copy link
Copy Markdown
Collaborator

@gustavo-marques gustavo-marques Apr 28, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this be MLE_use_PBL_MLD .and. MLE_use_Bodner? I do not think we need to save MLD if MLE_use_Bodner = True and MLE_use_PBL_MLD = False.

Copy link
Copy Markdown
Member Author

@alperaltuntas alperaltuntas Apr 28, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In mixedlayer_restrat_Bodner subroutine, BLD (MLD) and h_MLD is needed regardless of MLE_use_PBL_MLD. Hence, the .or. clause.

call register_restart_field(visc%MLD, "MLD", .false., restart_CS, &
"Instantaneous active mixing layer depth", units="m", conversion=US%Z_to_m)
endif
if (MLE_use_PBL_MLD .or. do_brine_plume .or. use_fpmix .or. &
use_neutral_diffusion .or. use_hor_bnd_diff) then
use_neutral_diffusion .or. use_hor_bnd_diff .or. MLE_use_Bodner) then
Copy link
Copy Markdown
Collaborator

@gustavo-marques gustavo-marques Apr 28, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same here. Do we need to save h_ML even when MLE_use_PBL_MLD = False?
If not, it might make more sense to have:
... .or. use_hor_bnd_diff .or. (MLE_use_Bodner .and. MLE_use_PBL_MLD)

Copy link
Copy Markdown
Member Author

@alperaltuntas alperaltuntas Apr 28, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Similarly, h_MLD is needed by mixedlayer_restrat_Bodner regardless of MLE_use_PBL_MLD.

call register_restart_field(visc%h_ML, "h_ML", .false., restart_CS, &
"Instantaneous active mixing layer thickness", &
units=get_thickness_units(GV), conversion=GV%H_to_mks)
Expand Down