diff --git a/config_src/drivers/nuopc_cap/mom_cap.F90 b/config_src/drivers/nuopc_cap/mom_cap.F90
index ba380afeaa..62386fc3ef 100644
--- a/config_src/drivers/nuopc_cap/mom_cap.F90
+++ b/config_src/drivers/nuopc_cap/mom_cap.F90
@@ -713,7 +713,9 @@ subroutine InitializeAdvertise(gcomp, importState, exportState, clock, rc)
Ice_ocean_boundary% hevap (isc:iec,jsc:jec), &
Ice_ocean_boundary% hcond (isc:iec,jsc:jec), &
Ice_ocean_boundary% lrunoff_glc (isc:iec,jsc:jec), &
- Ice_ocean_boundary% frunoff_glc (isc:iec,jsc:jec))
+ Ice_ocean_boundary% frunoff_glc (isc:iec,jsc:jec), &
+ Ice_ocean_boundary% hrofl_glc (isc:iec,jsc:jec), &
+ Ice_ocean_boundary% hrofi_glc (isc:iec,jsc:jec))
Ice_ocean_boundary%hrain = 0.0
Ice_ocean_boundary%hsnow = 0.0
@@ -723,6 +725,8 @@ subroutine InitializeAdvertise(gcomp, importState, exportState, clock, rc)
Ice_ocean_boundary%hcond = 0.0
Ice_ocean_boundary%lrunoff_glc = 0.0
Ice_ocean_boundary%frunoff_glc = 0.0
+ Ice_ocean_boundary%hrofl_glc = 0.0
+ Ice_ocean_boundary%hrofi_glc = 0.0
endif
call query_ocean_state(ocean_state, use_waves=use_waves, wave_method=wave_method)
@@ -783,6 +787,10 @@ subroutine InitializeAdvertise(gcomp, importState, exportState, clock, rc)
call fld_list_add(fldsToOcn_num, fldsToOcn, "Foxx_hcond" , "will provide")
call fld_list_add(fldsToOcn_num, fldsToOcn, "Foxx_hrofl" , "will provide")
call fld_list_add(fldsToOcn_num, fldsToOcn, "Foxx_hrofi" , "will provide")
+ if (cesm_coupled) then
+ call fld_list_add(fldsToOcn_num, fldsToOcn, "Foxx_hrofl_glc" , "will provide")
+ call fld_list_add(fldsToOcn_num, fldsToOcn, "Foxx_hrofi_glc" , "will provide")
+ endif
if (use_waves) then
if (wave_method == "EFACTOR") then
@@ -2789,6 +2797,20 @@ end subroutine shr_log_setLogUnit
!! |
!!
!!
+!! | Foxx_hrofi_glc |
+!! W m-2 |
+!! hrofi_glc |
+!! heat content (enthalpy) of frozen glc runoff |
+!! |
+!!
+!!
+!! | Foxx_hrofl_glc |
+!! W m-2 |
+!! hrofl_glc |
+!! heat content (enthalpy) of liquid glc runoff |
+!! |
+!!
+!!
!! | Fioi_salt |
!! kg m-2 s-1 |
!! salt_flux |
diff --git a/config_src/drivers/nuopc_cap/mom_cap_methods.F90 b/config_src/drivers/nuopc_cap/mom_cap_methods.F90
index 4206ad17a2..307462cc30 100644
--- a/config_src/drivers/nuopc_cap/mom_cap_methods.F90
+++ b/config_src/drivers/nuopc_cap/mom_cap_methods.F90
@@ -269,6 +269,23 @@ subroutine mom_import(ocean_public, ocean_grid, importState, ice_ocean_boundary,
if (ChkErr(rc,__LINE__,u_FILE_u)) return
end if
+ !----
+ ! enthalpy from liquid glc runoff (hrofl_glc)
+ !----
+ if ( associated(ice_ocean_boundary%hrofl_glc) ) then
+ call state_getimport(importState, 'Foxx_hrofl_glc', isc, iec, jsc, jec, &
+ ice_ocean_boundary%hrofl_glc, areacor=med2mod_areacor, rc=rc)
+ if (ChkErr(rc,__LINE__,u_FILE_u)) return
+ end if
+
+ !----
+ ! enthalpy from frozen glc runoff (hrofi_glc)
+ !----
+ if ( associated(ice_ocean_boundary%hrofi_glc) ) then
+ call state_getimport(importState, 'Foxx_hrofi_glc', isc, iec, jsc, jec, &
+ ice_ocean_boundary%hrofi_glc, areacor=med2mod_areacor, rc=rc)
+ if (ChkErr(rc,__LINE__,u_FILE_u)) return
+ end if
!----
! enthalpy from evaporation (hevap)
!----
diff --git a/config_src/drivers/nuopc_cap/mom_surface_forcing_nuopc.F90 b/config_src/drivers/nuopc_cap/mom_surface_forcing_nuopc.F90
index 292a7eb64d..5f2e186bd4 100644
--- a/config_src/drivers/nuopc_cap/mom_surface_forcing_nuopc.F90
+++ b/config_src/drivers/nuopc_cap/mom_surface_forcing_nuopc.F90
@@ -180,6 +180,8 @@ module MOM_surface_forcing_nuopc
real, pointer, dimension(:,:) :: mass_berg =>NULL() !< mass of icebergs(kg/m2)
real, pointer, dimension(:,:) :: hrofl =>NULL() !< heat content from liquid runoff [W/m2]
real, pointer, dimension(:,:) :: hrofi =>NULL() !< heat content from frozen runoff [W/m2]
+ real, pointer, dimension(:,:) :: hrofl_glc =>NULL() !< heat content from liquid glc runoff [W/m2]
+ real, pointer, dimension(:,:) :: hrofi_glc =>NULL() !< heat content from frozen glc runoff [W/m2]
real, pointer, dimension(:,:) :: hrain =>NULL() !< heat content from liquid precipitation [W/m2]
real, pointer, dimension(:,:) :: hsnow =>NULL() !< heat content from frozen precipitation [W/m2]
real, pointer, dimension(:,:) :: hevap =>NULL() !< heat content from evaporation [W/m2]
@@ -476,12 +478,12 @@ subroutine convert_IOB_to_fluxes(IOB, fluxes, index_bounds, Time, valid_time, G,
! add liquid glc runoff flux via rof
if (associated(IOB%lrunoff_glc)) then
- fluxes%lrunoff(i,j) = fluxes%lrunoff(i,j) + kg_m2_s_conversion * IOB%lrunoff_glc(i-i0,j-j0) * G%mask2dT(i,j)
+ fluxes%lrunoff_glc(i,j) = kg_m2_s_conversion * IOB%lrunoff_glc(i-i0,j-j0) * G%mask2dT(i,j)
endif
! ice glc runoff flux via rof
if (associated(IOB%frunoff_glc)) then
- fluxes%frunoff(i,j) = fluxes%frunoff(i,j) + kg_m2_s_conversion * IOB%frunoff_glc(i-i0,j-j0) * G%mask2dT(i,j)
+ fluxes%frunoff_glc(i,j) = kg_m2_s_conversion * IOB%frunoff_glc(i-i0,j-j0) * G%mask2dT(i,j)
endif
if (associated(IOB%ustar_berg)) &
@@ -525,6 +527,7 @@ subroutine convert_IOB_to_fluxes(IOB, fluxes, index_bounds, Time, valid_time, G,
if (associated(IOB%frunoff_glc)) then
fluxes%latent(i,j) = fluxes%latent(i,j) - &
IOB%frunoff_glc(i-i0,j-j0) * US%W_m2_to_QRZ_T * CS%latent_heat_fusion
+ ! todo: confirm below subtraction of frunoff_glc to latent_frunoff_diag is correct.
fluxes%latent_frunoff_diag(i,j) = fluxes%latent_frunoff_diag(i,j) - G%mask2dT(i,j) * &
IOB%frunoff_glc(i-i0,j-j0) * US%W_m2_to_QRZ_T * CS%latent_heat_fusion
endif
@@ -569,6 +572,12 @@ subroutine convert_IOB_to_fluxes(IOB, fluxes, index_bounds, Time, valid_time, G,
if (associated(IOB%hcond)) &
fluxes%heat_content_cond(i,j) = US%W_m2_to_QRZ_T * IOB%hcond(i-i0,j-j0) * G%mask2dT(i,j)
+
+ if (associated(IOB%hrofl_glc)) &
+ fluxes%heat_content_lrunoff_glc(i,j) = US%W_m2_to_QRZ_T * IOB%hrofl_glc(i-i0,j-j0) * G%mask2dT(i,j)
+
+ if (associated(IOB%hrofi_glc)) &
+ fluxes%heat_content_frunoff_glc(i,j) = US%W_m2_to_QRZ_T * IOB%hrofi_glc(i-i0,j-j0) * G%mask2dT(i,j)
endif
! sea ice fraction [nondim]
@@ -622,7 +631,8 @@ subroutine convert_IOB_to_fluxes(IOB, fluxes, index_bounds, Time, valid_time, G,
do j=js,je ; do i=is,ie
net_FW(i,j) = US%RZ_T_to_kg_m2s * &
(((fluxes%lprec(i,j) + fluxes%fprec(i,j) + fluxes%seaice_melt(i,j)) + &
- (fluxes%lrunoff(i,j) + fluxes%frunoff(i,j))) + &
+ (fluxes%lrunoff(i,j) + fluxes%frunoff(i,j) + &
+ fluxes%lrunoff_glc(i,j) + fluxes%frunoff_glc(i,j))) + &
(fluxes%evap(i,j) + fluxes%vprec(i,j)) ) * US%L_to_m**2*G%areaT(i,j)
net_FW2(i,j) = net_FW(i,j) / (US%L_to_m**2*G%areaT(i,j))
enddo ; enddo
@@ -1536,6 +1546,12 @@ subroutine ice_ocn_bnd_type_chksum(id, timestep, iobt)
if (associated(iobt%hcond)) then
chks = field_chksum( iobt%hcond ) ; if (root) write(outunit,100) 'iobt%hcond ', chks
endif
+ if (associated(iobt%hrofl_glc)) then
+ chks = field_chksum( iobt%hrofl_glc ) ; if (root) write(outunit,100) 'iobt%hrofl_glc ', chks
+ endif
+ if (associated(iobt%hrofl_glc)) then
+ chks = field_chksum( iobt%hrofl_glc ) ; if (root) write(outunit,100) 'iobt%hrofl_glc ', chks
+ endif
100 FORMAT(" CHECKSUM::",A20," = ",Z20)
diff --git a/src/core/MOM_forcing_type.F90 b/src/core/MOM_forcing_type.F90
index b8b3174b4a..0060e62be9 100644
--- a/src/core/MOM_forcing_type.F90
+++ b/src/core/MOM_forcing_type.F90
@@ -119,6 +119,8 @@ module MOM_forcing_type
vprec => NULL(), & !< virtual liquid precip associated w/ SSS restoring [R Z T-1 ~> kg m-2 s-1]
lrunoff => NULL(), & !< liquid river runoff entering ocean [R Z T-1 ~> kg m-2 s-1]
frunoff => NULL(), & !< frozen river runoff (calving) entering ocean [R Z T-1 ~> kg m-2 s-1]
+ lrunoff_glc => NULL(), & !< liquid river glc runoff entering ocean [R Z T-1 ~> kg m-2 s-1]
+ frunoff_glc => NULL(), & !< frozen river glc runoff entering ocean [R Z T-1 ~> kg m-2 s-1]
seaice_melt => NULL() !< snow/seaice melt (positive) or formation (negative) [R Z T-1 ~> kg m-2 s-1]
! Integrated water mass fluxes into the ocean, used for passive tracer sources [H ~> m or kg m-2]
@@ -131,15 +133,17 @@ module MOM_forcing_type
! heat associated with water crossing ocean surface
real, pointer, dimension(:,:) :: &
- heat_content_cond => NULL(), & !< heat content associated with condensating water [Q R Z T-1 ~> W m-2]
- heat_content_evap => NULL(), & !< heat content associated with evaporating water [Q R Z T-1 ~> W m-2]
- heat_content_lprec => NULL(), & !< heat content associated with liquid >0 precip [Q R Z T-1 ~> W m-2]
- heat_content_fprec => NULL(), & !< heat content associated with frozen precip [Q R Z T-1 ~> W m-2]
- heat_content_vprec => NULL(), & !< heat content associated with virtual >0 precip [Q R Z T-1 ~> W m-2]
- heat_content_lrunoff => NULL(), & !< heat content associated with liquid runoff [Q R Z T-1 ~> W m-2]
- heat_content_frunoff => NULL(), & !< heat content associated with frozen runoff [Q R Z T-1 ~> W m-2]
- heat_content_massout => NULL(), & !< heat content associated with mass leaving ocean [Q R Z T-1 ~> W m-2]
- heat_content_massin => NULL() !< heat content associated with mass entering ocean [Q R Z T-1 ~> W m-2]
+ heat_content_cond => NULL(), & !< heat content associated with condensating water [Q R Z T-1 ~> W m-2]
+ heat_content_evap => NULL(), & !< heat content associated with evaporating water [Q R Z T-1 ~> W m-2]
+ heat_content_lprec => NULL(), & !< heat content associated with liquid >0 precip [Q R Z T-1 ~> W m-2]
+ heat_content_fprec => NULL(), & !< heat content associated with frozen precip [Q R Z T-1 ~> W m-2]
+ heat_content_vprec => NULL(), & !< heat content associated with virtual >0 precip [Q R Z T-1 ~> W m-2]
+ heat_content_lrunoff => NULL(), & !< heat content associated with liquid runoff [Q R Z T-1 ~> W m-2]
+ heat_content_frunoff => NULL(), & !< heat content associated with frozen runoff [Q R Z T-1 ~> W m-2]
+ heat_content_lrunoff_glc => NULL(), & !< heat content associated with liquid runoff [Q R Z T-1 ~> W m-2]
+ heat_content_frunoff_glc => NULL(), & !< heat content associated with frozen runoff [Q R Z T-1 ~> W m-2]
+ heat_content_massout => NULL(), & !< heat content associated with mass leaving ocean [Q R Z T-1 ~> W m-2]
+ heat_content_massin => NULL() !< heat content associated with mass entering ocean [Q R Z T-1 ~> W m-2]
! salt mass flux (contributes to ocean mass only if non-Bouss )
real, pointer, dimension(:,:) :: &
@@ -304,6 +308,7 @@ module MOM_forcing_type
integer :: id_precip = -1, id_vprec = -1
integer :: id_lprec = -1, id_fprec = -1
integer :: id_lrunoff = -1, id_frunoff = -1
+ integer :: id_lrunoff_glc = -1, id_frunoff_glc = -1
integer :: id_net_massout = -1, id_net_massin = -1
integer :: id_massout_flux = -1, id_massin_flux = -1
integer :: id_seaice_melt = -1
@@ -313,6 +318,7 @@ module MOM_forcing_type
integer :: id_total_precip = -1, id_total_vprec = -1
integer :: id_total_lprec = -1, id_total_fprec = -1
integer :: id_total_lrunoff = -1, id_total_frunoff = -1
+ integer :: id_total_lrunoff_glc = -1, id_total_frunoff_glc = -1
integer :: id_total_net_massout = -1, id_total_net_massin = -1
integer :: id_total_seaice_melt = -1
@@ -322,34 +328,35 @@ module MOM_forcing_type
integer :: id_precip_ga = -1, id_vprec_ga= -1
! heat flux diagnostic handles
- integer :: id_net_heat_coupler = -1, id_net_heat_surface = -1
- integer :: id_sens = -1, id_LwLatSens = -1
- integer :: id_sw = -1, id_lw = -1
- integer :: id_sw_vis = -1, id_sw_nir = -1
- integer :: id_lat_evap = -1, id_lat_frunoff = -1
- integer :: id_lat = -1, id_lat_fprec = -1
- integer :: id_heat_content_lrunoff= -1, id_heat_content_frunoff = -1
- integer :: id_heat_content_lprec = -1, id_heat_content_fprec = -1
- integer :: id_heat_content_cond = -1, id_heat_content_surfwater= -1
- integer :: id_heat_content_evap = -1
- integer :: id_heat_content_vprec = -1, id_heat_content_massout = -1
- integer :: id_heat_added = -1, id_heat_content_massin = -1
- integer :: id_hfrainds = -1, id_hfrunoffds = -1
- integer :: id_seaice_melt_heat = -1
+ integer :: id_net_heat_coupler = -1, id_net_heat_surface = -1
+ integer :: id_sens = -1, id_LwLatSens = -1
+ integer :: id_sw = -1, id_lw = -1
+ integer :: id_sw_vis = -1, id_sw_nir = -1
+ integer :: id_lat_evap = -1, id_lat_frunoff = -1
+ integer :: id_lat = -1, id_lat_fprec = -1
+ integer :: id_heat_content_lrunoff = -1, id_heat_content_frunoff = -1
+ integer :: id_heat_content_lrunoff_glc= -1, id_heat_content_frunoff_glc= -1
+ integer :: id_heat_content_lprec = -1, id_heat_content_fprec = -1
+ integer :: id_heat_content_cond = -1, id_heat_content_surfwater = -1
+ integer :: id_heat_content_evap = -1
+ integer :: id_heat_content_vprec = -1, id_heat_content_massout = -1
+ integer :: id_heat_added = -1, id_heat_content_massin = -1
+ integer :: id_hfrainds = -1, id_hfrunoffds = -1
+ integer :: id_seaice_melt_heat = -1
! global area integrated heat flux diagnostic handles
- integer :: id_total_net_heat_coupler = -1, id_total_net_heat_surface = -1
- integer :: id_total_sens = -1, id_total_LwLatSens = -1
- integer :: id_total_sw = -1, id_total_lw = -1
- integer :: id_total_lat_evap = -1, id_total_lat_frunoff = -1
- integer :: id_total_lat = -1, id_total_lat_fprec = -1
- integer :: id_total_heat_content_lrunoff= -1, id_total_heat_content_frunoff = -1
- integer :: id_total_heat_content_lprec = -1, id_total_heat_content_fprec = -1
- integer :: id_total_heat_content_cond = -1, id_total_heat_content_surfwater= -1
- integer :: id_total_heat_content_evap = -1
- integer :: id_total_heat_content_vprec = -1, id_total_heat_content_massout = -1
- integer :: id_total_heat_added = -1, id_total_heat_content_massin = -1
- integer :: id_total_seaice_melt_heat = -1
+ integer :: id_total_net_heat_coupler = -1, id_total_net_heat_surface = -1
+ integer :: id_total_sens = -1, id_total_LwLatSens = -1
+ integer :: id_total_sw = -1, id_total_lw = -1
+ integer :: id_total_lat_evap = -1, id_total_lat_frunoff = -1
+ integer :: id_total_lat = -1, id_total_lat_fprec = -1
+ integer :: id_total_heat_content_lrunoff = -1, id_total_heat_content_frunoff = -1
+ integer :: id_total_heat_content_lprec = -1, id_total_heat_content_fprec = -1
+ integer :: id_total_heat_content_cond = -1, id_total_heat_content_surfwater = -1
+ integer :: id_total_heat_content_evap = -1
+ integer :: id_total_heat_content_vprec = -1, id_total_heat_content_massout = -1
+ integer :: id_total_heat_added = -1, id_total_heat_content_massin = -1
+ integer :: id_total_seaice_melt_heat = -1
! global area averaged heat flux diagnostic handles
integer :: id_net_heat_coupler_ga = -1, id_net_heat_surface_ga = -1
@@ -590,23 +597,27 @@ subroutine extractFluxes1d(G, GV, US, fluxes, optics, nsw, j, dt, &
! net volume/mass of liquid and solid passing through surface boundary fluxes
netMassInOut(i) = dt * (scale * &
- (((((( fluxes%lprec(i,j) &
+ ((((((( fluxes%lprec(i,j) &
+ fluxes%fprec(i,j) ) &
+ fluxes%evap(i,j) ) &
+ fluxes%lrunoff(i,j) ) &
+ + fluxes%lrunoff_glc(i,j)) &
+ fluxes%vprec(i,j) ) &
+ fluxes%seaice_melt(i,j)) &
- + fluxes%frunoff(i,j) ))
+ + fluxes%frunoff(i,j) ) &
+ + fluxes%frunoff_glc(i,j))
if (do_NMIOr) then ! Repeat the above code without multiplying by a timestep for legacy reasons
netMassInOut_rate(i) = (scale * &
- (((((( fluxes%lprec(i,j) &
+ ((((((( fluxes%lprec(i,j) &
+ fluxes%fprec(i,j) ) &
+ fluxes%evap(i,j) ) &
+ fluxes%lrunoff(i,j) ) &
+ + fluxes%lrunoff_glc(i,j)) &
+ fluxes%vprec(i,j) ) &
+ fluxes%seaice_melt(i,j)) &
- + fluxes%frunoff(i,j) ))
+ + fluxes%frunoff(i,j) ) &
+ + fluxes%frunoff_glc(i,j))
endif
! smg:
@@ -681,6 +692,8 @@ subroutine extractFluxes1d(G, GV, US, fluxes, optics, nsw, j, dt, &
! remove lrunoff*SST here, to counteract its addition elsewhere
net_heat(i) = (net_heat(i) + (scale*(dt * I_Cp_Hconvert)) * fluxes%heat_content_lrunoff(i,j)) - &
(GV%RZ_to_H * (scale * dt)) * fluxes%lrunoff(i,j) * T(i,1)
+ net_heat(i) = (net_heat(i) + (scale*(dt * I_Cp_Hconvert)) * fluxes%heat_content_lrunoff_glc(i,j)) - &
+ (GV%RZ_to_H * (scale * dt)) * fluxes%lrunoff_glc(i,j) * T(i,1)
!BGR-Jul 5, 2017{
!Intentionally neglect the following contribution to rate for legacy reasons.
!if (do_NHR) net_heat_rate(i) = (net_heat_rate(i) + (scale*I_Cp_Hconvert) * fluxes%heat_content_lrunoff(i,j)) - &
@@ -689,6 +702,8 @@ subroutine extractFluxes1d(G, GV, US, fluxes, optics, nsw, j, dt, &
if (calculate_diags .and. associated(tv%TempxPmE)) then
tv%TempxPmE(i,j) = tv%TempxPmE(i,j) + (scale * dt) * &
(I_Cp*fluxes%heat_content_lrunoff(i,j) - fluxes%lrunoff(i,j)*T(i,1))
+ tv%TempxPmE(i,j) = tv%TempxPmE(i,j) + (scale * dt) * &
+ (I_Cp*fluxes%heat_content_lrunoff_glc(i,j) - fluxes%lrunoff_glc(i,j)*T(i,1))
endif
endif
@@ -698,6 +713,8 @@ subroutine extractFluxes1d(G, GV, US, fluxes, optics, nsw, j, dt, &
! remove frunoff*SST here, to counteract its addition elsewhere
net_heat(i) = net_heat(i) + (scale*(dt * I_Cp_Hconvert)) * fluxes%heat_content_frunoff(i,j) - &
(GV%RZ_to_H * (scale * dt)) * fluxes%frunoff(i,j) * T(i,1)
+ net_heat(i) = net_heat(i) + (scale*(dt * I_Cp_Hconvert)) * fluxes%heat_content_frunoff_glc(i,j) - &
+ (GV%RZ_to_H * (scale * dt)) * fluxes%frunoff_glc(i,j) * T(i,1)
!BGR-Jul 5, 2017{
!Intentionally neglect the following contribution to rate for legacy reasons.
! if (do_NHR) net_heat_rate(i) = net_heat_rate(i) + (scale*I_Cp_Hconvert) * fluxes%heat_content_frunoff(i,j) - &
@@ -706,6 +723,8 @@ subroutine extractFluxes1d(G, GV, US, fluxes, optics, nsw, j, dt, &
if (calculate_diags .and. associated(tv%TempxPmE)) then
tv%TempxPmE(i,j) = tv%TempxPmE(i,j) + (scale * dt) * &
(I_Cp*fluxes%heat_content_frunoff(i,j) - fluxes%frunoff(i,j)*T(i,1))
+ tv%TempxPmE(i,j) = tv%TempxPmE(i,j) + (scale * dt) * &
+ (I_Cp*fluxes%heat_content_frunoff_glc(i,j) - fluxes%frunoff_glc(i,j)*T(i,1))
endif
endif
@@ -729,6 +748,7 @@ subroutine extractFluxes1d(G, GV, US, fluxes, optics, nsw, j, dt, &
if (.not. do_enthalpy) then
net_heat(i) = net_heat(i) + (scale * dt * I_Cp_Hconvert * &
(fluxes%heat_content_lrunoff(i,j) + fluxes%heat_content_frunoff(i,j) + &
+ fluxes%heat_content_lrunoff_glc(i,j) + fluxes%heat_content_frunoff_glc(i,j) + &
fluxes%heat_content_lprec(i,j) + fluxes%heat_content_fprec(i,j) + &
fluxes%heat_content_evap(i,j) + fluxes%heat_content_cond(i,j)))
endif
@@ -857,6 +877,9 @@ subroutine extractFluxes1d(G, GV, US, fluxes, optics, nsw, j, dt, &
if (associated(fluxes%lrunoff) .and. associated(fluxes%heat_content_lrunoff)) then
fluxes%heat_content_lrunoff(i,j) = tv%C_p*fluxes%lrunoff(i,j)*T(i,1)
endif
+ if (associated(fluxes%lrunoff_glc) .and. associated(fluxes%heat_content_lrunoff_glc)) then
+ fluxes%heat_content_lrunoff_glc(i,j) = tv%C_p*fluxes%lrunoff_glc(i,j)*T(i,1)
+ endif
endif
! Icebergs enter ocean at SST if land model does not provide calving heat content.
@@ -864,6 +887,9 @@ subroutine extractFluxes1d(G, GV, US, fluxes, optics, nsw, j, dt, &
if (associated(fluxes%frunoff) .and. associated(fluxes%heat_content_frunoff)) then
fluxes%heat_content_frunoff(i,j) = tv%C_p*fluxes%frunoff(i,j)*T(i,1)
endif
+ if (associated(fluxes%frunoff_glc) .and. associated(fluxes%heat_content_frunoff_glc)) then
+ fluxes%heat_content_frunoff_glc(i,j) = tv%C_p*fluxes%frunoff_glc(i,j)*T(i,1)
+ endif
endif
elseif (.not. do_enthalpy) then
@@ -886,6 +912,8 @@ subroutine extractFluxes1d(G, GV, US, fluxes, optics, nsw, j, dt, &
fluxes%heat_content_fprec(i,j) + &
fluxes%heat_content_lrunoff(i,j) + &
fluxes%heat_content_frunoff(i,j) + &
+ fluxes%heat_content_lrunoff_glc(i,j) + &
+ fluxes%heat_content_frunoff_glc(i,j) + &
fluxes%heat_content_evap(i,j) + &
fluxes%heat_content_cond(i,j))
endif
@@ -1319,14 +1347,24 @@ subroutine MOM_forcing_chksum(mesg, fluxes, G, US, haloshift)
call hchksum(fluxes%ustar_tidal, mesg//" fluxes%ustar_tidal", G%HI, haloshift=hshift, scale=US%Z_to_m*US%s_to_T)
if (associated(fluxes%lrunoff)) &
call hchksum(fluxes%lrunoff, mesg//" fluxes%lrunoff", G%HI, haloshift=hshift, scale=US%RZ_T_to_kg_m2s)
+ if (associated(fluxes%lrunoff_glc)) &
+ call hchksum(fluxes%lrunoff_glc, mesg//" fluxes%lrunoff_glc", G%HI, haloshift=hshift, scale=US%RZ_T_to_kg_m2s)
if (associated(fluxes%frunoff)) &
call hchksum(fluxes%frunoff, mesg//" fluxes%frunoff", G%HI, haloshift=hshift, scale=US%RZ_T_to_kg_m2s)
+ if (associated(fluxes%frunoff_glc)) &
+ call hchksum(fluxes%frunoff_glc, mesg//" fluxes%frunoff_glc", G%HI, haloshift=hshift, scale=US%RZ_T_to_kg_m2s)
if (associated(fluxes%heat_content_lrunoff)) &
call hchksum(fluxes%heat_content_lrunoff, mesg//" fluxes%heat_content_lrunoff", G%HI, &
haloshift=hshift, scale=US%QRZ_T_to_W_m2)
+ if (associated(fluxes%heat_content_lrunoff_glc)) &
+ call hchksum(fluxes%heat_content_lrunoff_glc, mesg//" fluxes%heat_content_lrunoff_glc", G%HI, &
+ haloshift=hshift, scale=US%QRZ_T_to_W_m2)
if (associated(fluxes%heat_content_frunoff)) &
call hchksum(fluxes%heat_content_frunoff, mesg//" fluxes%heat_content_frunoff", G%HI, &
haloshift=hshift, scale=US%QRZ_T_to_W_m2)
+ if (associated(fluxes%heat_content_frunoff_glc)) &
+ call hchksum(fluxes%heat_content_frunoff_glc, mesg//" fluxes%heat_content_frunoff_glc", G%HI, &
+ haloshift=hshift, scale=US%QRZ_T_to_W_m2)
if (associated(fluxes%heat_content_lprec)) &
call hchksum(fluxes%heat_content_lprec, mesg//" fluxes%heat_content_lprec", G%HI, &
haloshift=hshift, scale=US%QRZ_T_to_W_m2)
@@ -1441,9 +1479,13 @@ subroutine forcing_SinglePointPrint(fluxes, G, i, j, mesg)
call locMsg(fluxes%TKE_tidal,'TKE_tidal')
call locMsg(fluxes%ustar_tidal,'ustar_tidal')
call locMsg(fluxes%lrunoff,'lrunoff')
+ call locMsg(fluxes%lrunoff_glc,'lrunoff_glc')
call locMsg(fluxes%frunoff,'frunoff')
+ call locMsg(fluxes%frunoff_glc,'frunoff_glc')
call locMsg(fluxes%heat_content_lrunoff,'heat_content_lrunoff')
+ call locMsg(fluxes%heat_content_lrunoff_glc,'heat_content_lrunoff_glc')
call locMsg(fluxes%heat_content_frunoff,'heat_content_frunoff')
+ call locMsg(fluxes%heat_content_frunoff_glc,'heat_content_frunoff_glc')
call locMsg(fluxes%heat_content_lprec,'heat_content_lprec')
call locMsg(fluxes%heat_content_fprec,'heat_content_fprec')
call locMsg(fluxes%heat_content_vprec,'heat_content_vprec')
@@ -1608,6 +1650,12 @@ subroutine register_forcing_type_diags(Time, diag, US, use_temperature, handles,
cmor_standard_name='water_flux_into_sea_water_from_icebergs', &
cmor_long_name='Water Flux into Seawater from Icebergs')
+ !todo: check if above ficeberg (only including frunoff) should include below frunoff_glc
+ handles%id_frunoff_glc = register_diag_field('ocean_model', 'frunoff_glc', diag%axesT1, Time, &
+ 'Frozen glc runoff (calving) and iceberg melt into ocean', &
+ units='kg m-2 s-1', conversion=US%RZ_T_to_kg_m2s, &
+ standard_name='glc_water_flux_into_sea_water_from_icebergs')
+
handles%id_lrunoff = register_diag_field('ocean_model', 'lrunoff', diag%axesT1, Time, &
'Liquid runoff (rivers) into ocean', &
units='kg m-2 s-1', conversion=US%RZ_T_to_kg_m2s, &
@@ -1615,6 +1663,12 @@ subroutine register_forcing_type_diags(Time, diag, US, use_temperature, handles,
cmor_standard_name='water_flux_into_sea_water_from_rivers', &
cmor_long_name='Water Flux into Sea Water From Rivers')
+ !todo: check if above friver (only including lrunoff) should include below lrunoff_glc
+ handles%id_lrunoff_glc = register_diag_field('ocean_model', 'lrunoff_glc', diag%axesT1, Time, &
+ 'Liquid runoff (glaciers) into ocean', &
+ units='kg m-2 s-1', conversion=US%RZ_T_to_kg_m2s, &
+ standard_name='water_flux_into_sea_water_from_glaciers')
+
handles%id_net_massout = register_diag_field('ocean_model', 'net_massout', diag%axesT1, Time, &
'Net mass leaving the ocean due to evaporation, seaice formation', &
'kg m-2 s-1', conversion=US%RZ_T_to_kg_m2s)
@@ -1682,12 +1736,18 @@ subroutine register_forcing_type_diags(Time, diag, US, use_temperature, handles,
cmor_standard_name='water_flux_into_sea_water_from_icebergs_area_integrated', &
cmor_long_name='Water Flux into Seawater from Icebergs Area Integrated')
+ handles%id_total_frunoff_glc = register_scalar_field('ocean_model', 'total_frunoff_glc', Time, diag, &
+ long_name='Area integrated frozen glc runoff (calving) & iceberg melt into ocean', units='kg s-1')
+
handles%id_total_lrunoff = register_scalar_field('ocean_model', 'total_lrunoff', Time, diag,&
long_name='Area integrated liquid runoff into ocean', units='kg s-1', &
cmor_field_name='total_friver', &
cmor_standard_name='water_flux_into_sea_water_from_rivers_area_integrated', &
cmor_long_name='Water Flux into Sea Water From Rivers Area Integrated')
+ handles%id_total_lrunoff_glc = register_scalar_field('ocean_model', 'total_lrunoff_glc', Time, diag,&
+ long_name='Area integrated liquid glc runoff into ocean', units='kg s-1')
+
handles%id_total_net_massout = register_scalar_field('ocean_model', 'total_net_massout', Time, diag, &
long_name='Area integrated mass leaving ocean due to evap and seaice form', units='kg s-1')
@@ -1746,6 +1806,14 @@ subroutine register_forcing_type_diags(Time, diag, US, use_temperature, handles,
'W m-2', conversion=US%QRZ_T_to_W_m2, &
standard_name='temperature_flux_due_to_runoff_expressed_as_heat_flux_into_sea_water')
+ handles%id_heat_content_frunoff_glc = register_diag_field('ocean_model', 'heat_content_frunoff_glc', &
+ diag%axesT1, Time, 'Heat content (relative to 0C) of solid glc runoff into ocean', &
+ 'W m-2', conversion=US%QRZ_T_to_W_m2)
+
+ handles%id_heat_content_lrunoff_glc = register_diag_field('ocean_model', 'heat_content_lrunoff_glc', &
+ diag%axesT1, Time, 'Heat content (relative to 0C) of liquid glc runoff into ocean', &
+ 'W m-2', conversion=US%QRZ_T_to_W_m2)
+
handles%id_hfrunoffds = register_diag_field('ocean_model', 'hfrunoffds', &
diag%axesT1, Time, 'Heat content (relative to 0C) of liquid+solid runoff into ocean', &
'W m-2', conversion=US%QRZ_T_to_W_m2, &
@@ -1843,6 +1911,8 @@ subroutine register_forcing_type_diags(Time, diag, US, use_temperature, handles,
cmor_standard_name='heat_flux_into_sea_water_due_to_snow_thermodynamics', &
cmor_long_name='Latent Heat to Melt Frozen Precipitation')
+ ! Todo :check if below diagnostic field should include glc contribution,
+ ! or whether there should be a separate diagnostic field.
handles%id_lat_frunoff = register_diag_field('ocean_model', 'latent_frunoff', diag%axesT1, Time, &
'Latent heat flux into ocean due to melting of icebergs', 'W m-2', conversion=US%QRZ_T_to_W_m2, &
cmor_field_name='hfibthermds', &
@@ -1870,6 +1940,8 @@ subroutine register_forcing_type_diags(Time, diag, US, use_temperature, handles,
!===============================================================
! area integrated surface heat fluxes
+ ! Todo :check if below diagnostic field should include glc contribution,
+ ! or whether there should be a separate diagnostic field.
handles%id_total_heat_content_frunoff = register_scalar_field('ocean_model', &
'total_heat_content_frunoff', Time, diag, &
long_name='Area integrated heat content (relative to 0C) of solid runoff', &
@@ -1879,6 +1951,8 @@ subroutine register_forcing_type_diags(Time, diag, US, use_temperature, handles,
cmor_long_name= &
'Temperature Flux due to Solid Runoff Expressed as Heat Flux into Sea Water Area Integrated')
+ ! Todo :check if below diagnostic field should include glc contribution,
+ ! or whether there should be a separate diagnostic field.
handles%id_total_heat_content_lrunoff = register_scalar_field('ocean_model', &
'total_heat_content_lrunoff', Time, diag, &
long_name='Area integrated heat content (relative to 0C) of liquid runoff', &
@@ -1996,6 +2070,8 @@ subroutine register_forcing_type_diags(Time, diag, US, use_temperature, handles,
cmor_long_name= &
'Latent Heat to Melt Frozen Precipitation Area Integrated')
+ ! Todo :check if below diagnostic field should include glc contribution,
+ ! or whether there should be a separate diagnostic field.
handles%id_total_lat_frunoff = register_scalar_field('ocean_model', &
'total_lat_frunoff', Time, diag, &
long_name='Area integrated latent heat flux due to melting icebergs', &
@@ -2268,6 +2344,8 @@ subroutine fluxes_accumulate(flux_tmp, fluxes, G, wt2, forces)
fluxes%vprec(i,j) = wt1*fluxes%vprec(i,j) + wt2*flux_tmp%vprec(i,j)
fluxes%lrunoff(i,j) = wt1*fluxes%lrunoff(i,j) + wt2*flux_tmp%lrunoff(i,j)
fluxes%frunoff(i,j) = wt1*fluxes%frunoff(i,j) + wt2*flux_tmp%frunoff(i,j)
+ fluxes%lrunoff_glc(i,j) = wt1*fluxes%lrunoff_glc(i,j) + wt2*flux_tmp%lrunoff_glc(i,j)
+ fluxes%frunoff_glc(i,j) = wt1*fluxes%frunoff_glc(i,j) + wt2*flux_tmp%frunoff_glc(i,j)
fluxes%seaice_melt(i,j) = wt1*fluxes%seaice_melt(i,j) + wt2*flux_tmp%seaice_melt(i,j)
fluxes%sw(i,j) = wt1*fluxes%sw(i,j) + wt2*flux_tmp%sw(i,j)
fluxes%sw_vis_dir(i,j) = wt1*fluxes%sw_vis_dir(i,j) + wt2*flux_tmp%sw_vis_dir(i,j)
@@ -2321,6 +2399,16 @@ subroutine fluxes_accumulate(flux_tmp, fluxes, G, wt2, forces)
fluxes%heat_content_frunoff(i,j) = wt1*fluxes%heat_content_frunoff(i,j) + wt2*flux_tmp%heat_content_frunoff(i,j)
enddo ; enddo
endif
+ if (associated(fluxes%heat_content_lrunoff_glc) .and. associated(flux_tmp%heat_content_lrunoff_glc)) then
+ do j=js,je ; do i=is,ie
+ fluxes%heat_content_lrunoff_glc(i,j) = wt1*fluxes%heat_content_lrunoff_glc(i,j) + wt2*flux_tmp%heat_content_lrunoff_glc(i,j)
+ enddo ; enddo
+ endif
+ if (associated(fluxes%heat_content_frunoff_glc) .and. associated(flux_tmp%heat_content_frunoff_glc)) then
+ do j=js,je ; do i=is,ie
+ fluxes%heat_content_frunoff_glc(i,j) = wt1*fluxes%heat_content_frunoff_glc(i,j) + wt2*flux_tmp%heat_content_frunoff_glc(i,j)
+ enddo ; enddo
+ endif
if (associated(fluxes%ustar_shelf) .and. associated(flux_tmp%ustar_shelf)) then
do i=isd,ied ; do j=jsd,jed
@@ -2492,6 +2580,12 @@ subroutine get_net_mass_forcing(fluxes, G, US, net_mass_src)
if (associated(fluxes%frunoff)) then ; do j=js,je ; do i=is,ie
net_mass_src(i,j) = net_mass_src(i,j) + fluxes%frunoff(i,j)
enddo ; enddo ; endif
+ if (associated(fluxes%lrunoff_glc)) then ; do j=js,je ; do i=is,ie
+ net_mass_src(i,j) = net_mass_src(i,j) + fluxes%lrunoff_glc(i,j)
+ enddo ; enddo ; endif
+ if (associated(fluxes%frunoff_glc)) then ; do j=js,je ; do i=is,ie
+ net_mass_src(i,j) = net_mass_src(i,j) + fluxes%frunoff_glc(i,j)
+ enddo ; enddo ; endif
if (associated(fluxes%evap)) then ; do j=js,je ; do i=is,ie
net_mass_src(i,j) = net_mass_src(i,j) + fluxes%evap(i,j)
enddo ; enddo ; endif
@@ -2652,6 +2746,8 @@ subroutine forcing_diagnostics(fluxes_in, sfc_state, G_in, US, time_end, diag, h
if (associated(fluxes%evap)) res(i,j) = res(i,j) + fluxes%evap(i,j)
if (associated(fluxes%lrunoff)) res(i,j) = res(i,j) + fluxes%lrunoff(i,j)
if (associated(fluxes%frunoff)) res(i,j) = res(i,j) + fluxes%frunoff(i,j)
+ if (associated(fluxes%lrunoff_glc)) res(i,j) = res(i,j) + fluxes%lrunoff_glc(i,j)
+ if (associated(fluxes%frunoff_glc)) res(i,j) = res(i,j) + fluxes%frunoff_glc(i,j)
if (associated(fluxes%vprec)) res(i,j) = res(i,j) + fluxes%vprec(i,j)
if (associated(fluxes%seaice_melt)) res(i,j) = res(i,j) + fluxes%seaice_melt(i,j)
enddo ; enddo
@@ -2699,6 +2795,8 @@ subroutine forcing_diagnostics(fluxes_in, sfc_state, G_in, US, time_end, diag, h
if (associated(fluxes%fprec)) res(i,j) = res(i,j) + fluxes%fprec(i,j)
if (associated(fluxes%lrunoff)) res(i,j) = res(i,j) + fluxes%lrunoff(i,j)
if (associated(fluxes%frunoff)) res(i,j) = res(i,j) + fluxes%frunoff(i,j)
+ if (associated(fluxes%lrunoff_glc)) res(i,j) = res(i,j) + fluxes%lrunoff_glc(i,j)
+ if (associated(fluxes%frunoff_glc)) res(i,j) = res(i,j) + fluxes%frunoff_glc(i,j)
if (associated(fluxes%lprec)) then
if (fluxes%lprec(i,j) > 0.0) res(i,j) = res(i,j) + fluxes%lprec(i,j)
@@ -2802,6 +2900,22 @@ subroutine forcing_diagnostics(fluxes_in, sfc_state, G_in, US, time_end, diag, h
endif
endif
+ if (associated(fluxes%lrunoff_glc)) then
+ if (handles%id_lrunoff_glc > 0) call post_data(handles%id_lrunoff_glc, fluxes%lrunoff_glc, diag)
+ if (handles%id_total_lrunoff_glc > 0) then
+ total_transport = global_area_integral(fluxes%lrunoff_glc, G, scale=US%RZ_T_to_kg_m2s)
+ call post_data(handles%id_total_lrunoff_glc, total_transport, diag)
+ endif
+ endif
+
+ if (associated(fluxes%frunoff_glc)) then
+ if (handles%id_frunoff_glc > 0) call post_data(handles%id_frunoff_glc, fluxes%frunoff_glc, diag)
+ if (handles%id_total_frunoff_glc > 0) then
+ total_transport = global_area_integral(fluxes%frunoff_glc, G, scale=US%RZ_T_to_kg_m2s)
+ call post_data(handles%id_total_frunoff_glc, total_transport, diag)
+ endif
+ endif
+
if (associated(fluxes%seaice_melt)) then
if (handles%id_seaice_melt > 0) call post_data(handles%id_seaice_melt, fluxes%seaice_melt, diag)
if (handles%id_total_seaice_melt > 0) then
@@ -2826,6 +2940,12 @@ subroutine forcing_diagnostics(fluxes_in, sfc_state, G_in, US, time_end, diag, h
call post_data(handles%id_total_heat_content_frunoff, total_transport, diag)
endif
+ if ((handles%id_heat_content_lrunoff_glc > 0) .and. associated(fluxes%heat_content_lrunoff_glc)) &
+ call post_data(handles%id_heat_content_lrunoff_glc, fluxes%heat_content_lrunoff_glc, diag)
+
+ if ((handles%id_heat_content_frunoff_glc > 0) .and. associated(fluxes%heat_content_frunoff_glc)) &
+ call post_data(handles%id_heat_content_frunoff_glc, fluxes%heat_content_frunoff_glc, diag)
+
if ((handles%id_heat_content_lprec > 0) .and. associated(fluxes%heat_content_lprec)) &
call post_data(handles%id_heat_content_lprec, fluxes%heat_content_lprec, diag)
if ((handles%id_total_heat_content_lprec > 0) .and. associated(fluxes%heat_content_lprec)) then
@@ -2910,6 +3030,10 @@ subroutine forcing_diagnostics(fluxes_in, sfc_state, G_in, US, time_end, diag, h
res(i,j) = res(i,j) + fluxes%heat_content_lrunoff(i,j)
if (associated(fluxes%heat_content_frunoff)) &
res(i,j) = res(i,j) + fluxes%heat_content_frunoff(i,j)
+ if (associated(fluxes%heat_content_lrunoff_glc)) &
+ res(i,j) = res(i,j) + fluxes%heat_content_lrunoff_glc(i,j)
+ if (associated(fluxes%heat_content_frunoff_glc)) &
+ res(i,j) = res(i,j) + fluxes%heat_content_frunoff_glc(i,j)
if (associated(fluxes%heat_content_lprec)) &
res(i,j) = res(i,j) + fluxes%heat_content_lprec(i,j)
if (associated(fluxes%heat_content_fprec)) &
@@ -2942,12 +3066,14 @@ subroutine forcing_diagnostics(fluxes_in, sfc_state, G_in, US, time_end, diag, h
if (handles%id_heat_content_surfwater > 0 .or. handles%id_total_heat_content_surfwater > 0) then
do j=js,je ; do i=is,ie
res(i,j) = 0.0
- if (associated(fluxes%heat_content_lrunoff)) res(i,j) = res(i,j) + fluxes%heat_content_lrunoff(i,j)
- if (associated(fluxes%heat_content_frunoff)) res(i,j) = res(i,j) + fluxes%heat_content_frunoff(i,j)
- if (associated(fluxes%heat_content_lprec)) res(i,j) = res(i,j) + fluxes%heat_content_lprec(i,j)
- if (associated(fluxes%heat_content_fprec)) res(i,j) = res(i,j) + fluxes%heat_content_fprec(i,j)
- if (associated(fluxes%heat_content_vprec)) res(i,j) = res(i,j) + fluxes%heat_content_vprec(i,j)
- if (associated(fluxes%heat_content_cond)) res(i,j) = res(i,j) + fluxes%heat_content_cond(i,j)
+ if (associated(fluxes%heat_content_lrunoff)) res(i,j) = res(i,j) + fluxes%heat_content_lrunoff(i,j)
+ if (associated(fluxes%heat_content_frunoff)) res(i,j) = res(i,j) + fluxes%heat_content_frunoff(i,j)
+ if (associated(fluxes%heat_content_lrunoff_glc)) res(i,j) = res(i,j) + fluxes%heat_content_lrunoff_glc(i,j)
+ if (associated(fluxes%heat_content_frunoff_glc)) res(i,j) = res(i,j) + fluxes%heat_content_frunoff_glc(i,j)
+ if (associated(fluxes%heat_content_lprec)) res(i,j) = res(i,j) + fluxes%heat_content_lprec(i,j)
+ if (associated(fluxes%heat_content_fprec)) res(i,j) = res(i,j) + fluxes%heat_content_fprec(i,j)
+ if (associated(fluxes%heat_content_vprec)) res(i,j) = res(i,j) + fluxes%heat_content_vprec(i,j)
+ if (associated(fluxes%heat_content_cond)) res(i,j) = res(i,j) + fluxes%heat_content_cond(i,j)
if (mom_enthalpy) then
if (associated(fluxes%heat_content_massout)) res(i,j) = res(i,j) + fluxes%heat_content_massout(i,j)
else
@@ -2967,6 +3093,8 @@ subroutine forcing_diagnostics(fluxes_in, sfc_state, G_in, US, time_end, diag, h
res(i,j) = 0.0
if (associated(fluxes%heat_content_lrunoff)) res(i,j) = res(i,j) + fluxes%heat_content_lrunoff(i,j)
if (associated(fluxes%heat_content_frunoff)) res(i,j) = res(i,j) + fluxes%heat_content_frunoff(i,j)
+ if (associated(fluxes%heat_content_lrunoff_glc)) res(i,j) = res(i,j) + fluxes%heat_content_lrunoff_glc(i,j)
+ if (associated(fluxes%heat_content_frunoff_glc)) res(i,j) = res(i,j) + fluxes%heat_content_frunoff_glc(i,j)
enddo ; enddo
call post_data(handles%id_hfrunoffds, res, diag)
endif
@@ -3255,6 +3383,8 @@ subroutine allocate_forcing_by_group(G, fluxes, water, heat, ustar, press, &
call myAlloc(fluxes%vprec,isd,ied,jsd,jed, water)
call myAlloc(fluxes%lrunoff,isd,ied,jsd,jed, water)
call myAlloc(fluxes%frunoff,isd,ied,jsd,jed, water)
+ call myAlloc(fluxes%lrunoff_glc,isd,ied,jsd,jed, water)
+ call myAlloc(fluxes%frunoff_glc,isd,ied,jsd,jed, water)
call myAlloc(fluxes%seaice_melt,isd,ied,jsd,jed, water)
call myAlloc(fluxes%netMassOut,isd,ied,jsd,jed, water)
call myAlloc(fluxes%netMassIn,isd,ied,jsd,jed, water)
@@ -3277,6 +3407,8 @@ subroutine allocate_forcing_by_group(G, fluxes, water, heat, ustar, press, &
call myAlloc(fluxes%heat_content_vprec,isd,ied,jsd,jed, .true.)
call myAlloc(fluxes%heat_content_lrunoff,isd,ied,jsd,jed, .true.)
call myAlloc(fluxes%heat_content_frunoff,isd,ied,jsd,jed, .true.)
+ call myAlloc(fluxes%heat_content_lrunoff_glc,isd,ied,jsd,jed, .true.)
+ call myAlloc(fluxes%heat_content_frunoff_glc,isd,ied,jsd,jed, .true.)
call myAlloc(fluxes%heat_content_massout,isd,ied,jsd,jed, enthalpy_mom)
call myAlloc(fluxes%heat_content_massin,isd,ied,jsd,jed, enthalpy_mom)
endif ; endif
@@ -3532,6 +3664,8 @@ subroutine deallocate_forcing_type(fluxes)
if (associated(fluxes%heat_added)) deallocate(fluxes%heat_added)
if (associated(fluxes%heat_content_lrunoff)) deallocate(fluxes%heat_content_lrunoff)
if (associated(fluxes%heat_content_frunoff)) deallocate(fluxes%heat_content_frunoff)
+ if (associated(fluxes%heat_content_lrunoff_glc)) deallocate(fluxes%heat_content_lrunoff_glc)
+ if (associated(fluxes%heat_content_frunoff_glc)) deallocate(fluxes%heat_content_frunoff_glc)
if (associated(fluxes%heat_content_lprec)) deallocate(fluxes%heat_content_lprec)
if (associated(fluxes%heat_content_fprec)) deallocate(fluxes%heat_content_fprec)
if (associated(fluxes%heat_content_cond)) deallocate(fluxes%heat_content_cond)
@@ -3544,6 +3678,8 @@ subroutine deallocate_forcing_type(fluxes)
if (associated(fluxes%vprec)) deallocate(fluxes%vprec)
if (associated(fluxes%lrunoff)) deallocate(fluxes%lrunoff)
if (associated(fluxes%frunoff)) deallocate(fluxes%frunoff)
+ if (associated(fluxes%lrunoff_glc)) deallocate(fluxes%lrunoff_glc)
+ if (associated(fluxes%frunoff_glc)) deallocate(fluxes%frunoff_glc)
if (associated(fluxes%seaice_melt)) deallocate(fluxes%seaice_melt)
if (associated(fluxes%netMassOut)) deallocate(fluxes%netMassOut)
if (associated(fluxes%netMassIn)) deallocate(fluxes%netMassIn)
@@ -3619,6 +3755,8 @@ subroutine rotate_forcing(fluxes_in, fluxes, turns)
call rotate_array(fluxes_in%vprec, turns, fluxes%vprec)
call rotate_array(fluxes_in%lrunoff, turns, fluxes%lrunoff)
call rotate_array(fluxes_in%frunoff, turns, fluxes%frunoff)
+ call rotate_array(fluxes_in%lrunoff_glc, turns, fluxes%lrunoff_glc)
+ call rotate_array(fluxes_in%frunoff_glc, turns, fluxes%frunoff_glc)
call rotate_array(fluxes_in%seaice_melt, turns, fluxes%seaice_melt)
call rotate_array(fluxes_in%netMassOut, turns, fluxes%netMassOut)
call rotate_array(fluxes_in%netMassIn, turns, fluxes%netMassIn)
@@ -3645,7 +3783,9 @@ subroutine rotate_forcing(fluxes_in, fluxes, turns)
call rotate_array(fluxes_in%heat_content_fprec, turns, fluxes%heat_content_fprec)
call rotate_array(fluxes_in%heat_content_vprec, turns, fluxes%heat_content_vprec)
call rotate_array(fluxes_in%heat_content_lrunoff, turns, fluxes%heat_content_lrunoff)
+ call rotate_array(fluxes_in%heat_content_lrunoff_glc, turns, fluxes%heat_content_lrunoff_glc)
call rotate_array(fluxes_in%heat_content_frunoff, turns, fluxes%heat_content_frunoff)
+ call rotate_array(fluxes_in%heat_content_frunoff_glc, turns, fluxes%heat_content_frunoff_glc)
if (associated (fluxes_in%heat_content_evap)) then
call rotate_array(fluxes_in%heat_content_evap, turns, fluxes%heat_content_evap)
else
@@ -3883,6 +4023,8 @@ subroutine homogenize_forcing(fluxes, G, GV, US)
call homogenize_field_t(fluxes%vprec, G, tmp_scale=US%RZ_T_to_kg_m2s)
call homogenize_field_t(fluxes%lrunoff, G, tmp_scale=US%RZ_T_to_kg_m2s)
call homogenize_field_t(fluxes%frunoff, G, tmp_scale=US%RZ_T_to_kg_m2s)
+ call homogenize_field_t(fluxes%lrunoff_glc, G, tmp_scale=US%RZ_T_to_kg_m2s)
+ call homogenize_field_t(fluxes%frunoff_glc, G, tmp_scale=US%RZ_T_to_kg_m2s)
call homogenize_field_t(fluxes%seaice_melt, G, tmp_scale=US%RZ_T_to_kg_m2s)
! These two calls might not be needed.
call homogenize_field_t(fluxes%netMassOut, G, tmp_scale=GV%H_to_mks)
@@ -3912,6 +4054,8 @@ subroutine homogenize_forcing(fluxes, G, GV, US)
call homogenize_field_t(fluxes%heat_content_vprec, G, tmp_scale=US%QRZ_T_to_W_m2)
call homogenize_field_t(fluxes%heat_content_lrunoff, G, tmp_scale=US%QRZ_T_to_W_m2)
call homogenize_field_t(fluxes%heat_content_frunoff, G, tmp_scale=US%QRZ_T_to_W_m2)
+ call homogenize_field_t(fluxes%heat_content_lrunoff_glc, G, tmp_scale=US%QRZ_T_to_W_m2)
+ call homogenize_field_t(fluxes%heat_content_frunoff_glc, G, tmp_scale=US%QRZ_T_to_W_m2)
call homogenize_field_t(fluxes%heat_content_massout, G, tmp_scale=US%QRZ_T_to_W_m2)
call homogenize_field_t(fluxes%heat_content_massin, G, tmp_scale=US%QRZ_T_to_W_m2)
endif
diff --git a/src/diagnostics/MOM_sum_output.F90 b/src/diagnostics/MOM_sum_output.F90
index fb95b79a91..fdcee8107d 100644
--- a/src/diagnostics/MOM_sum_output.F90
+++ b/src/diagnostics/MOM_sum_output.F90
@@ -966,8 +966,8 @@ subroutine accumulate_net_input(fluxes, sfc_state, tv, dt, G, US, CS)
if (associated(fluxes%lprec) .and. associated(fluxes%fprec)) then
do j=js,je ; do i=is,ie
FW_in(i,j) = RZL2_to_kg * dt*G%areaT(i,j)*(fluxes%evap(i,j) + &
- (((fluxes%lprec(i,j) + fluxes%vprec(i,j)) + fluxes%lrunoff(i,j)) + &
- (fluxes%fprec(i,j) + fluxes%frunoff(i,j))))
+ (((fluxes%lprec(i,j) + fluxes%vprec(i,j)) + fluxes%lrunoff(i,j) + fluxes%lrunoff_glc(i,j)) + &
+ (fluxes%fprec(i,j) + fluxes%frunoff(i,j) + fluxes%frunoff_glc(i,j))))
enddo ; enddo
else
call MOM_error(WARNING, &
diff --git a/src/parameterizations/vertical/MOM_bulk_mixed_layer.F90 b/src/parameterizations/vertical/MOM_bulk_mixed_layer.F90
index c7e522eddc..2af07e0ecf 100644
--- a/src/parameterizations/vertical/MOM_bulk_mixed_layer.F90
+++ b/src/parameterizations/vertical/MOM_bulk_mixed_layer.F90
@@ -525,13 +525,15 @@ subroutine bulkmixedlayer(h_3d, u_3d, v_3d, tv, fluxes, dt, ea, eb, G, GV, US, C
RmixConst = -0.5*CS%rivermix_depth * GV%g_Earth
do i=is,ie
TKE_river(i) = max(0.0, RmixConst * dSpV0_dS(i) * &
- (fluxes%lrunoff(i,j) + fluxes%frunoff(i,j)) * S(i,1))
+ (fluxes%lrunoff(i,j) + fluxes%frunoff(i,j) + &
+ fluxes%lrunoff_glc(i,j) + fluxes%frunoff_glc(i,j)) * S(i,1))
enddo
else
RmixConst = 0.5*CS%rivermix_depth * GV%g_Earth * Irho0**2
do i=is,ie
TKE_river(i) = max(0.0, RmixConst*dR0_dS(i)* &
- (fluxes%lrunoff(i,j) + fluxes%frunoff(i,j)) * S(i,1))
+ (fluxes%lrunoff(i,j) + fluxes%frunoff(i,j) + &
+ fluxes%lrunoff_glc(i,j) + fluxes%frunoff_glc(i,j)) * S(i,1))
enddo
endif
else
diff --git a/src/parameterizations/vertical/MOM_diabatic_aux.F90 b/src/parameterizations/vertical/MOM_diabatic_aux.F90
index 6fdfdd5936..5c0011dadc 100644
--- a/src/parameterizations/vertical/MOM_diabatic_aux.F90
+++ b/src/parameterizations/vertical/MOM_diabatic_aux.F90
@@ -1442,7 +1442,8 @@ subroutine applyBoundaryFluxesInOut(CS, G, GV, US, dt, fluxes, optics, nsw, h, t
RivermixConst = -0.5*(CS%rivermix_depth*dt) * GV%Rho0 * ( US%L_to_Z**2*GV%g_Earth )
endif
cTKE(i,j,k) = cTKE(i,j,k) + max(0.0, RivermixConst*dSV_dS(i,j,1) * &
- (fluxes%lrunoff(i,j) + fluxes%frunoff(i,j)) * tv%S(i,j,1))
+ (fluxes%lrunoff(i,j) + fluxes%frunoff(i,j) + &
+ fluxes%lrunoff_glc(i,j) + fluxes%frunoff_glc(i,j)) * tv%S(i,j,1))
endif
! Update state