Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
144 commits
Select commit Hold shift + click to select a range
32f40af
rename & update derecho intel modulefile
gspetro-NOAA Apr 1, 2026
7a02dfc
update derecho gnu modulefile
gspetro-NOAA Apr 1, 2026
36472bc
update gaeac6 llvm modulefile
gspetro-NOAA Apr 1, 2026
da57f5e
update orion llvm modulefile
gspetro-NOAA Apr 1, 2026
7de8513
update hercules modulesfiles for ss2.x
gspetro-NOAA Apr 1, 2026
6720dab
update ursa modulefiles for ss2.x
gspetro-NOAA Apr 1, 2026
9bb7905
rm deprecated intel classic modulefiles
gspetro-NOAA Apr 1, 2026
a57b27d
update ufs_common.lua
gspetro-NOAA Apr 1, 2026
5c24bf1
update acorn modulefile info
gspetro-NOAA Apr 2, 2026
a58f290
update cmake version; rm zlib
gspetro-NOAA Apr 2, 2026
d95a5ab
rename acorn modulefile; preliminary updates
gspetro-NOAA Apr 2, 2026
8bf221b
update CMAKE_Platform
gspetro-NOAA Apr 2, 2026
a9ed6c9
fix fms version
gspetro-NOAA Apr 2, 2026
c7b8c98
update .gitmodules & UFSATM hash
gspetro-NOAA Apr 2, 2026
6470dcd
update ccpp sfcsub
gspetro-NOAA Apr 2, 2026
c2eb0be
Merge branch 'ufs-community:develop' into feature/ss2.x
gspetro-NOAA Apr 3, 2026
047c9cf
fix modulefiles
gspetro-NOAA Apr 3, 2026
344e688
Merge branch 'feature/ss2.x' of github.com:gspetro-NOAA/ufs-weather-m…
gspetro-NOAA Apr 3, 2026
c25f203
rm purge
gspetro-NOAA Apr 4, 2026
d413695
switch from sp to ip requirement
gspetro-NOAA Apr 4, 2026
0a4e090
update to ip 5 required
gspetro-NOAA Apr 6, 2026
1299c25
update UFSATM hash
gspetro-NOAA Apr 6, 2026
9101f4c
Merge branch 'feature/ss2.x' of github.com:gspetro-NOAA/ufs-weather-m…
gspetro-NOAA Apr 6, 2026
9bcc294
update UFSATM hash
gspetro-NOAA Apr 16, 2026
c7d6b92
Merge branch 'develop' of https://github.com/ufs-community/ufs-weathe…
gspetro-NOAA Apr 16, 2026
22df97c
add back intel/ifort modulefiles
gspetro-NOAA Apr 16, 2026
d770da0
rm blank line at EOF
gspetro-NOAA Apr 16, 2026
0e74863
revert derecho intel modulefile
gspetro-NOAA Apr 16, 2026
3dada52
update ufsatm hash w/ccpp physic syntax fix
gspetro-NOAA Apr 17, 2026
76faf43
fix nccmp ver in ursa modulefiles
gspetro-NOAA Apr 17, 2026
bfdeffa
Merge branch 'feature/ss2.x' of github.com:gspetro-NOAA/ufs-weather-m…
gspetro-NOAA Apr 17, 2026
00cb800
rm old cheyenne cmake files
gspetro-NOAA Apr 17, 2026
25d015b
rm -no-ip flag
gspetro-NOAA Apr 17, 2026
ffa7633
propagate ccpp & fv3 changes upwards
gspetro-NOAA Apr 17, 2026
660f426
rm -no-ip CMake flag
gspetro-NOAA Apr 17, 2026
42df89f
mv pm_ideal_doubly_periodic beside other intel tests in rt.conf
gspetro-NOAA Apr 17, 2026
e7f8f53
change intelllvm to oneapi
gspetro-NOAA Apr 17, 2026
4609bda
change intelllvm to oneapi
gspetro-NOAA Apr 17, 2026
5a1c2ed
sync UFSATM
gspetro-NOAA Apr 17, 2026
87828a9
Merge branch 'develop' of https://github.com/ufs-community/ufs-weathe…
gspetro-NOAA Apr 17, 2026
752275f
add rt_oneapi.conf for testing
gspetro-NOAA Apr 20, 2026
d504298
sync w/develop
gspetro-NOAA Apr 25, 2026
c8c6c95
switch intel compile jobs to oneapi
gspetro-NOAA Apr 27, 2026
50cc1a8
Merge branch 'feature/ss2.x' of github.com:gspetro-NOAA/ufs-weather-m…
gspetro-NOAA Apr 27, 2026
bc27700
merge intel & intelllvm tests into oneapi
gspetro-NOAA Apr 27, 2026
25352df
update setenv statements in modulefiles
gspetro-NOAA Apr 27, 2026
702234b
comment out duplicate compile
gspetro-NOAA Apr 27, 2026
d09389b
comment out duplicate compile
gspetro-NOAA Apr 27, 2026
5d90f69
ursa log to run through CI
gspetro-NOAA Apr 28, 2026
ad24bb5
hercules log to run through CI
gspetro-NOAA Apr 28, 2026
f0653ef
increase throttle to 25 for Derecho/Rocoto
gspetro-NOAA Apr 28, 2026
87b9d2d
update gaea C6 oneapi modulefile
gspetro-NOAA Apr 28, 2026
f51a987
orion log for ci testing
gspetro-NOAA Apr 29, 2026
4705ac5
update ufsatm hash
gspetro-NOAA Apr 29, 2026
a9c1539
FB hash update
gspetro-NOAA Apr 29, 2026
577fe53
modify derecho modulefile
gspetro-NOAA Apr 30, 2026
256f711
Merge branch 'feature/ss2.x' of https://github.com/gspetro-NOAA/ufs-w…
gspetro-NOAA Apr 30, 2026
8b5763c
update derecho modulefile
gspetro-NOAA Apr 30, 2026
0da54ea
update UFSATM hash
gspetro-NOAA May 1, 2026
5a4caee
Merge branch 'feature/ss2.x' of https://github.com/gspetro-NOAA/ufs-w…
gspetro-NOAA May 1, 2026
ff92e0a
update FB hash
gspetro-NOAA May 1, 2026
f2dbe40
sync w/develop
gspetro-NOAA May 1, 2026
60095d1
sync w/develop
gspetro-NOAA May 7, 2026
0b15094
add LM4-driver PR
gspetro-NOAA May 7, 2026
87cf4ae
fix derecho compiler names
gspetro-NOAA May 7, 2026
ca63aed
update UFSATM hash
gspetro-NOAA May 7, 2026
8d49ddd
rm python load from derecho gnu
gspetro-NOAA May 8, 2026
6a6f4e6
sync w/develop
gspetro-NOAA May 14, 2026
19bccc4
sync w/develop
gspetro-NOAA May 28, 2026
4a9619f
fix linter error
gspetro-NOAA May 28, 2026
990944b
update lm4 intel test to oneapi
gspetro-NOAA May 28, 2026
3443a3c
update UFSATM hash & sync w/develop
gspetro-NOAA Jun 3, 2026
fa54d03
hercules rt log
gspetro-NOAA Jun 5, 2026
8b1beca
update UFSATM hash
gspetro-NOAA Jun 8, 2026
a85da45
Merge branch 'feature/ss2.x' of github.com:gspetro-NOAA/ufs-weather-m…
gspetro-NOAA Jun 8, 2026
ded3623
sync w/develop
gspetro-NOAA Jun 8, 2026
98b897f
gaea rt log results
gspetro-NOAA Jun 9, 2026
b08f71e
ursa testing results
gspetro-NOAA Jun 10, 2026
2899b72
Merge branch 'feature/ss2.x' of https://github.com/gspetro-NOAA/ufs-w…
gspetro-NOAA Jun 10, 2026
708b91d
update UFSATM hash; sync w/develop
gspetro-NOAA Jun 11, 2026
9a0bc0f
Merge branch 'feature/ss2.x' of github.com:gspetro-NOAA/ufs-weather-m…
gspetro-NOAA Jun 11, 2026
8d68d1b
orion ss testing results
gspetro-NOAA Jun 11, 2026
7c3eb09
F90 -> FC; rm comment
gspetro-NOAA Jun 11, 2026
50ae6f1
Merge branch 'feature/ss2.x' of github.com:gspetro-NOAA/ufs-weather-m…
gspetro-NOAA Jun 11, 2026
b284c39
sync w/develop
gspetro-NOAA Jun 15, 2026
9639109
resolve issue #3213
gspetro-NOAA Jun 15, 2026
4d03f53
Merge branch 'feature/ss2.x' of https://github.com/gspetro-NOAA/ufs-w…
gspetro-NOAA Jun 15, 2026
4f85fe2
sync w/develop
gspetro-NOAA Jun 17, 2026
c3969dd
sync w/develop
gspetro-NOAA Jun 30, 2026
e9bdc9e
update ufsatm hash
gspetro-NOAA Jun 30, 2026
6cb49ee
update modulefiles to ss2.1.1
gspetro-NOAA Jun 30, 2026
76694ae
ursa rt logs - passed
gspetro-NOAA Jul 1, 2026
17f1119
gaea c6 rt logs - passed
gspetro-NOAA Jul 1, 2026
cdff09a
orion rt logs - 1 failure
gspetro-NOAA Jul 1, 2026
f2c1d39
hercules rt logs - 2 failures
gspetro-NOAA Jul 1, 2026
039c10c
update test_changes.list
gspetro-NOAA Jul 2, 2026
693fbfe
Merge branch 'feature/ss2.x' of https://github.com/gspetro-NOAA/ufs-w…
gspetro-NOAA Jul 2, 2026
037aed6
ursa rt logs w/o prior bl creation
gspetro-NOAA Jul 2, 2026
5070111
Merge branch 'develop' into feature/ss2.x
gspetro-NOAA Jul 2, 2026
922f006
Merge branch 'develop' into feature/ss2.x
gspetro-NOAA Jul 6, 2026
235564b
update ufsatm hash
gspetro-NOAA Jul 9, 2026
ceebd05
Merge branch 'feature/ss2.x' of github.com:gspetro-NOAA/ufs-weather-m…
gspetro-NOAA Jul 9, 2026
9224114
sync w/develop
gspetro-NOAA Jul 9, 2026
34418e5
resolve cpld_control_sfs_gnu timeout
gspetro-NOAA Jul 9, 2026
ccf201d
sync w/develop
gspetro-NOAA Jul 13, 2026
d373c0c
update Spack CI container hash
gspetro-NOAA Jul 22, 2026
403a48a
update UFSATM hash
gspetro-NOAA Jul 22, 2026
f60492c
sync w/develop
gspetro-NOAA Jul 22, 2026
a57b3f9
update gcc spack ci img
gspetro-NOAA Jul 22, 2026
ef0c46a
Updates for Derecho spack-stack-2.1.1: use Intel LLVM and GNU, work a…
climbfuji Jul 26, 2026
cf6aaa8
Merge branch 'feature/ss2.x' of https://github.com/gspetro-NOAA/ufs-w…
climbfuji Jul 26, 2026
4ae4be5
sync w/develop
gspetro-NOAA Jul 27, 2026
1220017
Merge temp Derecho bugfix from climbfuji/feature/ss2.x_derecho
gspetro-NOAA Jul 27, 2026
a67269b
update upp hash in ufsatm
gspetro-NOAA Jul 27, 2026
ab5c7fb
Merge branch 'feature/ss2.x' of github.com:gspetro-NOAA/ufs-weather-m…
gspetro-NOAA Jul 27, 2026
b7e0c2d
sync w/develop
gspetro-NOAA Jul 27, 2026
8c814ea
rm unsupported -fp-stack-check compiler flag in WM, WW3, atmos_cubed
gspetro-NOAA Jul 29, 2026
ced39e9
acorn modulefile update
gspetro-NOAA Aug 8, 2026
7832006
sync w/develop
gspetro-NOAA Aug 8, 2026
7471411
update CMEPS hash
gspetro-NOAA Aug 10, 2026
9168a68
update derecho stack path
gspetro-NOAA Aug 10, 2026
4b4c37d
update ufsatm hash
gspetro-NOAA Aug 10, 2026
106403b
sync w/develop
gspetro-NOAA Aug 10, 2026
616b40f
update derecho modulefiles
gspetro-NOAA Aug 11, 2026
7f2c5d8
Merge branch 'develop' into feature/ss2.x
gspetro-NOAA Aug 14, 2026
d0d3d1f
WARN_AS_ERROR=ON for datm_cdeps
gspetro-NOAA Aug 14, 2026
3e712ba
Delete duplicate GFS test
gspetro-NOAA Aug 14, 2026
88be776
orion rt log - passed
gspetro-NOAA Aug 17, 2026
c76d9b9
ursa rt logs - passed
gspetro-NOAA Aug 17, 2026
117cf85
hercules rt log - passed
gspetro-NOAA Aug 17, 2026
2742701
add CATChem fix for catchem pr to run w/oneapi
gspetro-NOAA Aug 17, 2026
c58691e
Merge branch 'feature/ss2.x' of https://github.com/gspetro-NOAA/ufs-w…
gspetro-NOAA Aug 17, 2026
5a220b9
point .gitmodules to gsp catchem fork
gspetro-NOAA Aug 17, 2026
d3b4a34
gaea rt logs - passed
gspetro-NOAA Aug 17, 2026
b809358
Rm duplicate datm_cdeps test in rt.conf
gspetro-NOAA Aug 17, 2026
d40ef5f
sync w/develop
gspetro-NOAA Aug 18, 2026
810eac6
turn -DWARN_AS_ERROR=ON for compiles listed in #3316
gspetro-NOAA Aug 18, 2026
e83bfe1
rm acorn oneapi modulefile
gspetro-NOAA Aug 31, 2026
aa9fe22
rm unneeded rt_oneapi.conf
gspetro-NOAA Aug 31, 2026
1e3f2f1
Merge branch 'develop' into feature/ss2.x
gspetro-NOAA Aug 31, 2026
2442da8
update .gitmodules
gspetro-NOAA Aug 31, 2026
5842277
update upp hash in ufsatm
gspetro-NOAA Sep 2, 2026
ba452c6
update UFSATM & CATChem hashes
gspetro-NOAA Sep 4, 2026
15f6fb1
sync w/develop
gspetro-NOAA Sep 4, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/Build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ jobs:
app: ["ATM", "S2SW", "HAFS-MOM6W"]
compiler:
- name: "gcc"
container: "ghcr.io/noaa-emc/ci-common-build-cache/ufs-weather-model-ubuntu-24.04-gcc-13-mpich-x@sha256:cc9bdafb43d31498fe833c1914d90e32570f8fa9f001e11ca16c4a88417128f8"
container: "ghcr.io/noaa-emc/ci-common-build-cache/ufs-weather-model-ubuntu-24.04-gcc-13-mpich-x@sha256:2dcb6aaaa605e00c0cb7357d322d0348c701d74cce327ac949748730b58ef51f"
- name: "oneapi"
container: "ghcr.io/noaa-emc/ci-common-build-cache/ufs-weather-model-ubuntu-24.04-oneapi-2025.3-intel-oneapi-mpi-2021.17@sha256:a8d5845388f64ed95ad19583b03536b68c48c2c2d8166f66269fac92fd2a0751"
container: "ghcr.io/noaa-emc/ci-common-build-cache/ufs-weather-model-ubuntu-24.04-oneapi-2025.3-intel-oneapi-mpi-2021.17@sha256:b9686ef67c3e334cc08eb96d7db46e98ab731f75c0d24353981c1beb143b6e71"
include:
- app: ATM # cover RRFS
ccpp_suites: "FV3_RAP,FV3_RAP_sfcdiff,FV3_HRRR,FV3_RRFS_v1beta,FV3_RRFS_v1nssl"
Expand Down
30 changes: 20 additions & 10 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
[submodule "UFSATM"]
path = UFSATM
url = https://github.com/NOAA-EMC/ufsatm
branch = develop
#url = https://github.com/NOAA-EMC/ufsatm
#branch = develop
url = https://github.com/gspetro-NOAA/ufsatm
branch = feature/ss2.x
[submodule "WW3"]
path = WW3
url = https://github.com/NOAA-EMC/WW3
branch = dev/ufs-weather-model
#url = https://github.com/NOAA-EMC/WW3
#branch = dev/ufs-weather-model
url = https://github.com/gspetro-NOAA/WW3
branch = feature/ss2.x
[submodule "stochastic_physics"]
path = stochastic_physics
url = https://github.com/NOAA-PSL/stochastic_physics
Expand Down Expand Up @@ -44,13 +48,19 @@
branch = develop
[submodule "LM4-driver"]
path = LM4-driver
url = https://github.com/NOAA-GFDL/LM4-NUOPC-driver
branch = develop
#url = https://github.com/NOAA-GFDL/LM4-NUOPC-driver
#branch = develop
url = https://github.com/JustinPerket/LM4-NUOPC-driver.git
branch = tmp/LM42025.03
[submodule "fire_behavior"]
path = fire_behavior
url = https://github.com/NOAA-EMC/fire_behavior
branch = emc/develop
#url = https://github.com/NOAA-EMC/fire_behavior
#branch = emc/develop
url = https://github.com/gspetro-NOAA/fire_behavior
branch = feature/ss2.x
[submodule "CATChem"]
path = CATChem
url = https://github.com/ufs-community/CATChem
branch = main
# url = https://github.com/ufs-community/CATChem
# branch = main
url = https://github.com/gspetro-NOAA/CATChem
branch = feature/ss2.x
2 changes: 1 addition & 1 deletion CATChem
2 changes: 1 addition & 1 deletion CDEPS-interface/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ elseif(CMAKE_Fortran_COMPILER_ID MATCHES "Intel")
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -g -traceback")
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -assume realloc_lhs")
if(FASTER)
set(CMAKE_Fortran_FLAGS_RELEASE "-O3 -fp-model precise -assume buffered_stdout -fno-alias -align all -debug minimal -qoverride-limits -ftz -no-ip")
set(CMAKE_Fortran_FLAGS_RELEASE "-O3 -fp-model precise -assume buffered_stdout -fno-alias -align all -debug minimal -qoverride-limits -ftz")
else()
set(CMAKE_Fortran_FLAGS_RELEASE "-O2 -fp-model precise")
endif()
Expand Down
2 changes: 1 addition & 1 deletion CICE-interface/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ elseif(CMAKE_Fortran_COMPILER_ID MATCHES "^(Intel)$")
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -g -traceback")
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -FR -convert big_endian -assume byterecl -ftz -align array64byte")
if(FASTER)
set(CMAKE_Fortran_FLAGS_RELEASE "-O3 -fp-model precise -assume buffered_stdout -fno-alias -align all -debug minimal -qoverride-limits -ftz -no-ip")
set(CMAKE_Fortran_FLAGS_RELEASE "-O3 -fp-model precise -assume buffered_stdout -fno-alias -align all -debug minimal -qoverride-limits -ftz")
else()
set(CMAKE_Fortran_FLAGS_RELEASE "-O2 -fp-model precise")
endif()
Expand Down
2 changes: 1 addition & 1 deletion CMEPS-interface/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ elseif(CMAKE_Fortran_COMPILER_ID MATCHES "Intel")
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -g -traceback")
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -assume realloc_lhs")
if(FASTER)
set(CMAKE_Fortran_FLAGS_RELEASE "-O3 -fp-model precise -assume buffered_stdout -fno-alias -align all -debug minimal -qoverride-limits -ftz -no-ip")
set(CMAKE_Fortran_FLAGS_RELEASE "-O3 -fp-model precise -assume buffered_stdout -fno-alias -align all -debug minimal -qoverride-limits -ftz")
else()
set(CMAKE_Fortran_FLAGS_RELEASE "-O2 -fp-model precise")
endif()
Expand Down
28 changes: 27 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ if(CMEPS OR CDEPS)
endif()

