Skip to content

Commit 2b7abec

Browse files
DeniseWorthenDeniseWorthen
authored
Merge pull request #2 from NOAA-EMC/dev/emc
merge dev/emc
2 parents ba6140c + 7135281 commit 2b7abec

3 files changed

Lines changed: 56 additions & 98 deletions

File tree

‎config_src/nuopc_driver/mom_cap.F90‎

Lines changed: 11 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ module MOM_cap_mod
4141
use shr_file_mod, only: shr_file_setLogUnit, shr_file_getLogUnit
4242
#endif
4343
use time_utils_mod, only: esmf2fms_time
44-
use data_override_mod, only: data_override_init, data_override
4544

4645
use, intrinsic :: iso_fortran_env, only: output_unit
4746

@@ -689,11 +688,6 @@ subroutine InitializeAdvertise(gcomp, importState, exportState, clock, rc)
689688
ocean_public%is_ocean_pe = .true.
690689
call ocean_model_init(ocean_public, ocean_state, time0, time_start, input_restart_file=trim(restartfile))
691690

692-
#ifndef CESMCOUPLED
693-
! for runoff in EMC
694-
call data_override_init(Ocean_domain_in = Ocean_public%domain)
695-
#endif
696-
697691
call ocean_model_init_sfc(ocean_state, ocean_public)
698692

699693
call mpp_get_compute_domain(ocean_public%domain, isc, iec, jsc, jec)
@@ -714,12 +708,10 @@ subroutine InitializeAdvertise(gcomp, importState, exportState, clock, rc)
714708
Ice_ocean_boundary% seaice_melt (isc:iec,jsc:jec), &
715709
Ice_ocean_boundary% mi (isc:iec,jsc:jec), &
716710
Ice_ocean_boundary% p (isc:iec,jsc:jec), &
717-
Ice_ocean_boundary% runoff (isc:iec,jsc:jec), &
718-
Ice_ocean_boundary% calving (isc:iec,jsc:jec), &
719-
Ice_ocean_boundary% runoff_hflx (isc:iec,jsc:jec), &
720-
Ice_ocean_boundary% calving_hflx (isc:iec,jsc:jec), &
721-
Ice_ocean_boundary% rofl_flux (isc:iec,jsc:jec), &
722-
Ice_ocean_boundary% rofi_flux (isc:iec,jsc:jec))
711+
Ice_ocean_boundary% lrunoff_hflx (isc:iec,jsc:jec), &
712+
Ice_ocean_boundary% frunoff_hflx (isc:iec,jsc:jec), &
713+
Ice_ocean_boundary% lrunoff (isc:iec,jsc:jec), &
714+
Ice_ocean_boundary% frunoff (isc:iec,jsc:jec))
723715

724716
Ice_ocean_boundary%u_flux = 0.0
725717
Ice_ocean_boundary%v_flux = 0.0
@@ -737,12 +729,10 @@ subroutine InitializeAdvertise(gcomp, importState, exportState, clock, rc)
737729
Ice_ocean_boundary%seaice_melt_heat= 0.0
738730
Ice_ocean_boundary%mi = 0.0
739731
Ice_ocean_boundary%p = 0.0
740-
Ice_ocean_boundary%runoff = 0.0
741-
Ice_ocean_boundary%calving = 0.0
742-
Ice_ocean_boundary%runoff_hflx = 0.0
743-
Ice_ocean_boundary%calving_hflx = 0.0
744-
Ice_ocean_boundary%rofl_flux = 0.0
745-
Ice_ocean_boundary%rofi_flux = 0.0
732+
Ice_ocean_boundary%lrunoff_hflx = 0.0
733+
Ice_ocean_boundary%frunoff_hflx = 0.0
734+
Ice_ocean_boundary%lrunoff = 0.0
735+
Ice_ocean_boundary%frunoff = 0.0
746736

