diff --git a/cime_config/config_component.xml b/cime_config/config_component.xml index 62611025..f7cfc844 100644 --- a/cime_config/config_component.xml +++ b/cime_config/config_component.xml @@ -1412,7 +1412,16 @@ idmap run_domain env_run.xml - lnd2rof flux mapping file + lnd2rof flux mapping file (conservative, conserve/fraction 'consf' mapping) + + + + char + unset + run_domain + env_run.xml + lnd2rof conservative (destarea, 'consd') fraction mapping file used by the mediator + fraction init; 'unset' computes the weights online (memory-heavy at high resolution) diff --git a/cime_config/namelist_definition_drv.xml b/cime_config/namelist_definition_drv.xml index 7493bbdf..808f61c0 100644 --- a/cime_config/namelist_definition_drv.xml +++ b/cime_config/namelist_definition_drv.xml @@ -2269,12 +2269,23 @@ mapping abs MED_attributes - lnd to rof mapping, 'unset' or 'idmap' are normal possible values (mapping file given for mizuRoute grids) + lnd to rof flux mapping (conservative, conserve/fraction 'consf' mapping); 'unset' or 'idmap' + are normal possible values (mapping file given for mizuRoute grids) $LND2ROF_FMAPNAME idmap + + char + mapping + MED_attributes + lnd to rof conservative destarea ('consd') fraction mapping file read by the mediator + fraction init (med_fraction_mod); 'unset' computes the weights online + + $LND2ROF_FRAC_FMAPNAME + + char mapping diff --git a/mediator/esmFldsExchange_cesm_mod.F90 b/mediator/esmFldsExchange_cesm_mod.F90 index 97ff04d5..979e6620 100644 --- a/mediator/esmFldsExchange_cesm_mod.F90 +++ b/mediator/esmFldsExchange_cesm_mod.F90 @@ -3320,7 +3320,7 @@ subroutine esmFldsExchange_cesm(gcomp, phase, rc) else if ( fldchk(is_local%wrap%FBImp(complnd, complnd), 'Flrl_rofsur'//trim(suffix), rc=rc) .and. & fldchk(is_local%wrap%FBExp(comprof) , 'Flrl_rofsur'//trim(suffix), rc=rc)) then - call addmap_from(complnd, 'Flrl_rofsur'//trim(suffix), comprof, mapconsf, map_fracname_lnd2rof, 'unset') + call addmap_from(complnd, 'Flrl_rofsur'//trim(suffix), comprof, mapconsf, map_fracname_lnd2rof, lnd2rof_map) call addmrg_to(comprof, 'Flrl_rofsur'//trim(suffix), & mrg_from=complnd, mrg_fld='Flrl_rofsur'//trim(suffix), & mrg_type='copy_with_weights', mrg_fracname=mrg_fracname_lnd2rof) @@ -3341,7 +3341,7 @@ subroutine esmFldsExchange_cesm(gcomp, phase, rc) else if ( fldchk(is_local%wrap%FBImp(complnd, complnd), 'Flrl_rofi'//trim(suffix), rc=rc) .and. & fldchk(is_local%wrap%FBExp(comprof) , 'Flrl_rofi'//trim(suffix), rc=rc)) then - call addmap_from(complnd, 'Flrl_rofi'//trim(suffix), comprof, mapconsf, map_fracname_lnd2rof, 'unset') + call addmap_from(complnd, 'Flrl_rofi'//trim(suffix), comprof, mapconsf, map_fracname_lnd2rof, lnd2rof_map) call addmrg_to(comprof, 'Flrl_rofi'//trim(suffix), & mrg_from=complnd, mrg_fld='Flrl_rofi'//trim(suffix), & mrg_type='copy_with_weights', mrg_fracname=mrg_fracname_lnd2rof) @@ -3362,7 +3362,7 @@ subroutine esmFldsExchange_cesm(gcomp, phase, rc) else if ( fldchk(is_local%wrap%FBImp(complnd, complnd), 'Flrl_rofgwl'//trim(suffix), rc=rc) .and. & fldchk(is_local%wrap%FBExp(comprof) , 'Flrl_rofgwl'//trim(suffix), rc=rc)) then - call addmap_from(complnd, 'Flrl_rofgwl'//trim(suffix), comprof, mapconsf, map_fracname_lnd2rof, 'unset') + call addmap_from(complnd, 'Flrl_rofgwl'//trim(suffix), comprof, mapconsf, map_fracname_lnd2rof, lnd2rof_map) call addmrg_to(comprof, 'Flrl_rofgwl'//trim(suffix), & mrg_from=complnd, mrg_fld='Flrl_rofgwl'//trim(suffix), & mrg_type='copy_with_weights', mrg_fracname=mrg_fracname_lnd2rof) @@ -3383,7 +3383,7 @@ subroutine esmFldsExchange_cesm(gcomp, phase, rc) else if ( fldchk(is_local%wrap%FBImp(complnd, complnd), 'Flrl_rofsub'//trim(suffix), rc=rc) .and. & fldchk(is_local%wrap%FBExp(comprof) , 'Flrl_rofsub'//trim(suffix), rc=rc)) then - call addmap_from(complnd, 'Flrl_rofsub'//trim(suffix), comprof, mapconsf, map_fracname_lnd2rof, 'unset') + call addmap_from(complnd, 'Flrl_rofsub'//trim(suffix), comprof, mapconsf, map_fracname_lnd2rof, lnd2rof_map) call addmrg_to(comprof, 'Flrl_rofsub'//trim(suffix), & mrg_from=complnd, mrg_fld='Flrl_rofsub'//trim(suffix), & mrg_type='copy_with_weights', mrg_fracname=mrg_fracname_lnd2rof) @@ -3404,7 +3404,7 @@ subroutine esmFldsExchange_cesm(gcomp, phase, rc) else if ( fldchk(is_local%wrap%FBImp(complnd, complnd), 'Flrl_irrig'//trim(suffix), rc=rc) .and. & fldchk(is_local%wrap%FBExp(comprof) , 'Flrl_irrig'//trim(suffix), rc=rc)) then - call addmap_from(complnd, 'Flrl_irrig'//trim(suffix), comprof, mapconsf, map_fracname_lnd2rof, 'unset') + call addmap_from(complnd, 'Flrl_irrig'//trim(suffix), comprof, mapconsf, map_fracname_lnd2rof, lnd2rof_map) call addmrg_to(comprof, 'Flrl_irrig'//trim(suffix), & mrg_from=complnd, mrg_fld='Flrl_irrig'//trim(suffix), & mrg_type='copy_with_weights', mrg_fracname=mrg_fracname_lnd2rof) diff --git a/mediator/med_fraction_mod.F90 b/mediator/med_fraction_mod.F90 index 9d58a43d..805af1ed 100644 --- a/mediator/med_fraction_mod.F90 +++ b/mediator/med_fraction_mod.F90 @@ -169,7 +169,7 @@ subroutine med_fraction_init(gcomp, rc) ! Initialize FBFrac(:) field bundles use ESMF , only : ESMF_LogWrite, ESMF_LOGMSG_INFO - use ESMF , only : ESMF_SUCCESS + use ESMF , only : ESMF_SUCCESS, ESMF_FAILURE, ESMF_LogSetError use ESMF , only : ESMF_GridComp, ESMF_GridCompGet, ESMF_StateIsCreated use ESMF , only : ESMF_FieldBundle, ESMF_FieldBundleIsCreated, ESMF_FieldBundleDestroy use ESMF , only : ESMF_FieldBundleGet @@ -181,6 +181,7 @@ subroutine med_fraction_init(gcomp, rc) use med_internalstate_mod , only : InternalState use med_map_mod , only : med_map_routehandles_init, med_map_rh_is_created use med_methods_mod , only : State_getNumFields => med_methods_State_getNumFields + use NUOPC , only : NUOPC_CompAttributeGet use perf_mod , only : t_startf, t_stopf ! input/output variables @@ -208,6 +209,8 @@ subroutine med_fraction_init(gcomp, rc) integer :: n,n1,ns integer :: maptype integer :: fieldCount + logical :: isPresent, isSet, lexist + character(len=CX) :: lnd2rof_fmap ! consd (destarea) lnd->rof fraction-map file logical, save :: first_call = .true. character(len=*),parameter :: subname=' (med_fraction_init)' !--------------------------------------- @@ -584,10 +587,34 @@ subroutine med_fraction_init(gcomp, rc) if (is_local%wrap%comp_present(complnd)) then maptype = mapconsd if (.not. med_map_RH_is_created(is_local%wrap%RH(complnd,comprof,:),maptype, rc=rc)) then - call med_map_routehandles_init( complnd, comprof, & - FBSrc=is_local%wrap%FBImp(complnd,complnd), & - FBDst=is_local%wrap%FBImp(complnd,comprof), & - mapindex=maptype, RouteHandle=is_local%wrap%RH, rc=rc) + ! The lnd->rof fraction map may be the only grid-crossing conservative coupling + ! map in a configuration, and computing its weights online (ESMF_FieldRegridStore) + ! can be prohibitively memory-heavy at high resolution. If the 'lnd2rof_fmap' + ! attribute names a file of offline consd (conserve/destarea) fraction weights, + ! read the weights from that file; otherwise compute them online. + call NUOPC_CompAttributeGet(gcomp, name='lnd2rof_fmap', value=lnd2rof_fmap, & + isPresent=isPresent, isSet=isSet, rc=rc) + if (ChkErr(rc,__LINE__,u_FILE_u)) return + if (.not. (isPresent .and. isSet)) lnd2rof_fmap = 'unset' + if (lnd2rof_fmap /= 'unset') then + inquire(file=lnd2rof_fmap, exist=lexist) + if (.not. lexist) then + call ESMF_LogSetError(ESMF_FAILURE, & + msg=trim(subname)//': lnd2rof_fmap weight file not found: '//trim(lnd2rof_fmap), & + line=__LINE__, file=u_FILE_u, rcToReturn=rc) + return + end if + call med_map_routehandles_init( complnd, comprof, & + FBSrc=is_local%wrap%FBImp(complnd,complnd), & + FBDst=is_local%wrap%FBImp(complnd,comprof), & + mapindex=maptype, RouteHandle=is_local%wrap%RH, & + mapfile=trim(lnd2rof_fmap), rc=rc) + else + call med_map_routehandles_init( complnd, comprof, & + FBSrc=is_local%wrap%FBImp(complnd,complnd), & + FBDst=is_local%wrap%FBImp(complnd,comprof), & + mapindex=maptype, RouteHandle=is_local%wrap%RH, rc=rc) + end if if (ChkErr(rc,__LINE__,u_FILE_u)) return end if diff --git a/mediator/med_map_mod.F90 b/mediator/med_map_mod.F90 index 9822dec1..a11f69d8 100644 --- a/mediator/med_map_mod.F90 +++ b/mediator/med_map_mod.F90 @@ -296,7 +296,7 @@ subroutine med_map_RouteHandles_initfrom_esmflds(gcomp, flds_scalar_name, llogun end subroutine med_map_RouteHandles_initfrom_esmflds !================================================================================ - subroutine med_map_routehandles_initfrom_fieldbundle(n1, n2, FBsrc, FBdst, mapindex, RouteHandle, rc) + subroutine med_map_routehandles_initfrom_fieldbundle(n1, n2, FBsrc, FBdst, mapindex, RouteHandle, mapfile, rc) use ESMF , only : ESMF_LogWrite, ESMF_LOGMSG_INFO, ESMF_SUCCESS, ESMF_LogFlush use ESMF , only : ESMF_Field, ESMF_FieldBundle, ESMF_RouteHandle @@ -313,6 +313,7 @@ subroutine med_map_routehandles_initfrom_fieldbundle(n1, n2, FBsrc, FBdst, mapin type(ESMF_FieldBundle) , intent(in) :: fBdst integer , intent(in) :: mapindex type(ESMF_RouteHandle) , intent(inout) :: RouteHandle(:,:,:) + character(len=*), optional, intent(in) :: mapfile ! read offline weights (ESMF_FieldSMMStore) instead of online regrid integer , intent(out) :: rc ! local variables @@ -333,7 +334,12 @@ subroutine med_map_routehandles_initfrom_fieldbundle(n1, n2, FBsrc, FBdst, mapin call med_methods_FB_getFieldN(FBDst, 1, flddst, rc) if (chkerr(rc,__LINE__,u_FILE_u)) return - call med_map_routehandles_initfrom_field(n1, n2, fldsrc, flddst, mapindex, routehandle(n1,n2,:), rc=rc) + if (present(mapfile)) then + call med_map_routehandles_initfrom_field(n1, n2, fldsrc, flddst, mapindex, routehandle(n1,n2,:), & + mapfile=mapfile, rc=rc) + else + call med_map_routehandles_initfrom_field(n1, n2, fldsrc, flddst, mapindex, routehandle(n1,n2,:), rc=rc) + end if if (chkerr(rc,__LINE__,u_FILE_u)) return if (dbug_flag > 1) then diff --git a/mediator/med_phases_aofluxes_mod.F90 b/mediator/med_phases_aofluxes_mod.F90 index 103d37ba..89cdff07 100644 --- a/mediator/med_phases_aofluxes_mod.F90 +++ b/mediator/med_phases_aofluxes_mod.F90 @@ -582,7 +582,11 @@ subroutine med_aofluxes_init_ogrid(gcomp, aoflux_in, aoflux_out, rc) if (chkerr(rc,__LINE__,u_FILE_u)) return call ESMF_FieldGet(lfield, mesh=lmesh, rc=rc) if (chkerr(rc,__LINE__,u_FILE_u)) return - is_local%wrap%aoflux_mesh = ESMF_MeshCreate(lmesh, rc=rc) + ! Reuse the ocean field's mesh directly rather than building a duplicate full + ! ESMF mesh per rank (a meaningful memory savings at high resolution). lmesh + ! persists in FBArea(compocn) and aoflux_mesh is never destroyed, so sharing + ! the handle is safe (ogrid path). + is_local%wrap%aoflux_mesh = lmesh call ESMF_MeshGet(lmesh, coordSys=coordSys, rc=rc) if (chkerr(rc,__LINE__,u_FILE_u)) return if (coordSys /= ESMF_COORDSYS_CART) then