Merge remote-tracking branch 'remotes/upstream/develop' into feature/3dtke_gfspbl

Author: BinLiu-NOAA

.cicd/Jenkinsfile

@@ -78,7 +78,7 @@ def generateStage(nodeLabel) {
 			    set +x
 
                             echo "Testing concluded...removing labels for $machine from $GIT_URL"
-                            echo "https://api.github.com/repos/${GIT_OWNER}/${GIT_REPO_NAME}/issues/${CHANGE_ID}/labels /{$machine-RT,$machine-BL}"
+                            echo "https://api.github.com/repos/${GIT_OWNER}/${GIT_REPO_NAME}/issues/${CHANGE_ID}/labels/{$machine-RT,$machine-BL}"
                             curl --silent -X DELETE -H "Accept: application/vnd.github.v3+json" -H "Authorization: Bearer ${GITHUB_TOKEN}"  https://api.github.com/repos/${GIT_OWNER}/${GIT_REPO_NAME}/issues/${CHANGE_ID}/labels/{$machine-RT,$machine-BL}
                         '''
                         currentBuild.result = 'FAILURE'
@@ -131,7 +131,7 @@ def generateStage(nodeLabel) {
 			    set +x
 
 			    echo "Testing concluded...removing label ${label} for ${machine} from ${GIT_URL}"
-			    echo "https://api.github.com/repos/${GIT_OWNER}/${GIT_REPO_NAME}/issues/${CHANGE_ID}/labels /${machine}-${label}"
+			    echo "https://api.github.com/repos/${GIT_OWNER}/${GIT_REPO_NAME}/issues/${CHANGE_ID}/labels/${machine}-${label}"
 			    curl --silent -X DELETE -H "Accept: application/vnd.github.v3+json" -H "Authorization: Bearer ${GITHUB_TOKEN}"  https://api.github.com/repos/${GIT_OWNER}/${GIT_REPO_NAME}/issues/${CHANGE_ID}/labels/{$machine-RT,$machine-BL}
 			'''
                 }