747737
ocean_internalstate%ptr%ocean_state_type_ptr => ocean_state
748738
call ESMF_GridCompSetInternalState(gcomp, ocean_internalstate, rc)
@@ -786,11 +776,9 @@ subroutine InitializeAdvertise(gcomp, importState, exportState, clock, rc)
786776
call fld_list_add(fldsToOcn_num, fldsToOcn, "Foxx_rofi" , "will provide") !-> ice runoff
787777
call fld_list_add(fldsToOcn_num, fldsToOcn, "mean_fresh_water_to_ocean_rate", "will provide")
788778
call fld_list_add(fldsToOcn_num, fldsToOcn, "net_heat_flx_to_ocn" , "will provide")
789-
790-
!call fld_list_add(fldsToOcn_num, fldsToOcn, "mean_runoff_rate" , "will provide")
791-
!call fld_list_add(fldsToOcn_num, fldsToOcn, "mean_calving_rate" , "will provide")
792-
!call fld_list_add(fldsToOcn_num, fldsToOcn, "mean_runoff_heat_flx" , "will provide")
793-
!call fld_list_add(fldsToOcn_num, fldsToOcn, "mean_calving_heat_flx" , "will provide")
779+
!These are not currently used and changing requires a nuopc dictionary change
780+
!call fld_list_add(fldsToOcn_num, fldsToOcn, "mean_runoff_heat_flx" , "will provide")
781+
!call fld_list_add(fldsToOcn_num, fldsToOcn, "mean_calving_heat_flx" , "will provide")
794782

795783
!--------- export fields -------------
796784
call fld_list_add(fldsFrOcn_num, fldsFrOcn, "ocean_mask" , "will provide")
@@ -1727,8 +1715,6 @@ subroutine ModelAdvance(gcomp, rc)
17271715
file=__FILE__)) &
17281716
return ! bail out
17291717

1730-
call ice_ocn_bnd_from_data(Ice_ocean_boundary, Time, Time_step_coupled) ! for runoff
1731-
17321718
!---------------
17331719
! Update MOM6
17341720
!---------------
@@ -2332,20 +2318,6 @@ subroutine shr_file_getLogUnit(nunit)
23322318
end subroutine shr_file_getLogUnit
23332319
#endif
23342320

2335-
subroutine ice_ocn_bnd_from_data(x, Time, Time_step_coupled)
2336-
! get forcing data from data_overide
2337-
type (ice_ocean_boundary_type) :: x
2338-
type(Time_type), intent(in) :: Time, Time_step_coupled
2339-
2340-
type(Time_type) :: Time_next
2341-
character(len=*),parameter :: subname='(mom_cap:ice_ocn_bnd_from_data)'
2342-
2343-
Time_next = Time + Time_step_coupled
2344-
! call data_override('OCN', 'runoff', x%runoff , Time_next)
2345-
call data_override('OCN', 'runoff', x%rofl_flux , Time_next)
2346-
2347-
end subroutine ice_ocn_bnd_from_data
2348-
23492321
!>
23502322
!! @page nuopc_cap NUOPC Cap
23512323
!! @author Fei Liu (fei.liu@gmail.com)

‎config_src/nuopc_driver/mom_cap_methods.F90‎

Lines changed: 13 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -214,64 +214,42 @@ subroutine mom_import(ocean_public, ocean_grid, importState, ice_ocean_boundary,
214214
return ! bail out
215215

216216
!----
217-
! runoff and heat content of runoff
217+
! mass and heat content of liquid and frozen runoff
218218
!----
219219
! Note - preset values to 0, if field does not exist in importState, then will simply return
220220
! and preset value will be used
221221

222222
! liquid runoff
223-
ice_ocean_boundary%rofl_flux (:,:) = 0._ESMF_KIND_R8
223+
ice_ocean_boundary%lrunoff (:,:) = 0._ESMF_KIND_R8
224224
call state_getimport(importState, 'Foxx_rofl', &
225-
isc, iec, jsc, jec, ice_ocean_boundary%rofl_flux,rc=rc)
225+
isc, iec, jsc, jec, ice_ocean_boundary%lrunoff,rc=rc)
226226
if (ESMF_LogFoundError(rcToCheck=rc, msg=ESMF_LOGERR_PASSTHRU, &
227227
line=__LINE__, &
228228
file=__FILE__)) &
229229
return ! bail out
230230

231231
! ice runoff
232-
ice_ocean_boundary%rofi_flux (:,:) = 0._ESMF_KIND_R8
232+
ice_ocean_boundary%frunoff (:,:) = 0._ESMF_KIND_R8
233233
call state_getimport(importState, 'Foxx_rofi', &
234-
isc, iec, jsc, jec, ice_ocean_boundary%rofi_flux,rc=rc)
234+
isc, iec, jsc, jec, ice_ocean_boundary%frunoff,rc=rc)
235235
if (ESMF_LogFoundError(rcToCheck=rc, msg=ESMF_LOGERR_PASSTHRU, &
236236
line=__LINE__, &
237237
file=__FILE__)) &
238238
return ! bail out
239239

