From 1aed114060b001222f5520ac40b572dd3a9262c1 Mon Sep 17 00:00:00 2001 From: Daniel Sarmiento Date: Wed, 25 Mar 2026 17:29:26 +0000 Subject: [PATCH] Initialize HAFS prod branch --- .gitmodules | 4 +++- WW3 | 2 +- cmake/Intel.cmake | 6 +++++- modulefiles/ufs_common.lua | 1 - modulefiles/ufs_gaeac6.intel.lua | 14 +++++++++----- modulefiles/ufs_hera.intel.lua | 3 +++ modulefiles/ufs_hercules.intel.lua | 3 +++ modulefiles/ufs_orion.intel.lua | 3 +++ modulefiles/ufs_ursa.intel.lua | 3 +++ modulefiles/ufs_wcoss2.intel.lua | 6 +++--- tests/compile.sh | 6 +++--- 11 files changed, 36 insertions(+), 15 deletions(-) diff --git a/.gitmodules b/.gitmodules index b881f89393..5164059887 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,11 +1,13 @@ [submodule "UFSATM"] path = UFSATM + #url = https://github.com/hafs-community/ufsatm + #branch = production/hafs.v2.2 url = https://github.com/NOAA-EMC/ufsatm branch = develop [submodule "WW3"] path = WW3 url = https://github.com/NOAA-EMC/WW3 - branch = dev/ufs-weather-model + branch = production/hafs.v2.2 [submodule "stochastic_physics"] path = stochastic_physics url = https://github.com/NOAA-PSL/stochastic_physics diff --git a/WW3 b/WW3 index 30674e5ee2..86b84cc3e5 160000 --- a/WW3 +++ b/WW3 @@ -1 +1 @@ -Subproject commit 30674e5ee2e9580d500e5437f7a2ca95698faf1f +Subproject commit 86b84cc3e5915841cb39fd67f42d2486bbfbb4b2 diff --git a/cmake/Intel.cmake b/cmake/Intel.cmake index 2cc4648027..b3107d16db 100644 --- a/cmake/Intel.cmake +++ b/cmake/Intel.cmake @@ -1,5 +1,9 @@ set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -g -traceback -fpp -fno-alias -auto -safe-cray-ptr -ftz -assume byterecl -sox -align array64byte -qno-opt-dynamic-align") -set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -qno-opt-dynamic-align -sox -fp-model source") +#set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -qno-opt-dynamic-align -sox -fp-model source") +set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -qno-opt-dynamic-align -fp-model precise") + +# supress ifort deprecation warning +set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -diag-disable 10448") # warning #5462: Global name too long. set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -diag-disable 5462") diff --git a/modulefiles/ufs_common.lua b/modulefiles/ufs_common.lua index 29ef59af3a..990150db59 100644 --- a/modulefiles/ufs_common.lua +++ b/modulefiles/ufs_common.lua @@ -20,7 +20,6 @@ local ufs_modules = { {["w3emc"] = "2.10.0"}, {["gftl-shared"] = "1.9.0"}, {["mapl"] = "2.53.4-esmf-8.8.0"}, - {["scotch"] = "7.0.4"}, } for i = 1, #ufs_modules do diff --git a/modulefiles/ufs_gaeac6.intel.lua b/modulefiles/ufs_gaeac6.intel.lua index bb0c3e46b7..ce0ddb7015 100644 --- a/modulefiles/ufs_gaeac6.intel.lua +++ b/modulefiles/ufs_gaeac6.intel.lua @@ -5,13 +5,14 @@ help([[ whatis([===[Loads libraries needed for building the UFS Weather Model on Gaea C6]===]) -prepend_path("MODULEPATH", "/ncrc/proj/epic/spack-stack/c6/spack-stack-1.9.2/envs/ue-intel-2023.2.0/install/modulefiles/Core") +prepend_path("MODULEPATH", "/ncrc/proj/epic/spack-stack/c6/spack-stack-1.9.2/envs/ue-oneapi-2024.2.1/install/modulefiles/Core") + prepend_path("MODULEPATH", "/ncrc/proj/epic/spack-stack/c6/modulefiles") -stack_intel_ver=os.getenv("stack_intel_ver") or "2023.2.0" -load(pathJoin("stack-intel", stack_intel_ver)) +stack_oneapi_ver=os.getenv("stack_oneapi_ver") or "2024.2.1" +load(pathJoin("stack-oneapi", stack_oneapi_ver)) -stack_cray_mpich_ver=os.getenv("stack_cray_mpich_ver") or "8.1.30" +stack_cray_mpich_ver=os.getenv("stack_cray_mpich_ver") or "8.1.32" load(pathJoin("stack-cray-mpich", stack_cray_mpich_ver)) stack_python_ver=os.getenv("stack_python_ver") or "3.11.7" @@ -26,8 +27,11 @@ load("zlib/1.2.13") nccmp_ver=os.getenv("nccmp_ver") or "1.9.0.1" load(pathJoin("nccmp", nccmp_ver)) +scotch_ver=os.getenv("scotch_ver") or "7.0.7" +load(pathJoin("scotch", scotch_ver)) + unload("darshan-runtime") -unload("cray-libsci") +--unload("cray-libsci") setenv("CC","cc") setenv("CXX","CC") diff --git a/modulefiles/ufs_hera.intel.lua b/modulefiles/ufs_hera.intel.lua index c681cb713c..66eea4baf0 100644 --- a/modulefiles/ufs_hera.intel.lua +++ b/modulefiles/ufs_hera.intel.lua @@ -20,6 +20,9 @@ load("zlib/1.2.11") nccmp_ver=os.getenv("nccmp_ver") or "1.9.0.1" load(pathJoin("nccmp", nccmp_ver)) +scotch_ver=os.getenv("scotch_ver") or "7.0.4" +load(pathJoin("scotch", scotch_ver)) + setenv("CC", "mpiicx") setenv("CXX", "mpiicpx") setenv("FC", "mpiifort") diff --git a/modulefiles/ufs_hercules.intel.lua b/modulefiles/ufs_hercules.intel.lua index d4c128cbde..7f51a015f9 100644 --- a/modulefiles/ufs_hercules.intel.lua +++ b/modulefiles/ufs_hercules.intel.lua @@ -20,6 +20,9 @@ load("zlib/1.2.13") nccmp_ver=os.getenv("nccmp_ver") or "1.9.0.1" load(pathJoin("nccmp", nccmp_ver)) +scotch_ver=os.getenv("scotch_ver") or "7.0.4" +load(pathJoin("scotch", scotch_ver)) + setenv("CC", "mpiicc") setenv("CXX", "mpiicpc") setenv("FC", "mpiifort") diff --git a/modulefiles/ufs_orion.intel.lua b/modulefiles/ufs_orion.intel.lua index 1640ac8e08..f83d63b562 100644 --- a/modulefiles/ufs_orion.intel.lua +++ b/modulefiles/ufs_orion.intel.lua @@ -25,6 +25,9 @@ load(pathJoin("nccmp", nccmp_ver)) tar_ver=os.getenv("tar_ver") or "1.34" load(pathJoin("tar", tar_ver)) +scotch_ver=os.getenv("scotch_ver") or "7.0.4" +load(pathJoin("scotch", scotch_ver)) + setenv("CC", "mpiicc") setenv("CXX", "mpiicpc") setenv("FC", "mpiifort") diff --git a/modulefiles/ufs_ursa.intel.lua b/modulefiles/ufs_ursa.intel.lua index dd1501a55d..8ebbca895a 100644 --- a/modulefiles/ufs_ursa.intel.lua +++ b/modulefiles/ufs_ursa.intel.lua @@ -19,6 +19,9 @@ load("ufs_common") nccmp_ver=os.getenv("nccmp_ver") or "1.9.1.0" load(pathJoin("nccmp", nccmp_ver)) +scotch_ver=os.getenv("scotch_ver") or "7.0.4" +load(pathJoin("scotch", scotch_ver)) + setenv("CC", "mpiicx") setenv("CXX", "mpiicpx") setenv("FC", "mpiifort") diff --git a/modulefiles/ufs_wcoss2.intel.lua b/modulefiles/ufs_wcoss2.intel.lua index 91fab03415..48488fbdbb 100644 --- a/modulefiles/ufs_wcoss2.intel.lua +++ b/modulefiles/ufs_wcoss2.intel.lua @@ -28,11 +28,11 @@ local ufs_modules = { {["esmf-D"] = "8.8.0"}, {["fms-D"] = "2024.01"}, {["bacio"] = "2.4.1"}, - {["crtm"] = "2.4.0"}, + {["crtm"] = "2.4.0.1"}, {["g2"] = "3.5.1"}, {["g2tmpl"] = "1.13.0"}, - {["ip"] = "4.0.0"}, - {["sp"] = "2.3.3"}, + {["ip"] = "5.2.0"}, + {["sp"] = "2.4.0"}, {["w3emc"] = "2.12.0"}, {["gftl-shared"] = "1.6.1"}, {["mapl-D"] = "2.53.0"}, diff --git a/tests/compile.sh b/tests/compile.sh index 3b54cb6c78..b766e748be 100755 --- a/tests/compile.sh +++ b/tests/compile.sh @@ -97,9 +97,9 @@ else fi fi -if [[ ${MACHINE_ID} == wcoss2 ]] || [[ ${MACHINE_ID} == acorn ]]; then - CMAKE_FLAGS+=" -DENABLE_PARALLELRESTART=ON" -fi +#if [[ ${MACHINE_ID} == wcoss2 ]] || [[ ${MACHINE_ID} == acorn ]]; then +# CMAKE_FLAGS+=" -DENABLE_PARALLELRESTART=ON" +#fi # Check if suites argument is provided or not set +ex