Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions mediator/esmFldsExchange_sofar_mod.F90
Original file line number Diff line number Diff line change
Expand Up @@ -406,9 +406,12 @@ subroutine esmFldsExchange_sofar_init(gcomp, phase, rc)
use med_methods_mod , only : fldchk => med_methods_FB_FldChk
use med_internalstate_mod , only : InternalState
use med_internalstate_mod , only : mapbilnr, mapconsf, mapconsd, mappatch
use med_internalstate_mod , only : mapfcopy, mapnstod, mapnstod_consd
use med_internalstate_mod , only : mapfcopy, mapnstod, mapnstod_consd, mapnstod_consf
use med_internalstate_mod , only : mapfillv_bilnr
use med_internalstate_mod , only : mapnstod_consf

! Added 5/12/25, following esmFldsExchange_ufs_mod.F90
use med_internalstate_mod , only : mapconsf_aofrac, mapbilnr_nstod

use esmFlds , only : addmap_from => med_fldList_addmap_from
use esmFlds , only : addmrg_to => med_fldList_addmrg_to

Expand Down Expand Up @@ -490,7 +493,7 @@ subroutine esmFldsExchange_sofar_init(gcomp, phase, rc)
fldchk(is_local%wrap%FBImp(compocn,compocn),trim(fldname),rc=rc) &
) then
call addmap_from(compocn, trim(fldname), compatm, &
mapfillv_bilnr, sofar_attr%mapnorm, sofar_attr%ocn2atm_smap)
mapbilnr_nstod, sofar_attr%mapnorm, sofar_attr%ocn2atm_smap)
call addmrg_to(compatm, trim(fldname), &
mrg_from=compocn, mrg_fld=trim(fldname), mrg_type='copy')
endif
Expand All @@ -515,7 +518,7 @@ subroutine esmFldsExchange_sofar_init(gcomp, phase, rc)
fldchk(is_local%wrap%FBImp(compwav,compwav),trim(fldname),rc=rc) &
) then
call addmap_from(compwav, trim(fldname), compatm, &
mapfillv_bilnr, sofar_attr%mapnorm, sofar_attr%wav2atm_smap)
mapbilnr_nstod, sofar_attr%mapnorm, sofar_attr%wav2atm_smap)
call addmrg_to(compatm, trim(fldname), &
mrg_from=compwav, mrg_fld=trim(fldname), mrg_type='copy')
endif
Expand Down Expand Up @@ -554,7 +557,7 @@ subroutine esmFldsExchange_sofar_init(gcomp, phase, rc)
fldchk(is_local%wrap%FBImp(compatm,compatm),trim(fldname),rc=rc) &
) then
call addmap_from(compatm, trim(fldname), compocn, &
mapfillv_bilnr, sofar_attr%mapnorm, sofar_attr%atm2ocn_smap)
mapbilnr_nstod, sofar_attr%mapnorm, sofar_attr%atm2ocn_smap)
call addmrg_to(compocn, trim(fldname), &
mrg_from=compatm, mrg_fld=trim(fldname), mrg_type='copy')
endif
Expand Down Expand Up @@ -599,7 +602,7 @@ subroutine esmFldsExchange_sofar_init(gcomp, phase, rc)
fldchk(is_local%wrap%FBImp(compatm,compatm),trim(fldname1),rc=rc) &
) then
call addmap_from(compatm, trim(fldname1), compocn, &
mapfillv_bilnr, sofar_attr%mapnorm, sofar_attr%atm2ocn_smap)
mapbilnr_nstod, sofar_attr%mapnorm, sofar_attr%atm2ocn_smap)
call addmrg_to(compocn, trim(fldname2), &
mrg_from=compatm, mrg_fld=trim(fldname1), mrg_type='copy')
endif
Expand Down Expand Up @@ -629,7 +632,7 @@ subroutine esmFldsExchange_sofar_init(gcomp, phase, rc)
fldchk(is_local%wrap%FBImp(compatm,compatm), trim(fldname),rc=rc) &
) then
call addmap_from(compatm, trim(fldname), compwav, &
mapfillv_bilnr, sofar_attr%mapnorm, sofar_attr%atm2wav_smap)
mapbilnr_nstod, sofar_attr%mapnorm, sofar_attr%atm2wav_smap)
call addmrg_to(compwav, trim(fldname), &
mrg_from=compatm, mrg_fld=trim(fldname), mrg_type='copy')
end if
Expand Down