240-
! total runoff
241-
ice_ocean_boundary%runoff (:,:) = 0._ESMF_KIND_R8
242-
call state_getimport(importState, 'mean_runoff_rate', &
243-
isc, iec, jsc, jec, ice_ocean_boundary%runoff, rc=rc)
240+
! heat content of lrunoff
241+
ice_ocean_boundary%lrunoff_hflx(:,:) = 0._ESMF_KIND_R8
242+
call state_getimport(importState, 'mean_runoff_heat_flx', &
243+
isc, iec, jsc, jec, ice_ocean_boundary%lrunoff_hflx, rc=rc)
244244
if (ESMF_LogFoundError(rcToCheck=rc, msg=ESMF_LOGERR_PASSTHRU, &
245245
line=__LINE__, &
246246
file=__FILE__)) &
247247
return ! bail out
248248

249-
! heat content of runoff
250-
ice_ocean_boundary%runoff_hflx(:,:) = 0._ESMF_KIND_R8
251-
call state_getimport(importState, 'mean_runoff_heat_flux', &
252-
isc, iec, jsc, jec, ice_ocean_boundary%runoff_hflx, rc=rc)
253-
if (ESMF_LogFoundError(rcToCheck=rc, msg=ESMF_LOGERR_PASSTHRU, &
254-
line=__LINE__, &
255-
file=__FILE__)) &
256-
return ! bail out
257-
258-
!----
259-
! calving rate and heat flux
260-
!----
261-
! Note - preset values to 0, if field does not exist in importState, then will simply return
262-
! and preset value will be used
263-
264-
ice_ocean_boundary%calving(:,:) = 0._ESMF_KIND_R8
265-
call state_getimport(importState, 'mean_calving_rate', &
266-
isc, iec, jsc, jec, ice_ocean_boundary%calving, rc=rc)
267-
if (ESMF_LogFoundError(rcToCheck=rc, msg=ESMF_LOGERR_PASSTHRU, &
268-
line=__LINE__, &
269-
file=__FILE__)) &
270-
return ! bail out
271-
272-
ice_ocean_boundary%calving_hflx(:,:) = 0._ESMF_KIND_R8
273-
call state_getimport(importState, 'mean_calving_heat_flux', &
274-
isc, iec, jsc, jec, ice_ocean_boundary%calving_hflx, rc=rc)
249+
! heat content of frunoff
250+
ice_ocean_boundary%frunoff_hflx(:,:) = 0._ESMF_KIND_R8
251+
call state_getimport(importState, 'mean_calving_heat_flx', &
252+
isc, iec, jsc, jec, ice_ocean_boundary%frunoff_hflx, rc=rc)
275253
if (ESMF_LogFoundError(rcToCheck=rc, msg=ESMF_LOGERR_PASSTHRU, &
276254
line=__LINE__, &
277255
file=__FILE__)) &

‎config_src/nuopc_driver/mom_surface_forcing_nuopc.F90‎

Lines changed: 32 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ module MOM_surface_forcing_nuopc
107107
!! sea-ice viscosity becomes effective, in kg m-2,
108108
!! typically of order 1000 [kg m-2].
109109
logical :: allow_flux_adjustments !< If true, use data_override to obtain flux adjustments
110+
logical :: liquid_runoff_from_data !< If true, use data_override to obtain liquid runoff
110111

