diff --git a/components/mpas-ocean/driver/mpaso_cpl_indices.F b/components/mpas-ocean/driver/mpaso_cpl_indices.F
index 968a4090fe4a..10cbfe80e968 100644
--- a/components/mpas-ocean/driver/mpaso_cpl_indices.F
+++ b/components/mpas-ocean/driver/mpaso_cpl_indices.F
@@ -22,7 +22,11 @@ module mpaso_cpl_indices
integer :: index_o2x_Faoo_fco2_ocn
integer :: index_o2x_Faoo_fdms_ocn
integer :: index_o2x_So_ssh
-
+ integer :: index_o2x_Foxo_ismw
+ integer :: index_o2x_Foxo_rrofl
+ integer :: index_o2x_Foxo_rrofi
+ integer :: index_o2x_Foxo_ismh
+ integer :: index_o2x_Foxo_rrofih
! ocn -> drv for calculation of ocean-ice sheet interactions
@@ -188,6 +192,13 @@ subroutine mpaso_cpl_indices_set( )
index_o2x_Faoo_fdms_ocn = mct_avect_indexra(o2x,'Faoo_fdms_ocn',perrWith='quiet')
index_o2x_So_ssh = mct_avect_indexra(o2x,'So_ssh')
+ index_o2x_Foxo_ismw = mct_avect_indexra(o2x,'Foxo_ismw')
+ index_o2x_Foxo_rrofl = mct_avect_indexra(o2x,'Foxo_rrofl')
+ index_o2x_Foxo_rrofi = mct_avect_indexra(o2x,'Foxo_rrofi')
+
+ index_o2x_Foxo_ismh = mct_avect_indexra(o2x,'Foxo_ismh')
+ index_o2x_Foxo_rrofih = mct_avect_indexra(o2x,'Foxo_rrofih')
+
index_o2x_So_blt = mct_avect_indexra(o2x,'So_blt')
index_o2x_So_bls = mct_avect_indexra(o2x,'So_bls')
index_o2x_So_htv = mct_avect_indexra(o2x,'So_htv')
diff --git a/components/mpas-ocean/driver/ocn_comp_mct.F b/components/mpas-ocean/driver/ocn_comp_mct.F
index b8900a4f3e26..567c39e607c1 100644
--- a/components/mpas-ocean/driver/ocn_comp_mct.F
+++ b/components/mpas-ocean/driver/ocn_comp_mct.F
@@ -2694,7 +2694,12 @@ subroutine ocn_export_mct(o2x_o, errorCode) !{{{
avgOceanSurfaceDOCSemiLabile, &
avgOceanSurfaceFeParticulate, &
avgOceanSurfaceFeDissolved, &
- ssh
+ ssh, &
+ avgLandIceFreshwaterFlux, &
+ avgRemovedRiverRunoffFlux, &
+ avgRemovedIceRunoffFlux, &
+ avgLandIceHeatFlux, &
+ avgRemovedIceRunoffHeatFlux
real (kind=RKIND), dimension(:,:), pointer :: avgTracersSurfaceValue, avgSurfaceVelocity, &
avgSSHGradient, avgOceanSurfacePhytoC, &
@@ -2703,6 +2708,7 @@ subroutine ocn_export_mct(o2x_o, errorCode) !{{{
real (kind=RKIND) :: surfaceFreezingTemp
logical, pointer :: frazilIceActive, &
+ config_remove_AIS_coupler_runoff, &
config_use_ecosysTracers, &
config_use_DMSTracers, &
config_use_MacroMoleculesTracers, &
@@ -2719,6 +2725,7 @@ subroutine ocn_export_mct(o2x_o, errorCode) !{{{
call mpas_pool_get_package(domain % packages, 'frazilIceActive', frazilIceActive)
call mpas_pool_get_config(domain % configs, 'config_use_ecosysTracers', config_use_ecosysTracers)
call mpas_pool_get_config(domain % configs, 'config_land_ice_flux_mode', config_land_ice_flux_mode)
+ call mpas_pool_get_config(domain % configs, 'config_remove_AIS_coupler_runoff', config_remove_AIS_coupler_runoff)
call mpas_pool_get_config(domain % configs, 'config_use_DMSTracers', config_use_DMSTracers)
call mpas_pool_get_config(domain % configs, 'config_use_MacroMoleculesTracers', config_use_MacroMoleculesTracers)
call mpas_pool_get_config(domain % configs, 'config_use_ecosysTracers_sea_ice_coupling', &
@@ -2761,6 +2768,17 @@ subroutine ocn_export_mct(o2x_o, errorCode) !{{{
call mpas_pool_get_array(statePool, 'accumulatedFrazilIceMass', accumulatedFrazilIceMass, 1)
end if
+ ! Cryo fields
+ if (trim(config_land_ice_flux_mode) == 'standalone' .or. trim(config_land_ice_flux_mode) == 'data') then
+ call mpas_pool_get_array(forcingPool, 'avgLandIceFreshwaterFlux', avgLandIceFreshwaterFlux)
+ call mpas_pool_get_array(forcingPool, 'avgLandIceHeatFlux', avgLandIceHeatFlux)
+ endif
+ if (config_remove_AIS_coupler_runoff) then
+ call mpas_pool_get_array(forcingPool, 'avgRemovedRiverRunoffFlux', avgRemovedRiverRunoffFlux)
+ call mpas_pool_get_array(forcingPool, 'avgRemovedIceRunoffFlux', avgRemovedIceRunoffFlux)
+ call mpas_pool_get_array(forcingPool, 'avgRemovedIceRunoffHeatFlux', avgRemovedIceRunoffHeatFlux)
+ endif
+
! BGC fields
if (config_use_ecosysTracers) then
@@ -2812,6 +2830,17 @@ subroutine ocn_export_mct(o2x_o, errorCode) !{{{
o2x_o % rAttr(index_o2x_Faoo_h2otemp, n) = avgTotalFreshWaterTemperatureFlux(i) * rho_sw * cp_sw
+ ! Cryo fields
+ if (trim(config_land_ice_flux_mode) == 'standalone' .or. trim(config_land_ice_flux_mode) == 'data') then
+ o2x_o % rAttr(index_o2x_Foxo_ismw, n) = avgLandIceFreshwaterFlux(i)
+ o2x_o % rAttr(index_o2x_Foxo_ismh, n) = avgLandIceHeatFlux(i)
+ endif
+ if (config_remove_AIS_coupler_runoff) then
+ o2x_o % rAttr(index_o2x_Foxo_rrofl, n) = avgRemovedRiverRunoffFlux(i)
+ o2x_o % rAttr(index_o2x_Foxo_rrofi, n) = avgRemovedIceRunoffFlux(i)
+ o2x_o % rAttr(index_o2x_Foxo_rrofih, n) = avgRemovedIceRunoffHeatFlux(i)
+ endif
+
if ( frazilIceActive ) then
! negative when frazil ice can be melted
keepFrazil = .true.
@@ -3975,7 +4004,12 @@ subroutine ocn_export_moab(EClock) !{{{
avgOceanSurfaceDOCSemiLabile, &
avgOceanSurfaceFeParticulate, &
avgOceanSurfaceFeDissolved, &
- ssh
+ ssh, &
+ avgLandIceFreshwaterFlux, &
+ avgRemovedRiverRunoffFlux, &
+ avgRemovedIceRunoffFlux, &
+ avgLandIceHeatFlux, &
+ avgRemovedIceRunoffHeatFlux
real (kind=RKIND), dimension(:,:), pointer :: avgTracersSurfaceValue, avgSurfaceVelocity, &
avgSSHGradient, avgOceanSurfacePhytoC, &
@@ -3984,6 +4018,7 @@ subroutine ocn_export_moab(EClock) !{{{
real (kind=RKIND) :: surfaceFreezingTemp
logical, pointer :: frazilIceActive, &
+ config_remove_AIS_coupler_runoff, &
config_use_ecosysTracers, &
config_use_DMSTracers, &
config_use_MacroMoleculesTracers, &
@@ -4000,6 +4035,7 @@ subroutine ocn_export_moab(EClock) !{{{
call mpas_pool_get_package(domain % packages, 'frazilIceActive', frazilIceActive)
call mpas_pool_get_config(domain % configs, 'config_use_ecosysTracers', config_use_ecosysTracers)
call mpas_pool_get_config(domain % configs, 'config_land_ice_flux_mode', config_land_ice_flux_mode)
+ call mpas_pool_get_config(domain % configs, 'config_remove_AIS_coupler_runoff', config_remove_AIS_coupler_runoff)
call mpas_pool_get_config(domain % configs, 'config_use_DMSTracers', config_use_DMSTracers)
call mpas_pool_get_config(domain % configs, 'config_use_MacroMoleculesTracers', config_use_MacroMoleculesTracers)
call mpas_pool_get_config(domain % configs, 'config_use_ecosysTracers_sea_ice_coupling', &
@@ -4041,6 +4077,16 @@ subroutine ocn_export_moab(EClock) !{{{
call mpas_pool_get_array(forcingPool, 'frazilSurfacePressure', frazilSurfacePressure)
call mpas_pool_get_array(statePool, 'accumulatedFrazilIceMass', accumulatedFrazilIceMass, 1)
end if
+
+ if (trim(config_land_ice_flux_mode == 'standalone') .or. trim(config_land_ice_flux_mode) == 'data') then
+ call mpas_pool_get_array(forcingPool, 'avgLandIceFreshwaterFlux', avgLandIceFreshwaterFlux)
+ call mpas_pool_get_array(forcingPool, 'avgLandIceHeatFlux', avgLandIceHeatFlux)
+ endif
+ if (config_remove_AIS_coupler_runoff) then
+ call mpas_pool_get_array(forcingPool, 'avgRemovedRiverRunoffFlux', avgRemovedRiverRunoffFlux)
+ call mpas_pool_get_array(forcingPool, 'avgRemovedIceRunoffFlux', avgRemovedIceRunoffFlux)
+ call mpas_pool_get_array(forcingPool, 'avgRemovedIceRunoffHeatFlux', avgRemovedIceRunoffHeatFlux)
+ endif
! BGC fields
if (config_use_ecosysTracers) then
@@ -4092,7 +4138,17 @@ subroutine ocn_export_moab(EClock) !{{{
o2x_om(n, index_o2x_So_dhdy) = avgSSHGradient(index_avgMeridionalSSHGradient, i)
o2x_om(n, index_o2x_Faoo_h2otemp) = avgTotalFreshWaterTemperatureFlux(i) * rho_sw * cp_sw
-
+
+ if (trim(config_land_ice_flux_mode == 'standalone') .or. trim(config_land_ice_flux_mode) == 'data') then
+ o2x_om(n, index_o2x_Foxo_ismw) = avgLandIceFreshwaterFlux(i)
+ o2x_om(n, index_o2x_Foxo_ismh) = avgLandIceHeatFlux(i)
+ endif
+ if (config_remove_AIS_coupler_runoff) then
+ o2x_om(n, index_o2x_Foxo_rrofl) = avgRemovedRiverRunoffFlux(i)
+ o2x_om(n, index_o2x_Foxo_rrofi) = avgRemovedIceRunoffFlux(i)
+ o2x_om(n, index_o2x_Foxo_rrofih) = avgRemovedIceRunoffHeatFlux(i)
+ endif
+
if ( frazilIceActive ) then
! negative when frazil ice can be melted
keepFrazil = .true.
diff --git a/components/mpas-ocean/src/Registry.xml b/components/mpas-ocean/src/Registry.xml
index f8b56c083d44..a953b64d8f8e 100644
--- a/components/mpas-ocean/src/Registry.xml
+++ b/components/mpas-ocean/src/Registry.xml
@@ -3608,6 +3608,7 @@
packages="activeTracersBulkRestoringPKG;thicknessBulkPKG"
/>
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/components/mpas-ocean/src/analysis_members/mpas_ocn_conservation_check.F b/components/mpas-ocean/src/analysis_members/mpas_ocn_conservation_check.F
index a4f2a0b7ab5d..01f2b5345468 100644
--- a/components/mpas-ocean/src/analysis_members/mpas_ocn_conservation_check.F
+++ b/components/mpas-ocean/src/analysis_members/mpas_ocn_conservation_check.F
@@ -2432,7 +2432,8 @@ subroutine ocn_restart_conservation_check(domain, err)!{{{
err = 0
if ( trim(config_land_ice_flux_mode) == 'standalone' .or. &
- trim(config_land_ice_flux_mode) == 'coupled' ) then
+ trim(config_land_ice_flux_mode) == 'coupled' .or. &
+ trim(config_land_ice_flux_mode) == 'data' ) then
landIceFreshwaterFluxesOn = .true.
end if
diff --git a/components/mpas-ocean/src/shared/mpas_ocn_time_average_coupled.F b/components/mpas-ocean/src/shared/mpas_ocn_time_average_coupled.F
index b796c56fa1a6..751c547d95bd 100644
--- a/components/mpas-ocean/src/shared/mpas_ocn_time_average_coupled.F
+++ b/components/mpas-ocean/src/shared/mpas_ocn_time_average_coupled.F
@@ -53,7 +53,10 @@ subroutine ocn_time_average_coupled_init(forcingPool)!{{{
real (kind=RKIND), dimension(:,:), pointer :: avgTracersSurfaceValue, avgSurfaceVelocity, avgSSHGradient, &
avgLandIceBoundaryLayerTracers, avgLandIceTracerTransferVelocities
- real (kind=RKIND), dimension(:), pointer :: avgEffectiveDensityInLandIce, avgTotalFreshWaterTemperatureFlux
+ real (kind=RKIND), dimension(:), pointer :: avgEffectiveDensityInLandIce, avgTotalFreshWaterTemperatureFlux, &
+ avgLandIceFreshwaterFlux, &
+ avgRemovedRiverRunoffFlux, avgRemovedIceRunoffFlux, &
+ avgLandIceHeatFlux, avgRemovedIceRunoffHeatFlux
integer :: iCell
integer, pointer :: nAccumulatedCoupled, nCells
@@ -116,6 +119,37 @@ subroutine ocn_time_average_coupled_init(forcingPool)!{{{
!$omp end parallel
end if
+ ! Set up polar fields if necessary
+ if(trim(config_land_ice_flux_mode)=='standalone' .or. trim(config_land_ice_flux_mode) == 'data') then
+ call mpas_pool_get_array(forcingPool, 'avgLandIceFreshwaterFlux', avgLandIceFreshwaterFlux)
+ call mpas_pool_get_array(forcingPool, 'avgLandIceHeatFlux', avgLandIceHeatFlux)
+
+ !$omp parallel
+ !$omp do schedule(runtime)
+ do iCell = 1, nCells
+ avgLandIceFreshwaterFlux(iCell) = 0.0_RKIND
+ avgLandIceHeatFlux(iCell) = 0.0_RKIND
+ end do
+ !$omp end do
+ !$omp end parallel
+ end if
+
+ if(config_remove_AIS_coupler_runoff) then
+ call mpas_pool_get_array(forcingPool, 'avgRemovedRiverRunoffFlux', avgRemovedRiverRunoffFlux)
+ call mpas_pool_get_array(forcingPool, 'avgRemovedIceRunoffFlux', avgRemovedIceRunoffFlux)
+ call mpas_pool_get_array(forcingPool, 'avgRemovedIceRunoffHeatFlux', avgRemovedIceRunoffHeatFlux)
+
+ !$omp parallel
+ !$omp do schedule(runtime)
+ do iCell = 1, nCells
+ avgRemovedRiverRunoffFlux(iCell) = 0.0_RKIND
+ avgRemovedIceRunoffFlux(iCell) = 0.0_RKIND
+ avgRemovedIceRunoffHeatFlux(iCell) = 0.0_RKIND
+ end do
+ !$omp end do
+ !$omp end parallel
+ end if
+
! set up BGC coupling fields if necessary
if (config_use_ecosysTracers) then
@@ -201,6 +235,9 @@ end subroutine ocn_time_average_coupled_init!}}}
!
!-----------------------------------------------------------------------
subroutine ocn_time_average_coupled_accumulate(statePool, forcingPool, timeLevel)!{{{
+ use ocn_constants, only: &
+ latent_heat_fusion_mks
+
type (mpas_pool_type), intent(in) :: statePool
type (mpas_pool_type), intent(inout) :: forcingPool
integer, intent(in) :: timeLevel
@@ -215,7 +252,12 @@ subroutine ocn_time_average_coupled_accumulate(statePool, forcingPool, timeLevel
real (kind=RKIND), dimension(:,:), pointer :: &
avgLandIceBoundaryLayerTracers, avgLandIceTracerTransferVelocities
real (kind=RKIND), dimension(:), pointer :: effectiveDensityInLandIce, avgEffectiveDensityInLandIce, &
- totalFreshWaterTemperatureFlux, avgTotalFreshWaterTemperatureFlux
+ totalFreshWaterTemperatureFlux, avgTotalFreshWaterTemperatureFlux, &
+ landIceFreshwaterFlux, avgLandIceFreshwaterFlux, &
+ landIceHeatFlux, avgLandIceHeatFlux, &
+ removedRiverRunoffFlux, avgRemovedRiverRunoffFlux, &
+ removedIceRunoffFlux, avgRemovedIceRunoffFlux, &
+ avgRemovedIceRunoffHeatFlux
type (mpas_pool_type), pointer :: tracersPool
@@ -311,6 +353,48 @@ subroutine ocn_time_average_coupled_accumulate(statePool, forcingPool, timeLevel
!$omp end parallel
end if
+ ! Accumulate polar fields if necessary
+ if(trim(config_land_ice_flux_mode) == 'standalone' .or. trim(config_land_ice_flux_mode) == 'data') then
+ call mpas_pool_get_array(forcingPool, 'avgLandIceFreshwaterFlux', avgLandIceFreshwaterFlux)
+ call mpas_pool_get_array(forcingPool, 'landIceFreshwaterFlux', landIceFreshwaterFlux)
+ call mpas_pool_get_array(forcingPool, 'avgLandIceHeatFlux', avgLandIceHeatFlux)
+ call mpas_pool_get_array(forcingPool, 'landIceHeatFlux', landIceHeatFlux)
+
+ !$omp parallel
+ !$omp do schedule(runtime)
+ do iCell = 1, nCells
+ avgLandIceFreshwaterFlux(iCell) = ( avgLandIceFreshwaterFlux(iCell) * nAccumulatedCoupled &
+ + landIceFreshwaterFlux(iCell) ) / ( nAccumulatedCoupled + 1)
+ avgLandIceHeatFlux(iCell) = ( avgLandIceHeatFlux(iCell) * nAccumulatedCoupled &
+ + landIceHeatFlux(iCell) ) / ( nAccumulatedCoupled + 1)
+ end do
+ !$omp end do
+ !$omp end parallel
+
+ end if
+
+ if (config_remove_AIS_coupler_runoff) then
+ call mpas_pool_get_array(forcingPool, 'avgRemovedRiverRunoffFlux', avgRemovedRiverRunoffFlux)
+ call mpas_pool_get_array(forcingPool, 'avgRemovedIceRunoffFlux', avgRemovedIceRunoffFlux)
+ call mpas_pool_get_array(forcingPool, 'avgRemovedIceRunoffHeatFlux', avgRemovedIceRunoffHeatFlux)
+ call mpas_pool_get_array(forcingPool, 'removedRiverRunoffFlux', removedRiverRunoffFlux)
+ call mpas_pool_get_array(forcingPool, 'removedIceRunoffFlux', removedIceRunoffFlux)
+
+ !$omp parallel
+ !$omp do schedule(runtime)
+ do iCell = 1, nCells
+ avgRemovedRiverRunoffFlux(iCell) = ( avgRemovedRiverRunoffFlux(iCell) * nAccumulatedCoupled &
+ + removedRiverRunoffFlux(iCell) ) / ( nAccumulatedCoupled + 1)
+ avgRemovedIceRunoffFlux(iCell) = ( avgRemovedIceRunoffFlux(iCell) * nAccumulatedCoupled &
+ + removedIceRunoffFlux(iCell) ) / ( nAccumulatedCoupled + 1)
+ avgRemovedIceRunoffHeatFlux(iCell) = ( avgRemovedIceRunoffHeatFlux(iCell) * nAccumulatedCoupled &
+ + removedIceRunoffFlux(iCell)*latent_heat_fusion_mks ) / ( nAccumulatedCoupled + 1)
+ end do
+ !$omp end do
+ !$omp end parallel
+
+ end if
+
! accumulate BGC coupling fields if necessary
if (config_use_ecosysTracers) then
diff --git a/driver-mct/main/seq_diag_mct.F90 b/driver-mct/main/seq_diag_mct.F90
index 2a7d999ccc5e..f3c466f15e9b 100644
--- a/driver-mct/main/seq_diag_mct.F90
+++ b/driver-mct/main/seq_diag_mct.F90
@@ -139,37 +139,42 @@ module seq_diag_mct
integer(in),parameter :: f_hioff = 9 ! heat : latent, fusion, frozen runoff
integer(in),parameter :: f_hsen =10 ! heat : sensible
integer(in),parameter :: f_hberg =11 ! heat : data icebergs
- integer(in),parameter :: f_hh2ot =12 ! heat : water temperature
- integer(in),parameter :: f_wfrz =13 ! water: freezing
- integer(in),parameter :: f_wmelt =14 ! water: melting
- integer(in),parameter :: f_wrain =15 ! water: precip, liquid
- integer(in),parameter :: f_wsnow =16 ! water: precip, frozen
- integer(in),parameter :: f_wberg =17 ! water: data icebergs
- integer(in),parameter :: f_wevap =18 ! water: evaporation
- integer(in),parameter :: f_wroff =19 ! water: runoff/flood
- integer(in),parameter :: f_wioff =20 ! water: frozen runoff
- integer(in),parameter :: f_wirrig =21 ! water: irrigation
- integer(in),parameter :: f_wfrz_16O =22 ! water: freezing
- integer(in),parameter :: f_wmelt_16O =23 ! water: melting
- integer(in),parameter :: f_wrain_16O =24 ! water: precip, liquid
- integer(in),parameter :: f_wsnow_16O =25 ! water: precip, frozen
- integer(in),parameter :: f_wevap_16O =26 ! water: evaporation
- integer(in),parameter :: f_wroff_16O =27 ! water: runoff/flood
- integer(in),parameter :: f_wioff_16O =28 ! water: frozen runoff
- integer(in),parameter :: f_wfrz_18O =29 ! water: freezing
- integer(in),parameter :: f_wmelt_18O =30 ! water: melting
- integer(in),parameter :: f_wrain_18O =31 ! water: precip, liquid
- integer(in),parameter :: f_wsnow_18O =32 ! water: precip, frozen
- integer(in),parameter :: f_wevap_18O =33 ! water: evaporation
- integer(in),parameter :: f_wroff_18O =34 ! water: runoff/flood
- integer(in),parameter :: f_wioff_18O =35 ! water: frozen runoff
- integer(in),parameter :: f_wfrz_HDO =36 ! water: freezing
- integer(in),parameter :: f_wmelt_HDO =37 ! water: melting
- integer(in),parameter :: f_wrain_HDO =38 ! water: precip, liquid
- integer(in),parameter :: f_wsnow_HDO =39 ! water: precip, frozen
- integer(in),parameter :: f_wevap_HDO =40 ! water: evaporation
- integer(in),parameter :: f_wroff_HDO =41 ! water: runoff/flood
- integer(in),parameter :: f_wioff_HDO =42 ! water: frozen runoff
+ integer(in),parameter :: f_hism =12 ! heat : ice shelf melt
+ integer(in),parameter :: f_hriof =13 ! heat : data icebergs
+ integer(in),parameter :: f_hh2ot =14 ! heat : water temperature
+ integer(in),parameter :: f_wfrz =15 ! water: freezing
+ integer(in),parameter :: f_wmelt =16 ! water: melting
+ integer(in),parameter :: f_wrain =17 ! water: precip, liquid
+ integer(in),parameter :: f_wsnow =18 ! water: precip, frozen
+ integer(in),parameter :: f_wevap =19 ! water: evaporation
+ integer(in),parameter :: f_wroff =20 ! water: runoff/flood
+ integer(in),parameter :: f_wioff =21 ! water: frozen runoff
+ integer(in),parameter :: f_wberg =22 ! water: data icebergs
+ integer(in),parameter :: f_wism =23 ! water: ice-shelf melt
+ integer(in),parameter :: f_wrrof =24 ! water: removed liquid runoff
+ integer(in),parameter :: f_wriof =25 ! water: removed ice runoff
+ integer(in),parameter :: f_wirrig =26 ! water: irrigation
+ integer(in),parameter :: f_wfrz_16O =27 ! water: freezing
+ integer(in),parameter :: f_wmelt_16O =28 ! water: melting
+ integer(in),parameter :: f_wrain_16O =29 ! water: precip, liquid
+ integer(in),parameter :: f_wsnow_16O =30 ! water: precip, frozen
+ integer(in),parameter :: f_wevap_16O =31 ! water: evaporation
+ integer(in),parameter :: f_wroff_16O =32 ! water: runoff/flood
+ integer(in),parameter :: f_wioff_16O =33 ! water: frozen runoff
+ integer(in),parameter :: f_wfrz_18O =34 ! water: freezing
+ integer(in),parameter :: f_wmelt_18O =35 ! water: melting
+ integer(in),parameter :: f_wrain_18O =36 ! water: precip, liquid
+ integer(in),parameter :: f_wsnow_18O =37 ! water: precip, frozen
+ integer(in),parameter :: f_wevap_18O =38 ! water: evaporation
+ integer(in),parameter :: f_wroff_18O =39 ! water: runoff/flood
+ integer(in),parameter :: f_wioff_18O =40 ! water: frozen runoff
+ integer(in),parameter :: f_wfrz_HDO =41 ! water: freezing
+ integer(in),parameter :: f_wmelt_HDO =42 ! water: melting
+ integer(in),parameter :: f_wrain_HDO =43 ! water: precip, liquid
+ integer(in),parameter :: f_wsnow_HDO =44 ! water: precip, frozen
+ integer(in),parameter :: f_wevap_HDO =45 ! water: evaporation
+ integer(in),parameter :: f_wroff_HDO =46 ! water: runoff/flood
+ integer(in),parameter :: f_wioff_HDO =47 ! water: frozen runoff
integer(in),parameter :: f_size = f_wioff_HDO ! Total array size of all elements
integer(in),parameter :: f_a = f_area ! 1st index for area
@@ -189,8 +194,10 @@ module seq_diag_mct
(/' area',' hfreeze',' hmelt',' hnetsw',' hlwdn', &
' hlwup',' hlatvap',' hlatfus',' hiroff',' hsen', &
- ' hberg',' hh2otemp',' wfreeze',' wmelt',' wrain', &
- ' wsnow',' wberg',' wevap',' wrunoff',' wfrzrof', &
+ ' hberg',' hism',' hriof', &
+ ' hh2otemp',' wfreeze',' wmelt',' wrain', &
+ ' wsnow',' wevap',' wrunoff',' wfrzrof', &
+ ' wberg',' wism',' wrrof',' wriof', &
' wirrig', &
' wfreeze_16O',' wmelt_16O',' wrain_16O',' wsnow_16O', &
' wevap_16O',' wrunoff_16O',' wfrzrof_16O', &
@@ -288,6 +295,12 @@ module seq_diag_mct
integer :: index_o2x_Fioo_frazil
integer :: index_o2x_Fioo_q
+ integer :: index_o2x_Foxo_ismw
+ integer :: index_o2x_Foxo_rrofl
+ integer :: index_o2x_Foxo_rrofi
+ integer :: index_o2x_Foxo_ismh
+ integer :: index_o2x_Foxo_rrofih
+
integer :: index_xao_Faox_lwup
integer :: index_xao_Faox_lat
integer :: index_xao_Faox_sen
@@ -1337,7 +1350,7 @@ subroutine seq_diag_ocn_mct( ocn, xao_o, frac_o, infodata, do_o2x, do_x2o, do_xa
integer(in) :: kArea ! index of area field in aVect
integer(in) :: ko,ki ! fraction indices
integer(in) :: lSize ! size of aVect
- real(r8) :: ca_i,ca_o ! area of a grid cell
+ real(r8) :: ca_i,ca_o,ca_c ! area of a grid cell
logical,save :: first_time = .true.
logical,save :: flds_wiso_ocn = .false.
@@ -1373,6 +1386,11 @@ subroutine seq_diag_ocn_mct( ocn, xao_o, frac_o, infodata, do_o2x, do_x2o, do_xa
index_o2x_Fioo_frazil = mct_aVect_indexRA(o2x_o,'Fioo_frazil')
index_o2x_Fioo_q = mct_aVect_indexRA(o2x_o,'Fioo_q')
index_o2x_Faoo_h2otemp = mct_aVect_indexRA(o2x_o,'Faoo_h2otemp')
+ index_o2x_Foxo_ismw = mct_aVect_indexRA(o2x_o,'Foxo_ismw')
+ index_o2x_Foxo_rrofl = mct_aVect_indexRA(o2x_o,'Foxo_rrofl')
+ index_o2x_Foxo_rrofi = mct_aVect_indexRA(o2x_o,'Foxo_rrofi')
+ index_o2x_Foxo_ismh = mct_aVect_indexRA(o2x_o,'Foxo_ismh')
+ index_o2x_Foxo_rrofih = mct_aVect_indexRA(o2x_o,'Foxo_rrofih')
end if
lSize = mct_avect_lSize(o2x_o)
@@ -1380,10 +1398,16 @@ subroutine seq_diag_ocn_mct( ocn, xao_o, frac_o, infodata, do_o2x, do_x2o, do_xa
do n=1,lSize
ca_o = dom_o%data%rAttr(kArea,n) * frac_o%rAttr(ko,n)
ca_i = dom_o%data%rAttr(kArea,n) * frac_o%rAttr(ki,n)
+ ca_c = dom_o%data%rAttr(kArea,n)
nf = f_area; budg_dataL(nf,ic,ip) = budg_dataL(nf,ic,ip) + ca_o
nf = f_wfrz; budg_dataL(nf,ic,ip) = budg_dataL(nf,ic,ip) - (ca_o+ca_i)*max(0.0_r8,o2x_o%rAttr(index_o2x_Fioo_frazil,n))
nf = f_hfrz; budg_dataL(nf,ic,ip) = budg_dataL(nf,ic,ip) + (ca_o+ca_i)*max(0.0_r8,o2x_o%rAttr(index_o2x_Fioo_q,n))
nf = f_hh2ot; budg_dataL(nf,ic,ip) = budg_dataL(nf,ic,ip) + (ca_o+ca_i)*o2x_o%rAttr(index_o2x_Faoo_h2otemp,n)
+ nf = f_wism; budg_dataL(nf,ic,ip) = budg_dataL(nf,ic,ip) + ca_c*o2x_o%rAttr(index_o2x_Foxo_ismw,n)
+ nf = f_wrrof; budg_dataL(nf,ic,ip) = budg_dataL(nf,ic,ip) - (ca_o+ca_i)*o2x_o%rAttr(index_o2x_Foxo_rrofl,n)
+ nf = f_wriof; budg_dataL(nf,ic,ip) = budg_dataL(nf,ic,ip) - (ca_o+ca_i)*o2x_o%rAttr(index_o2x_Foxo_rrofi,n)
+ nf = f_hism; budg_dataL(nf,ic,ip) = budg_dataL(nf,ic,ip) + ca_c*o2x_o%rAttr(index_o2x_Foxo_ismh,n)
+ nf = f_hriof; budg_dataL(nf,ic,ip) = budg_dataL(nf,ic,ip) + ca_c*o2x_o%rAttr(index_o2x_Foxo_rrofih,n)
end do
end if
@@ -1613,8 +1637,8 @@ subroutine seq_diag_ice_mct( ice, frac_i, infodata, do_i2x, do_x2i)
if (present(do_i2x)) then
index_i2x_Fioi_melth = mct_aVect_indexRA(i2x_i,'Fioi_melth')
index_i2x_Fioi_meltw = mct_aVect_indexRA(i2x_i,'Fioi_meltw')
- index_i2x_Fioi_bergh = mct_aVect_indexRA(i2x_i,'PFioi_bergh')
- index_i2x_Fioi_bergw = mct_aVect_indexRA(i2x_i,'PFioi_bergw')
+! index_i2x_Fioi_bergh = mct_aVect_indexRA(i2x_i,'PFioi_bergh')
+! index_i2x_Fioi_bergw = mct_aVect_indexRA(i2x_i,'PFioi_bergw')
index_i2x_Fioi_swpen = mct_aVect_indexRA(i2x_i,'Fioi_swpen')
index_i2x_Faii_swnet = mct_aVect_indexRA(i2x_i,'Faii_swnet')
index_i2x_Faii_lwup = mct_aVect_indexRA(i2x_i,'Faii_lwup')
@@ -1650,9 +1674,9 @@ subroutine seq_diag_ice_mct( ice, frac_i, infodata, do_i2x, do_x2i)
nf = f_hlwup ; budg_dataL(nf,ic,ip) = budg_dataL(nf,ic,ip) + ca_i*i2x_i%rAttr(index_i2x_Faii_lwup,n)
nf = f_hlatv ; budg_dataL(nf,ic,ip) = budg_dataL(nf,ic,ip) + ca_i*i2x_i%rAttr(index_i2x_Faii_lat,n)
nf = f_hsen ; budg_dataL(nf,ic,ip) = budg_dataL(nf,ic,ip) + ca_i*i2x_i%rAttr(index_i2x_Faii_sen,n)
- nf = f_hberg ; budg_dataL(nf,ic,ip) = budg_dataL(nf,ic,ip) - (ca_o+ca_i)*i2x_i%rAttr(index_i2x_Fioi_bergh,n)
+! nf = f_hberg ; budg_dataL(nf,ic,ip) = budg_dataL(nf,ic,ip) - (ca_o+ca_i)*i2x_i%rAttr(index_i2x_Fioi_bergh,n)
nf = f_wmelt ; budg_dataL(nf,ic,ip) = budg_dataL(nf,ic,ip) - ca_i*i2x_i%rAttr(index_i2x_Fioi_meltw,n)
- nf = f_wberg ; budg_dataL(nf,ic,ip) = budg_dataL(nf,ic,ip) - (ca_o+ca_i)*i2x_i%rAttr(index_i2x_Fioi_bergw,n)
+! nf = f_wberg ; budg_dataL(nf,ic,ip) = budg_dataL(nf,ic,ip) - (ca_o+ca_i)*i2x_i%rAttr(index_i2x_Fioi_bergw,n)
nf = f_wevap ; budg_dataL(nf,ic,ip) = budg_dataL(nf,ic,ip) + ca_i*i2x_i%rAttr(index_i2x_Faii_evap,n)
if ( flds_wiso_ice )then
diff --git a/driver-mct/shr/seq_flds_mod.F90 b/driver-mct/shr/seq_flds_mod.F90
index 4b37e40b7b3e..cb41fa6439f2 100644
--- a/driver-mct/shr/seq_flds_mod.F90
+++ b/driver-mct/shr/seq_flds_mod.F90
@@ -1583,6 +1583,46 @@ subroutine seq_flds_set(nmlfile, ID, infodata)
attname = 'PFioi_bergw'
call metadata_set(attname, longname, stdname, units)
+ ! Water flux from ice shelf melt
+ call seq_flds_add(o2x_fluxes,"Foxo_ismw")
+ longname = 'Water flux due to basal melting of ice shelves'
+ stdname = 'basal_iceshelf_melt_flux'
+ units = 'kg m-2 s-1'
+ attname = 'Foxo_ismw'
+ call metadata_set(attname, longname, stdname, units)
+
+ ! Heat flux from ice shelf melt
+ call seq_flds_add(o2x_fluxes,"Foxo_ismh")
+ longname = 'Heat flux due to basal melting of ice shelves'
+ stdname = 'basal_iceshelf_heat_flux'
+ units = 'W m-2'
+ attname = 'Foxo_ismh'
+ call metadata_set(attname, longname, stdname, units)
+
+ ! Water flux from removed liquid runoff
+ call seq_flds_add(o2x_fluxes,"Foxo_rrofl")
+ longname = 'Water flux due to removed liqiud runoff'
+ stdname = 'removed_liquid_runoff_flux'
+ units = 'kg m-2 s-1'
+ attname = 'Foxo_rrofl'
+ call metadata_set(attname, longname, stdname, units)
+
+ ! Water flux from removed solid runoff
+ call seq_flds_add(o2x_fluxes,"Foxo_rrofi")
+ longname = 'Water flux due to removed solid runoff'
+ stdname = 'removed_solid_runoff_flux'
+ units = 'kg m-2 s-1'
+ attname = 'Foxo_rrofi'
+ call metadata_set(attname, longname, stdname, units)
+
+ ! Heat flux from removed solid runoff
+ call seq_flds_add(o2x_fluxes,"Foxo_rrofih")
+ longname = 'Heat flux due to removed solid runoff'
+ stdname = 'removed_solid_runoff_heat_flux'
+ units = 'W m-2'
+ attname = 'Foxo_rrofih'
+ call metadata_set(attname, longname, stdname, units)
+
! Salt flux
call seq_flds_add(i2x_fluxes,"Fioi_salt")
call seq_flds_add(x2o_fluxes,"Fioi_salt")