Skip to content
Open
Show file tree
Hide file tree
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
10 changes: 5 additions & 5 deletions mediator/esmFldsExchange_accessesm_mod.F90
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ subroutine esmFldsExchange_accessesm_init(gcomp, phase, rc)
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 : mapfillv_bilnr
use med_internalstate_mod , only : mapfillv_bilnr, mappatch_uv3d
use med_internalstate_mod , only : mapnstod_consf

! input/output parameters:
Expand Down Expand Up @@ -477,14 +477,14 @@ subroutine esmFldsExchange_accessesm_init(gcomp, phase, rc)
if (fldchk(is_local%wrap%FBExp(compocn), trim('Foxx_taux'), rc=rc) .and. &
fldchk(is_local%wrap%FBImp(compatm, compatm), trim('Faxa_taux'),rc=rc) &
) then
call addmap_from(compatm, trim('Faxa_taux'), compocn, mappatch, 'one', 'unset')
call addmap_from(compatm, trim('Faxa_taux'), compocn, mappatch_uv3d, 'one', 'unset')
call addmrg_to(compocn, trim('Foxx_taux'), mrg_from=compatm, mrg_fld=trim('Faxa_taux'), mrg_type='merge', mrg_fracname='ofrac')
end if

if (fldchk(is_local%wrap%FBExp(compocn), trim('Foxx_tauy'), rc=rc) .and. &
fldchk(is_local%wrap%FBImp(compatm, compatm), trim('Faxa_tauy'),rc=rc) &
) then
call addmap_from(compatm, trim('Faxa_tauy'), compocn, mappatch, 'one', 'unset')
call addmap_from(compatm, trim('Faxa_tauy'), compocn, mappatch_uv3d, 'one', 'unset')
call addmrg_to(compocn, trim('Foxx_tauy'), mrg_from=compatm, mrg_fld=trim('Faxa_tauy'), mrg_type='merge', mrg_fracname='ofrac')
end if

Expand Down Expand Up @@ -546,14 +546,14 @@ subroutine esmFldsExchange_accessesm_init(gcomp, phase, rc)
if (fldchk(is_local%wrap%FBExp(compice), trim('Faia_taux'), rc=rc) .and. &
fldchk(is_local%wrap%FBImp(compatm, compatm), trim('Faxa_taux'),rc=rc) &
) then
call addmap_from(compatm, trim('Faxa_taux'), compice, mappatch, 'one', 'unset')
call addmap_from(compatm, trim('Faxa_taux'), compice, mappatch_uv3d, 'one', 'unset')
call addmrg_to(compice, trim('Faia_taux'), mrg_from=compatm, mrg_fld=trim('Faxa_taux'), mrg_type='copy')
end if

if (fldchk(is_local%wrap%FBExp(compice), trim('Faia_tauy'), rc=rc) .and. &
fldchk(is_local%wrap%FBImp(compatm, compatm), trim('Faxa_tauy'),rc=rc) &
) then
call addmap_from(compatm, trim('Faxa_tauy'), compice, mappatch, 'one', 'unset')
call addmap_from(compatm, trim('Faxa_tauy'), compice, mappatch_uv3d, 'one', 'unset')
call addmrg_to(compice, trim('Faia_tauy'), mrg_from=compatm, mrg_fld=trim('Faxa_tauy'), mrg_type='copy')
end if

Expand Down
8 changes: 7 additions & 1 deletion mediator/med_map_mod.F90
Original file line number Diff line number Diff line change
Expand Up @@ -950,6 +950,7 @@ subroutine med_map_field_packed(FBSrc, FBDst, FBFracSrc, FBDat, use_data, field_
use med_internalstate_mod , only : nmappers, mapfcopy
use med_internalstate_mod , only : mappatch_uv3d, mappatch, mapbilnr_uv3d, mapconsf_uv3d, mapbilnr
use med_internalstate_mod , only : packed_data_type
use med_internalstate_mod , only : coupling_mode
use med_methods_mod , only : Field_diagnose => med_methods_Field_diagnose

! input/output variables
Expand Down Expand Up @@ -1031,7 +1032,12 @@ subroutine med_map_field_packed(FBSrc, FBDst, FBFracSrc, FBDat, use_data, field_
if (mapindex == mappatch_uv3d) then

! For mappatch_uv3d do not use packed field bundles
call med_map_uv_cart3d(FBsrc, FBdst, routehandles, mappatch_uv3d, rc=rc)
if (trim(coupling_mode) == 'access-esm') then
call med_map_uv_cart3d(FBsrc, FBdst, routehandles, mappatch_uv3d, map_stress=.true., rc=rc)
else
call med_map_uv_cart3d(FBsrc, FBdst, routehandles, mappatch_uv3d, rc=rc)
end if

if (chkerr(rc,__LINE__,u_FILE_u)) return

else if (mapindex == mapbilnr_uv3d) then
Expand Down