111112
real :: Flux_const !< piston velocity for surface restoring [m/s]
112113
logical :: salt_restore_as_sflux !< If true, SSS restore as salt flux instead of water flux
@@ -152,8 +153,8 @@ module MOM_surface_forcing_nuopc
152153
!> Structure corresponding to forcing, but with the elements, units, and conventions
153154
!! that exactly conform to the use for MOM-based coupled models.
154155
type, public :: ice_ocean_boundary_type
155-
real, pointer, dimension(:,:) :: rofl_flux =>NULL() !< liquid runoff [kg/m2/s]
156-
real, pointer, dimension(:,:) :: rofi_flux =>NULL() !< ice runoff [kg/m2/s]
156+
real, pointer, dimension(:,:) :: lrunoff =>NULL() !< liquid runoff [kg/m2/s]
157+
real, pointer, dimension(:,:) :: frunoff =>NULL() !< ice runoff [kg/m2/s]
157158
real, pointer, dimension(:,:) :: u_flux =>NULL() !< i-direction wind stress [Pa]
158159
real, pointer, dimension(:,:) :: v_flux =>NULL() !< j-direction wind stress [Pa]
159160
real, pointer, dimension(:,:) :: t_flux =>NULL() !< sensible heat flux [W/m2]
@@ -168,13 +169,11 @@ module MOM_surface_forcing_nuopc
168169
real, pointer, dimension(:,:) :: sw_flux_nir_dif =>NULL() !< diffuse Near InfraRed sw radiation [W/m2]
169170
real, pointer, dimension(:,:) :: lprec =>NULL() !< mass flux of liquid precip [kg/m2/s]
170171
real, pointer, dimension(:,:) :: fprec =>NULL() !< mass flux of frozen precip [kg/m2/s]
171-
real, pointer, dimension(:,:) :: runoff =>NULL() !< mass flux of liquid runoff [kg/m2/s]
172-
real, pointer, dimension(:,:) :: calving =>NULL() !< mass flux of frozen runoff [kg/m2/s]
173172
real, pointer, dimension(:,:) :: ustar_berg =>NULL() !< frictional velocity beneath icebergs [m/s]
174173
real, pointer, dimension(:,:) :: area_berg =>NULL() !< area covered by icebergs[m2/m2]
175174
real, pointer, dimension(:,:) :: mass_berg =>NULL() !< mass of icebergs(kg/m2)
176-
real, pointer, dimension(:,:) :: runoff_hflx =>NULL() !< heat content of liquid runoff [W/m2]
177-
real, pointer, dimension(:,:) :: calving_hflx =>NULL() !< heat content of frozen runoff [W/m2]
175+
real, pointer, dimension(:,:) :: lrunoff_hflx =>NULL() !< heat content of liquid runoff [W/m2]
176+
real, pointer, dimension(:,:) :: frunoff_hflx =>NULL() !< heat content of frozen runoff [W/m2]
178177
real, pointer, dimension(:,:) :: p =>NULL() !< pressure of overlying ice and atmosphere
179178
!< on ocean surface [Pa]
180179
real, pointer, dimension(:,:) :: mi =>NULL() !< mass of ice [kg/m2]
@@ -411,6 +410,13 @@ subroutine convert_IOB_to_fluxes(IOB, fluxes, index_bounds, Time, G, US, CS, &
411410
enddo ; enddo
412411
endif
413412

413+
! Check that liquid runoff has a place to go
414+
if (CS%liquid_runoff_from_data .and. .not. associated(IOB%lrunoff)) then
415+
call MOM_error(FATAL, "liquid runoff is being added via data_override but "// &
416+
"there is no associated runoff in the IOB")
417+
return
418+
end if
419+
414420
! obtain fluxes from IOB; note the staggering of indices
415421
i0 = is - isc_bnd ; j0 = js - jsc_bnd
416422
do j=js,je ; do i=is,ie
@@ -425,17 +431,14 @@ subroutine convert_IOB_to_fluxes(IOB, fluxes, index_bounds, Time, G, US, CS, &
425431
fluxes%evap(i,j) = IOB%q_flux(i-i0,j-j0) * G%mask2dT(i,j)
426432

427433
! liquid runoff flux
428-
if (associated(IOB%rofl_flux)) then
429-
fluxes%lrunoff(i,j) = IOB%rofl_flux(i-i0,j-j0) * G%mask2dT(i,j)
430-
else if (associated(IOB%runoff)) then
431-
fluxes%lrunoff(i,j) = IOB%runoff(i-i0,j-j0) * G%mask2dT(i,j)
434+
if (associated(IOB%lrunoff)) then
435+
if(CS%liquid_runoff_from_data)call data_override('OCN', 'runoff', IOB%lrunoff, Time)
436+
fluxes%lrunoff(i,j) = IOB%lrunoff(i-i0,j-j0) * G%mask2dT(i,j)
432437
endif
433438

434439
! ice runoff flux
435-
if (associated(IOB%rofi_flux)) then
436-
fluxes%frunoff(i,j) = IOB%rofi_flux(i-i0,j-j0) * G%mask2dT(i,j)
437-
elseif (associated(IOB%calving)) then
438-
fluxes%frunoff(i,j) = IOB%calving(i-i0,j-j0) * G%mask2dT(i,j)
440+
if (associated(IOB%frunoff)) then
441+
fluxes%frunoff(i,j) = IOB%frunoff(i-i0,j-j0) * G%mask2dT(i,j)
439442
endif
440443

441444
if (associated(IOB%ustar_berg)) &
@@ -447,11 +450,11 @@ subroutine convert_IOB_to_fluxes(IOB, fluxes, index_bounds, Time, G, US, CS, &
447450
if (associated(IOB%mass_berg)) &
448451
fluxes%mass_berg(i,j) = IOB%mass_berg(i-i0,j-j0) * G%mask2dT(i,j)
449452

450-
if (associated(IOB%runoff_hflx)) &
451-
fluxes%heat_content_lrunoff(i,j) = IOB%runoff_hflx(i-i0,j-j0) * G%mask2dT(i,j)
453+
if (associated(IOB%lrunoff_hflx)) &
454+
fluxes%heat_content_lrunoff(i,j) = IOB%lrunoff_hflx(i-i0,j-j0) * G%mask2dT(i,j)
452455

453-
if (associated(IOB%calving_hflx)) &
454-
fluxes%heat_content_frunoff(i,j) = IOB%calving_hflx(i-i0,j-j0) * G%mask2dT(i,j)
456+
if (associated(IOB%frunoff_hflx)) &
457+
fluxes%heat_content_frunoff(i,j) = IOB%frunoff_hflx(i-i0,j-j0) * G%mask2dT(i,j)
455458

456459
if (associated(IOB%lw_flux)) &
457460
fluxes%LW(i,j) = IOB%lw_flux(i-i0,j-j0) * G%mask2dT(i,j)
@@ -472,9 +475,9 @@ subroutine convert_IOB_to_fluxes(IOB, fluxes, index_bounds, Time, G, US, CS, &
472475
fluxes%latent(i,j) = fluxes%latent(i,j) + IOB%fprec(i-i0,j-j0)*CS%latent_heat_fusion
473476
fluxes%latent_fprec_diag(i,j) = G%mask2dT(i,j) * IOB%fprec(i-i0,j-j0)*CS%latent_heat_fusion
474477
endif
475-
if (associated(IOB%calving)) then
476-
fluxes%latent(i,j) = fluxes%latent(i,j) + IOB%calving(i-i0,j-j0)*CS%latent_heat_fusion
477-
fluxes%latent_frunoff_diag(i,j) = G%mask2dT(i,j) * IOB%calving(i-i0,j-j0)*CS%latent_heat_fusion
478+
if (associated(IOB%frunoff)) then
479+
fluxes%latent(i,j) = fluxes%latent(i,j) + IOB%frunoff(i-i0,j-j0)*CS%latent_heat_fusion
480+
fluxes%latent_frunoff_diag(i,j) = G%mask2dT(i,j) * IOB%frunoff(i-i0,j-j0)*CS%latent_heat_fusion
478481
endif
479482
if (associated(IOB%q_flux)) then
480483
fluxes%latent(i,j) = fluxes%latent(i,j) + IOB%q_flux(i-i0,j-j0)*CS%latent_heat_vapor
@@ -1262,7 +1265,12 @@ subroutine surface_forcing_init(Time, G, US, param_file, diag, CS, restore_salt,
12621265
call get_param(param_file, mdl, "ALLOW_FLUX_ADJUSTMENTS", CS%allow_flux_adjustments, &
12631266
"If true, allows flux adjustments to specified via the "//&
12641267
"data_table using the component name 'OCN'.", default=.false.)
1265-
if (CS%allow_flux_adjustments) then
1268+
1269+
call get_param(param_file, mdl, "LIQUID_RUNOFF_FROM_DATA", CS%liquid_runoff_from_data, &
1270+
"If true, allows liquid river runoff to be specified via the "//&
1271+
"data_table using the component name 'OCN'.", default=.false.)
1272+
1273+
if (CS%allow_flux_adjustments .or. CS%liquid_runoff_from_data) then
12661274
call data_override_init(Ocean_domain_in=G%Domain%mpp_domain)
12671275
endif
12681276

@@ -1352,8 +1360,8 @@ subroutine ice_ocn_bnd_type_chksum(id, timestep, iobt)
13521360
write(outunit,100) 'iobt%sw_flux_nir_dif' , mpp_chksum( iobt%sw_flux_nir_dif)
13531361
write(outunit,100) 'iobt%lprec ' , mpp_chksum( iobt%lprec )
13541362
write(outunit,100) 'iobt%fprec ' , mpp_chksum( iobt%fprec )
1355-
write(outunit,100) 'iobt%runoff ' , mpp_chksum( iobt%runoff )
1356-
write(outunit,100) 'iobt%calving ' , mpp_chksum( iobt%calving )
1363+
write(outunit,100) 'iobt%lrunoff ' , mpp_chksum( iobt%lrunoff )
1364+
write(outunit,100) 'iobt%frunoff ' , mpp_chksum( iobt%frunoff )
13571365
write(outunit,100) 'iobt%p ' , mpp_chksum( iobt%p )
13581366
if (associated(iobt%ustar_berg)) &
13591367
write(outunit,100) 'iobt%ustar_berg ' , mpp_chksum( iobt%ustar_berg )

0 commit comments

Comments
 (0)
⚡