fix So_t and masking for atm+docn

ESCOMP · Oct 16, 2023 · 0c30c0a · 0c30c0a
1 parent 3e0af36
commit 0c30c0a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/mediator/esmFldsExchange_cesm_mod.F90 b/mediator/esmFldsExchange_cesm_mod.F90
@@ -1348,6 +1348,7 @@ subroutine esmFldsExchange_cesm(gcomp, phase, rc)
           end if
        end if
        if (fldchk(is_local%wrap%FBexp(compatm), 'So_t', rc=rc)) then
+          call addmap_from(compocn, 'So_t', compatm, mapnstod_consf, 'ofrac', ocn2atm_map)
           call addmrg_to(compatm, 'So_t', mrg_from=compocn, mrg_fld='So_t', mrg_type='copy')
        end if
     end if

diff --git a/mediator/med_map_mod.F90 b/mediator/med_map_mod.F90
@@ -403,9 +403,13 @@ subroutine med_map_routehandles_initfrom_field(n1, n2, fldsrc, flddst, mapindex,
     ! override defaults for specific cases
     if (trim(coupling_mode) == 'cesm') then
        if (n1 == compwav .and. n2 == compocn) then
-         srcMaskValue = 0
-         dstMaskValue = ispval_mask
-      endif
+          srcMaskValue = 0
+          dstMaskValue = ispval_mask
+       endif
+       if (n1 == compocn .and. n2 == compatm) then
+          srcMaskValue = 0
+          dstMaskValue = 0
+       endif
     end if
     if (trim(coupling_mode(1:4)) == 'nems') then
        if (n1 == compatm .and. n2 == complnd) then