find_package(bacio 2.4.0 REQUIRED)
find_package(sp 2.3.3 REQUIRED)
find_package(ip 5 REQUIRED)
find_package(w3emc 2.9.2 REQUIRED)

if(MPAS)
Expand Down Expand Up @@ -247,6 +247,32 @@ endif()
###############################################################################
if(UFS_GOCART)
add_subdirectory(GOCART)
# This ugly hack is necessary to avoid the error from buggy fpp in Intel compiler version 2025.2.1
#
# If:
# 1) we are on Gaea C6 AND
# 2) the Fortran compiler is IntelLLVM version 2025.2.1 AND
# 3) an fpp from an earlier compiler version exists THEN
# explicitly set the name of the fpp preprocessor executable for all targets in GOCART
#
# Once newer Intel compiler (with fixed fpp) is installed on Gaea C6 this should be removed
#
if(CMAKE_Platform STREQUAL "gaeac6.oneapi" AND
CMAKE_Fortran_COMPILER_ID STREQUAL "IntelLLVM" AND CMAKE_Fortran_COMPILER_VERSION VERSION_EQUAL 2025.2.1 AND
EXISTS "/opt/intel/oneapi/compiler/2025.0/bin/fpp")

target_compile_options(Process_Library PRIVATE -fpp-name=/opt/intel/oneapi/compiler/2025.0/bin/fpp -Qoption,fpp,-P)
target_compile_options(Chem_Shared2G PRIVATE -fpp-name=/opt/intel/oneapi/compiler/2025.0/bin/fpp -Qoption,fpp,-P)
target_compile_options(GA_Environment PRIVATE -fpp-name=/opt/intel/oneapi/compiler/2025.0/bin/fpp -Qoption,fpp,-P)
target_compile_options(CA2G_GridComp PRIVATE -fpp-name=/opt/intel/oneapi/compiler/2025.0/bin/fpp -Qoption,fpp,-P)
target_compile_options(DU2G_GridComp PRIVATE -fpp-name=/opt/intel/oneapi/compiler/2025.0/bin/fpp -Qoption,fpp,-P)
target_compile_options(NI2G_GridComp PRIVATE -fpp-name=/opt/intel/oneapi/compiler/2025.0/bin/fpp -Qoption,fpp,-P)
target_compile_options(SS2G_GridComp PRIVATE -fpp-name=/opt/intel/oneapi/compiler/2025.0/bin/fpp -Qoption,fpp,-P)
target_compile_options(SU2G_GridComp PRIVATE -fpp-name=/opt/intel/oneapi/compiler/2025.0/bin/fpp -Qoption,fpp,-P)
target_compile_options(GOCART2G_GridComp PRIVATE -fpp-name=/opt/intel/oneapi/compiler/2025.0/bin/fpp -Qoption,fpp,-P)
target_compile_options(Aerosol_GridComp PRIVATE -fpp-name=/opt/intel/oneapi/compiler/2025.0/bin/fpp -Qoption,fpp,-P)
target_compile_options(UFS_Aerosols PRIVATE -fpp-name=/opt/intel/oneapi/compiler/2025.0/bin/fpp -Qoption,fpp,-P)
endif()
endif()