@@ -150,7 +150,7 @@ pipeline {
     parameters {
         booleanParam name: 'WM_BUILD', defaultValue: false, description: 'Whether to attempt to compile the model code tests'
         // Regression Test Suite ?
-        choice(name: 'WM_OPERATIONAL_TESTS', choices: ['default', 'control_p8', 'cpld_control_p8', 'comprehensive', 'rt.sh', 'none'], description: 'Specify the suite of tests to run')
+        choice(name: 'WM_OPERATIONAL_TESTS', choices: ['rt.conf', 'default', 'control_p8', 'cpld_control_p8', 'comprehensive', 'none'], description: 'Specify the suite of tests to run')
     }
     environment {
         ACCNR = 'epic'

.cicd/README.txt

@@ -0,0 +1,2 @@
+This folder contains scripts to perform automated builds.
+It is intended to collect important performance metrics for trending.

.github/pull_request_template.md

@@ -103,6 +103,15 @@ Please delete what is not needed.
 * Blocked by #
 * None
 
+### Documentation:
+<!--
+Indicate what documentation, if any, is needed for this PR and who will add it (if applicable).
+Please delete what is not needed.
+-->
+* This PR requires a documentation update, and the WM User's Guide has been updated based on the changes in this PR.
+* This PR requires a documentation update, and a WM issue has been opened to track the need for a documentation update; a person responsible for submitting the update has been assigned to the issue (link issue). 
+* No documentation update is required for this PR (please explain).
+
 ---
 ## Changes
 ### Regression Test Changes (Please commit test_changes.list):
@@ -145,7 +154,6 @@ Please delete what is not needed.
   - [ ] Hera
   - [ ] Orion
   - [ ] Hercules
-  - [ ] GaeaC5
   - [ ] GaeaC6
   - [ ] Derecho
 - WCOSS2

.github/workflows/aux.yml

@@ -15,7 +15,7 @@ env:
 jobs:
   pre:
     name: Preprocess
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
 
     steps:
       - name: Share helper id
@@ -28,7 +28,7 @@ jobs:
 
   repocheck:
     name: Repo check
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     steps:
       - name: Check up-to-dateness and post comment

.github/workflows/build_test._yml

@@ -10,7 +10,7 @@ env:
 jobs:
   repocheck:
     name: Check if repos are up to date
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     outputs:
       current: ${{ steps.check.outputs.current }}

AQM

@@ -19,6 +19,7 @@ module shr_is_restart_fh_mod
   end type is_restart_fh_type
 
   public :: init_is_restart_fh, is_restart_fh, finalize_restart_fh, is_restart_fh_type
+  public :: log_restart_fh
 
 contains
 
@@ -81,7 +82,7 @@ subroutine init_is_restart_fh(currentTime, dtime, lLog, restartfh_info)
       call ESMF_ConfigDestroy(CF_mc, rc=rc)
       if (ESMF_LogFoundError(rcToCheck=rc, msg=ESMF_LOGERR_PASSTHRU, line=__LINE__, file=__FILE__)) return
     end if !model_configure
-  
+
   end subroutine init_is_restart_fh
 
   subroutine is_restart_fh(clock, restartfh_info, lWrite)
@@ -91,7 +92,7 @@ subroutine is_restart_fh(clock, restartfh_info, lWrite)
     !
     ! !USES:
     use ESMF, only : ESMF_ClockGetNextTime
-    
+
     !
     ! !ARGUMENTS:
     type(ESMF_Clock), intent(in) :: clock
@@ -114,8 +115,59 @@ subroutine is_restart_fh(clock, restartfh_info, lWrite)
     end if
 
     lWrite = restartfh_info%write_restartfh
-    
+
   end subroutine is_restart_fh
+  !===============================================================================
+  !> Write a log file
+  !!
+  !> @details Write a log file for a named component when a restart file is written
+  !!
+  !! @param[in]   nextTime      the ESMF time at the end of a ModelAdvance
+  !! @param[in]   startTime     the ESMF time at the Model Start
+  !! @param[in]   complog       the named component
+  !! @param[out]  rc return code
+  !!
+  !> @authorDenise.Worthen@noaa.gov
+  !> @date 04-14-2025
+  subroutine log_restart_fh(nextTime, startTime, complog, rc)
+
+    use ESMF,              only : ESMF_SUCCESS, ESMF_MAXSTR, ESMF_Time, ESMF_TimeInterval
+    use ESMF,              only : ESMF_TimeGet, ESMF_TimeIntervalGet
+    use ESMF,              only : operator(==), operator(-)
+
+    type(ESMF_Time),  intent(in) :: nextTime, startTime
+    character(len=*), intent(in) :: complog
+    integer,         intent(out) :: rc
+
+    ! local variables
+    type(ESMF_TimeInterval)     :: elapsedTime
+    real(ESMF_KIND_R8)          :: fhour
+    character(ESMF_MAXSTR)      :: filename
+    character(ESMF_MAXSTR)      :: nexttimestring
+    integer                     :: fh_logunit
+    integer                     :: yr,mon,day,hour,minute,sec ! time units
+    character(len=*), parameter :: subname='(log_restart_fh)'
+    !-----------------------------------------------------------------------
+
+    call ESMF_LogWrite(trim(subname)//": called", ESMF_LOGMSG_INFO)
+    rc = ESMF_SUCCESS
+
+    elapsedTime = nextTime - startTime
+    call ESMF_TimeIntervalGet(elapsedTime, h_r8=fhour,rc=rc)
+    if (ESMF_LogFoundError(rcToCheck=rc, msg=ESMF_LOGERR_PASSTHRU, line=__LINE__, file=__FILE__)) return
+
+    call ESMF_TimeGet(nexttime, 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
+    write(nexttimestring,'(6i8)')yr,mon,day,hour,minute,sec
+
+    write(filename,'(a,i4.4)')'log.'//trim(complog)//'.f',int(fhour)
+    open(newunit=fh_logunit,file=trim(filename))
+    write(fh_logunit,'(a)')'completed: '//trim(complog)
+    write(fh_logunit,'(a,f10.3)')'forecast hour:',fhour
+    write(fh_logunit,'(a)')'valid time: '//trim(nexttimestring)
+    close(fh_logunit)
+
+  end subroutine log_restart_fh
 
   subroutine finalize_restart_fh(restartfh_info)
     !

CDEPS-interface/CDEPS

@@ -43,7 +43,7 @@ include(cmake/configure_apps.cmake)
 
 message("")
 message("FMS .............. ${FMS}")
-message("FV3 .............. ${FV3}")
+message("FV3_dy ........... ${FV3}")
 message("AQM .............. ${AQM}")
 message("GOCART ........... ${UFS_GOCART}")
 message("MOM6 ............. ${MOM6}")
@@ -141,7 +141,10 @@ else()
   set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Set type of build to Release." FORCE)
 endif()
 
-include(cmake/${CMAKE_Fortran_COMPILER_ID}.cmake)
+# Detect and set UFS_COMPILER_SUITE in detect_compiler_suite.cmake
+set(UFS_COMPILER_SUITE)
+include(cmake/detect_compiler_suite.cmake)
+include(cmake/${UFS_COMPILER_SUITE}.cmake)
 
 ###############################################################################
 ### Find Dependencies
@@ -190,6 +193,11 @@ endif()
 
 ###############################################################################
 ### Atmosphere Components [FV3, MPAS?]
+### DJS2024: There will be a generalized atmospheric component with multiple
+###          dycores, not multiple atmospheric components (one for each dycore).
+###          So, - rename the atmospheric component FV3 to UFSATM or ATM, then
+###              - if FV3 or MPAS, add_sudirectory(UFSATM or ATM)
+###
 ###############################################################################
 if(FV3)
   add_subdirectory(FV3)
@@ -318,9 +326,9 @@ if(STOCH_PHYS)
 endif()
 
 if(FV3)
-  add_dependencies(ufs fv3atm)
-  list(APPEND _ufs_defs_private FRONT_FV3=fv3atm_cap_mod)
-  list(APPEND _ufs_libs_public fv3atm)
+  add_dependencies(ufs ufsatm_fv3)
+  list(APPEND _ufs_defs_private FRONT_FV3=${DYCORE_TARGET_CAP_MOD})
+  list(APPEND _ufs_libs_public ${DYCORE_TARGET})
 endif()
 
 if(MOM6)