Skip to content

Commit 1e92f4c

Browse files
committed
Merge remote-tracking branch 'remotes/origin/feature/hafs.v2.1.1' into feature/EMC_mn_noahmp
2 parents 49e1393 + 9313aee commit 1e92f4c

File tree

6 files changed

+71
-2
lines changed

6 files changed

+71
-2
lines changed

FV3

Submodule FV3 updated 1 file

cmake/Intel.cmake

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
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")
2-
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -qno-opt-dynamic-align -sox -fp-model source")
2+
#set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -qno-opt-dynamic-align -sox -fp-model source")
3+
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -qno-opt-dynamic-align -fp-model precise")
4+
5+
# supress ifort deprecation warning
6+
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -diag-disable 10448")
37

48
# warning #5462: Global name too long.
59
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -diag-disable 5462")

cmake/configure_ursa.gnu.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
set(PARALLEL_NETCDF ON CACHE BOOL "Enable parallel NetCDF" FORCE)

cmake/configure_ursa.intel.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
set(PARALLEL_NETCDF ON CACHE BOOL "Enable parallel NetCDF" FORCE)

modulefiles/ufs_ursa.intel.lua

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
help([[
2+
loads UFS Model prerequisites for Ursa/Intel
3+
]])
4+
5+
prepend_path("MODULEPATH", "/contrib/spack-stack/spack-stack-1.9.1/envs/ue-oneapi-2024.2.1/install/modulefiles/Core")
6+
7+
stack_oneapi_ver=os.getenv("stack_oneapi_ver") or "2024.2.1"
8+
load(pathJoin("stack-oneapi", stack_oneapi_ver))
9+
10+
stack_impi_ver=os.getenv("stack_impi_ver") or "2021.13"
11+
load(pathJoin("stack-intel-oneapi-mpi", stack_impi_ver))
12+
13+
cmake_ver=os.getenv("cmake_ver") or "3.27.9"
14+
load(pathJoin("cmake", cmake_ver))
15+
16+
nccmp_ver=os.getenv("nccmp_ver") or "1.9.1.0"
17+
load(pathJoin("nccmp", nccmp_ver))
18+
19+
20+
local ufs_modules = {
21+
{["jasper"] = "2.0.32"},
22+
{["zlib"] = "1.2.13"},
23+
{["libpng"] = "1.6.37"},
24+
{["hdf5"] = "1.14.3"},
25+
{["netcdf-c"] = "4.9.2"},
26+
{["netcdf-fortran"] = "4.6.1"},
27+
{["parallelio"] = "2.6.2"},
28+
{["esmf"] = "8.8.0"},
29+
{["fms"] = "2024.02"},
30+
{["bacio"] = "2.4.1"},
31+
{["crtm"] = "2.4.0.1"},
32+
{["g2"] = "3.5.1"},
33+
{["g2tmpl"] = "1.13.0"},
34+
{["ip"] = "5.1.0"},
35+
{["sp"] = "2.5.0"},
36+
{["w3emc"] = "2.10.0"},
37+
{["gftl-shared"] = "1.9.0"},
38+
{["mapl"] = "2.53.0-esmf-8.8.0"},
39+
{["scotch"] = "7.0.4"},
40+
}
41+
42+
for i = 1, #ufs_modules do
43+
for name, default_version in pairs(ufs_modules[i]) do
44+
local env_version_name = string.gsub(name, "-", "_") .. "_ver"
45+
load(pathJoin(name, os.getenv(env_version_name) or default_version))
46+
end
47+
end
48+
49+
setenv("CC", "mpiicx")
50+
setenv("CXX", "mpiicpx")
51+
setenv("FC", "mpiifort")
52+
setenv("I_MPI_CC", "icx")
53+
setenv("I_MPI_CXX", "icpx")
54+
setenv("I_MPI_F90", "ifort")
55+
56+
setenv("CMAKE_Platform", "ursa.intel")
57+
58+
whatis("Description: UFS build environment")

tests/detect_machine.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ case $(hostname -f) in
2929
hfe0[1-9]) MACHINE_ID=hera ;; ### hera01-09
3030
hfe1[0-2]) MACHINE_ID=hera ;; ### hera10-12
3131
hecflow01) MACHINE_ID=hera ;; ### heraecflow01
32+
33+
ufe0[1-4]) MACHINE_ID=ursa ;; ### ursa
3234

3335
s4-submit.ssec.wisc.edu) MACHINE_ID=s4 ;; ### s4
3436

@@ -83,6 +85,9 @@ elif [[ -d /mnt/lfs1 ]]; then
8385
elif [[ -d /scratch1 ]]; then
8486
# We are on NOAA Hera
8587
MACHINE_ID=hera
88+
elif [[ -d /scratch3 ]]; then
89+
# We are on NOAA Ursa
90+
MACHINE_ID=ursa
8691
elif [[ -d /work ]]; then
8792
# We are on MSU Orion or Hercules
8893
mount=$(findmnt -n -o SOURCE /home)

0 commit comments

Comments
 (0)