###############################################################################
Expand Down
2 changes: 1 addition & 1 deletion MOM6-interface/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ elseif(CMAKE_Fortran_COMPILER_ID MATCHES "^(Intel)$")
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -i4 -r8")
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -fno-alias -auto -safe-cray-ptr -ftz -assume byterecl -sox")
if(FASTER)
set(CMAKE_Fortran_FLAGS_RELEASE "-O3 -fp-model precise -assume buffered_stdout -fno-alias -align all -debug minimal -qoverride-limits -ftz -no-ip")
set(CMAKE_Fortran_FLAGS_RELEASE "-O3 -fp-model precise -assume buffered_stdout -fno-alias -align all -debug minimal -qoverride-limits -ftz")
else()
set(CMAKE_Fortran_FLAGS_RELEASE "-O2 -debug minimal -fp-model source")
endif()
Expand Down
2 changes: 1 addition & 1 deletion UFSATM
2 changes: 1 addition & 1 deletion WW3
Submodule WW3 updated 1 files
+2 −2 model/src/CMakeLists.txt
2 changes: 1 addition & 1 deletion cmake/Intel.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ if(DEBUG)
set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0 -ftrapuv")
else()
if(FASTER)
set(CMAKE_Fortran_FLAGS_RELEASE "-O3 -fp-model precise -assume buffered_stdout -fno-alias -align all -debug minimal -qoverride-limits -ftz -no-ip")
set(CMAKE_Fortran_FLAGS_RELEASE "-O3 -fp-model precise -assume buffered_stdout -fno-alias -align all -debug minimal -qoverride-limits -ftz")
set(CMAKE_C_FLAGS_RELEASE "-O3 -fp-model precise -debug minimal -qoverride-limits -ftz")
else()
set(CMAKE_Fortran_FLAGS_RELEASE "-O2 -debug minimal -qoverride-limits")
Expand Down
11 changes: 6 additions & 5 deletions cmake/IntelLLVM.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,13 @@ set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -diag-disable 8291")
# warning #5194: Source line truncated.
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -diag-disable 5194")

