fix problems in prealpha_noresm testing

ESCOMP · Apr 10, 2024 · f81d357 · f81d357
1 parent e2b453e
commit f81d357
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 20 deletions.
diff --git a/mediator/esmFldsExchange_cesm_mod.F90 b/mediator/esmFldsExchange_cesm_mod.F90
@@ -1620,6 +1620,8 @@ subroutine esmFldsExchange_cesm(gcomp, phase, rc)
        call addfld_from(compocn, 'Faoo_fdms_ocn')
        call addfld_to(compatm, 'Faoo_fdms_ocn')
     else
+       ! Note that Faoo_dmds should not be weighted by ifrac - since
+       ! it will be weighted by ifrac in the merge to the atm
        if ( fldchk(is_local%wrap%FBImp(compocn, compocn), 'Faoo_fdms_ocn', rc=rc) .and. &
             fldchk(is_local%wrap%FBExp(compatm)         , 'Faoo_fdms_ocn', rc=rc)) then
           call addmap_from(compocn, 'Faoo_fdms_ocn', compatm, mapconsd, 'one', ocn2atm_map)
@@ -3392,25 +3394,6 @@ subroutine esmFldsExchange_cesm(gcomp, phase, rc)
        end if
     endif
 
-    !=====================================================================
-    ! DMS EXCHANGE
-    !=====================================================================
-
-    ! Get dms flux from ocn and send to atm
-    if (phase == 'advertise') then
-       call addfld_from(compocn, 'Faoo_dms_ocn')
-       call addfld_to(compatm, 'Faoo_dms_ocn')
-    else
-       ! Note that Faoo_dmds should not be weighted by ifrac - since
-       ! it will be weighted by ifrac in the merge to the atm
-       if ( fldchk(is_local%wrap%FBImp(compocn,compocn), 'Faoo_dms_ocn', rc=rc) .and. &
-            fldchk(is_local%wrap%FBexp(compatm)        , 'Faoo_dms_ocn', rc=rc)) then
-          call addmap_from(complnd, 'Faoo_dms_ocn', compocn, mapconsf, 'lfrac', ocn2atm_map)
-          call addmrg_to(compatm , 'Faoo_dms_ocn', &
-               mrg_from=compmed, mrg_fld='Faoo_dms_ocn', mrg_type='merge', mrg_fracname='ofrac')
-       end if
-    end if
-
   end subroutine esmFldsExchange_cesm
 
 end module esmFldsExchange_cesm_mod
diff --git a/mediator/fd_cesm.yaml b/mediator/fd_cesm.yaml
@@ -859,7 +859,7 @@
        canonical_units: moles m-2 s-1
        description: ocn import to med
      #
-     - standard_name: Faoo_dms_ocn
+     - standard_name: Faoo_fdms_ocn
        canonical_units: moles m-2 s-1
        description: ocn import to med - surface flux of DMS (downward positive)
      #