Skip to content
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

Temporary fix for Rocky8 (dev) #59

Merged
merged 5 commits into from
May 17, 2024
Merged

Temporary fix for Rocky8 (dev) #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
86867b6
temporary fix for Rocky8
kayeekayee Apr 15, 2024
d67e38c
use temporary gfs_utils from KaYee
kayeekayee Apr 16, 2024
75e9f8b
replace gfs_utils.fd pointer to KaYee
kayeekayee Apr 16, 2024
a3ab0e6
increase wallclock time to run 120hrs
kayeekayee Apr 17, 2024
2a9e30e
increase more wallclock time to run 120hrs
kayeekayee Apr 17, 2024
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
2 changes: 1 addition & 1 deletion .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
url = https://github.com/NOAA-EMC/wxflow
[submodule "sorc/gfs_utils.fd"]
path = sorc/gfs_utils.fd
url = https://github.com/NOAA-EMC/gfs-utils
url = https://github.com/kayeekayee/gfs-utils.git
[submodule "sorc/ufs_utils.fd"]
path = sorc/ufs_utils.fd
url = https://github.com/NOAA-GSL/UFS_UTILS.git
Expand Down
4 changes: 4 additions & 0 deletions INFO
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
04-15-24
========
temporary fix for Rocky 8

03-12-24
========
12Jan24 global-workflow
Expand Down
4 changes: 2 additions & 2 deletions jobs/rocoto/init.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ status=$?
[[ $status -ne 0 ]] && exit $status

#JKH load ufs-utils modules
module use /scratch1/BMC/gsd-fv3-dev/Judy.K.Henderson/test/gsl_ufs_dev/sorc/ufs_utils.fd/modulefiles
module load build.hera.intel
module use /scratch1/BMC/gsd-fv3/rtruns/modulefiles
module load build.hera.gfsinit
module list

###############################################################
Expand Down
5 changes: 3 additions & 2 deletions jobs/rocoto/remapgrib.ksh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
# 236 201 244 130 224 242

# initialize
module load intel/2022.1.2
module load wgrib2/2.0.8
module load gnu/13.2.0 intel/2023.2.0 netcdf/4.7.0 wgrib2/3.1.2_ncep
module list
ECHO=echo
MKDIR=mkdir
LN=ln
Expand All @@ -20,6 +20,7 @@
echo "GRID_NAMES = ${GRID_NAMES}"
echo

echo `which wgrib2`

Check warning

Code scanning / shellcheck

Quote this to prevent word splitting. Warning

Quote this to prevent word splitting.

Check notice

Code scanning / shellcheck

Useless echo? Instead of 'echo $(cmd)', just use 'cmd'. Note

Useless echo? Instead of 'echo $(cmd)', just use 'cmd'.

Check notice

Code scanning / shellcheck

Use $(...) notation instead of legacy backticks .... Note

Use $(...) notation instead of legacy backticks ....

Check notice

Code scanning / shellcheck

'which' is non-standard. Use builtin 'command -v' instead. Note

'which' is non-standard. Use builtin 'command -v' instead.

Check notice

Code scanning / shellcheck

Consider invoking this command separately to avoid masking its return value (or use '|| true' to ignore). Note

Consider invoking this command separately to avoid masking its return value (or use '|| true' to ignore).
#########################
# Grid Definitions
#########################
Expand Down
7 changes: 3 additions & 4 deletions modulefiles/module_base.hera.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@ help([[
Load environment to run GFS on Hera
]])

spack_stack_ver=(os.getenv("spack_stack_ver") or "None")
spack_env=(os.getenv("spack_env") or "None")
prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-" .. spack_stack_ver .. "/envs/" .. spack_env .. "/install/modulefiles/Core")
local spack_mod_path=(os.getenv("spack_mod_path") or "None")
prepend_path("MODULEPATH", spack_mod_path)

load(pathJoin("stack-intel", (os.getenv("stack_intel_ver") or "None")))
load(pathJoin("stack-intel-oneapi-mpi", (os.getenv("stack_impi_ver") or "None")))
Expand Down Expand Up @@ -42,7 +41,7 @@ setenv("WGRIB2","wgrib2")
setenv("UTILROOT",(os.getenv("prod_util_ROOT") or "None"))

--prepend_path("MODULEPATH", pathJoin("/scratch1/NCEPDEV/global/glopara/git/prepobs/v" .. (os.getenv("prepobs_run_ver") or "None"), "modulefiles"))
prepend_path("MODULEPATH", pathJoin("/scratch1/NCEPDEV/global/glopara/git/prepobs/feature-GFSv17_com_reorg_log_update/modulefiles"))
prepend_path("MODULEPATH", pathJoin("/scratch1/NCEPDEV/global/glopara/git/prepobs/dev-gfsv17/modulefiles"))
load(pathJoin("prepobs", (os.getenv("prepobs_run_ver") or "None")))