if(CMAKE_Platform STREQUAL "derecho.intel")
set(CMAKE_Fortran_LINK_FLAGS "-Wl,--copy-dt-needed-entries")
endif()

if(NOT 32BIT)
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -real-size 64")
endif()

if(DEBUG)
add_definitions(-DDEBUG)
set(CMAKE_Fortran_FLAGS_DEBUG "${CMAKE_Fortran_FLAGS_DEBUG} -O0 -check all -check noarg_temp_created -check nopointer -warn -warn noerrors -fp-stack-check -fstack-protector-all -fpe0 -debug minimal -ftrapuv -init=snan,arrays")
set(CMAKE_Fortran_FLAGS_DEBUG "${CMAKE_Fortran_FLAGS_DEBUG} -O0 -check all -check noarg_temp_created -check nopointer -warn -warn noerrors -fstack-protector-all -fpe0 -debug minimal -ftrapuv -init=snan,arrays")
set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0 -ftrapuv")
else()
if(FASTER)
Expand Down Expand Up @@ -62,3 +58,8 @@ endif()
if(WARN_AS_ERROR)
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -warn errors")
endif()

# Link to issue here
if(CMAKE_Platform STREQUAL "derecho.oneapi")
string(REGEX REPLACE "(^| )-g( |$)" " -g1 " CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS}")
endif()
Empty file removed cmake/configure_cheyenne.gnu.cmake
Empty file.
1 change: 1 addition & 0 deletions cmake/configure_orion.oneapi.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
set(PARALLEL_NETCDF ON CACHE BOOL "Enable parallel NetCDF" FORCE)
3 changes: 0 additions & 3 deletions cmake/configure_s4.intel.cmake

