diff --git a/.gitmodules b/.gitmodules index e625fbe2b0..0aa0a2000a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -17,7 +17,7 @@ [submodule "CMEPS"] path = CMEPS-interface/CMEPS url = https://github.com/NOAA-EMC/CMEPS - branch = emc/develop + branch = production/GFS.v17 [submodule "HYCOM"] path = HYCOM-interface/HYCOM url = https://github.com/NOAA-EMC/HYCOM-src @@ -29,7 +29,7 @@ [submodule "CICE"] path = CICE-interface/CICE url = https://github.com/NOAA-EMC/CICE - branch = develop + branch = production/GFS.v17 [submodule "CDEPS"] path = CDEPS-interface/CDEPS url = https://github.com/NOAA-EMC/CDEPS diff --git a/CDEPS-interface/ufs/cdeps_share/shr_is_restart_fh_mod.F90 b/CDEPS-interface/ufs/cdeps_share/shr_is_restart_fh_mod.F90 index 234040e0f1..205f1f6014 100644 --- a/CDEPS-interface/ufs/cdeps_share/shr_is_restart_fh_mod.F90 +++ b/CDEPS-interface/ufs/cdeps_share/shr_is_restart_fh_mod.F90 @@ -128,11 +128,12 @@ end subroutine is_restart_fh !! @param[in] prefixtime optional, if true log filename has time prefix !! @param[in] lastrestart optional, if present, write the time of the last restart !! @param[in] lastoutput optional, if present, write the filename written at this FH + !! @param[in] output_dir optional, if present, write logs to specified directory !! @param[out] rc return code !! !> @authorDenise.Worthen@noaa.gov !> @date 04-14-2025 - subroutine log_restart_fh(myTime, startTime, complog, prefixtime, lastrestart, lastoutput, rc) + subroutine log_restart_fh(myTime, startTime, complog, prefixtime, lastrestart, lastoutput, output_dir, rc) use ESMF, only : ESMF_SUCCESS, ESMF_MAXSTR, ESMF_Time, ESMF_TimeInterval use ESMF, only : ESMF_TimeGet, ESMF_TimeIntervalGet @@ -143,6 +144,7 @@ subroutine log_restart_fh(myTime, startTime, complog, prefixtime, lastrestart, l logical, intent(in), optional :: prefixtime type(ESMF_Time), intent(in), optional :: lastrestart character(len=*), intent(in), optional :: lastoutput + character(len=*), intent(in), optional :: output_dir integer, intent(out) :: rc ! local variables @@ -181,6 +183,17 @@ subroutine log_restart_fh(myTime, startTime, complog, prefixtime, lastrestart, l else write(filename,'(a,i4.4)')'log.'//trim(complog)//'.f',int(fhour) end if + + if (present(output_dir)) then + if (len_trim(output_dir) > 0) then + if (output_dir(len_trim(output_dir):len_trim(output_dir)) /= '/') then + filename = trim(output_dir)//'/'//trim(filename) + else + filename = trim(output_dir)//trim(filename) + end if + end if + end if + if (present(lastrestart)) then call ESMF_TimeGet(lastrestart, yy=yr, mm=mon, dd=day, h=hour, m=minute, s=sec, rc=rc) if (ESMF_LogFoundError(rcToCheck=rc, msg=ESMF_LOGERR_PASSTHRU, line=__LINE__, file=__FILE__)) return diff --git a/CICE-interface/CICE b/CICE-interface/CICE index c90ee5a0e7..77542dcc69 160000 --- a/CICE-interface/CICE +++ b/CICE-interface/CICE @@ -1 +1 @@ -Subproject commit c90ee5a0e72ecc9cbee4694e95df228d01f8d7dd +Subproject commit 77542dcc69403e88c5e35e9f48391f2ed4872f79 diff --git a/CMEPS-interface/CMEPS b/CMEPS-interface/CMEPS index 607a0bddce..fddd80a9bb 160000 --- a/CMEPS-interface/CMEPS +++ b/CMEPS-interface/CMEPS @@ -1 +1 @@ -Subproject commit 607a0bddcef8b8c4f0c80886be68db88fe52429f +Subproject commit fddd80a9bb7c96533147c844a6d7208d425aad59 diff --git a/MOM6-interface/MOM6 b/MOM6-interface/MOM6 index 5c21e918af..5d7b7c283a 160000 --- a/MOM6-interface/MOM6 +++ b/MOM6-interface/MOM6 @@ -1 +1 @@ -Subproject commit 5c21e918af02e947d7f1cd3609f26c50fb7ce9fd +Subproject commit 5d7b7c283ae9dc04946c5583b864a50fd0078ec1