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.

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

Update to spack-stack 1.6.0 #2239

Merged
merged 72 commits into from
Feb 23, 2024
Merged
Show file tree
Hide file tree
Changes from 46 commits
Commits
Show all changes
72 commits
Select commit Hold shift + click to select a range
21ff645
Update modulefiles, submodules to spack-stack 1.6.0. #2195
DavidHuber-NOAA Jan 19, 2024
9a09d30
Corrected gsi-addon-dev spelling.
DavidHuber-NOAA Jan 19, 2024
4365f63
Corrected the SS env. name in the version files. #2195
DavidHuber-NOAA Jan 22, 2024
3ef3411
Merge remote-tracking branch 'origin/develop' into ss160
DavidHuber-NOAA Jan 22, 2024
ccc6e2d
Reenable verif-global. #2195
DavidHuber-NOAA Jan 22, 2024
e304bbe
Better optimize build jobs (more ufs jobs).
DavidHuber-NOAA Jan 22, 2024
f663d47
Fix gsi-addon paths for hercules, orion, and S4.
DavidHuber-NOAA Jan 22, 2024
e400068
More gsi-addon path fixes.
DavidHuber-NOAA Jan 22, 2024
f775755
Assign fcsthrs for awips_g2 job.
DavidHuber-NOAA Jan 24, 2024
4c46354
Reenable verif-global support
DavidHuber-NOAA Jan 24, 2024
5ef8eb2
Merge branch 'ss160' of github.com:DavidHuber-NOAA/global-workflow in…
DavidHuber-NOAA Jan 24, 2024
a9eaec2
Update gdasapp to include ss/1.6.0 support.
DavidHuber-NOAA Jan 24, 2024
afa09e3
New (cleaner history) gdas hash.
DavidHuber-NOAA Jan 24, 2024
56b9680
Update hashes (revert WCOSS2 modules).
DavidHuber-NOAA Jan 24, 2024
6c05803
Fix wgrib2/gfs_utils on Hercules.
DavidHuber-NOAA Jan 25, 2024
4d66742
Merge branch 'ss160' of github.com:DavidHuber-NOAA/global-workflow in…
DavidHuber-NOAA Jan 25, 2024
04e0772
Update ufs_utils hash for spack-stack/1.6.0 support.
DavidHuber-NOAA Jan 26, 2024
be11f85
Merge branch 'ss160' of github.com:DavidHuber-NOAA/global-workflow in…
DavidHuber-NOAA Jan 26, 2024
6ffd94f
Update GDAS hash to include SS/1.6.0 support.
DavidHuber-NOAA Jan 26, 2024
2238dd6
Update Orion, Hercules, S4 modulefiles.
DavidHuber-NOAA Jan 29, 2024
81557be
Update monitor hash to noaa-emc with SS/1.6.0 support.
DavidHuber-NOAA Jan 29, 2024
0400e1f
Fix gfs_utils Orion spack-stack env path.
DavidHuber-NOAA Jan 30, 2024
b5f2bd9
Merge branch 'ss160' of github.com:DavidHuber-NOAA/global-workflow in…
DavidHuber-NOAA Jan 30, 2024
dae884a
Removed jlogfile and postmsg references within gempak scripts.
henrywinterbottom-wxdev Feb 7, 2024
5894ca2
Removed dummy variable passed to perl scripts.
henrywinterbottom-wxdev Feb 7, 2024
4745d4a
Removed jlogfile references.
henrywinterbottom-wxdev Feb 7, 2024
2d08d01
Merge branch 'NOAA-EMC:develop' into feature/gfsv17_issue_2125
HenryRWinterbottom Feb 8, 2024
4b01d8e
Revert Hercules modules to SS/1.5.1.
DavidHuber-NOAA Feb 9, 2024
b972f66
Fix SS versions for CI modules.
DavidHuber-NOAA Feb 9, 2024
28ccf78
Merge remote-tracking branch 'emc/develop' into ss160
DavidHuber-NOAA Feb 9, 2024
929b903
Merge branch 'NOAA-EMC:develop' into feature/gfsv17_issue_2125
HenryRWinterbottom Feb 13, 2024
40f2cf6
Implemented ush/detect_machine.sh for host determination and removed …
henrywinterbottom-wxdev Feb 13, 2024
0330411
Merge branch 'NOAA-EMC:develop' into feature/gfsv17_issue_2125
HenryRWinterbottom Feb 14, 2024
60d5ee6
Merge branch 'NOAA-EMC:develop' into feature/gwdev_issue_2129
HenryRWinterbottom Feb 14, 2024
e4bc674
Corrected based on reviewer review.
henrywinterbottom-wxdev Feb 14, 2024
73bc76b
Updates based on user request.
henrywinterbottom-wxdev Feb 14, 2024
8f59002
Update GSI hashes.
DavidHuber-NOAA Feb 14, 2024
2b160f8
Reenable METplus jobs on Hercules.
DavidHuber-NOAA Feb 14, 2024
4568653
Reupgrade Hercules to SS/1.6.0
DavidHuber-NOAA Feb 14, 2024
c3553f0
Merge remote-tracking branch 'origin/develop' into ss160
DavidHuber-NOAA Feb 14, 2024
49392dd
Updated GSI-Utils hash to head of develop.
DavidHuber-NOAA Feb 14, 2024
3080a34
Fixed xarray version for SS/1.6.0.
DavidHuber-NOAA Feb 14, 2024
0ce8c0d
Fix git version in Hera's gwsetup module.
DavidHuber-NOAA Feb 15, 2024
ef07235
Revert UFS hash.
DavidHuber-NOAA Feb 15, 2024
777d97d
Fixed Orion cdo version.
DavidHuber-NOAA Feb 15, 2024
eb8791c
Merge branch 'NOAA-EMC:develop' into feature/gwdev_issue_2129
HenryRWinterbottom Feb 15, 2024
2415b7b
Load default rocoto on Jet.
DavidHuber-NOAA Feb 15, 2024
9929277
Merge branch 'NOAA-EMC:develop' into feature/gwdev_issue_2129
HenryRWinterbottom Feb 15, 2024
eb2ed53
Merge branch 'NOAA-EMC:develop' into feature/gwdev_issue_2129
HenryRWinterbottom Feb 16, 2024
7ca45db
Merge branch 'NOAA-EMC:develop' into feature/gfsv17_issue_2125
HenryRWinterbottom Feb 16, 2024
f9fb64e
Merge remote-tracking branch 'emc/develop' into ss160
DavidHuber-NOAA Feb 16, 2024
6a0b7bf
Merge branch 'ss160' of github.com:DavidHuber-NOAA/global-workflow in…
DavidHuber-NOAA Feb 16, 2024
ed25bbd
Linter corrections.
henrywinterbottom-wxdev Feb 16, 2024
4624ce2
Updates requested by reviewer; testing -- DO NOT REVIEW.
henrywinterbottom-wxdev Feb 16, 2024
8e4f94d
Updates requested by reviewer Rahul Mahajan.
henrywinterbottom-wxdev Feb 16, 2024
4529e8c
Bug fix.
henrywinterbottom-wxdev Feb 16, 2024
48b34d0
Added verif-global support back to WCOSS2.
Feb 16, 2024
ae7eb19
Fix whitespace in build_upp.sh.
DavidHuber-NOAA Feb 16, 2024
d81f07f
Clean up build_upp.sh.
DavidHuber-NOAA Feb 20, 2024
a812f88
Update verif-global to latest WCOSS2 support.
DavidHuber-NOAA Feb 20, 2024
d7d28a6
Update comment about METplus support.
DavidHuber-NOAA Feb 20, 2024
fdc638c
Move SS module path to version files.
DavidHuber-NOAA Feb 20, 2024
3330cd7
Removed MET/METplus 'not available' comments
DavidHuber-NOAA Feb 20, 2024
0bf340b
Construct SS paths from version variables.
DavidHuber-NOAA Feb 20, 2024
f6d3015
Update GDASApp hash to include SS/1.6.0 support.
DavidHuber-NOAA Feb 20, 2024
516b2a2
Updated GDAS to include rocoto/1.3.6 on Hera.
DavidHuber-NOAA Feb 22, 2024
4ad837e
Merge remote-tracking branch 'henry/feature/gfsv17_issue_2125' into s…
DavidHuber-NOAA Feb 22, 2024
abbb0b8
Merge remote-tracking branch 'henry/feature/gwdev_issue_2129' into ss160
DavidHuber-NOAA Feb 22, 2024
79144f2
Merge remote-tracking branch 'origin/develop' into ss160
DavidHuber-NOAA Feb 22, 2024
5c96eb2
Update GDAS hash to allow modified snow DA analysis
DavidHuber-NOAA Feb 22, 2024
0459203
Update GDASApp hash to current develop
DavidHuber-NOAA Feb 22, 2024
79d305e
Disable snow DA tests
DavidHuber-NOAA Feb 22, 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
1 change: 1 addition & 0 deletions jobs/rocoto/awips_g2.sh
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ for fhr3 in ${fhrlst}; do
fhmax=240
if (( fhr >= fhmin && fhr <= fhmax )); then
if ((fhr % 6 == 0)); then
export fcsthrs="${fhr3}"
"${AWIPSG2SH}"
fi
fi
Expand Down
13 changes: 6 additions & 7 deletions modulefiles/module_base.hera.lua
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 @@ -33,12 +32,12 @@ load(pathJoin("wgrib2", (os.getenv("wgrib2_ver") or "None")))
load(pathJoin("py-netcdf4", (os.getenv("py_netcdf4_ver") or "None")))
load(pathJoin("py-pyyaml", (os.getenv("py_pyyaml_ver") or "None")))
load(pathJoin("py-jinja2", (os.getenv("py_jinja2_ver") or "None")))
load(pathJoin("py-pandas", (os.getenv("py_pandas_ver") or "None")))
load(pathJoin("py-python-dateutil", (os.getenv("py_python_dateutil_ver") or "None")))
load(pathJoin("met", (os.getenv("met_ver") or "None")))
load(pathJoin("metplus", (os.getenv("metplus_ver") or "None")))
load(pathJoin("py-xarray", (os.getenv("py_xarray_ver") or "None")))