This file was deleted.

1 change: 1 addition & 0 deletions cmake/configure_ursa.oneapi.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
set(PARALLEL_NETCDF ON CACHE BOOL "Enable parallel NetCDF" FORCE)
2 changes: 1 addition & 1 deletion fire_behavior
Submodule fire_behavior updated 1 files
+1 −1 CMakeLists.txt
21 changes: 10 additions & 11 deletions modulefiles/ufs_common.lua
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,23 @@ whatis("Description: UFS build environment common libraries")
help([[Load UFS Model common libraries]])

local ufs_modules = {
{["jasper"] = "2.0.32"},
{["jasper"] = "4.2.4"},
{["libpng"] = "1.6.37"},
{["hdf5"] = "1.14.3"},
{["hdf5"] = "1.14.5"},
{["netcdf-c"] = "4.9.2"},
{["netcdf-fortran"] = "4.6.1"},
{["parallelio"] = "2.6.2"},
{["esmf"] = "8.8.0"},
{["fms"] = "2024.02"},
{["bacio"] = "2.4.1"},
{["crtm"] = "2.4.0.1"},
{["fms"] = "2025.03-gfs-constants"},
{["bacio"] = "2.6.0"},
{["crtm"] = "3.1.3"},
{["g2"] = "3.5.1"},
{["g2tmpl"] = "1.13.0"},
{["ip"] = "5.1.0"},
{["sp"] = "2.5.0"},
{["w3emc"] = "2.10.0"},
{["gftl-shared"] = "1.9.0"},
{["g2tmpl"] = "1.17.0"},
{["ip"] = "5.4.0"},
{["w3emc"] = "2.13.0"},
{["gftl-shared"] = "1.11.0"},
{["mapl"] = "2.53.4-esmf-8.8.0"},
{["scotch"] = "7.0.4"},
{["scotch"] = "7.0.10"},
}

