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

Clean up dev/cefi #23

Merged
merged 5 commits into from
Jan 2, 2025
+11 −8
Merged

Clean up dev/cefi #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9ac2e5a
Resolved a line truncation issue
yichengt900 Jan 2, 2025
78d3812
Fixed trailing space issue
yichengt900 Jan 2, 2025
818e93f
fixed parameter description issue
yichengt900 Jan 2, 2025
10a7f94
Fixed line length exceeded issue
yichengt900 Jan 2, 2025
c69832e
fixed Expression verification tests
yichengt900 Jan 2, 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
3 changes: 2 additions & 1 deletion config_src/external/GFDL_ocean_BGC/generic_tracer.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,8 @@ subroutine generic_tracer_source(Temp,Salt,rho_dzt,dzt,hblt_depth,ilb,jlb,tau,dt
real, dimension(ilb:,jlb:),optional , intent(in) :: current_wave_stress !< Unknown, and presently unused by MOM6
real, optional , intent(in) :: sosga !< Global average sea surface salinity [ppt]
real, dimension(ilb:,jlb:),optional, intent(in) :: geolat !< Latitude
real, dimension(ilb:,jlb:), optional, intent(in) :: photo_acc_dpth
real, dimension(ilb:,jlb:), optional, intent(in) :: photo_acc_dpth !< The mixed layer depth calculated for
!! iphotoacclimation (COBALTv3 only)
end subroutine generic_tracer_source

!> Update the tracers from bottom fluxes
Expand Down
8 changes: 5 additions & 3 deletions src/tracer/MOM_generic_tracer.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -766,14 +766,16 @@ subroutine MOM_generic_tracer_column_physics(h_old, h_new, ea, eb, fluxes, Hml,
enddo ; enddo
sosga = global_area_mean(surface_field, G, unscale=US%S_to_ppt)

mld_pha(:,:) = 0.0
mld_pha(:,:) = 0.0
if (.not.CS%mld_pha_calc) then
mld_pha(:,:) = CS%mld_pha_val
else
if (CS%mld_pha_use_delta_rho) then
call diagnoseMLDbyDensityDifference(-1, h_old, tv, CS%mld_pha_drho, G, GV, US, CS%diag, CS%mld_pha_href, id_ref_z=-1, id_ref_rho=-1, MLD_out=mld_pha)
call diagnoseMLDbyDensityDifference(-1, h_old, tv, CS%mld_pha_drho, G, GV, US, CS%diag, &
CS%mld_pha_href, id_ref_z=-1, id_ref_rho=-1, MLD_out=mld_pha)
elseif (CS%mld_pha_use_delta_eng) then
call diagnoseMLDbyEnergy((/-1, -1, -1/), h_old, tv, G, GV, US, (/CS%mld_pha_deng, CS%mld_pha_deng, CS%mld_pha_deng/), CS%diag, MLD_out=mld_pha)
call diagnoseMLDbyEnergy((/-1, -1, -1/), h_old, tv, G, GV, US, (/CS%mld_pha_deng, &
CS%mld_pha_deng, CS%mld_pha_deng/), CS%diag, MLD_out=mld_pha)
endif
endif

Expand Down
8 changes: 4 additions & 4 deletions src/tracer/MOM_tracer_registry.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,19 +457,19 @@ subroutine register_tracer_diagnostics(Reg, h, Time, diag, G, GV, US, use_ALE, u
conversion=Tr%conv_scale*US%s_to_T)
Tr%id_difc_xy = register_diag_field('ocean_model',trim(shortnm)//"_diffusionc_xy", &
diag%axesTL, Time, "Horizontal convergence of residual mean diffusive fluxes of "//&
trim(shortnm)//' concentration', trim(units)//' s-1')
trim(shortnm)//' concentration', trim(units)//' s-1', conversion=Tr%conc_scale*US%s_to_T)
Tr%id_dif_xy = register_diag_field('ocean_model',trim(shortnm)//"_diffusion_xy", &
diag%axesTL, Time, "Horizontal convergence of residual mean diffusive fluxes of "//trim(shortnm), &
conv_units, conversion=Tr%conv_scale*US%s_to_T)
Tr%id_advc_xy = register_diag_field('ocean_model',trim(shortnm)//"_advectionc_xy", &
diag%axesTL, Time, "Horizontal convergence of residual mean advective fluxes of "//&
trim(shortnm)//' concentration', trim(units)//' s-1')
trim(shortnm)//' concentration', trim(units)//' s-1', conversion=Tr%conc_scale*US%s_to_T)
Tr%id_advc_x = register_diag_field("ocean_model",trim(shortnm)//'_advectionc_x', &
diag%axesTL, Time, "Horizontal x mean advective fluxes of "//trim(shortnm)//' concentration', &
trim(units)//' s-1')
trim(units)//' s-1', conversion=Tr%conc_scale*US%s_to_T)
Tr%id_advc_y = register_diag_field("ocean_model",trim(shortnm)//'_advectionc_y', &
diag%axesTL, Time, "Horizontal y mean advective fluxes of "//trim(shortnm)//' concentration', &
trim(units)//' s-1')
trim(units)//' s-1', conversion=Tr%conc_scale*US%s_to_T)
Tr%id_adv_xy_2d = register_diag_field('ocean_model', trim(shortnm)//"_advection_xy_2d", &
diag%axesT1, Time, &
'Vertical sum of horizontal convergence of residual mean advective fluxes of '//&
Expand Down
Loading