-- MET/METplus are not available for use with spack-stack, yet
--load(pathJoin("met", (os.getenv("met_ver") or "None")))
--load(pathJoin("metplus", (os.getenv("metplus_ver") or "None")))

setenv("WGRIB2","wgrib2")
setenv("UTILROOT",(os.getenv("prod_util_ROOT") or "None"))

Expand Down
13 changes: 6 additions & 7 deletions modulefiles/module_base.hercules.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,15 @@ help([[
Load environment to run GFS on Hercules
]])

spack_stack_ver=(os.getenv("spack_stack_ver") or "None")
spack_env=(os.getenv("spack_env") or "None")
prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/hercules/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")))
load(pathJoin("intel-oneapi-mkl", (os.getenv("intel_mkl_ver") or "None")))
load(pathJoin("python", (os.getenv("python_ver") or "None")))
load(pathJoin("perl", (os.getenv("perl_ver") or "None")))

-- TODO load NCL once the SAs remove the 'depends_on' statements within it
-- NCL is a static installation and does not depend on any libraries
-- but as is will load, among others, the system netcdf-c/4.9.0 module
--load(pathJoin("ncl", (os.getenv("ncl_ver") or "None")))
load(pathJoin("jasper", (os.getenv("jasper_ver") or "None")))
load(pathJoin("libpng", (os.getenv("libpng_ver") or "None")))
load(pathJoin("cdo", (os.getenv("cdo_ver") or "None")))
Expand All @@ -35,6 +30,10 @@ load(pathJoin("wgrib2", (os.getenv("wgrib2_ver") or "None")))
load(pathJoin("py-netcdf4", (os.getenv("py_netcdf4_ver") or "None")))
load(pathJoin("py-pyyaml", (os.getenv("py_pyyaml_ver") or "None")))
load(pathJoin("py-jinja2", (os.getenv("py_jinja2_ver") or "None")))
load(pathJoin("py-pandas", (os.getenv("py_pandas_ver") or "None")))
load(pathJoin("py-python-dateutil", (os.getenv("py_python_dateutil_ver") or "None")))
load(pathJoin("met", (os.getenv("met_ver") or "None")))
load(pathJoin("metplus", (os.getenv("metplus_ver") or "None")))
load(pathJoin("py-xarray", (os.getenv("py_xarray_ver") or "None")))