for i = 1, #ufs_modules do
Expand Down
27 changes: 16 additions & 11 deletions modulefiles/ufs_derecho.gnu.lua
Original file line number Diff line number Diff line change
Expand Up @@ -3,29 +3,34 @@ loads UFS Model prerequisites for Derecho/GNU
]])

setenv("LMOD_TMOD_FIND_FIRST","yes")
prepend_path("MODULEPATH", "/glade/work/epicufsrt/contrib/spack-stack/derecho/spack-stack-1.9.2/envs/ue-gcc-12.4-zlib-1.2.13/install/modulefiles/Core")

unload("ncarcompilers")
stack_gnu_ver=os.getenv("stack_gnu_ver") or "12.4.0"
prepend_path("MODULEPATH", "/opt/cray/pe/modulefiles")
load("crayenv/25.03")

--prepend_path("MODULEPATH", "/glade/work/epicufsrt/contrib/spack-stack/derecho/spack-stack-2.1.1/envs/ue-gcc-13.3.1/modules/Core")
prepend_path("MODULEPATH", "/glade/work/epicufsrt/contrib/spack-stack/derecho/spack-stack-2.1.1/envs/ue-gcc-13.3.1-build/modules/Core")


stack_gnu_ver=os.getenv("stack_gnu_ver") or "13.3.1"
load(pathJoin("stack-gcc", stack_gnu_ver))

