Update emc/develop branch with recent changes in master branch of ESCOMP/CDEPS

CMakeLists.txt

@@ -27,13 +27,22 @@ list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
 
 message("CMAKE_MODULE_PATH is ${CMAKE_MODULE_PATH}")
 
-find_package(ESMF REQUIRED)
-if (DEFINED PIO)
-  set(PIO_PATH ${PIO})
+if (TARGET esmf)
+  message("Target esmf is already found. Skip find_package ...")
 else()
-  set(PIO_PATH $ENV{PIO})
+  find_package(ESMF REQUIRED)
+endif()
+
+if (DEFINED ENV{PIO_ROOT})
+  message("PIO_ROOT is $ENV{PIO_ROOT}")
+else()
+  if (DEFINED PIO)
+    set(PIO_PATH ${PIO})
+  else()
+    set(PIO_PATH $ENV{PIO})
+  endif()
+  find_package(PIO REQUIRED COMPONENT C Fortran PATH ${PIO_PATH})
 endif()
-find_package(PIO REQUIRED COMPONENT C Fortran PATH ${PIO_PATH})
 
 if (NOT DEFINED MPILIB OR NOT ${MPILIB} STREQUAL "mpi-serial")
   find_package(MPI REQUIRED)
@@ -53,5 +62,41 @@ foreach(COMP datm dice dlnd docn drof dwav)
   add_subdirectory("${COMP}")
 endforeach(COMP)
 
-install(TARGETS streams dshr
-	LIBRARY DESTINATION lib)
+target_include_directories(streams PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/share>
+                                          $<INSTALL_INTERFACE:mod>)
+target_include_directories(streams PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/fox/include>
+                                          $<INSTALL_INTERFACE:mod>)
+target_include_directories(dshr PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/share>
+                                       $<INSTALL_INTERFACE:mod>)
+target_include_directories(dshr PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/fox/include>
+                                       $<INSTALL_INTERFACE:mod>)
+target_include_directories(dshr PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/streams>
+                                       $<INSTALL_INTERFACE:mod>)
+
+foreach(COMP datm dice dlnd docn drof dwav)
+  target_include_directories(${COMP} PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/share>
+                                            $<INSTALL_INTERFACE:mod>)
+  target_include_directories(${COMP} PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/streams>
+                                            $<INSTALL_INTERFACE:mod>)
+  target_include_directories(${COMP} PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/dshr>
+                                            $<INSTALL_INTERFACE:mod>)
+
+  install(TARGETS ${COMP} 
+          EXPORT  ${COMP}
+          LIBRARY DESTINATION lib
+          COMPONENT Library)
+  install(EXPORT      ${COMP} 
+          DESTINATION lib/cmake)
+endforeach(COMP)
+
+foreach(DEPS streams dshr cdeps_share FoX_dom FoX_wxml FoX_sax FoX_common FoX_utils FoX_fsys)
+  if(NOT BLD_STANDALONE AND ${DEPS} STREQUAL "cdeps_share")
+     continue()
+  endif()
+  install(TARGETS ${DEPS} 
+          EXPORT  ${DEPS}
+          LIBRARY DESTINATION lib
+          COMPONENT Library)
+  install(EXPORT      ${DEPS} 
+          DESTINATION lib/cmake)
+endforeach(COMP)

cime_config/stream_cdeps.py

