Sync generic working in UFS

.gitignore

@@ -31,5 +31,9 @@
 *.out
 *.app
 
+# Externals
+fox
+share/genf90
+
 # ignore pycache
 __pycache__

.gitmodules

@@ -1,16 +1,3 @@
 # This is a git-fleximod adapted .gitmodules file.  Any field with a name starting in fx is a git-fleximod
 # specific field.  See https://github.com/ESMCI/git-fleximod for details.
 
-[submodule "fox"]
-path = fox
-url = https://github.com/ESMCI/fox.git
-fxtag = 4.1.2.4
-fxrequired = AlwaysRequired
-fxDONOTUSEurl = https://github.com/ESMCI/fox.git
-
-[submodule "genf90"]
-path = share/genf90
-url = https://github.com/PARALLELIO/genf90
-fxtag = 4816965
-fxrequired = AlwaysRequired
-fxDONOTUSEurl = https://github.com/PARALLELIO/genf90

datm/CMakeLists.txt

@@ -12,7 +12,6 @@ set(SRCFILES atm_comp_nuopc.F90
              datm_pres_ndep_mod.F90
              datm_pres_o3_mod.F90)
 
-
 foreach(FILE ${SRCFILES})
   if(EXISTS "${CASEROOT}/SourceMods/src.datm/${FILE}")
     list(REMOVE_ITEM SRCFILES ${FILE})

datm/atm_comp_nuopc.F90

@@ -266,7 +266,7 @@ subroutine InitializeAdvertise(gcomp, importState, exportState, clock, rc)
 
     ! Obtain flds_scalar values, mpi values, multi-instance values and
     ! set logunit and set shr logging to my log file
-    call dshr_init(gcomp, 'ATM', mpicom, my_task, inst_index, inst_suffix, &
+    call dshr_init(gcomp, sdat, 'ATM', mpicom, my_task, inst_index, inst_suffix, &
          flds_scalar_name, flds_scalar_num, flds_scalar_index_nx, flds_scalar_index_ny, &
          logunit, rc=rc)
     if (ChkErr(rc,__LINE__,u_FILE_u)) return
@@ -425,7 +425,7 @@ subroutine InitializeAdvertise(gcomp, importState, exportState, clock, rc)
             nlfilename, my_task, vm, rc)
        if (ChkErr(rc,__LINE__,u_FILE_u)) return
     case ('GENERIC')
-       call datamode_generic_advertise(fldsExport, sdat, rc)
+       call datamode_generic_advertise(exportState, fldsExport, sdat, flds_scalar_name, rc)
        if (ChkErr(rc,__LINE__,u_FILE_u)) return
     end select
 
@@ -466,7 +466,7 @@ subroutine InitializeRealize(gcomp, importState, exportState, clock, rc)
 
     ! Initialize mesh, restart flag, compid, and logunit
     call ESMF_TraceRegionEnter('datm_strdata_init')