stack_cray_mpich_ver=os.getenv("stack_cray_mpich_ver") or "8.1.29"
--stack_cray_mpich_ver=os.getenv("stack_cray_mpich_ver") or "8.1.29"
stack_cray_mpich_ver=os.getenv("stack_cray_mpich_ver") or "8.1.32"
load(pathJoin("stack-cray-mpich", stack_cray_mpich_ver))

cmake_ver=os.getenv("cmake_ver") or "3.27.9"
load(pathJoin("cmake", cmake_ver))
unload("cray-libsci")

stack_python_ver=os.getenv("stack_python_ver") or "3.11.7"
load(pathJoin("stack-python", stack_python_ver))
cmake_ver=os.getenv("cmake_ver") or "3.31.8"
load(pathJoin("cmake", cmake_ver))

load("ufs_common")

nccmp_ver=os.getenv("nccmp_ver") or "1.9.0.1"
load(pathJoin("nccmp", nccmp_ver))

setenv("CC","cc")
setenv("CXX","CC")
setenv("FC","ftn")
setenv("CC", "mpicc")
setenv("CXX", "mpicxx")
setenv("FC", "mpif90")
setenv("CMAKE_Platform", "derecho.gnu")

whatis("Description: UFS build environment")
35 changes: 0 additions & 35 deletions modulefiles/ufs_derecho.intel.lua

