From 9ac2e5a8bfb7d7766546ca96ac3a6c4cc071fd0b Mon Sep 17 00:00:00 2001 From: yuchengt900 Date: Thu, 2 Jan 2025 10:40:19 -0500 Subject: [PATCH 1/5] Resolved a line truncation issue --- src/tracer/MOM_generic_tracer.F90 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/tracer/MOM_generic_tracer.F90 b/src/tracer/MOM_generic_tracer.F90 index de2e849d50..f3b9955c83 100644 --- a/src/tracer/MOM_generic_tracer.F90 +++ b/src/tracer/MOM_generic_tracer.F90 @@ -771,9 +771,11 @@ subroutine MOM_generic_tracer_column_physics(h_old, h_new, ea, eb, fluxes, Hml, 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 From 78d38126cae426d82c8ecf993ef9501b9accc9c3 Mon Sep 17 00:00:00 2001 From: yuchengt900 Date: Thu, 2 Jan 2025 10:51:29 -0500 Subject: [PATCH 2/5] Fixed trailing space issue --- src/tracer/MOM_generic_tracer.F90 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tracer/MOM_generic_tracer.F90 b/src/tracer/MOM_generic_tracer.F90 index f3b9955c83..8ad8afa448 100644 --- a/src/tracer/MOM_generic_tracer.F90 +++ b/src/tracer/MOM_generic_tracer.F90 @@ -766,7 +766,7 @@ 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 From 818e93f725dc8e5f8afa604338a9d15e28c3ddb4 Mon Sep 17 00:00:00 2001 From: yuchengt900 Date: Thu, 2 Jan 2025 11:07:01 -0500 Subject: [PATCH 3/5] fixed parameter description issue --- config_src/external/GFDL_ocean_BGC/generic_tracer.F90 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config_src/external/GFDL_ocean_BGC/generic_tracer.F90 b/config_src/external/GFDL_ocean_BGC/generic_tracer.F90 index af9444363c..dcc9a2887d 100644 --- a/config_src/external/GFDL_ocean_BGC/generic_tracer.F90 +++ b/config_src/external/GFDL_ocean_BGC/generic_tracer.F90 @@ -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 photoacclimation + !! that is used for COBALTv3 end subroutine generic_tracer_source !> Update the tracers from bottom fluxes From 10a7f9411cdd24153789caad82cef492cdd45b2c Mon Sep 17 00:00:00 2001 From: yuchengt900 Date: Thu, 2 Jan 2025 11:12:57 -0500 Subject: [PATCH 4/5] Fixed line length exceeded issue --- config_src/external/GFDL_ocean_BGC/generic_tracer.F90 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config_src/external/GFDL_ocean_BGC/generic_tracer.F90 b/config_src/external/GFDL_ocean_BGC/generic_tracer.F90 index dcc9a2887d..0017916406 100644 --- a/config_src/external/GFDL_ocean_BGC/generic_tracer.F90 +++ b/config_src/external/GFDL_ocean_BGC/generic_tracer.F90 @@ -97,8 +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 !< The mixed layer depth calculated for photoacclimation - !! that is used for COBALTv3 + 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 From c69832ed536c7703b0503c238e149c2236d54f3d Mon Sep 17 00:00:00 2001 From: yuchengt900 Date: Thu, 2 Jan 2025 14:53:55 -0500 Subject: [PATCH 5/5] fixed Expression verification tests --- src/tracer/MOM_tracer_registry.F90 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/tracer/MOM_tracer_registry.F90 b/src/tracer/MOM_tracer_registry.F90 index 39ffac5e0b..f1f2394d3d 100644 --- a/src/tracer/MOM_tracer_registry.F90 +++ b/src/tracer/MOM_tracer_registry.F90 @@ -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 '//&