@@ -99,8 +99,12 @@ def create_stream_xml(self, stream_names, case, streams_xml_file, data_list_file
                         stream_datafiles = child.xml_element.text
                         stream_datafiles = self._resolve_values(case, stream_datafiles)
                         if 'first_year' in child.xml_element.attrib and 'last_year' in child.xml_element.attrib:
-                            stream_year_first= int(child.xml_element.get('first_year'))
-                            stream_year_last = int(child.xml_element.get('last_year'))
+                            value = child.xml_element.get('first_year') 
+                            value = self._resolve_values(case, value)
+                            stream_year_first= int(value)
+                            value = child.xml_element.get('last_year') 
+                            value = self._resolve_values(case, value)
+                            stream_year_last = int(value)
                             year_first = max(stream_year_first, data_year_first)
                             year_last = min(stream_year_last, data_year_last)
                             stream_datafiles = self._sub_paths(stream_datafiles, year_first, year_last)
@@ -117,6 +121,7 @@ def create_stream_xml(self, stream_names, case, streams_xml_file, data_list_file
                       or node_name == 'stream_taxmode' 
                       or node_name == 'stream_dtlimit'):
                     attributes['model_grid'] = case.get_value("GRID")
+                    attributes['compset'] = case.get_value("COMPSET")
                     value = self._get_value_match(node, node_name[7:], attributes=attributes)
                     value = self._resolve_values(case, value)
                     value = value.strip()

cime_config/streams_v2.0.xsd

@@ -6,19 +6,20 @@
   <!-- ======================== -->
 
   <xs:attribute name="name"       type="xs:string"/>
-  <xs:attribute name="first_year" type="xs:integer"/>
-  <xs:attribute name="last_year"  type="xs:integer"/>
+  <xs:attribute name="first_year" type="xs:string"/>
+  <xs:attribute name="last_year"  type="xs:string"/>
   <xs:attribute name="model_grid" type="xs:string"/>
+  <xs:attribute name="compset"    type="xs:string"/>
   <xs:attribute name="version"    type="xs:string"/>
 
   <!-- ======================== -->
   <!-- simple elements -->
   <!-- ======================== -->
 
   <xs:element name="stream_lev_dimname" type="xs:string"/>
-  <xs:element name="stream_year_first"  type="xs:string"/> 
-  <xs:element name="stream_year_last"   type="xs:string"/> 
-  <xs:element name="stream_year_align"  type="xs:string"/> 
+  <xs:element name="stream_year_first"  type="xs:string"/>
+  <xs:element name="stream_year_last"   type="xs:string"/>
+  <xs:element name="stream_year_align"  type="xs:string"/>
   <xs:element name="stream_offset"      type="xs:integer"/>
 
   <xs:element name="stream_readmode">
@@ -32,13 +33,13 @@
 
   <xs:element name="stream_vectors">
     <xs:simpleType>
-      <xs:list itemType="xs:string"/> 
+      <xs:list itemType="xs:string"/>
     </xs:simpleType>
   </xs:element>
 
   <xs:element name="var">
     <xs:simpleType>
-      <xs:list itemType="xs:string"/> 
+      <xs:list itemType="xs:string"/>
     </xs:simpleType>
   </xs:element>
 
@@ -76,6 +77,7 @@
       <xs:simpleContent>
         <xs:extension base="xs:string">
           <xs:attribute name="model_grid" type="xs:string" />
+          <xs:attribute name="compset" type="xs:string" />
         </xs:extension>
       </xs:simpleContent>
     </xs:complexType>
@@ -100,6 +102,7 @@
       <xs:simpleContent>
         <xs:extension base="taxmodeType">
           <xs:attribute ref="model_grid"/>
+          <xs:attribute ref="compset"/>
         </xs:extension>
       </xs:simpleContent>
     </xs:complexType>
@@ -125,6 +128,7 @@
       <xs:simpleContent>
         <xs:extension base="mapalgoType">
           <xs:attribute ref="model_grid"/>
+          <xs:attribute ref="compset"/>
         </xs:extension>
       </xs:simpleContent>
     </xs:complexType>
@@ -142,6 +146,7 @@
       <xs:simpleContent>
         <xs:extension base="xs:string">
           <xs:attribute ref="model_grid"/>
+          <xs:attribute ref="compset"/>
         </xs:extension>
       </xs:simpleContent>
     </xs:complexType>

datm/CMakeLists.txt

@@ -1,16 +1,28 @@
 project(datm Fortran)
+set(SRCFILES atm_comp_nuopc.F90
+             datm_datamode_clmncep_mod.F90
+             datm_datamode_cplhist_mod.F90
+             datm_datamode_core2_mod.F90
+             datm_datamode_jra_mod.F90
+             datm_datamode_cfsr_mod.F90
+             datm_datamode_era5_mod.F90)
 
-add_library(datm atm_comp_nuopc.F90
-		 datm_datamode_clmncep_mod.F90
-		 datm_datamode_core2_mod.F90
-		 datm_datamode_jra_mod.F90
-		 datm_datamode_cfsr_mod.F90
-		 datm_datamode_era5_mod.F90)
+foreach(FILE ${SRCFILES})
+  if(EXISTS "${CASEROOT}/SourceMods/src.datm/${FILE}")
+    list(REMOVE_ITEM SRCFILES ${FILE})
+    list(APPEND SRCFILES "${CASEROOT}/SourceMods/src.datm/${FILE}")
+    message("Using ${FILE} from ${CASEROOT}/SourceMods/src.datm")
+  endif()
+endforeach()
+
+message("DATM srcfiles are ${SRCFILES}")
+
+add_library(datm ${SRCFILES})
 
 add_dependencies(datm dshr streams)
-target_include_directories (datm PUBLIC ${ESMF_F90COMPILEPATHS})
-target_include_directories (datm PUBLIC "${CMAKE_BINARY_DIR}/dshr")
-target_include_directories (datm PUBLIC "${CMAKE_SOURCE_DIR}")
-target_include_directories (datm PUBLIC "${CMAKE_BINARY_DIR}/share")
-target_include_directories (datm PUBLIC "${CMAKE_BINARY_DIR}/streams")
-target_include_directories (datm PUBLIC "${PIO_Fortran_INCLUDE_DIR}")
+target_include_directories (datm PRIVATE ${ESMF_F90COMPILEPATHS})
+target_include_directories (datm PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/dshr)
+target_include_directories (datm PRIVATE ${CMAKE_SOURCE_DIR})
+target_include_directories (datm PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/share)
+target_include_directories (datm PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/streams)
+target_include_directories (datm PRIVATE ${PIO_Fortran_INCLUDE_DIR})

datm/atm_comp_nuopc.F90

@@ -4,7 +4,15 @@ module atm_comp_nuopc
   ! This is the NUOPC cap for DATM
   !----------------------------------------------------------------------------
 
-  use ESMF
+  use ESMF             , only : ESMF_Mesh, ESMF_GridComp, ESMF_SUCCESS, ESMF_LogWrite
+  use ESMF             , only : ESMF_GridCompSetEntryPoint, ESMF_METHOD_INITIALIZE
+  use ESMF             , only : ESMF_MethodRemove, ESMF_State, ESMF_Clock, ESMF_TimeInterval
+  use ESMF             , only : ESMF_State, ESMF_Field, ESMF_LOGMSG_INFO, ESMF_ClockGet
+  use ESMF             , only : ESMF_Time, ESMF_Alarm, ESMF_TimeGet, ESMF_TimeInterval
+  use ESMF             , only : operator(+), ESMF_TimeIntervalGet, ESMF_ClockGetAlarm
+  use ESMF             , only : ESMF_AlarmIsRinging, ESMF_AlarmRingerOff, ESMF_StateGet
+  use ESMF             , only : ESMF_FieldGet, ESMF_MAXSTR
+  use ESMF             , only : ESMF_TraceRegionEnter, ESMF_TraceRegionExit
   use NUOPC            , only : NUOPC_CompDerive, NUOPC_CompSetEntryPoint, NUOPC_CompSpecialize
   use NUOPC            , only : NUOPC_CompAttributeGet, NUOPC_Advertise
   use NUOPC_Model      , only : model_routine_SS        => SetServices
@@ -26,21 +34,31 @@ module atm_comp_nuopc
   use dshr_mod         , only : dshr_orbital_init, dshr_orbital_update
   use dshr_dfield_mod  , only : dfield_type, dshr_dfield_add, dshr_dfield_copy
   use dshr_fldlist_mod , only : fldlist_type, dshr_fldlist_add, dshr_fldlist_realize
+
   use datm_datamode_core2_mod   , only : datm_datamode_core2_advertise
   use datm_datamode_core2_mod   , only : datm_datamode_core2_init_pointers
   use datm_datamode_core2_mod   , only : datm_datamode_core2_advance
   use datm_datamode_core2_mod   , only : datm_datamode_core2_restart_write
   use datm_datamode_core2_mod   , only : datm_datamode_core2_restart_read
+
   use datm_datamode_jra_mod     , only : datm_datamode_jra_advertise
   use datm_datamode_jra_mod     , only : datm_datamode_jra_init_pointers
   use datm_datamode_jra_mod     , only : datm_datamode_jra_advance
   use datm_datamode_jra_mod     , only : datm_datamode_jra_restart_write
   use datm_datamode_jra_mod     , only : datm_datamode_jra_restart_read
+
   use datm_datamode_clmncep_mod , only : datm_datamode_clmncep_advertise
   use datm_datamode_clmncep_mod , only : datm_datamode_clmncep_init_pointers
   use datm_datamode_clmncep_mod , only : datm_datamode_clmncep_advance
   use datm_datamode_clmncep_mod , only : datm_datamode_clmncep_restart_write
   use datm_datamode_clmncep_mod , only : datm_datamode_clmncep_restart_read
+
+  use datm_datamode_cplhist_mod , only : datm_datamode_cplhist_advertise
+  use datm_datamode_cplhist_mod , only : datm_datamode_cplhist_init_pointers
+  use datm_datamode_cplhist_mod , only : datm_datamode_cplhist_advance
+  use datm_datamode_cplhist_mod , only : datm_datamode_cplhist_restart_write
+  use datm_datamode_cplhist_mod , only : datm_datamode_cplhist_restart_read
+
   use datm_datamode_era5_mod    , only : datm_datamode_era5_advertise
   use datm_datamode_era5_mod    , only : datm_datamode_era5_init_pointers
   use datm_datamode_era5_mod    , only : datm_datamode_era5_advance
@@ -52,6 +70,12 @@ module atm_comp_nuopc
   use datm_datamode_cfsr_mod    , only : datm_datamode_cfsr_restart_write
   use datm_datamode_cfsr_mod    , only : datm_datamode_cfsr_restart_read
 
+  use datm_datamode_cfsr_mod    , only : datm_datamode_cfsr_advertise
+  use datm_datamode_cfsr_mod    , only : datm_datamode_cfsr_init_pointers
+  use datm_datamode_cfsr_mod    , only : datm_datamode_cfsr_advance
+  use datm_datamode_cfsr_mod    , only : datm_datamode_cfsr_restart_write
+  use datm_datamode_cfsr_mod    , only : datm_datamode_cfsr_restart_read
+
   implicit none
   private ! except
 
@@ -289,6 +313,7 @@ subroutine InitializeAdvertise(gcomp, importState, exportState, clock, rc)
          trim(datamode) == 'CORE2_IAF'    .or. &
          trim(datamode) == 'CORE_IAF_JRA' .or. &
          trim(datamode) == 'CLMNCEP'      .or. &
+         trim(datamode) == 'CPLHIST'      .or. &
          trim(datamode) == 'CFSR'         .or. &
          trim(datamode) == 'ERA5') then
     else
