fixed compilation problems

ESCOMP · Jun 16, 2024 · e35644a · e35644a
1 parent 6bd2631
commit e35644a
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 7 deletions.
diff --git a/mediator/esmFldsExchange_cesm_mod.F90 b/mediator/esmFldsExchange_cesm_mod.F90
@@ -233,6 +233,12 @@ subroutine esmFldsExchange_cesm(gcomp, phase, rc)
 
        ! write diagnostic output
        if (maintask) then
+          write(logunit,'(a)'   ) ' flds_co2a: prognostic and diagnostic CO2 at lowest atm level is sent to lnd and ocn'
+          write(logunit,'(a)'   ) ' flds_co2b: prognostic and diagnostic CO2 at lowest atm level is sent to lnd and ocn'
+          write(logunit,'(a)'   ) '            and surface flux of CO2 from lnd is sent back to atm'
+          write(logunit,'(a)'   ) ' flds_co2c: prognostic and diagnostic CO2 at lowest atm level is sent to lnd and ocn'
+          write(logunit,'(a)'   ) '            and surface flux of CO2 from lnd is sent back to atm'
+          write(logunit,'(a)'   ) '            and surface flux of CO2 from ocn is sent back to atm'
           write(logunit,'(a,l7)') trim(subname)//' flds_co2a                       = ',flds_co2a
           write(logunit,'(a,l7)') trim(subname)//' flds_co2b                       = ',flds_co2b
           write(logunit,'(a,l7)') trim(subname)//' flds_co2c                       = ',flds_co2c
@@ -1607,9 +1613,9 @@ subroutine esmFldsExchange_cesm(gcomp, phase, rc)
     else
        if ( fldchk(is_local%wrap%FBImp(complnd, complnd), 'Fall_voc', rc=rc) .and. &
             fldchk(is_local%wrap%FBExp(compatm)         , 'Fall_voc', rc=rc)) then
-          call addmap_from(complnd, 'Fall_voc', compatm, mapconsf, map_fracname_lnd2atm, lnd2atm_map
+          call addmap_from(complnd, 'Fall_voc', compatm, mapconsf, map_fracname_lnd2atm, lnd2atm_map)
           call addmrg_to(compatm, 'Fall_voc', &
-               mrg_from=complnd, mrg_fld='Fall_voc', mrg_type='merge', mrg_fracname=mrg_fracname_lnd2atm_flux)
+               mrg_from=complnd, mrg_fld='Fall_voc', mrg_type='copy_with_weights', mrg_fracname=mrg_fracname_lnd2atm_flux)
        end if
     end if
 
@@ -1625,7 +1631,7 @@ subroutine esmFldsExchange_cesm(gcomp, phase, rc)
             fldchk(is_local%wrap%FBExp(compatm)         , 'Fall_fire', rc=rc)) then
           call addmap_from(complnd, 'Fall_fire', compatm, mapconsf, 'lfrin', lnd2atm_map)
           call addmrg_to(compatm, 'Fall_fire', &
-               mrg_from=complnd, mrg_fld='Fall_fire', mrg_type='merge', mrg_fracname=mrg_fracname_lnd2atm_flux)
+               mrg_from=complnd, mrg_fld='Fall_fire', mrg_type='copy_with_weights', mrg_fracname=mrg_fracname_lnd2atm_flux)
        end if
     end if
     ! 'wild fire plume height'
@@ -1636,7 +1642,8 @@ subroutine esmFldsExchange_cesm(gcomp, phase, rc)
        if ( fldchk(is_local%wrap%FBImp(complnd, complnd), 'Sl_fztop', rc=rc) .and. &
             fldchk(is_local%wrap%FBExp(compatm)         , 'Sl_fztop', rc=rc)) then
           call addmap_from(complnd, 'Sl_fztop', compatm, mapconsf, map_fracname_lnd2atm, lnd2atm_map)
-          call addmrg_to(compatm, 'Sl_fztop', mrg_from=complnd, mrg_fld='Sl_fztop', mrg_type='copy')
+          call addmrg_to(compatm, 'Sl_fztop', &
+               mrg_from=complnd, mrg_fld='Sl_fztop', mrg_type='copy')
        end if
     end if
 

diff --git a/mediator/fd_cesm.yaml b/mediator/fd_cesm.yaml
@@ -857,12 +857,16 @@
      #
      - standard_name: Faoo_fco2_ocn
        canonical_units: moles m-2 s-1
-       description: ocn import to med
+       description: ocn import to med - surface flux of CO2 (downward positive)
      #
      - standard_name: Faoo_dms_ocn
        canonical_units: moles m-2 s-1
        description: ocn import to med - surface flux of DMS (downward positive)
      #
+     - standard_name: Faoo_bromo_ocn
+       canonical_units: moles m-2 s-1
+       description: ocn import to med - surface flux of Bromoform (downward positive)
+     #
      - standard_name: So_anidf
        canonical_units: 1
        description: ocn import to med

diff --git a/mediator/med_phases_prep_atm_mod.F90 b/mediator/med_phases_prep_atm_mod.F90
@@ -32,7 +32,7 @@ module med_phases_prep_atm_mod
 
   real(r8), public :: global_htot_corr(1) = 0._r8  ! enthalpy correction from med_phases_prep_ocn
 
-  character(len=14) :: fldnames_to_ocn(3) = (/'Faoo_bromo_ocn','Faoo_fdms_ocn ','Faoo_fco2_ocn '
+  character(len=14) :: fldnames_to_ocn(3) = (/'Faoo_bromo_ocn','Faoo_fdms_ocn ','Faoo_fco2_ocn '/)
 
   character(*), parameter :: u_FILE_u  = &
        __FILE__
@@ -54,7 +54,7 @@ subroutine med_phases_prep_atm(gcomp, rc)
     real(R8), pointer          :: dataPtr2(:)
     real(R8), pointer          :: ifrac(:)
     real(R8), pointer          :: ofrac(:)
-    integer                    :: n
+    integer                    :: n,nf
     type(med_fldlist_type), pointer :: fldList
     character(len=*),parameter :: subname='(med_phases_prep_atm)'
     !-------------------------------------------------------------------------------