merge to master

ESCOMP · Sep 21, 2022 · cdbd5c1 · cdbd5c1
1 parent c550a3f
commit cdbd5c1
Show file tree

Hide file tree

Showing 4 changed files with 1,211 additions and 16 deletions.
diff --git a/cesm/driver/ensemble_driver.F90 b/cesm/driver/ensemble_driver.F90
@@ -371,7 +371,7 @@ subroutine InitializeIO(ensemble_driver, rc)
     use ESMF, only: ESMF_CONFIG, ESMF_GridCompIsPetLocal, ESMF_State, ESMF_Clock
     use NUOPC, only: NUOPC_CompAttributeGet, NUOPC_CompGet
     use NUOPC_DRIVER, only: NUOPC_DriverGetComp
-    use shr_pio_mod   , only: shr_pio_init, shr_pio_component_init
+    use driver_pio_mod   , only: driver_pio_init, driver_pio_component_init
 
     type(ESMF_GridComp) :: ensemble_driver
     type(ESMF_VM) :: ensemble_vm
@@ -402,11 +402,11 @@ subroutine InitializeIO(ensemble_driver, rc)
           call NUOPC_CompGet(dcomp(drv), name=compname, rc=rc)
           if (chkerr(rc,__LINE__,u_FILE_u)) return
           call ESMF_LogWrite(trim(subname)//": call shr_pio_init "//compname, ESMF_LOGMSG_INFO)
-          call shr_pio_init(dcomp(drv), rc=rc)
+          call driver_pio_init(dcomp(drv), rc=rc)
           if (chkerr(rc,__LINE__,u_FILE_u)) return
 
           call ESMF_LogWrite(trim(subname)//": call shr_pio_component_init "//compname, ESMF_LOGMSG_INFO)
-          call shr_pio_component_init(dcomp(drv), Global_Comm, asyncio_petlist, rc)
+          call driver_pio_component_init(dcomp(drv), Global_Comm, asyncio_petlist, rc)
           if (chkerr(rc,__LINE__,u_FILE_u)) return
           call ESMF_LogWrite(trim(subname)//": shr_pio_component_init done "//compname, ESMF_LOGMSG_INFO)
        endif

diff --git a/cesm/nuopc_cap_share/driver_pio_mod.F90 b/cesm/nuopc_cap_share/driver_pio_mod.F90
@@ -169,7 +169,7 @@ subroutine driver_pio_init(driver, rc)
 
   end subroutine driver_pio_init
 
-  subroutine driver_pio_component_init(driver, ncomps, rc)
+  subroutine driver_pio_component_init(driver, Global_comm, asyncio_petlist, rc)
     use ESMF, only : ESMF_GridComp, ESMF_LogSetError, ESMF_RC_NOT_VALID, ESMF_GridCompIsCreated, ESMF_VM, ESMF_VMGet
     use ESMF, only : ESMF_GridCompGet, ESMF_GridCompIsPetLocal, ESMF_VMIsCreated, ESMF_Finalize, ESMF_PtrInt1D
     use ESMF, only : ESMF_LOGMSG_INFO, ESMF_LOGWRITE
@@ -457,8 +457,8 @@ subroutine driver_pio_component_init(driver, ncomps, rc)
     deallocate(gcomp)
   end subroutine driver_pio_component_init
 
-  subroutine driver_pio_log_comp_settings(gcomp, logunit)
-    use ESMF, only : ESMF_GridComp, ESMF_GridCompGet
+  subroutine driver_pio_log_comp_settings(gcomp, logunit, rc)
+    use ESMF, only : ESMF_GridComp, ESMF_GridCompGet, ESMF_SUCCESS
     use NUOPC, only: NUOPC_CompAttributeGet
 
     type(ESMF_GridComp) :: gcomp

diff --git a/cesm/nuopc_cap_share/nuopc_shr_methods.F90 b/cesm/nuopc_cap_share/nuopc_shr_methods.F90
@@ -170,8 +170,8 @@ subroutine set_component_logging(gcomp, mastertask, logunit, shrlogunit, rc)
        open(newunit=logunit,file=trim(diro)//"/"//trim(logfile))
 
        ! Write the PIO settings to the beggining of each component log
-       call driver_pio_log_comp_settings(gcomp, logunit)
-
+       call driver_pio_log_comp_settings(gcomp, logunit, rc)
+       if (chkerr(rc,__LINE__,u_FILE_u)) return
     else
        logUnit = 6
     endif