add med_enthaply_mod

.github/workflows/extbuild.yml

@@ -48,27 +48,31 @@ jobs:
         id: cache-ParallelIO
         uses: actions/cache@v4
         with:
-          path: ~/pio
+          path: {GITHUB_WORKSPACE}/pio
           key: ${{ runner.os }}-${{ env.PIO_VERSION }}.pio
       - name: Build ParallelIO
         if: steps.cache-ParallelIO.outputs.cache-hit != 'true'
-        uses: NCAR/ParallelIO/.github/actions/parallelio_cmake@pio2_6_0
+        uses: NCAR/ParallelIO/.github/actions/parallelio_cmake@pio2_6_2
         with:
           parallelio_version: ${{ env.ParallelIO_VERSION }}
           enable_fortran: True
-          install_prefix: $HOME/pio
-      - name: Build ESMF
-        if: steps.cache-esmf.outputs.cache-hit != 'true'
-        uses: ESCOMP/CDEPS/.github/actions/[email protected]
+          install_prefix: ${GITHUB_WORKSPACE}/pio
+      - name: Install ESMF
+        uses: esmf-org/install-esmf-action@v1
+        env:
+          ESMF_COMPILER: gfortran
+          ESMF_BOPT: g
+          ESMF_COMM: openmpi
+          ESMF_NETCDF: nc-config
+          ESMF_PNETCDF: pnetcdf-config
+          ESMF_INSTALL_PREFIX: ${GITHUB_WORKSPACE}/ESMF
+          ESMF_PIO: external
+          ESMF_PIO_INCLUDE: ${GITHUB_WORKSPACE}/pio/include
+          ESMF_PIO_LIBPATH: ${GITHUB_WORKSPACE}/pio/lib
         with:
-          esmf_version: ${{ env.ESMF_VERSION }}
-          esmf_bopt: g
-          esmf_comm: openmpi
-          install_prefix: $HOME/ESMF
-          netcdf_c_path: /usr
-          netcdf_fortran_path: /usr
-          pnetcdf_path: /usr
-          parallelio_path: $HOME/pio
+          version: ${{ env.ESMF_VERSION }}
+          esmpy: false
+          cache: true
       - name: Cache CDEPS
         id: cache-cdeps
         uses: actions/cache@v4
@@ -90,8 +94,8 @@ jobs:
         if: steps.cache-cdeps.outputs.cache-hit != 'true'
         uses: ESCOMP/CDEPS/.github/actions/[email protected]
         with:
-          esmfmkfile: $HOME/ESMF/lib/libg/Linux.gfortran.64.openmpi.default/esmf.mk
-          pio_path: $HOME/pio
+          esmfmkfile: $ESMFMKFILE
+          pio_path: ${GITHUB_WORKSPACE}/pio
           src_root: ${GITHUB_WORKSPACE}/cdeps-src
           cmake_flags: " -Wno-dev -DDISABLE_FoX=ON -DCMAKE_BUILD_TYPE=DEBUG -DWERROR=ON  -DCMAKE_Fortran_FLAGS=\"-DCPRGNU -g -Wall \
           -ffree-form -ffree-line-length-none -fallow-argument-mismatch \""

.github/workflows/srt.yml

@@ -172,6 +172,6 @@ jobs:
           popd
 #     the following can be used by developers to login to the github server in case of errors
 #     see https://github.com/marketplace/actions/debugging-with-tmate for further details
-      - name: Setup tmate session
-        if: ${{ failure() }}
-        uses: mxschmitt/action-tmate@v3
+#      - name: Setup tmate session
+#        if: ${{ failure() }}
+#        uses: mxschmitt/action-tmate@v3

cime_config/namelist_definition_drv.xml

@@ -696,6 +696,20 @@
       <value>.true.</value>
     </values>
   </entry>
+
+  <entry id="compute_enthalpy">
+    <type>logical</type>
+    <category>control</category>
+    <group>MED_attributes</group>
+    <desc>
+      Compute energy of enthalpy
+    </desc>
+    <values>
+      <value>.false.</value>
+      <value comp_ocn="mom">.true.</value>
+    </values>
+  </entry>
+
   <entry id="atm_nx" modify_via_xml="ATM_NX">
     <type>integer</type>
     <category>control</category>
@@ -929,7 +943,8 @@
       default: ogrid
     </desc>
     <values>
-      <value>ogrid</value>
+      <value samegrid_atm_ocn='false'>xgrid</value>
+      <value samegrid_atm_ocn='true'>ogrid</value>
     </values>
   </entry>
   <entry id="ocn_surface_flux_scheme">

mediator/CMakeLists.txt

@@ -16,7 +16,8 @@ set(SRCFILES esmFldsExchange_cesm_mod.F90 med_fraction_mod.F90
               med_phases_post_ocn_mod.F90  med_phases_ocnalb_mod.F90
               med_phases_post_atm_mod.F90 med_phases_post_ice_mod.F90
               med_phases_post_lnd_mod.F90 med_phases_post_glc_mod.F90
-              med_phases_post_rof_mod.F90 med_phases_post_wav_mod.F90)
+              med_phases_post_rof_mod.F90 med_phases_post_wav_mod.F90
+              med_enthalpy_mod.F90)
 
 foreach(FILE ${SRCFILES})
   if(EXISTS "${CASEROOT}/SourceMods/src.cmeps/${FILE}")

