CMEPS PR for CDEPS Inline implementation

.github/workflows/srt.yml

@@ -79,18 +79,22 @@ jobs:
       - name: checkout externals
         run: |
           pushd cesm
-          ./manage_externals/checkout_externals ccs_config cdeps cime share mct cpl7 parallelio
+          ./manage_externals/checkout_externals ccs_config cdeps share mct cpl7 parallelio
           cd ccs_config
-          git checkout main
-          cd ../cime
-          git checkout master
+          git checkout main 
+          cd ../
+          git clone https://github.com/ESMCI/cime
+          cd cime
           if [[ ! -e "${PWD}/.gitmodules.bak" ]]
              then
-              echo "Convering [email protected] to https://github.com urls in ${PWD}/.gitmodules"
+              echo "Converting [email protected] to https://github.com urls in ${PWD}/.gitmodules"
 
               sed -i".bak" "s/[email protected]:/https:\/\/github.com\//g" "${PWD}/.gitmodules"
           fi
           git submodule update --init
+          cd ../components/cdeps
+          git checkout main
+
       - name: Cache ESMF
         id: cache-esmf
         uses: actions/cache@v3

cesm/driver/ensemble_driver.F90

@@ -145,7 +145,7 @@ subroutine SetModelServices(ensemble_driver, rc)
     integer                :: pio_asyncio_stride
     integer                :: pio_asyncio_rootpe
     integer                :: Global_Comm
-    character(len=CL)          :: start_type     ! Type of startup
+    character(len=CL)      :: start_type     ! Type of startup
     character(len=7)       :: drvrinst
     character(len=5)       :: inst_suffix
     character(len=CX)      :: msgstr
@@ -377,10 +377,8 @@ subroutine SetModelServices(ensemble_driver, rc)
        endif
        call shr_log_setLogUnit (logunit)
        ! Create a clock for each driver instance
-
        call esm_time_clockInit(ensemble_driver, driver, logunit, localpet==petList(1), rc)
        if (chkerr(rc,__LINE__,u_FILE_u)) return
-
     enddo
     inst = localPet/(ntasks_per_member+pio_asyncio_ntasks) + 1
 

cesm/driver/esm.F90

@@ -1517,6 +1517,7 @@ subroutine esm_finalize(driver, rc)
 
     call ESMF_LogWrite(trim(subname)//": called", ESMF_LOGMSG_INFO)
     rc = ESMF_SUCCESS
+
     call shr_log_setLogunit(logunit)
     call ESMF_GridCompGet(driver, vm=vm, rc=rc)
     if (chkerr(rc,__LINE__,u_FILE_u)) return

cesm/driver/esm_time_mod.F90

@@ -282,7 +282,6 @@ subroutine esm_time_clockInit(ensemble_driver, instance_driver, logunit, maintas
     call ESMF_TimeSet( RefTime, yy=yr, mm=mon, dd=day, s=ref_tod, rc=rc)
     if (ChkErr(rc,__LINE__,u_FILE_u)) return
 
-
     call ESMF_TimeIntervalSet( TimeStep, s=dtime_drv, rc=rc )
     if (ChkErr(rc,__LINE__,u_FILE_u)) return