-    call dshr_mesh_init(gcomp, sdat, nullstr, logunit, 'ATM', nx_global, ny_global, &
+    call dshr_mesh_init(gcomp, nullstr, logunit, 'ATM', nx_global, ny_global, &
          model_meshfile, model_maskfile, model_mesh, model_mask, model_frac, restart_read, rc=rc)
     if (ChkErr(rc,__LINE__,u_FILE_u)) return
 
@@ -543,7 +543,7 @@ subroutine ModelAdvance(gcomp, rc)
     type(ESMF_Time)         :: nextTime
     type(ESMF_TimeInterval) :: timeStep
     real(r8)                :: nextsw_cday
-    logical                 :: restart_write         ! restart alarm is ringing
+    logical                 :: restart_write ! restart alarm is ringing
     integer                 :: next_ymd      ! model date
     integer                 :: next_tod      ! model sec into model date
     integer                 :: yr, mon, day  ! year, month, day

datm/datm_datamode_era5_mod.F90

@@ -22,11 +22,17 @@ module datm_datamode_era5_mod
   real(r8), pointer :: Sa_z(:)              => null()
   real(r8), pointer :: Sa_u10m(:)           => null()
   real(r8), pointer :: Sa_v10m(:)           => null()
+  real(r8), pointer :: Sa_u(:)              => null()
+  real(r8), pointer :: Sa_v(:)              => null()
   real(r8), pointer :: Sa_wspd10m(:)        => null()
+  real(r8), pointer :: Sa_wspd(:)           => null()
   real(r8), pointer :: Sa_t2m(:)            => null()
+  real(r8), pointer :: Sa_tbot(:)           => null()
   real(r8), pointer :: Sa_tskn(:)           => null()
   real(r8), pointer :: Sa_q2m(:)            => null()
+  real(r8), pointer :: Sa_shum(:)           => null()
   real(r8), pointer :: Sa_pslv(:)           => null()
+  real(r8), pointer :: Sa_pbot(:)           => null()
   real(r8), pointer :: Faxa_rain(:)         => null()
   real(r8), pointer :: Faxa_rainc(:)        => null()
   real(r8), pointer :: Faxa_rainl(:)        => null()
@@ -69,8 +75,10 @@ module datm_datamode_era5_mod
   real(r8), pointer :: strm_Faxa_taux(:)  => null()
   real(r8), pointer :: strm_Faxa_tauy(:)  => null()
 
-  real(r8) :: t2max  ! units detector
-  real(r8) :: td2max ! units detector
+  real(r8) :: t2max   ! units detector
+  real(r8) :: td2max  ! units detector
+  real(r8) :: lwmax ! units detector
+  real(r8) :: precmax ! units detector
 
   real(r8) , parameter :: tKFrz    = SHR_CONST_TKFRZ
   real(r8) , parameter :: rdair    = SHR_CONST_RDAIR ! dry air gas constant ~ J/K/kg
@@ -102,11 +110,17 @@ subroutine datm_datamode_era5_advertise(exportState, fldsexport, flds_scalar_nam
     call dshr_fldList_add(fldsExport, 'Sa_z'       )
     call dshr_fldList_add(fldsExport, 'Sa_u10m'    )
     call dshr_fldList_add(fldsExport, 'Sa_v10m'    )
+    call dshr_fldList_add(fldsExport, 'Sa_u'       )
+    call dshr_fldList_add(fldsExport, 'Sa_v'       )
     call dshr_fldList_add(fldsExport, 'Sa_wspd10m' )
+    call dshr_fldList_add(fldsExport, 'Sa_wspd'    )
     call dshr_fldList_add(fldsExport, 'Sa_t2m'     )
+    call dshr_fldList_add(fldsExport, 'Sa_tbot'    )
     call dshr_fldList_add(fldsExport, 'Sa_tskn'    )
     call dshr_fldList_add(fldsExport, 'Sa_q2m'     )
+    call dshr_fldList_add(fldsExport, 'Sa_shum'    )
     call dshr_fldList_add(fldsExport, 'Sa_pslv'    )
+    call dshr_fldList_add(fldsExport, 'Sa_pbot'    )
     call dshr_fldList_add(fldsExport, 'Faxa_rain'  )
     call dshr_fldList_add(fldsExport, 'Faxa_rainc' )
     call dshr_fldList_add(fldsExport, 'Faxa_rainl' )
@@ -192,16 +206,28 @@ subroutine datm_datamode_era5_init_pointers(exportState, sdat, rc)
     if (ChkErr(rc,__LINE__,u_FILE_u)) return
     call dshr_state_getfldptr(exportState, 'Sa_v10m'    , fldptr1=Sa_v10m    , allowNullReturn=.true., rc=rc)
     if (ChkErr(rc,__LINE__,u_FILE_u)) return
+    call dshr_state_getfldptr(exportState, 'Sa_u'       , fldptr1=Sa_u       , allowNullReturn=.true., rc=rc)
+    if (ChkErr(rc,__LINE__,u_FILE_u)) return
+    call dshr_state_getfldptr(exportState, 'Sa_v'       , fldptr1=Sa_v       , allowNullReturn=.true., rc=rc)
+    if (ChkErr(rc,__LINE__,u_FILE_u)) return
     call dshr_state_getfldptr(exportState, 'Sa_wspd10m' , fldptr1=Sa_wspd10m , allowNullReturn=.true., rc=rc)
     if (ChkErr(rc,__LINE__,u_FILE_u)) return
+    call dshr_state_getfldptr(exportState, 'Sa_wspd'    , fldptr1=Sa_wspd    , allowNullReturn=.true., rc=rc)
+    if (ChkErr(rc,__LINE__,u_FILE_u)) return
     call dshr_state_getfldptr(exportState, 'Sa_t2m'     , fldptr1=Sa_t2m     , allowNullReturn=.true., rc=rc)
     if (ChkErr(rc,__LINE__,u_FILE_u)) return
+    call dshr_state_getfldptr(exportState, 'Sa_tbot'    , fldptr1=Sa_tbot    , allowNullReturn=.true., rc=rc)
+    if (ChkErr(rc,__LINE__,u_FILE_u)) return
     call dshr_state_getfldptr(exportState, 'Sa_tskn'    , fldptr1=Sa_tskn    , allowNullReturn=.true., rc=rc)
     if (ChkErr(rc,__LINE__,u_FILE_u)) return
     call dshr_state_getfldptr(exportState, 'Sa_q2m'     , fldptr1=Sa_q2m     , allowNullReturn=.true., rc=rc)
     if (ChkErr(rc,__LINE__,u_FILE_u)) return
+    call dshr_state_getfldptr(exportState, 'Sa_shum'    , fldptr1=Sa_shum    , allowNullReturn=.true., rc=rc)
+    if (ChkErr(rc,__LINE__,u_FILE_u)) return
     call dshr_state_getfldptr(exportState, 'Sa_pslv'    , fldptr1=Sa_pslv    , allowNullReturn=.true., rc=rc)
     if (ChkErr(rc,__LINE__,u_FILE_u)) return
+    call dshr_state_getfldptr(exportState, 'Sa_pbot'    , fldptr1=Sa_pbot    , allowNullReturn=.true., rc=rc)
+    if (ChkErr(rc,__LINE__,u_FILE_u)) return
     call dshr_state_getfldptr(exportState, 'Faxa_rain'  , fldptr1=Faxa_rain  , allowNullReturn=.true., rc=rc)
     if (ChkErr(rc,__LINE__,u_FILE_u)) return
     call dshr_state_getfldptr(exportState, 'Faxa_rainc' , fldptr1=Faxa_rainc , allowNullReturn=.true., rc=rc)
@@ -352,7 +378,7 @@ subroutine datm_datamode_era5_advance(exportstate, mainproc, logunit, rc)
     ! local variables
     logical  :: first_time = .true.
     integer  :: n                   ! indices
-    integer  :: lsize               ! size of attr vect
+    integer  :: lsize = 0           ! size of attr vect
     real(r8) :: rtmp(2)
     real(r8) :: t2, pslv
     real(r8) :: e, qsat
@@ -389,7 +415,7 @@ subroutine datm_datamode_era5_advance(exportstate, mainproc, logunit, rc)
     do n = 1, lsize
        !--- bottom layer height ---
        if (associated(Sa_z)) then
-         Sa_z(n) = 10.0_r8
+          Sa_z(n) = 10.0_r8
        end if
 
        !--- calculate wind speed ---

dglc/glc_comp_nuopc.F90

@@ -192,6 +192,7 @@ subroutine InitializeAdvertise(gcomp, importState, exportState, clock, rc)
     character(len=CS) :: cnum
     character(len=ESMF_MAXSTR) :: model_datafiles_list ! colon separated string containing input datafiles
     character(len=ESMF_MAXSTR) :: model_meshfiles_list ! colon separated string containing model meshfiles
+    type(shr_strdata_type)     :: sdat_dummy
     character(len=*),parameter :: subname=trim(module_name)//':(InitializeAdvertise) '
     !-------------------------------------------------------------------------------
 
@@ -210,7 +211,7 @@ subroutine InitializeAdvertise(gcomp, importState, exportState, clock, rc)
 
     ! Obtain flds_scalar values, mpi values, multi-instance values and
     ! set logunit and set shr logging to my log file
-    call dshr_init(gcomp, 'GLC', mpicom, my_task, inst_index, inst_suffix, &
+    call dshr_init(gcomp, sdat_dummy, 'GLC', mpicom, my_task, inst_index, inst_suffix, &
          flds_scalar_name, flds_scalar_num, flds_scalar_index_nx, flds_scalar_index_ny, logunit, rc)
     if (ChkErr(rc,__LINE__,u_FILE_u)) return
 

dice/ice_comp_nuopc.F90

@@ -182,6 +182,7 @@ subroutine InitializeAdvertise(gcomp, importState, exportState, clock, rc)
     integer           :: bcasttmp(4)
     real(r8)          :: rbcasttmp(3)
     type(ESMF_VM)     :: vm
+    logical           :: isPresent, isSet
     character(len=*),parameter  :: subname=trim(modName)//':(InitializeAdvertise) '
     !-------------------------------------------------------------------------------
 
@@ -197,7 +198,7 @@ subroutine InitializeAdvertise(gcomp, importState, exportState, clock, rc)
 
     ! Obtain flds_scalar values, mpi values, multi-instance values and
     ! set logunit and set shr logging to my log file
-    call dshr_init(gcomp, 'ICE', mpicom, my_task, inst_index, inst_suffix, &
+    call dshr_init(gcomp, sdat, 'ICE', mpicom, my_task, inst_index, inst_suffix, &
          flds_scalar_name, flds_scalar_num, flds_scalar_index_nx, flds_scalar_index_ny, &
          logunit, rc=rc)
     if (ChkErr(rc,__LINE__,u_FILE_u)) return
@@ -240,6 +241,7 @@ subroutine InitializeAdvertise(gcomp, importState, exportState, clock, rc)
        rbcasttmp(1) = flux_swpf
        rbcasttmp(2) = flux_Qmin
        rbcasttmp(3) = flux_Qacc0
+       if(export_all) bcasttmp(4) = 1
     endif
 
     ! broadcast namelist input
@@ -254,7 +256,7 @@ subroutine InitializeAdvertise(gcomp, importState, exportState, clock, rc)
     if (ChkErr(rc,__LINE__,u_FILE_u)) return
     call ESMF_VMBroadcast(vm, restfilm, CX, main_task, rc=rc)
     if (ChkErr(rc,__LINE__,u_FILE_u)) return
-    call ESMF_VMBroadcast(vm, bcasttmp, 3, main_task, rc=rc)
+    call ESMF_VMBroadcast(vm, bcasttmp, 4, main_task, rc=rc)
     if (ChkErr(rc,__LINE__,u_FILE_u)) return
     call ESMF_VMBroadcast(vm, rbcasttmp, 3, main_task, rc=rc)
     if (ChkErr(rc,__LINE__,u_FILE_u)) return
@@ -326,7 +328,7 @@ subroutine InitializeRealize(gcomp, importState, exportState, clock, rc)
 
     ! Initialize mesh, restart flag, logunit
     call ESMF_TraceRegionEnter('dice_strdata_init')
-    call dshr_mesh_init(gcomp, sdat, nullstr, logunit, 'ICE', nx_global, ny_global, &
+    call dshr_mesh_init(gcomp, nullstr, logunit, 'ICE', nx_global, ny_global, &
          model_meshfile, model_maskfile, model_mesh, model_mask, model_frac, restart_read, rc=rc)
     if (ChkErr(rc,__LINE__,u_FILE_u)) return
 

dlnd/lnd_comp_nuopc.F90

@@ -184,7 +184,7 @@ subroutine InitializeAdvertise(gcomp, importState, exportState, clock, rc)
 
     ! Obtain flds_scalar values, mpi values, multi-instance values and
     ! set logunit and set shr logging to my log file
-    call dshr_init(gcomp, 'LND', mpicom, my_task, inst_index, inst_suffix, &
+    call dshr_init(gcomp, sdat, 'LND', mpicom, my_task, inst_index, inst_suffix, &
          flds_scalar_name, flds_scalar_num, flds_scalar_index_nx, flds_scalar_index_ny, &
          logunit, rc=rc)
     if (ChkErr(rc,__LINE__,u_FILE_u)) return
@@ -223,7 +223,7 @@ subroutine InitializeAdvertise(gcomp, importState, exportState, clock, rc)
     if (ChkErr(rc,__LINE__,u_FILE_u)) return
     call ESMF_VMBroadcast(vm, restfilm, CX, main_task, rc=rc)
     if (ChkErr(rc,__LINE__,u_FILE_u)) return
-    call ESMF_VMBroadcast(vm, bcasttmp, 3, main_task, rc=rc)
+    call ESMF_VMBroadcast(vm, bcasttmp, 4, main_task, rc=rc)
     if (ChkErr(rc,__LINE__,u_FILE_u)) return
 
     nx_global = bcasttmp(1)
@@ -288,7 +288,7 @@ subroutine InitializeRealize(gcomp, importState, exportState, clock, rc)
 
     ! Initialize sdat
     call ESMF_TraceRegionEnter('dlnd_strdata_init')
-    call dshr_mesh_init(gcomp, sdat, nullstr, logunit, 'LND', nx_global, ny_global, &
+    call dshr_mesh_init(gcomp, nullstr, logunit, 'LND', nx_global, ny_global, &
          model_meshfile, model_maskfile, model_mesh, model_mask, model_frac, restart_read, rc=rc)
 
     ! Initialize stream data type

docn/ocn_comp_nuopc.F90

@@ -188,7 +188,7 @@ end subroutine SetServices
   !===============================================================================
   subroutine InitializeAdvertise(gcomp, importState, exportState, clock, rc)
     use shr_nl_mod, only:  shr_nl_find_group_name
-
+    
     ! input/output variables
     type(ESMF_GridComp)  :: gcomp
     type(ESMF_State)     :: importState, exportState
@@ -218,7 +218,7 @@ subroutine InitializeAdvertise(gcomp, importState, exportState, clock, rc)
 
     ! Obtain flds_scalar values, mpi values, multi-instance values and
     ! set logunit and set shr logging to my log file
-    call dshr_init(gcomp, 'OCN', mpicom, my_task, inst_index, inst_suffix, &
+    call dshr_init(gcomp, sdat, 'OCN', mpicom, my_task, inst_index, inst_suffix, &
          flds_scalar_name, flds_scalar_num, flds_scalar_index_nx, flds_scalar_index_ny, logunit, rc)
     if (ChkErr(rc,__LINE__,u_FILE_u)) return
 
@@ -260,6 +260,7 @@ subroutine InitializeAdvertise(gcomp, importState, exportState, clock, rc)
        if(skip_restart_read) bcasttmp(3) = 1
        if(export_all) bcasttmp(4) = 1
        rtmp(1) = sst_constant_value
+       if(export_all) bcasttmp(4) = 1
     endif
 
     ! Broadcast namelist input
@@ -398,7 +399,7 @@ subroutine InitializeRealize(gcomp, importState, exportState, clock, rc)
        if (ChkErr(rc,__LINE__,u_FILE_u)) return
     end if
 
-    call dshr_mesh_init(gcomp, sdat, nullstr, logunit, 'OCN', nx_global, ny_global, &
+    call dshr_mesh_init(gcomp, nullstr, logunit, 'OCN', nx_global, ny_global, &
          model_meshfile, model_maskfile, model_mesh, model_mask, model_frac, restart_read, rc=rc)
     if (ChkErr(rc,__LINE__,u_FILE_u)) return
 

drof/rof_comp_nuopc.F90

@@ -183,7 +183,7 @@ subroutine InitializeAdvertise(gcomp, importState, exportState, clock, rc)
 
     ! Obtain flds_scalar values, mpi values, multi-instance values and
     ! set logunit and set shr logging to my log file
-    call dshr_init(gcomp, 'ROF', mpicom, my_task, inst_index, inst_suffix, &
+    call dshr_init(gcomp, sdat, 'ROF', mpicom, my_task, inst_index, inst_suffix, &
          flds_scalar_name, flds_scalar_num, flds_scalar_index_nx, flds_scalar_index_ny, &
          logunit, rc=rc)
     if (ChkErr(rc,__LINE__,u_FILE_u)) return
@@ -235,7 +235,7 @@ subroutine InitializeAdvertise(gcomp, importState, exportState, clock, rc)
     if (ChkErr(rc,__LINE__,u_FILE_u)) return
     call ESMF_VMBroadcast(vm, restfilm, CX, main_task, rc=rc)
     if (ChkErr(rc,__LINE__,u_FILE_u)) return
-    call ESMF_VMBroadcast(vm, bcasttmp, 3, main_task, rc=rc)
+    call ESMF_VMBroadcast(vm, bcasttmp, 4, main_task, rc=rc)
     if (ChkErr(rc,__LINE__,u_FILE_u)) return
 
     nx_global = bcasttmp(1)
@@ -287,7 +287,7 @@ subroutine InitializeRealize(gcomp, importState, exportState, clock, rc)
 
     ! Initialize mesh, restart flag, logunit
     call ESMF_TraceRegionEnter('drof_strdata_init')
-    call dshr_mesh_init(gcomp, sdat, nullstr, logunit, 'ROF', nx_global, ny_global, &
+    call dshr_mesh_init(gcomp, nullstr, logunit, 'ROF', nx_global, ny_global, &
          model_meshfile, model_maskfile, model_mesh, model_mask, model_frac, restart_read, rc=rc)
     if (ChkErr(rc,__LINE__,u_FILE_u)) return
 

dshr/dshr_fldlist_mod.F90

@@ -79,7 +79,6 @@ subroutine dshr_fldlist_realize(state, fldLists, flds_scalar_name, flds_scalar_n
        stdname = fldList%stdname
 
        if (NUOPC_IsConnected(state, fieldName=stdname) .or. export_all) then
-
           ! Check field name since linked list might have empty string
           if (trim(stdname) == '') then
              fldList => fldList%next

dshr/dshr_generic_mod.F90

@@ -2,6 +2,7 @@ module dshr_generic_mod
 
   use ESMF            , only : ESMF_SUCCESS, ESMF_State, &
                                ESMF_LogWrite, ESMF_LOGMSG_INFO, ESMF_LOGMSG_WARNING
+  use NUOPC           , only : NUOPC_Advertise
   use shr_kind_mod    , only : r8=>shr_kind_r8, cl=>shr_kind_cl
   use dshr_fldlist_mod, only : fldlist_type, dshr_fldlist_add
   use dshr_strdata_mod, only : shr_strdata_type, shr_strdata_get_stream_pointer
@@ -32,13 +33,16 @@ module dshr_generic_mod
 contains
 
   ! =======================================================================
-  subroutine datamode_generic_advertise(fldsExport, sdat, rc)
+  subroutine datamode_generic_advertise(exportState, fldsExport, sdat, flds_scalar_name, rc)
+    type(ESMF_State)      , intent(inout) :: exportState
     type(fldList_type),     pointer       :: fldsExport
     type(shr_strdata_type), intent(in)    :: sdat
+    character(len=*)      , intent(in)    :: flds_scalar_name
     integer,        intent(out), optional :: rc
 
     integer :: i, n
     character(len=CL) :: fieldName
+    type(fldlist_type), pointer :: fldList
 
     if (present(rc)) rc = ESMF_SUCCESS
 
@@ -58,14 +62,24 @@ subroutine datamode_generic_advertise(fldsExport, sdat, rc)
           endif
        end do
     endif
+    ! Handle cpl_scalars
+    call dshr_fldList_add(fldsExport, trim(flds_scalar_name))
+
+    fldlist => fldsExport ! the head of the linked list
+    do while (associated(fldlist))
+       call NUOPC_Advertise(exportState, standardName=fldlist%stdname, rc=rc)
+       if (ChkErr(rc,__LINE__,u_FILE_u)) return
+       call ESMF_LogWrite('(datm_comp_advertise): Fr_atm'//trim(fldList%stdname), ESMF_LOGMSG_INFO)
+       fldList => fldList%next
+    enddo
 
   end subroutine datamode_generic_advertise
 
   ! =======================================================================
   subroutine datamode_generic_init_pointers(exportState, sdat, rc)
     type(ESMF_State),       intent(inout) :: exportState
     type(shr_strdata_type), intent(in)    :: sdat
-    integer,                intent(out),  :: rc
+    integer,                intent(out)   :: rc
 
     integer :: i, n, total_vars, cache_idx
     character(len=CL) :: fieldName