mediator/esmFldsExchange_cesm_mod.F90

@@ -2206,7 +2206,7 @@ subroutine esmFldsExchange_cesm(gcomp, phase, rc)
     ! to ocn: enthalpy from ice melt
     ! ---------------------------------------------------------------------
     ! Note - do not need to add addmap or addmrg for the following since they
-    ! will be computed directly in med_phases_prep_ocn
+    ! will be computed directly in med_enthalpy_mod
     if (phase == 'advertise') then
        call addfld_to(compocn, 'Foxx_hrain')
        call addfld_to(compocn, 'Foxx_hsnow')

mediator/fd_cesm.yaml

@@ -72,6 +72,21 @@
        canonical_units: N m-2
        description: med export - atm/ocn meridional surface stress computed in medidator
      #
+
+     - standard_name: Faox_tauxa
+       alias: stress_on_air_ocn_zonal (atm)
+       canonical_units: N m-2
+       description: mediator export
+     #
+     - standard_name: Faox_tauya
+       alias: stress_on_air_ocn_merid (atm)
+       canonical_units: N m-2
+       description: mediator export
+     #
+     - standard_name: area
+       canonical_units: radians**2
+       description: mediator area for component
+
      - standard_name: Fwxx_taux
        alias: mean_zonal_moment_flx
        canonical_units: N m-2
@@ -81,6 +96,7 @@
        alias: mean_merid_moment_flx
        canonical_units: N m-2
        description: wave import to med - meridional surface stress
+
      #
      #-----------------------------------
      # section: lnd import to med
@@ -298,6 +314,16 @@
        description: atm import to med
          mean downward SW heat flux
      #
+     - standard_name: Faxa_wsxadj
+       canonical_units: Pa
+       description: (from) atmosphere export to flux_atmocn (for now)
+         mean wind-stess correction due to PBL iteration, zonal component
+     #
+     - standard_name: Faxa_wsyadj
+       canonical_units: Pa
+       description: (from) atmosphere export to flux_atmocn (for now)
+         mean wind-stess correction due to PBL iteration, meridional component
+     #
      - standard_name: Faxa_ndep
        canonical_units: kg(N)/m2/sec
        description: atm import to med - currently nhx and noy
@@ -330,7 +356,12 @@
      #
      - standard_name: Faxa_rainl_wiso
        canonical_units: kg m-2 s-1
-       description: atm import to med
+       description: atmosphere export
+     # 
+     - standard_name: Faxa_hrain
+       alias: mean_matentf_of_rain
+       canonical_units: W m-2 
+       description: atmosphere export
      #
      - standard_name: Faxa_snow
        alias: mean_fprec_rate
@@ -355,6 +386,11 @@
      #
      - standard_name: Faxa_snowl_wiso
        canonical_units: kg m-2 s-1
+       description: atmosphere export
+     # 
+     - standard_name: Faxa_hsnow
+       alias: mean_matentf_of_snow
+       canonical_units: W m-2 
        description: atm import to med
      #
      - standard_name: Faxa_swnet
@@ -486,7 +522,13 @@
      - standard_name: Faxa_lat
        alias: mean_laten_heat_flx_atm
        canonical_units: W m-2
+       description: atmosphere export
+     # 
+     - standard_name: Faxa_hevap
+       alias: mean_matentf_of_vapour
+       canonical_units: W m-2
        description: atm import to med
+
      #
      - standard_name: Faxa_sen
        alias: mean_sensi_heat_flx_atm
@@ -1247,6 +1289,9 @@
        canonical_units: m2/s
        description: wave elevation spectrum
      #
+     #-----------------------------------
+     # section: wave import
+     # -----------------------------------
      - standard_name: Sw_ustokes_avg
        canonical_units: m/s
        description: Daily averaged stokes drift u component (only needed for med history output)

mediator/med.F90

@@ -678,7 +678,8 @@ subroutine AdvertiseFields(gcomp, importState, exportState, clock, rc)
     use esmFlds, only : med_fldlist_init1, med_fld_GetFldInfo, med_fldList_entry_type
     use med_phases_history_mod, only : med_phases_history_init
     use med_methods_mod       , only : mediator_checkfornans
-
+    use med_enthalpy_mod      , only : mediator_compute_enthalpy
+
     ! input/output variables
     type(ESMF_GridComp)  :: gcomp
     type(ESMF_State)     :: importState, exportState
@@ -959,6 +960,24 @@ subroutine AdvertiseFields(gcomp, importState, exportState, clock, rc)
        endif
     endif
 