setenv("WGRIB2","wgrib2")
Expand Down
9 changes: 6 additions & 3 deletions modulefiles/module_base.jet.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@ help([[
Load environment to run GFS on Jet
]])

spack_stack_ver=(os.getenv("spack_stack_ver") or "None")
spack_env=(os.getenv("spack_env") or "None")
prepend_path("MODULEPATH", "/mnt/lfs4/HFIP/hfv3gfs/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 @@ -33,6 +32,10 @@ load(pathJoin("wgrib2", (os.getenv("wgrib2_ver") or "None")))
load(pathJoin("py-netcdf4", (os.getenv("py_netcdf4_ver") or "None")))
load(pathJoin("py-pyyaml", (os.getenv("py_pyyaml_ver") or "None")))
load(pathJoin("py-jinja2", (os.getenv("py_jinja2_ver") or "None")))
load(pathJoin("py-pandas", (os.getenv("py_pandas_ver") or "None")))
load(pathJoin("py-python-dateutil", (os.getenv("py_python_dateutil_ver") or "None")))
load(pathJoin("met", (os.getenv("met_ver") or "None")))
load(pathJoin("metplus", (os.getenv("metplus_ver") or "None")))
load(pathJoin("py-xarray", (os.getenv("py_xarray_ver") or "None")))

setenv("WGRIB2","wgrib2")
Expand Down
13 changes: 6 additions & 7 deletions modulefiles/module_base.orion.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@ help([[
Load environment to run GFS on Orion
]])

spack_stack_ver=(os.getenv("spack_stack_ver") or "None")
spack_env=(os.getenv("spack_env") or "None")
prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/orion/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 All @@ -31,12 +30,12 @@ load(pathJoin("wgrib2", (os.getenv("wgrib2_ver") or "None")))
load(pathJoin("py-netcdf4", (os.getenv("py_netcdf4_ver") or "None")))
load(pathJoin("py-pyyaml", (os.getenv("py_pyyaml_ver") or "None")))
load(pathJoin("py-jinja2", (os.getenv("py_jinja2_ver") or "None")))
load(pathJoin("py-pandas", (os.getenv("py_pandas_ver") or "None")))
load(pathJoin("py-python-dateutil", (os.getenv("py_python_dateutil_ver") or "None")))
load(pathJoin("met", (os.getenv("met_ver") or "None")))
load(pathJoin("metplus", (os.getenv("metplus_ver") or "None")))
load(pathJoin("py-xarray", (os.getenv("py_xarray_ver") or "None")))

-- MET/METplus are not yet supported with spack-stack
--load(pathJoin("met", (os.getenv("met_ver") or "None")))
--load(pathJoin("metplus", (os.getenv("metplus_ver") or "None")))

setenv("WGRIB2","wgrib2")
setenv("UTILROOT",(os.getenv("prod_util_ROOT") or "None"))

Expand Down
9 changes: 6 additions & 3 deletions modulefiles/module_base.s4.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@ help([[
Load environment to run GFS on S4
]])

spack_stack_ver=(os.getenv("spack_stack_ver") or "None")
spack_env=(os.getenv("spack_env") or "None")
prepend_path("MODULEPATH", "/data/prod/jedi/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 All @@ -30,6 +29,10 @@ load(pathJoin("wgrib2", (os.getenv("wgrib2_ver") or "None")))
load(pathJoin("py-netcdf4", (os.getenv("py_netcdf4_ver") or "None")))
load(pathJoin("py-pyyaml", (os.getenv("py_pyyaml_ver") or "None")))
load(pathJoin("py-jinja2", (os.getenv("py_jinja2_ver") or "None")))
load(pathJoin("py-pandas", (os.getenv("py_pandas_ver") or "None")))
load(pathJoin("py-python-dateutil", (os.getenv("py_python_dateutil_ver") or "None")))
load(pathJoin("met", (os.getenv("met_ver") or "None")))
load(pathJoin("metplus", (os.getenv("metplus_ver") or "None")))
load(pathJoin("py-xarray", (os.getenv("py_xarray_ver") or "None")))

setenv("WGRIB2","wgrib2")
Expand Down
5 changes: 5 additions & 0 deletions modulefiles/module_base.wcoss2.lua
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,11 @@ load(pathJoin("ncdiag", (os.getenv("ncdiag_ver") or "None")))
load(pathJoin("crtm", (os.getenv("crtm_ver") or "None")))
load(pathJoin("wgrib2", (os.getenv("wgrib2_ver") or "None")))

prepend_path("MODULEPATH", "/apps/ops/para/libs/modulefiles/compiler/intel/19.1.3.304")
setenv("HPC_OPT", "/apps/ops/para/libs")
load(pathJoin("met", (os.getenv("met_ver") or "None")))
load(pathJoin("metplus", (os.getenv("metplus_ver") or "None")))

--prepend_path("MODULEPATH", pathJoin("/lfs/h2/emc/global/save/emc.global/git/prepobs/v" .. (os.getenv("prepobs_run_ver") or "None"), "modulefiles"))
prepend_path("MODULEPATH", pathJoin("/lfs/h2/emc/global/save/emc.global/git/prepobs/feature-GFSv17_com_reorg_log_update/modulefiles"))
load(pathJoin("prepobs", (os.getenv("prepobs_run_ver") or "None")))
Expand Down
4 changes: 2 additions & 2 deletions modulefiles/module_gwci.hera.lua
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/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
2 changes: 1 addition & 1 deletion modulefiles/module_gwci.hercules.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ help([[
Load environment to run GFS workflow ci scripts on Hercules
]])

prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.5.1/envs/gsi-addon/install/modulefiles/Core")
prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.6.0/envs/gsi-addon-env/install/modulefiles/Core")

load(pathJoin("stack-intel", os.getenv("2021.9.0")))
load(pathJoin("stack-intel-oneapi-mpi", os.getenv("2021.9.0")))
Expand Down
4 changes: 2 additions & 2 deletions modulefiles/module_gwci.orion.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ help([[
Load environment to run GFS workflow ci scripts on Orion
]])

prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-1.5.1/envs/gsi-addon/install/modulefiles/Core")
prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-1.6.0/envs/gsi-addon-env/install/modulefiles/Core")

load(pathJoin("stack-intel", os.getenv("2022.0.2")))
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
6 changes: 3 additions & 3 deletions modulefiles/module_gwsetup.hera.lua
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@ 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/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))
load("py-jinja2")
load("py-pyyaml")
load("py-numpy")
local git_ver=os.getenv("git_ver") or "2.40.0"
local git_ver=os.getenv("git_ver") or "2.18.0"
load(pathJoin("git", git_ver))

