Skip to content

Commit

Permalink
[develop] Changes for Rocky8 on Hera (ufs-community#1041)
Browse files Browse the repository at this point in the history
Hera is switching from CentOS to Rocky OS.
 * One of changes needed for SRW to run on both Rocky and CentOS is to update cmake version from 3.20.1 to 3.23.1
 * Some HPSS batch jobs need more than 2GB
 * Fix in bash scripts/exregional_make_lbcs.sh
  • Loading branch information
RatkoVasic-NOAA committed Feb 26, 2024
1 parent 6d3ebfb commit b10dbad
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 5 deletions.
3 changes: 3 additions & 0 deletions modulefiles/build_hera_gnu.lua
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ the NOAA RDHPC machine Hera using GNU 9.2.0

whatis([===[Loads libraries needed for building the UFS SRW App on Hera using GNU 9.2.0 ]===])

-- When Hera switches from CentOS to Rocky, replace line withh correct path to spack-stack
-- If you want to use Rocky OS now, use line below
--prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.5.0/envs/unified-env-rocky8/install/modulefiles/Core")
prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.5.0/envs/unified-env-noavx512/install/modulefiles/Core")
prepend_path("MODULEPATH", "/scratch1/NCEPDEV/jcsda/jedipara/spack-stack/modulefiles")

Expand Down
5 changes: 4 additions & 1 deletion modulefiles/build_hera_intel.lua
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ whatis([===[Loads libraries needed for building the UFS SRW App on Hera ]===])
prepend_path("MODULEPATH","/contrib/sutils/modulefiles")
load("sutils")

-- When Hera switches from CentOS to Rocky, replace line withh correct path to spack-stack
-- If you want to use Rocky OS now, use line below
--prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.5.0/envs/unified-env-rocky8/install/modulefiles/Core")
prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.5.0/envs/unified-env-noavx512/install/modulefiles/Core")
prepend_path("MODULEPATH", "/scratch1/NCEPDEV/jcsda/jedipara/spack-stack/modulefiles")

Expand All @@ -20,7 +23,7 @@ load(pathJoin("stack-intel-oneapi-mpi", stack_impi_ver))
stack_python_ver=os.getenv("stack_python_ver") or "3.10.8"
load(pathJoin("stack-python", stack_python_ver))

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

load("srw_common")
Expand Down
4 changes: 2 additions & 2 deletions parm/wflow/coldstart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ task_get_extrn_ics:
<<: *default_vars
ICS_OR_LBCS: ICS
join: !cycstr '&LOGDIR;/{{ jobname }}_@Y@m@d@H&LOGEXT;'
memory: 2G
memory: 4G
nnodes: 1
native: '{% if platform.get("SCHED_NATIVE_CMD_HPSS") %}{{ platform.SCHED_NATIVE_CMD_HPSS }}{% else %}{{ platform.SCHED_NATIVE_CMD}}{% endif %}'
partition: '{% if platform.get("PARTITION_HPSS") %}&PARTITION_HPSS;{% else %}None{% endif %}'
Expand Down Expand Up @@ -59,7 +59,7 @@ task_get_extrn_lbcs:
<<: *default_vars
ICS_OR_LBCS: LBCS
join: !cycstr '&LOGDIR;/{{ jobname }}_@Y@m@d@H&LOGEXT;'
memory: 2G
memory: 4G
nnodes: 1
native: '{% if platform.get("SCHED_NATIVE_CMD_HPSS") %}{{ platform.SCHED_NATIVE_CMD_HPSS }}{% else %}{{ platform.SCHED_NATIVE_CMD}}{% endif %}'
partition: '{% if platform.get("PARTITION_HPSS") %}&PARTITION_HPSS;{% else %}None{% endif %}'
Expand Down
2 changes: 1 addition & 1 deletion scripts/exregional_make_lbcs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -410,7 +410,7 @@ for (( ii=0; ii<${num_fhrs}; ii=ii+bcgrpnum10 )); do
fi
;;
"GDAS")
fn_atm="${EXTRN_MDL_FNS[0][$i]}"
fn_atm="${EXTRN_MDL_FNS[$i]}"
;;
"GEFS")
fn_grib2="${EXTRN_MDL_FNS[$i]}"
Expand Down
2 changes: 1 addition & 1 deletion ush/machine/jet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ platform:
DOMAIN_PREGEN_BASEDIR: /mnt/lfs4/HFIP/hfv3gfs/role.epic/UFS_SRW_data/develop/FV3LAM_pregen
PARTITION_DEFAULT: sjet,vjet,kjet,xjet
QUEUE_DEFAULT: batch
PARTITION_FCST: xjet
PARTITION_FCST: vjet
QUEUE_FCST: batch
PARTITION_HPSS: service
QUEUE_HPSS: batch
Expand Down

0 comments on commit b10dbad

Please sign in to comment.