Update CMEPS; refactor esmFieldsExchange_nems and default_masks

cesm/driver/ensemble_driver.F90

@@ -244,7 +244,7 @@ subroutine SetModelServices(ensemble_driver, rc)
           call ReadAttributes(driver, config, "DRIVER_attributes::", rc=rc)
           if (chkerr(rc,__LINE__,u_FILE_u)) return
 
-          call ReadAttributes(driver, config, "DRV_modelio"//trim(inst_suffix)//"::", rc=rc)
+          call ReadAttributes(driver, config, "DRV_modelio::", rc=rc)
           if (chkerr(rc,__LINE__,u_FILE_u)) return
 
           ! Set the driver log to the driver task 0 

cesm/driver/esm.F90

@@ -5,13 +5,12 @@ module ESM
   !-----------------------------------------------------------------------------
 
   use shr_kind_mod , only : r8=>shr_kind_r8, cl=>shr_kind_cl, cs=>shr_kind_cs
-  use shr_log_mod  , only : shrlogunit=> shr_log_unit
   use shr_sys_mod  , only : shr_sys_abort
   use shr_mpi_mod  , only : shr_mpi_bcast
   use shr_mem_mod  , only : shr_mem_init
   use shr_file_mod , only : shr_file_setLogunit
   use esm_utils_mod, only : logunit, mastertask, dbug_flag, chkerr
-  use perf_mod     , only : t_initf
+  use perf_mod     , only : t_initf, t_setLogUnit
 
   implicit none
   private
@@ -220,8 +219,7 @@ subroutine SetModelServices(driver, rc)
     !-------------------------------------------
     ! Timer initialization (has to be after pelayouts are determined)
     !-------------------------------------------
-
-    call t_initf('drv_in', LogPrint=.true., mpicom=global_comm, mastertask=mastertask, MaxThreads=maxthreads)
+    call t_initf('drv_in', LogPrint=.true., LogUnit=logunit, mpicom=global_comm, mastertask=mastertask, MaxThreads=maxthreads)
 
     call ESMF_LogWrite(trim(subname)//": done", ESMF_LOGMSG_INFO)
 
@@ -670,8 +668,11 @@ subroutine AddAttributes(gcomp, driver, config, compid, compname, inst_suffix, n
     if (chkerr(rc,__LINE__,u_FILE_u)) return
     call ReadAttributes(gcomp, config, "ALLCOMP_attributes::", rc=rc)
     if (chkerr(rc,__LINE__,u_FILE_u)) return
-    call ReadAttributes(gcomp, config, trim(compname)//"_modelio"//trim(inst_suffix)//"::", rc=rc)
-    if (chkerr(rc,__LINE__,u_FILE_u)) return
+    call ReadAttributes(gcomp, config, trim(compname)//"_modelio::", rc=rc)
+    if (chkerr(rc,__LINE__,u_FILE_u)) then
+       print *,__FILE__,__LINE__,"ERROR reading ",trim(compname)," modelio from runconfig"
+       return
+    endif
     call ReadAttributes(gcomp, config, "CLOCK_attributes::", rc=rc)
     if (chkerr(rc,__LINE__,u_FILE_u)) return
 
@@ -807,7 +808,7 @@ subroutine esm_init_pelayout(driver, maxthreads, rc)
     use mpi          , only : MPI_COMM_NULL, mpi_comm_size
 #endif
     use mct_mod      , only : mct_world_init
-    use shr_pio_mod  , only : shr_pio_init2
+    use shr_pio_mod  , only : shr_pio_init, shr_pio_component_init
 
 #ifdef MED_PRESENT
     use med_internalstate_mod , only : med_id
@@ -931,6 +932,11 @@ subroutine esm_init_pelayout(driver, maxthreads, rc)
        inst_suffix = ""
     endif
 
+    ! Initialize PIO
+    ! This reads in the pio parameters that are independent of component
+    call shr_pio_init(driver, rc=rc)
+    if (chkerr(rc,__LINE__,u_FILE_u)) return
+
     allocate(comms(componentCount+1), comps(componentCount+1))
     comps(1) = 1
     comms = MPI_COMM_NULL
@@ -1174,12 +1180,14 @@ subroutine esm_init_pelayout(driver, maxthreads, rc)
        if (chkerr(rc,__LINE__,u_FILE_u)) return
 
     enddo
+    ! Read in component dependent PIO parameters and initialize
+    ! IO systems
+    call shr_pio_component_init(driver, size(comps), rc)
+    if (chkerr(rc,__LINE__,u_FILE_u)) return
 
     ! Initialize MCT (this is needed for data models and cice prescribed capability)
     call mct_world_init(componentCount+1, GLOBAL_COMM, comms, comps)
 
-    ! Initialize PIO
-    call shr_pio_init2(comps(2:), compLabels, comp_iamin, comms(2:), comp_comm_iam)
 
     deallocate(petlist, comms, comps, comp_iamin, comp_comm_iam)
 

cesm/driver/esmApp.F90

@@ -15,7 +15,6 @@ program esmApp
   use mpi
   use NUOPC,           only : NUOPC_FieldDictionarySetup
   use ensemble_driver, only : SetServices
-  use shr_pio_mod,     only : shr_pio_init1
   use shr_sys_mod,     only : shr_sys_abort
 
   implicit none
@@ -44,17 +43,6 @@ program esmApp
 #endif
   COMP_COMM = MPI_COMM_WORLD
 
-  !-----------------------------------------------------------------------------
-  ! Initialize PIO
-  !-----------------------------------------------------------------------------
-
-  ! For planned future use of async io using pio2.  The IO tasks are seperated from the compute tasks here
-  ! and COMP_COMM will be MPI_COMM_NULL on the IO tasks which then call shr_pio_init2 and do not return until
-  ! the model completes.  All other tasks call ESMF_Initialize.  8 is the maximum number of component models
-  ! supported
-
-  call shr_pio_init1(8, "drv_in", COMP_COMM)
-
   !-----------------------------------------------------------------------------
   ! Initialize ESMF
   !-----------------------------------------------------------------------------

cesm/nuopc_cap_share/nuopc_shr_methods.F90

@@ -132,7 +132,7 @@ end subroutine get_component_instance
 !===============================================================================
 
   subroutine set_component_logging(gcomp, mastertask, logunit, shrlogunit, rc)
-
+    use shr_pio_mod, only : shr_pio_log_comp_settings
     ! input/output variables
     type(ESMF_GridComp)  :: gcomp
     logical, intent(in)  :: mastertask
@@ -143,6 +143,8 @@ subroutine set_component_logging(gcomp, mastertask, logunit, shrlogunit, rc)
     ! local variables
     character(len=CL) :: diro
     character(len=CL) :: logfile
+    character(len=CL) :: inst_suffix
+    integer :: inst_index  ! not used here
     !-----------------------------------------------------------------------
 
     rc = ESMF_SUCCESS
@@ -154,14 +156,23 @@ subroutine set_component_logging(gcomp, mastertask, logunit, shrlogunit, rc)
        if (chkerr(rc,__LINE__,u_FILE_u)) return
        call NUOPC_CompAttributeGet(gcomp, name="logfile", value=logfile, rc=rc)
        if (chkerr(rc,__LINE__,u_FILE_u)) return
+       call get_component_instance(gcomp, inst_suffix, inst_index, rc=rc)
+       if (chkerr(rc,__LINE__,u_FILE_u)) return
+       ! Multiinstance logfile name needs a correction
+       if(logfile(4:4) == '_') then
+          logfile = logfile(1:3)//trim(inst_suffix)//logfile(9:)
+       endif
 
        open(newunit=logunit,file=trim(diro)//"/"//trim(logfile))
+       ! Write the PIO settings to the beggining of each component log
+       call shr_pio_log_comp_settings(gcomp, logunit)
+
     else
        logUnit = 6
     endif
-
+    ! TODO: shr_file mod is deprecated and should be removed.
     call shr_file_setLogUnit (logunit)
-
+    
   end subroutine set_component_logging
 
 !===============================================================================

cesm/nuopc_cap_share/seq_drydep_mod.F90

@@ -893,6 +893,7 @@ subroutine seq_drydep_readnl(NLFilename, drydep_nflds)
     !-----------------------------------------------------------------------------
 
     rc = ESMF_SUCCESS
+    drydep_nflds = 0
 
     !--- Open and read namelist ---
     if ( len_trim(NLFilename) == 0  )then

cesm/nuopc_cap_share/shr_ndep_mod.F90

@@ -49,9 +49,9 @@ subroutine shr_ndep_readnl(NLFilename, ndep_nflds)
     character(len=32)  :: ndep_list(maxspc) = '' ! List of ndep species
     integer            :: localpet
     integer            :: mpicom
-    character(*),parameter :: F00   = "('(shr_ndep_read) ',8a)"
-    character(*),parameter :: FI1   = "('(shr_ndep_init) ',a,I2)"
-    character(*),parameter :: subName = '(shr_ndep_read) '
+
+    character(*),parameter :: subName = '(shr_ndep_readnl) '
+    character(*),parameter :: F00   = "('(shr_ndep_readnl) ',8a)"
     ! ------------------------------------------------------------------
 
     namelist /ndep_inparm/ ndep_list