whatis("Description: GFS run setup environment")
4 changes: 2 additions & 2 deletions modulefiles/module_gwsetup.hercules.lua
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ Load environment to run GFS workflow ci scripts on Hercules
load(pathJoin("contrib","0.1"))
load(pathJoin("rocoto","1.3.5"))

prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.5.1/envs/gsi-addon/install/modulefiles/Core")
prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.6.0/envs/gsi-addon-env/install/modulefiles/Core")

local stack_intel_ver=os.getenv("stack_intel_ver") or "2021.9.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
6 changes: 3 additions & 3 deletions modulefiles/module_gwsetup.jet.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ help([[
Load environment to run GFS workflow setup scripts on Jet
]])

load(pathJoin("rocoto", "1.3.3"))
load(pathJoin("rocoto"))

prepend_path("MODULEPATH", "/mnt/lfs4/HFIP/hfv3gfs/role.epic/spack-stack/spack-stack-1.5.1/envs/gsi-addon/install/modulefiles/Core")
prepend_path("MODULEPATH", "/mnt/lfs4/HFIP/hfv3gfs/role.epic/spack-stack/spack-stack-1.6.0/envs/gsi-addon-dev/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
4 changes: 2 additions & 2 deletions modulefiles/module_gwsetup.orion.lua
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ load(pathJoin("contrib","0.1"))
load(pathJoin("rocoto","1.3.3"))
load(pathJoin("git","2.28.0"))

prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-1.5.1/envs/gsi-addon/install/modulefiles/Core")
prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-1.6.0/envs/gsi-addon-env/install/modulefiles/Core")

local stack_intel_ver=os.getenv("stack_intel_ver") or "2022.0.2"
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
4 changes: 2 additions & 2 deletions modulefiles/module_gwsetup.s4.lua
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ Load environment to run GFS workflow setup scripts on S4
load(pathJoin("rocoto","1.3.5"))
load(pathJoin("git","2.30.0"))

prepend_path("MODULEPATH", "/data/prod/jedi/spack-stack/spack-stack-1.5.1/envs/gsi-addon/install/modulefiles/Core")
prepend_path("MODULEPATH", "/data/prod/jedi/spack-stack/spack-stack-1.6.0/envs/gsi-addon-env/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 parm/config/gfs/config.base.emc.dyn
Original file line number Diff line number Diff line change
Expand Up @@ -377,7 +377,7 @@ export netcdf_diag=".true."
export binary_diag=".false."

# Verification options
export DO_METP="NO" # Run METPLUS jobs - set METPLUS settings in config.metp; not supported with spack-stack
export DO_METP="YES" # Run METPLUS jobs - set METPLUS settings in config.metp
export DO_FIT2OBS="YES" # Run fit to observations package
export DO_VRFY_OCEANDA="NO" # Run SOCA Ocean DA verification tasks

Expand Down
1 change: 1 addition & 0 deletions parm/config/gfs/config.metp
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ export VERIF_GLOBALSH=${HOMEverif_global}/ush/run_verif_global_in_global_workflo
export model=${PSLOT}
export model_file_format="pgbf{lead?fmt=%2H}.${CDUMP}.{init?fmt=%Y%m%d%H}.grib2"
export model_hpss_dir=${ATARDIR}/..
export model_dir=${ARCDIR}/..
export get_data_from_hpss="NO"
export hpss_walltime="10"
## OUTPUT SETTINGS
Expand Down
8 changes: 4 additions & 4 deletions sorc/build_all.sh
Original file line number Diff line number Diff line change
Expand Up @@ -119,16 +119,16 @@ build_jobs["ufs"]=8
big_jobs=$((big_jobs+1))
build_opts["ufs"]="${_wave_unst} ${_verbose_opt} ${_build_ufs_opt}"

build_jobs["upp"]=6 # The UPP is hardcoded to use 6 cores
build_jobs["upp"]=2
build_opts["upp"]=""

build_jobs["ufs_utils"]=3
build_jobs["ufs_utils"]=2
build_opts["ufs_utils"]="${_verbose_opt}"

build_jobs["gfs_utils"]=1
build_opts["gfs_utils"]="${_verbose_opt}"

build_jobs["ww3prepost"]=3
build_jobs["ww3prepost"]=2
build_opts["ww3prepost"]="${_wave_unst} ${_verbose_opt} ${_build_ufs_opt}"

# Optional DA builds
Expand All @@ -146,7 +146,7 @@ if [[ "${_build_gsi}" == "YES" ]]; then
build_opts["gsi_enkf"]="${_verbose_opt}"
fi
if [[ "${_build_gsi}" == "YES" || "${_build_ufsda}" == "YES" ]] ; then
build_jobs["gsi_utils"]=2
build_jobs["gsi_utils"]=1
build_opts["gsi_utils"]="${_verbose_opt}"
if [[ "${MACHINE_ID}" == "hercules" ]]; then
echo "NOTE: The GSI Monitor is not supported on Hercules. Disabling build."
Expand Down
5 changes: 3 additions & 2 deletions sorc/build_upp.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,10 @@ cd "${script_dir}" || exit 1

OPTIND=1
_opts=""
while getopts ":dv" option; do
while getopts ":dj:v" option; do
case "${option}" in
d) _opts+="-d ";;
j) export BUILD_JOBS="${OPTARG}" ;;
v) _opts+="-v ";;
:)
echo "[${BASH_SOURCE[0]}]: ${option} requires an argument"
Expand All @@ -27,4 +28,4 @@ fi