prepend_path("MODULEPATH", pathJoin("/scratch1/NCEPDEV/global/glopara/git/Fit2Obs/v" .. (os.getenv("fit2obs_ver") or "None"), "modulefiles"))
Expand Down
4 changes: 2 additions & 2 deletions modulefiles/module_gwci.hera.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ help([[
Load environment to run GFS workflow setup scripts on Hera
]])

prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.5.1/envs/gsi-addon/install/modulefiles/Core")
prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.6.0/envs/gsi-addon-dev-rocky8/install/modulefiles/Core")

load(pathJoin("stack-intel", os.getenv("2021.5.0")))
load(pathJoin("stack-intel-oneapi-mpi", os.getenv("2021.5.1")))

load(pathJoin("netcdf-c", os.getenv("4.9.2")))
load(pathJoin("netcdf-fortran", os.getenv("4.6.0")))
load(pathJoin("netcdf-fortran", os.getenv("4.6.1")))
load(pathJoin("nccmp","1.9.0.1"))
load(pathJoin("wgrib2", "2.0.8"))

Expand Down
4 changes: 2 additions & 2 deletions modulefiles/module_gwsetup.hera.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ Load environment to run GFS workflow setup scripts on Hera

load(pathJoin("rocoto"))

prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.5.1/envs/gsi-addon/install/modulefiles/Core")
prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.6.0/envs/gsi-addon-dev-rocky8/install/modulefiles/Core")

local stack_intel_ver=os.getenv("stack_intel_ver") or "2021.5.0"
local python_ver=os.getenv("python_ver") or "3.10.8"
local python_ver=os.getenv("python_ver") or "3.11.6"

load(pathJoin("stack-intel", stack_intel_ver))
load(pathJoin("python", python_ver))
Expand Down
2 changes: 1 addition & 1 deletion sorc/gfs_utils.fd
Open in desktop
Submodule gfs_utils.fd updated 1 files
+2 −1 modulefiles/gfsutils_hera.intel.lua
3 changes: 2 additions & 1 deletion ush/load_fv3gfs_modules.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ source "${HOMEgfs}/modulefiles/module-setup.sh.inc"
source "${HOMEgfs}/versions/run.ver"

# Load our modules:
module use "${HOMEgfs}/modulefiles"
#KYWmodule use "${HOMEgfs}/modulefiles"
module use "/scratch1/BMC/gsd-fv3/rtruns/modulefiles/"

if [[ -d /lfs/f1 ]]; then
# We are on WCOSS2 (Cactus or Dogwood)
Expand Down
2 changes: 2 additions & 0 deletions versions/build.hera.ver
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
export stack_intel_ver=2021.5.0
export stack_impi_ver=2021.5.1
export spack_env=gsi-addon-dev-rocky8
source "${HOMEgfs:-}/versions/build.spack.ver"
export spack_mod_path="/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-${spack_stack_ver}/envs/${spack_env}/install/modulefiles/Core"
6 changes: 2 additions & 4 deletions versions/run.hera.ver
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
export stack_intel_ver=2021.5.0
export stack_impi_ver=2021.5.1
export spack_env=gsi-addon-dev-rocky8

export hpss_ver=hpss
export ncl_ver=6.6.2
export R_ver=3.5.0
export gempak_ver=7.4.2

#For metplus jobs, not currently working with spack-stack
#export met_ver=9.1.3
#export metplus_ver=3.1.1

source "${HOMEgfs:-}/versions/run.spack.ver"
export spack_mod_path="/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-${spack_stack_ver}/envs/${spack_env}/install/modulefiles/Core"
2 changes: 1 addition & 1 deletion versions/run.spack.ver
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
export spack_stack_ver=1.5.1
export spack_env=gsi-addon
export spack_env=gsi-addon-dev-rocky8
export python_ver=3.10.8

export jasper_ver=2.0.32
Expand Down
2 changes: 1 addition & 1 deletion workflow/gsl_template_hera.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
<account>gsd-fv3</account>
<queue>batch</queue>
<partition>hera</partition>
<walltime>04:10:00</walltime>
<walltime>05:00:00</walltime>
<!-- <nodes>101:ppn=40:tpp=1</nodes> --> <!-- 16x16, 2th, 2wg, 40wt -->
<nodes>56:ppn=40:tpp=1</nodes> <!-- 12x12, 2th, 1wg, 40wt -->
<native>&NATIVE_STR;</native>
Expand Down
Loading