Skip to content

[prod/HAFSv.2.2] Start HAFS v2.2 production branch #3164

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dpsarmie wants to merge 1 commit into
base: production/HAFS.v2.2
Choose a base branch
from
+36 −15
Open

[prod/HAFSv.2.2] Start HAFS v2.2 production branch #3164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 3 additions & 1 deletion .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion WW3
Open in desktop
Submodule WW3 updated 5 files
+1 −0 model/src/cmake/src_list.cmake
+829 −0 model/src/w3iorsmdold.F90
+4 −0 model/src/ww3_bound.F90
+3 −2 model/src/ww3_gint.F90
+1 −1 model/src/ww3_grib.F90
6 changes: 5 additions & 1 deletion cmake/Intel.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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")
Expand Down
1 change: 0 additions & 1 deletion modulefiles/ufs_common.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 9 additions & 5 deletions modulefiles/ufs_gaeac6.intel.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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")
Expand Down
3 changes: 3 additions & 0 deletions modulefiles/ufs_hera.intel.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
3 changes: 3 additions & 0 deletions modulefiles/ufs_hercules.intel.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
3 changes: 3 additions & 0 deletions modulefiles/ufs_orion.intel.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
3 changes: 3 additions & 0 deletions modulefiles/ufs_ursa.intel.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
6 changes: 3 additions & 3 deletions modulefiles/ufs_wcoss2.intel.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"},
Expand Down
6 changes: 3 additions & 3 deletions tests/compile.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading