Fix compilation warnings and update WW3

.cicd/Jenkinsfile

@@ -187,20 +187,18 @@ pipeline {
     }
     post {
         success {
-            node('built-in') {
-                echo 'This will run only if successful.'
-                sh '''
-                  aws sns publish --topic-arn "arn:aws:sns:us-east-1:${AWS_PROD_ACCOUNT_ID}:${AWS_PROD_SNS_TOPIC}" --region us-east-1 --message '{"version":"1.0","source":"custom","content":{"description":":sunny: Jenkins build *'"$JOB_NAME"' '"$BUILD_NUMBER"'* with *PR-'"$CHANGE_ID"'*  *succeeded*"}}'
-               '''
-            }
+            slackSend (
+                channel: '#jenkins-notifications',
+                color: 'good',
+                message: "*SUCCESS: Build ${env.JOB_NAME} #${env.BUILD_NUMBER}* <${env.BUILD_URL}|Open Build>"
+            )
         }
         failure {
-            node('built-in') {
-                echo 'This will run only if the run was marked as unstable.'
-                sh '''
-                  aws sns publish --topic-arn "arn:aws:sns:us-east-1:${AWS_PROD_ACCOUNT_ID}:${AWS_PROD_SNS_TOPIC}" --region us-east-1 --message '{"version":"1.0","source":"custom","content":{"description":":warning: Jenkins build *'"$JOB_NAME"' '"$BUILD_NUMBER"'* with *PR-'"$CHANGE_ID"'*  *failed!*"}}'
-               '''
-            }
+            slackSend (
+                channel: '#jenkins-notifications',
+                color: 'danger',
+                message: "*FAILURE: Build ${env.JOB_NAME} #${env.BUILD_NUMBER}*  <${env.BUILD_URL}|Open Build>"
+            )
         }
 	always {
             script {

.gitmodules

@@ -4,8 +4,10 @@
   branch = develop
 [submodule "WW3"]
   path = WW3
-  url = https://github.com/NOAA-EMC/WW3
-  branch = dev/ufs-weather-model
+  #url = https://github.com/NOAA-EMC/WW3
+  url = https://github.com/mingchen-NOAA/WW3
+  #branch = dev/ufs-weather-model
+  branch = develop2devufswmplusfixwarnings
 [submodule "stochastic_physics"]
   path = stochastic_physics
   url = https://github.com/NOAA-PSL/stochastic_physics

CDEPS-interface/CMakeLists.txt

@@ -32,7 +32,7 @@ set_target_properties(share PROPERTIES Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_
 target_include_directories(share PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/ufs/cdeps_share)
 target_include_directories(share PRIVATE $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/mod>)
 target_compile_definitions(share PRIVATE ${CDEPS_SHARE_DEFS})
-target_link_libraries(share PRIVATE esmf)
+target_link_libraries(share PRIVATE ESMF::ESMF)
 
 # CDEPS/streams
 add_library(streams OBJECT ${cdeps_streams_files})
@@ -41,71 +41,71 @@ set_target_properties(streams PROPERTIES Fortran_MODULE_DIRECTORY ${CMAKE_CURREN
 target_include_directories(streams PRIVATE $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/mod>)
 target_compile_definitions(streams PUBLIC "DISABLE_FoX")
 target_link_libraries(streams PRIVATE share)
-target_link_libraries(streams PRIVATE esmf PIO::PIO_Fortran)
+target_link_libraries(streams PRIVATE ESMF::ESMF PIO::PIO_Fortran)
 
 # CDEPS/dshr
 add_library(dshr OBJECT ${cdeps_dshr_files})
 add_dependencies(dshr share streams)
 set_target_properties(dshr PROPERTIES Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/mod)
 target_include_directories(dshr PRIVATE $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/mod>)
 target_link_libraries(dshr PRIVATE share streams)
-target_link_libraries(dshr PRIVATE esmf PIO::PIO_Fortran)
+target_link_libraries(dshr PRIVATE ESMF::ESMF PIO::PIO_Fortran)
 
 # CDEPS/datm
 add_library(datm OBJECT ${cdeps_datm_files})
 add_dependencies(datm share streams dshr)
 set_target_properties(datm PROPERTIES Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/mod)
 target_include_directories(datm PRIVATE $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/mod>)
 target_link_libraries(datm PRIVATE dshr share streams)
-target_link_libraries(datm PRIVATE esmf PIO::PIO_Fortran)
+target_link_libraries(datm PRIVATE ESMF::ESMF PIO::PIO_Fortran)
 
 # CDEPS/dice
 add_library(dice OBJECT ${cdeps_dice_files})
 add_dependencies(dice share streams dshr)
 set_target_properties(dice PROPERTIES Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/mod)
 target_include_directories(dice PRIVATE $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/mod>)
 target_link_libraries(dice PRIVATE dshr share streams)
-target_link_libraries(dice PRIVATE esmf)
+target_link_libraries(dice PRIVATE ESMF::ESMF)
 
 # CDEPS/dlnd
 add_library(dlnd OBJECT ${cdeps_dlnd_files})
 add_dependencies(dlnd share streams dshr)
 set_target_properties(dlnd PROPERTIES Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/mod)
 target_include_directories(dlnd PRIVATE $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/mod>)
 target_link_libraries(dlnd PRIVATE dshr share streams)
-target_link_libraries(dlnd PRIVATE esmf)
+target_link_libraries(dlnd PRIVATE ESMF::ESMF)
 
 # CDEPS/docn
 add_library(docn OBJECT ${cdeps_docn_files})
 add_dependencies(docn share streams dshr)
 set_target_properties(docn PROPERTIES Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/mod)
 target_include_directories(docn PRIVATE $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/mod>)
 target_link_libraries(docn PRIVATE dshr share streams)
-target_link_libraries(docn PRIVATE esmf PIO::PIO_Fortran)
+target_link_libraries(docn PRIVATE ESMF::ESMF PIO::PIO_Fortran)
 
 # CDEPS/drof
 add_library(drof OBJECT ${cdeps_drof_files})
 add_dependencies(drof share streams dshr)
 set_target_properties(drof PROPERTIES Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/mod)
 target_include_directories(drof PRIVATE $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/mod>)
 target_link_libraries(drof PRIVATE dshr share streams)
-target_link_libraries(drof PRIVATE esmf)
+target_link_libraries(drof PRIVATE ESMF::ESMF)
 
 # CDEPS/dwav
 add_library(dwav OBJECT ${cdeps_dwav_files})
 add_dependencies(dwav share streams dshr)
 set_target_properties(dwav PROPERTIES Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/mod)
 target_include_directories(dwav PRIVATE $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/mod>)
 target_link_libraries(dwav PRIVATE dshr share streams)
-target_link_libraries(dwav PRIVATE esmf)
+target_link_libraries(dwav PRIVATE ESMF::ESMF)
 
 # CDEPS/dglc
 add_library(dglc OBJECT ${cdeps_dglc_files})
 add_dependencies(dglc share streams dshr)
 set_target_properties(dglc PROPERTIES Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/mod)
 target_include_directories(dglc PRIVATE $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/mod>)
 target_link_libraries(dglc PRIVATE dshr share streams)
-target_link_libraries(dglc PRIVATE esmf PIO::PIO_Fortran)
+target_link_libraries(dglc PRIVATE ESMF::ESMF PIO::PIO_Fortran)
 
 # CDEPS
 add_library(cdeps STATIC $<TARGET_OBJECTS:share>
@@ -121,7 +121,7 @@ add_library(cdeps STATIC $<TARGET_OBJECTS:share>
 add_library(cdeps::cdeps ALIAS cdeps)
 target_include_directories(cdeps PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/mod>
                                         $<INSTALL_INTERFACE:mod>)
-target_link_libraries(cdeps PUBLIC esmf PIO::PIO_Fortran)
+target_link_libraries(cdeps PUBLIC ESMF::ESMF PIO::PIO_Fortran)
 list(APPEND LIB_TARGETS cdeps)
 
 ###############################################################################

CICE-interface/CMakeLists.txt

@@ -103,7 +103,7 @@ set_target_properties(cice PROPERTIES Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_B
 target_compile_definitions(cice PUBLIC "${_cice_defs}")
 target_include_directories(cice PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/mod>
                                        $<INSTALL_INTERFACE:mod>)
-target_link_libraries(cice PUBLIC esmf)
+target_link_libraries(cice PUBLIC ESMF::ESMF)
 if(CICE_IO MATCHES "^(NetCDF|PIO)$")
   target_link_libraries(cice PUBLIC NetCDF::NetCDF_Fortran)
   if(CICE_IO MATCHES "PIO")

CMEPS-interface/CMakeLists.txt

@@ -188,7 +188,7 @@ set_target_properties(cmeps PROPERTIES Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_
 target_include_directories(cmeps PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/mod>
                                         $<INSTALL_INTERFACE:mod>)
 target_compile_definitions(cmeps PRIVATE ${CDEPS_SHARE_DEFS})
-target_link_libraries(cmeps PUBLIC esmf
+target_link_libraries(cmeps PUBLIC ESMF::ESMF
                                    PIO::PIO_Fortran)
 if(OpenMP_Fortran_FOUND)
   target_link_libraries(cmeps PRIVATE OpenMP::OpenMP_Fortran)

CMakeLists.txt

@@ -8,7 +8,10 @@ if (CMAKE_Fortran_COMPILER_ID MATCHES "GNU" AND CMAKE_Fortran_COMPILER_VERSION V
   message(FATAL_ERROR "GNU Compiler >= 9 is required")
 endif()
 
-list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
+set(CMAKE_Platform $ENV{CMAKE_Platform})
+
+list(APPEND CMAKE_MODULE_PATH $ENV{ESMF_ROOT}/cmake)
+list(APPEND CMAKE_MODULE_PATH $ENV{esmf_ROOT}/cmake)
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/CMakeModules/Modules)
 
 ###############################################################################
@@ -84,7 +87,6 @@ set(PDLIB_BT4       OFF CACHE BOOL "Enable Domain Decomposition in WW3 via PDLIB
 set(CDEPS_INLINE    OFF CACHE BOOL "Enable CDEPS inline capability")
 set(HYDRO           OFF CACHE BOOL "Enable hydrostatic set")
 
-set(CMAKE_Platform $ENV{CMAKE_Platform})
 if(CMAKE_Platform)
   message("")
   if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/cmake/configure_${CMAKE_Platform}.cmake)
@@ -160,8 +162,8 @@ if(OPENMP)
 endif()
 
 find_package(NetCDF 4.7.4 REQUIRED C Fortran)
+set(USE_ESMF_STATIC_LIBS ON)
 find_package(ESMF 8.8.0 MODULE REQUIRED)
-#add_library(ESMF::ESMF ALIAS esmf)
 if(FMS)
   find_package(FMS 2022.04 REQUIRED COMPONENTS R4 R8)
   if(APP MATCHES "^(HAFSW)$")
@@ -330,7 +332,7 @@ if(WW3)
   target_link_libraries(ufs PUBLIC WW3::WW3)
 endif()
 
-list(APPEND _ufs_libs_public esmf)
+list(APPEND _ufs_libs_public ESMF::ESMF)
 
 if(STOCH_PHYS)
   list(APPEND _ufs_libs_public stochastic_physics)
@@ -406,7 +408,7 @@ target_link_libraries(ufs PUBLIC "${_ufs_libs_public}")
 ###############################################################################
 add_executable(ufs_model driver/UFS.F90)
 add_dependencies(ufs_model ufs)
-target_link_libraries(ufs_model ufs esmf w3emc::w3emc_d)
+target_link_libraries(ufs_model ufs ESMF::ESMF w3emc::w3emc_d)
 set_target_properties(ufs_model PROPERTIES LINKER_LANGUAGE Fortran)
 
 ###############################################################################

HYCOM-interface/CMakeLists.txt

@@ -85,7 +85,7 @@ target_include_directories(hycom_nuopc_obj PRIVATE $<BUILD_INTERFACE:${CMAKE_CUR
                                                    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/HYCOM/NUOPC>)
 target_compile_definitions(hycom_nuopc_obj PRIVATE "${_hycom_defs}")
 target_link_libraries(hycom_nuopc_obj PRIVATE hycom_obj
-                                              esmf
+                                              ESMF::ESMF
                                               NetCDF::NetCDF_Fortran)
 
 ### Create target library and set PUBLIC interfaces on the library
@@ -96,7 +96,7 @@ target_include_directories(hycom PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY
 target_include_directories(hycom PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/HYCOM>
                                         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/HYCOM/NUOPC>)
 target_compile_definitions(hycom PRIVATE "${_hycom_defs}")
-target_link_libraries(hycom PUBLIC esmf
+target_link_libraries(hycom PUBLIC ESMF::ESMF
                                    NetCDF::NetCDF_Fortran)
 
 ### Create HYCOM offline executable

MOM6-interface/CMakeLists.txt

@@ -52,7 +52,7 @@ else()
                                               $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/MOM6/src/framework>)
 endif()
 target_link_libraries(mom6_obj PRIVATE fms
-                                       esmf
+                                       ESMF::ESMF
                                        stochastic_physics
                                        NetCDF::NetCDF_Fortran)
 # OpenMP is disabled in MOM6
@@ -73,7 +73,7 @@ endif()
 target_link_libraries(mom6_nuopc_obj PRIVATE mom6_obj
                                              fms
                                              stochastic_physics
-                                             esmf)
+                                             ESMF::ESMF)
 # OpenMP is disabled in MOM6
 #if(OpenMP_Fortran_FOUND)
 # target_link_libraries(mom6_nuopc_obj PRIVATE OpenMP::OpenMP_Fortran)
@@ -88,7 +88,7 @@ target_include_directories(mom6 PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_
                                        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/MOM6/src/framework>)
 target_link_libraries(mom6 PUBLIC fms
                                   stochastic_physics
-                                  esmf
+                                  ESMF::ESMF
                                   NetCDF::NetCDF_Fortran)
 # OpenMP is disabled in MOM6
 #if(OpenMP_Fortran_FOUND)
@@ -108,7 +108,7 @@ if(MOM6SOLO)
   target_link_libraries(mom6solo PRIVATE mom6_obj
                                          fms
                                          stochastic_physics
-                                         esmf
+                                         ESMF::ESMF
                                          NetCDF::NetCDF_Fortran)
   # OpenMP is disabled in MOM6
   #if(OpenMP_Fortran_FOUND)

NOAHMP-interface/CMakeLists.txt

@@ -68,7 +68,7 @@ add_library(noahmp STATIC ${_noahmp_cap_files} ${_noahmp_ccpp_files} ${_noahmp_f
 set_target_properties(noahmp PROPERTIES Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/mod)
 target_include_directories(noahmp PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/mod>
                                        $<INSTALL_INTERFACE:mod>)
-target_link_libraries(noahmp PUBLIC esmf)
+target_link_libraries(noahmp PUBLIC ESMF::ESMF)
 
 ###############################################################################
 ### Install

ci/package.py

@@ -214,6 +214,8 @@ def cmake_args(self):
             args.append(self.define_from_variant("CCPP", "ccpp"))
             args.append(self.define_from_variant("QUAD_PRECISION", "quad_precision"))
 
+        args.append(self.define("CMAKE_MODULE_PATH", self.spec["esmf"].prefix.cmake))
+
         return args
 
     # This patch can be removed once https://github.com/NOAA-EMC/WW3/issues/1021

tests/bl_date.conf

@@ -1 +1 @@
-export BL_DATE=20251117
+export BL_DATE=20251119

tests/ci/Jenkinsfile.ort

@@ -17,8 +17,11 @@ pipeline {
             else if ((label.matches("hercules"))) { 
                 env.CHOICE_NODE='hercules'
             }  
-            else if ((label.matches("jet"))) {
-                env.CHOICE_NODE='jet'
+            else if ((label.matches("gaeac6"))) {
+                env.CHOICE_NODE='gaeac6'
+            } 
+            else if ((label.matches("ursa"))) {
+                env.CHOICE_NODE='ursa'
             } 
             else { 
                 env.CHOICE_NODE='none'
@@ -30,11 +33,14 @@ pipeline {
                 echo "Starting up orion ${CHOICE_NODE}...this might take 5-10 minutes...please be patient."
 
             } 
-             else if (CHOICE_NODE == 'jet') {
-                echo "Starting up jet ${CHOICE_NODE}...this might take 5-10 minutes...please be patient."
+             else if (CHOICE_NODE == 'ursa') {
+                echo "Starting up ursa ${CHOICE_NODE}...this might take 5-10 minutes...please be patient."
+            }
+             else if (CHOICE_NODE == 'gaeac6') {
+                echo "Starting up gaeac6 ${CHOICE_NODE}...this might take 5-10 minutes...please be patient."
             }
              else if (CHOICE_NODE == 'hercules') {
-                 echo "Starting up hera ${CHOICE_NODE}...this might take 5-10 minutes...please be patient."
+                 echo "Starting up hercules ${CHOICE_NODE}...this might take 5-10 minutes...please be patient."
             }
              else if (CHOICE_NODE == 'hera') {
                  echo "Starting up hera ${CHOICE_NODE}...this might take 5-10 minutes...please be patient."
@@ -52,6 +58,7 @@ pipeline {
         environment {
         ACCNR = 'epic'
         NODE_PATH = '/scratch3/NAGAPE/epic/role.epic/'
+        GITHUB_TOKEN = credentials('GithubJenkinsNew')
       }
       steps {
 
@@ -70,6 +77,8 @@ pipeline {
 	pwd
         sed "s|intel|gnu|g" -i opnReqTest
         export ACCNR=epic
+        export GIT_OWNER=$(echo $GIT_URL | cut -d '/' -f4)
+        export GIT_REPO_NAME=$(echo $GIT_URL | cut -d '/' -f5 | cut -d '.' -f1)
         ./opnReqTest -n regional_control -a ${ACCNR} -c bit,dcp,thr
         cd logs/
         cp OpnReqTests_regional_control_hera.log /scratch3/NAGAPE/epic/role.epic/jenkins/workspace
@@ -91,8 +100,6 @@ pipeline {
         cd $WORKSPACE/tests/
         git config user.email "ecc.platform@noaa.gov"
         git config user.name "epic-cicd-jenkins"
-        echo "Testing concluded...removing labels for $machine from $GIT_URL"
-
         export machine_name_logs=$(echo $machine | awk '{ print tolower($1) }')
         git remote -v | grep -w sshorigin > /dev/null 2>&1 && git remote remove sshorigin > /dev/null 2>&1
         git remote add sshorigin $SSH_ORIGIN > /dev/null 2>&1
@@ -102,6 +109,33 @@ pipeline {
         git push sshorigin HEAD:$FORK_BRANCH
         '''
         }
-      }	      
+        post {
+        always {
+         sh '''
+           export GIT_OWNER=$(echo $GIT_URL | cut -d '/' -f4)
+           export GIT_REPO_NAME=$(echo $GIT_URL | cut -d '/' -f5 | cut -d '.' -f1)
+           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/jenkins-ort"
+           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/jenkins-ort
+         '''
+        }
+        success {
+          slackSend (
+                channel: '#jenkins-notifications',
+                color: 'good',
+                message: "*SUCCESS: Build ${env.JOB_NAME} #${env.BUILD_NUMBER}* <${env.BUILD_URL}|Open Build>"
+            )
+
+        }
+
+        failure {
+          slackSend (
+                channel: '#jenkins-notifications',
+                color: 'danger',
+                message: "*FAILURE: Build ${env.JOB_NAME} #${env.BUILD_NUMBER}*  <${env.BUILD_URL}|Open Build>"
+            )
+        }
+      }
+    }	      
   }
 }