cd ufs_model.fd/FV3/upp/tests
# shellcheck disable=SC2086
./compile_upp.sh ${_opts}
BUILD_JOBS=${BUILD_JOBS:-8} ./compile_upp.sh ${_opts}
2 changes: 1 addition & 1 deletion sorc/gsi_enkf.fd
Submodule gsi_enkf.fd updated 154 files
2 changes: 1 addition & 1 deletion sorc/gsi_utils.fd
Submodule gsi_utils.fd updated 42 files
+14 −0 .github/workflows/gcc.yml
+14 −0 .github/workflows/intel.yml
+2 −2 ci/spack.yaml
+3 −3 modulefiles/gsiutils_common.lua
+3 −3 modulefiles/gsiutils_hera.gnu.lua
+3 −3 modulefiles/gsiutils_hera.intel.lua
+3 −3 modulefiles/gsiutils_hercules.intel.lua
+3 −3 modulefiles/gsiutils_jet.intel.lua
+3 −3 modulefiles/gsiutils_orion.intel.lua
+3 −3 modulefiles/gsiutils_s4.intel.lua
+1 −1 modulefiles/gsiutils_wcoss2.intel.lua
+0 −1 src/CMakeLists.txt
+0 −7 src/README
+0 −209 src/Radiance_Utilities/diag2grads/Makefile
+0 −88 src/Radiance_Utilities/diag2grads/Makefile.conf.AIX
+0 −68 src/Radiance_Utilities/diag2grads/Makefile.conf.wcoss
+0 −68 src/Radiance_Utilities/diag2grads/Makefile.conf.zeus
+0 −91 src/Radiance_Utilities/diag2grads/configure
+0 −468 src/Radiance_Utilities/diag2grads/diag2grads.f90
+0 −385 src/Radiance_Utilities/diag2grads/diag2grads.sh
+0 −29 src/Radiance_Utilities/diag2grads/grads_hdr.f90
+0 −1 src/Radiance_Utilities/diag2grads/kinds.F90
+0 −1 src/Radiance_Utilities/diag2grads/read_diag.f90
+0 −260 src/Radiance_Utilities/diag2grads/utilities_time.f90
+0 −80 src/Radiance_Utilities/diag2grads/write_station.f90
+0 −94 src/global_angupdate/Convert_Satang.f90
+0 −296 src/global_angupdate/JGDAS_ANGUPDATE
+0 −309 src/global_angupdate/Makefile
+0 −111 src/global_angupdate/Makefile.conf.AIX
+0 −73 src/global_angupdate/Makefile.conf.Linux
+0 −152 src/global_angupdate/Makefile.conf.theia
+0 −76 src/global_angupdate/Makefile.conf.wcoss
+0 −73 src/global_angupdate/Makefile.conf.zeus
+0 −4 src/global_angupdate/Makefile.dependency
+0 −91 src/global_angupdate/configure
+0 −89 src/global_angupdate/determine_time_levels.f90
+0 −374 src/global_angupdate/exglobal_angupdate.sh.ecf
+0 −1 src/global_angupdate/kinds.F90
+0 −696 src/global_angupdate/main.F90
+0 −1 src/global_angupdate/read_diag.f90
+1 −1 ush/build.sh
+60 −15 ush/detect_machine.sh
2 changes: 1 addition & 1 deletion sorc/verif-global.fd
Submodule verif-global.fd updated 42 files
+1 −3 README.md
+0 −59 ecf/scripts/verif_global/jverif_global_grid2grid_step1.ecf
+0 −59 ecf/scripts/verif_global/jverif_global_grid2grid_step2.ecf
+0 −59 ecf/scripts/verif_global/jverif_global_grid2obs_step1.ecf
+0 −59 ecf/scripts/verif_global/jverif_global_grid2obs_step2.ecf
+0 −59 ecf/scripts/verif_global/jverif_global_precip_step1.ecf
+0 −59 ecf/scripts/verif_global/jverif_global_precip_step2.ecf
+0 −128 jobs/JVERIF_GLOBAL_GRID2GRID_STEP1
+0 −128 jobs/JVERIF_GLOBAL_GRID2GRID_STEP2
+0 −128 jobs/JVERIF_GLOBAL_GRID2OBS_STEP1
+0 −128 jobs/JVERIF_GLOBAL_GRID2OBS_STEP2
+0 −128 jobs/JVERIF_GLOBAL_PRECIP_STEP1
+0 −128 jobs/JVERIF_GLOBAL_PRECIP_STEP2
+59 −0 modulefiles/emc_verif_global_jet.lua
+35 −29 parm/config/config.vrfy
+3 −7 scripts/exgrid2grid_step1.sh
+3 −7 scripts/exgrid2grid_step2.sh
+3 −7 scripts/exgrid2obs_step1.sh
+3 −7 scripts/exgrid2obs_step2.sh
+3 −7 scripts/exmaps2d.sh
+3 −7 scripts/exmapsda.sh
+3 −7 scripts/exprecip_step1.sh
+3 −7 scripts/exprecip_step2.sh
+3 −7 scripts/exsatellite_step1.sh
+3 −7 scripts/exsatellite_step2.sh
+7 −14 scripts/extropcyc.sh
+7 −23 ush/build_webpage.py
+53 −4 ush/check_config.py
+14 −4 ush/create_METplus_job_scripts.py
+239 −88 ush/get_data_files.py
+8 −20 ush/get_machine.py
+126 −0 ush/get_tc_info.py
+15 −98 ush/load_modules.sh
+6 −14 ush/load_to_METviewer_AWS.py
+7 −7 ush/plotting_scripts/plot_maps2d_lat_lon_errors.py
+7 −7 ush/plotting_scripts/plot_maps2d_model2obs_calc_vars_lat_lon_errors.py
+7 −7 ush/plotting_scripts/plot_mapsda_lat_lon_errors.py
+6 −16 ush/plotting_scripts/plot_scorecard.py
+17 −42 ush/run_batch.py
+23 −219 ush/run_verif_global_in_global_workflow.sh
+39 −69 ush/set_up_verif_global.sh
+4 −3 versions/run.ver
2 changes: 2 additions & 0 deletions versions/build.hera.ver
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
aerorahul marked this conversation as resolved.
Show resolved Hide resolved
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"
3 changes: 3 additions & 0 deletions versions/build.hercules.ver
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
export stack_intel_ver=2021.9.0
export stack_impi_ver=2021.9.0
export intel_mkl_ver=2023.1.0
export spack_env=gsi-addon-env
source "${HOMEgfs:-}/versions/build.spack.ver"
export spack_mod_path="/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-${spack_stack_ver}/envs/${spack_env}/install/modulefiles/Core"
2 changes: 2 additions & 0 deletions versions/build.jet.ver
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
source "${HOMEgfs:-}/versions/build.spack.ver"
export spack_mod_path="/lfs4/HFIP/hfv3gfs/role.epic/spack-stack/spack-stack-${spack_stack_ver}/envs/${spack_env}/install/modulefiles/Core"
4 changes: 3 additions & 1 deletion versions/build.orion.ver
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
export stack_intel_ver=2021.5.0
export stack_intel_ver=2022.0.2
export stack_impi_ver=2021.5.1
export spack_env=gsi-addon-env
source "${HOMEgfs:-}/versions/build.spack.ver"
export spack_mod_path="/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-${spack_stack_ver}/envs/${spack_env}/install/modulefiles/Core"
2 changes: 2 additions & 0 deletions versions/build.s4.ver
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.0
export spack_env=gsi-addon-env
source "${HOMEgfs:-}/versions/build.spack.ver"
export spack_mod_path="/data/prod/jedi/spack-stack/spack-stack-${spack_stack_ver}/envs/${spack_env}/install/modulefiles/Core"
Loading
Loading