+
+    ! Should enthalpy be calculated
+    call NUOPC_CompAttributeGet(gcomp, name="compute_enthalpy", value=cvalue, isPresent=isPresent, isSet=isSet, rc=rc)
+    if (ChkErr(rc,__LINE__,u_FILE_u)) return
+    if(isPresent .and. isSet) then
+       read(cvalue, *) mediator_compute_enthalpy
+    else
+       mediator_compute_enthalpy = .false.
+    endif
+    if(maintask) then
+       write(logunit,*) ' compute_enthalpy is ',mediator_compute_enthalpy
+       if(mediator_compute_enthalpy) then
+          write(logunit,*) ' Enthalpy calculation is ON'
+       else
+          write(logunit,*) ' Enthalpy calculation is OFF'
+       endif
+    endif
+
     ! Should target component use all data for first time step?
     do ncomp = 1,ncomps
        if (ncomp /= compmed) then

mediator/med_diag_mod.F90

@@ -144,6 +144,7 @@ module med_diag_mod
   integer :: f_heat_latf     = unset_index ! heat : latent, fusion, snow
   integer :: f_heat_ioff     = unset_index ! heat : latent, fusion, frozen runoff
   integer :: f_heat_sen      = unset_index ! heat : sensible
+
   integer :: f_heat_rain     = unset_index ! heat : heat content of rain
   integer :: f_heat_snow     = unset_index ! heat : heat content of snow
   integer :: f_heat_evap     = unset_index ! heat : heat content of evaporation
@@ -409,7 +410,7 @@ subroutine med_diag_init(gcomp, rc)
     ! Salt fluxes budget terms (for v1 only)
     ! -----------------------------------------
 
-    if (trim(budget_table_version) == 'v1') then
+    if (trim(budget_table_version) .ne. 'v0') then
        call add_to_budget_diag(budget_diags%fields, f_watr_salt  ,'saltf') ! field  water: salt flux
        f_salt_beg = f_watr_salt
        f_salt_end = f_watr_salt
@@ -448,7 +449,6 @@ subroutine med_diag_init(gcomp, rc)
     allocate(budget_global   (f_size , c_size , p_size)) ! global sum, valid only on root pe
     allocate(budget_counter  (f_size , c_size , p_size)) ! counter, valid only on root pe
     allocate(budget_global_1d(f_size * c_size * p_size)) ! needed for ESMF_VMReduce call
-
   end subroutine med_diag_init
 
   integer function get_diag_attribute(gcomp, name, rc)
@@ -735,6 +735,25 @@ subroutine med_phases_diag_atm(gcomp, rc)
        if (ChkErr(rc,__LINE__,u_FILE_u)) return
     end if
 
+    call diag_atm_recv(is_local%wrap%FBImp(compatm,compatm), 'Faxa_hrain', f_heat_rain, &
+         areas, lats, afrac, lfrac, ofrac, ifrac, budget_local, rc=rc)
+    if (ChkErr(rc,__LINE__,u_FILE_u)) return
+
+    call diag_atm_recv(is_local%wrap%FBImp(compatm,compatm), 'Faxa_hsnow', f_heat_snow, &
+         areas, lats, afrac, lfrac, ofrac, ifrac, budget_local, rc=rc)
+    if (ChkErr(rc,__LINE__,u_FILE_u)) return
+
+    call diag_atm_recv(is_local%wrap%FBImp(compatm,compatm), 'Faxa_hevap', f_heat_evap, &
+         areas, lats, afrac, lfrac, ofrac, ifrac, budget_local, rc=rc)
+    if (ChkErr(rc,__LINE__,u_FILE_u)) return
+    call diag_atm_recv(is_local%wrap%FBImp(compatm,compatm), 'Faxa_hrofl', f_heat_rofl, &
+         areas, lats, afrac, lfrac, ofrac, ifrac, budget_local, rc=rc)
+    if (ChkErr(rc,__LINE__,u_FILE_u)) return
+    call diag_atm_recv(is_local%wrap%FBImp(compatm,compatm), 'Faxa_hrofi', f_heat_rofi, &
+         areas, lats, afrac, lfrac, ofrac, ifrac, budget_local, rc=rc)
+    if (ChkErr(rc,__LINE__,u_FILE_u)) return
+
+
     ! heat implied by snow flux from atm to mediator
     budget_local(f_heat_latf,c_atm_recv ,ip) = -budget_local(f_watr_snow,c_atm_recv ,ip)*shr_const_latice
     budget_local(f_heat_latf,c_lnd_arecv,ip) = -budget_local(f_watr_snow,c_lnd_arecv,ip)*shr_const_latice
@@ -2715,7 +2734,7 @@ subroutine med_diag_print_summary(data, ip, date, tod)
     ! write out net salt budgets
     ! -----------------------------
 
-    if (trim(budget_table_version) == 'v1') then
+    if (trim(budget_table_version) .ne. 'v0') then
        write(diagunit,*) ' '
        write(diagunit,FAH) subname,'NET SALT BUDGET (kg/m2s): period = ',&
             trim(budget_diags%periods(ip)%name), ': date = ',date,tod