@@ -308,6 +333,10 @@ subroutine InitializeAdvertise(gcomp, importState, exportState, clock, rc)
        call datm_datamode_clmncep_advertise(exportState, fldsExport, flds_scalar_name, &
             flds_co2, flds_wiso, flds_presaero, rc)
        if (ChkErr(rc,__LINE__,u_FILE_u)) return
+    case ('CPLHIST')
+       call datm_datamode_cplhist_advertise(exportState, fldsExport, flds_scalar_name, &
+            flds_co2, flds_wiso, flds_presaero, rc)
+       if (ChkErr(rc,__LINE__,u_FILE_u)) return
     case ('ERA5')
        call datm_datamode_era5_advertise(exportState, fldsExport, flds_scalar_name, rc)
        if (ChkErr(rc,__LINE__,u_FILE_u)) return
@@ -547,6 +576,9 @@ subroutine datm_comp_run(importState, exportState, target_ymd, target_tod, targe
        case('CLMNCEP')
           call datm_datamode_clmncep_init_pointers(importState, exportState, sdat, rc)
           if (ChkErr(rc,__LINE__,u_FILE_u)) return
+       case('CPLHIST')
+          call datm_datamode_cplhist_init_pointers(importState, exportState, sdat, rc)
+          if (ChkErr(rc,__LINE__,u_FILE_u)) return
        case('ERA5')
           call datm_datamode_era5_init_pointers(exportState, sdat, rc)
           if (ChkErr(rc,__LINE__,u_FILE_u)) return
@@ -564,6 +596,8 @@ subroutine datm_comp_run(importState, exportState, target_ymd, target_tod, targe
              call datm_datamode_jra_restart_read(restfilm, inst_suffix, logunit, my_task, mpicom, sdat)
           case('CLMNCEP')
              call datm_datamode_clmncep_restart_read(restfilm, inst_suffix, logunit, my_task, mpicom, sdat)
+          case('CPLHIST')
+             call datm_datamode_cplhist_restart_read(restfilm, inst_suffix, logunit, my_task, mpicom, sdat)
           case('ERA5')
              call datm_datamode_era5_restart_read(restfilm, inst_suffix, logunit, my_task, mpicom, sdat)
           case('CFSR')
@@ -608,6 +642,9 @@ subroutine datm_comp_run(importState, exportState, target_ymd, target_tod, targe
     case('CLMNCEP')
        call datm_datamode_clmncep_advance(masterproc, logunit, mpicom,  rc)
        if (ChkErr(rc,__LINE__,u_FILE_u)) return
+    case('CPLHIST')
+       call datm_datamode_cplhist_advance(masterproc, logunit, mpicom,  rc)
+       if (ChkErr(rc,__LINE__,u_FILE_u)) return
     case('ERA5')
        call datm_datamode_era5_advance(exportstate, masterproc, logunit, mpicom, target_ymd, &
             target_tod, sdat%model_calendar, rc)
@@ -633,6 +670,10 @@ subroutine datm_comp_run(importState, exportState, target_ymd, target_tod, targe
           call datm_datamode_clmncep_restart_write(case_name, inst_suffix, target_ymd, target_tod, &
                logunit, my_task, sdat)
           if (ChkErr(rc,__LINE__,u_FILE_u)) return
+       case('CPLHIST')
+          call datm_datamode_cplhist_restart_write(case_name, inst_suffix, target_ymd, target_tod, &
+               logunit, my_task, sdat)
+          if (ChkErr(rc,__LINE__,u_FILE_u)) return
        case('ERA5')
           call datm_datamode_era5_restart_write(case_name, inst_suffix, target_ymd, target_tod, &
                logunit, my_task, sdat)