updates that will only work now with the cmeps_update branches for NEMS and FV3

Author: Mariana Vertenstein

mediator/esmFldsExchange.F90

@@ -37,6 +37,7 @@ subroutine esmFldsExchange(gcomp, phase, rc)
     use esmflds               , only : mapuv_with_cart3d
     use esmflds               , only : fldListTo, fldListFr, fldListMed_aoflux, fldListMed_ocnalb
     use esmFlds               , only : coupling_mode
+    use med_internalstate_mod , only : mastertask, logunit
 
     ! input/output parameters:
     type(ESMF_GridComp)              :: gcomp
@@ -126,6 +127,11 @@ subroutine esmFldsExchange(gcomp, phase, rc)
           coupling_mode = 'nems_frac'
 
        end if
+
+       call ESMF_LogWrite(trim(subname) //' coupling mode is '//trim(coupling_mode), ESMF_LOGMSG_INFO)
+       if (mastertask) then
+          write(logunit,*) trim(subname) //' coupling mode is '//trim(coupling_mode)
+       end if
     end if
 
     !--------------------------------------
@@ -821,6 +827,9 @@ subroutine esmFldsExchange(gcomp, phase, rc)
                   mrg_from1=compice, mrg_fld1='Si_t', mrg_type1='copy')
              call addmrg(fldListTo(compatm)%flds, 'So_t', &
                   mrg_from1=compocn, mrg_fld1='So_t', mrg_type1='copy')
+          else
+             call ESMF_LogWrite(trim(subname) //'incorrect fields for nems_orig mode', ESMF_LOGMSG_INFO)
+             call ESMF_Finalize(endflag=ESMF_END_ABORT)
           end if
 
        else if (coupling_mode == 'nems_frac') then
@@ -830,6 +839,9 @@ subroutine esmFldsExchange(gcomp, phase, rc)
              call addmap(fldListFr(compice)%flds, 'Si_t', compatm, mapconsf , 'ifrac', ice2atm_fmap)
              call addmrg(fldListTo(compatm)%flds, 'Si_t', &
                   mrg_from1=compice, mrg_fld1='Si_t', mrg_type1='copy')
+          else
+             call ESMF_LogWrite(trim(subname) //'incorrect fields for nems_frac mode', ESMF_LOGMSG_INFO)
+             call ESMF_Finalize(endflag=ESMF_END_ABORT)
           end if
        end if
     end if

mediator/med_io_mod.F90

@@ -128,7 +128,7 @@ subroutine med_io_init()
     use shr_pio_mod , only : shr_pio_getiosys, shr_pio_getiotype, shr_pio_getioformat
 #ifdef INTERNAL_PIO_INIT
     ! if CMEPS is the only component using PIO, then it needs to initialize PIO
-    use shr_pio_mod , only : shr_pio_init2
+    use shr_pio_mod , only : shr_pio_init1, shr_pio_init2
 
     type(ESMF_VM)         :: vm
     integer               :: comms(1), comps(1)
@@ -147,6 +147,7 @@ subroutine med_io_init()
     compLabels(1) = "MED"
     comp_iamin(1) = .true.
 
+    call shr_pio_init1(1, "pio_in", comms(1))
     call shr_pio_init2(comps, compLabels, comp_iamin, comms, comp_comm_iam)
 #endif
 

nems/fd.yaml

@@ -240,7 +240,7 @@
        description: atmosphere export
          instantaneous downward long wave radiation flux (fv3 only)
      #
-     - standard_name: inst_net_lw_flx_atm
+     - standard_name: inst_net_lw_flx
        canonical_units: W m-2
        description: atmosphere export
          instantaneous NET long wave radiation flux (fv3 only)
@@ -646,21 +646,21 @@
        canonical_units: W m-2
        description: atmosphere export
      #
-     - standard_name: inst_zonal_moment_flx_atm
+     - standard_name: inst_zonal_moment_flx
        canonical_units: N m-2
        description: atmosphere export
          zonal component of momentum flux
      #
-     - standard_name: inst_merid_moment_flx_atm
+     - standard_name: inst_merid_moment_flx
        canonical_units: N m-2
        description: atmosphere export
          meridional component of momentum flux
      #
-     - standard_name: inst_laten_heat_flx_atm
+     - standard_name: inst_laten_heat_flx
        canonical_units: W m-2
        description: atmosphere export
      #
-     - standard_name: inst_sensi_heat_flx_atm
+     - standard_name: inst_sensi_heat_flx
        canonical_units: W m-2
        description: atmosphere export
 

nems/lib/Makefile

@@ -18,8 +18,8 @@ CMAKE_ENV_VARS := CC="$(CC)"   \
 
 CMAKE_OPTS := -D CMAKE_VERBOSE_MAKEFILE:BOOL=ON \
               -D PIO_ENABLE_TESTS:BOOL=OFF \
-              -D PIO_ENABLE_TIMING:BOOL=ON \
-              -D PIO_USE_MALLOC:BOOL=OFF \
+              -D PIO_ENABLE_TIMING:BOOL=OFF \
+              -D PIO_USE_MALLOC:BOOL=ON \
               -D GENF90_PATH=$(BASE_DIR)/genf90 \
               -D USER_CMAKE_MODULE_PATH=$(PIO_SRC_DIR)/cmake \
               -D CMAKE_INSTALL_PREFIX=$(PIO_INSTALL_DIR)