This file was deleted.

39 changes: 39 additions & 0 deletions modulefiles/ufs_derecho.oneapi.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
help([[
loads UFS Model prerequisites for Derecho/IntelLLVM
]])

setenv("LMOD_TMOD_FIND_FIRST","yes")

prepend_path("MODULEPATH", "/opt/cray/pe/modulefiles")
load("crayenv/25.03")

prepend_path("MODULEPATH", "/glade/work/epicufsrt/contrib/spack-stack/derecho/spack-stack-2.1.1/envs/ue-oneapi-2025.3.1-build/modules/Core")
--prepend_path("MODULEPATH", "/glade/work/epicufsrt/contrib/spack-stack/derecho/spack-stack-2.1.1/envs/ue-oneapi-2025.3.1/modules/Core")
prepend_path("MODULEPATH", "/glade/work/epicufsrt/contrib/spack-stack/derecho/installs/oneapi-2025.3.1/modulefiles")

stack_intel_ver=os.getenv("stack_intel_ver") or "2025.3.1"
load(pathJoin("stack-intel-oneapi-compilers", stack_intel_ver))

--stack_cray_mpich_ver=os.getenv("stack_cray_mpich_ver") or "8.1.29"
stack_cray_mpich_ver=os.getenv("stack_cray_mpich_ver") or "8.1.32"
load(pathJoin("stack-cray-mpich", stack_cray_mpich_ver))

unload("cray-libsci")

cmake_ver=os.getenv("cmake_ver") or "3.31.8"
load(pathJoin("cmake", cmake_ver))

load("ufs_common")

nccmp_ver=os.getenv("nccmp_ver") or "1.9.0.1"
load(pathJoin("nccmp", nccmp_ver))

setenv("CC", "mpicc")
setenv("CXX", "mpicxx")
setenv("FC", "mpif90")
setenv("I_MPI_CC", "icx")
setenv("I_MPI_CXX", "icpx")
setenv("I_MPI_FC", "ifx")

setenv("CMAKE_Platform", "derecho.oneapi")
whatis("Description: UFS build environment")
Original file line number Diff line number Diff line change
Expand Up @@ -5,38 +5,30 @@ 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/modulefiles")
prepend_path("MODULEPATH", "/ncrc/proj/epic/spack-stack/c6/spack-stack-2.1.1/envs/ue-oneapi-2025.2.1/modules/Core")

stack_intel_ver=os.getenv("stack_intel_ver") or "2023.2.0"
load(pathJoin("stack-intel", stack_intel_ver))
stack_intel_ver=os.getenv("stack_intel_ver") or "2025.2.1"
load(pathJoin("stack-intel-oneapi-compilers", stack_intel_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"
load(pathJoin("stack-python", stack_python_ver))

cmake_ver=os.getenv("cmake_ver") or "3.27.9"
cmake_ver=os.getenv("cmake_ver") or "3.31.8"
load(pathJoin("cmake", cmake_ver))

load("ufs_common")
load("zlib/1.2.13")

nccmp_ver=os.getenv("nccmp_ver") or "1.9.0.1"
load(pathJoin("nccmp", nccmp_ver))

unload("darshan-runtime")
unload("cray-libsci")

unload("intel-classic/2023.2.0")
load("intel-oneapi/2023.2.0")

setenv("I_MPI_CC", "icx")
setenv("I_MPI_CXX", "icpx")
setenv("I_MPI_F90", "ifx")

setenv("I_MPI_FC", "ifx")
setenv("CC","cc")
setenv("CXX","CC")
setenv("FC","ftn")
setenv("CMAKE_Platform","gaeac6.intelllvm")

setenv("CMAKE_Platform","gaeac6.oneapi")
Loading
Loading