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 obsproc/v1.2.0 and prepobs/v1.1.0 #2903

Merged
Show file tree
Hide file tree
Changes from 13 commits
Commits
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
6 changes: 2 additions & 4 deletions modulefiles/module_base.gaea.lua
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,8 @@ load(pathJoin("py-xarray", (os.getenv("py_xarray_ver") or "None")))
setenv("WGRIB2","wgrib2")
setenv("UTILROOT",(os.getenv("prod_util_ROOT") or "None"))

--prepend_path("MODULEPATH", pathJoin("/gpfs/f5/ufs-ard/world-shared/global/glopara/data/git/prepobs/v" .. (os.getenv("prepobs_run_ver") or "None"), "modulefiles"))
--load(pathJoin("prepobs", (os.getenv("prepobs_run_ver") or "None")))
prepend_path("MODULEPATH", pathJoin("/gpfs/f5/ufs-ard/world-shared/global/glopara/data/git/prepobs/v1.1.0", "modulefiles"))
load(pathJoin("prepobs", "1.1.0"))
prepend_path("MODULEPATH", pathJoin("/gpfs/f5/ufs-ard/world-shared/global/glopara/data/git/prepobs/v" .. (os.getenv("prepobs_run_ver") or "None"), "modulefiles"))
load(pathJoin("prepobs", (os.getenv("prepobs_run_ver") or "None")))

prepend_path("MODULEPATH", pathJoin("/gpfs/f5/ufs-ard/world-shared/global/glopara/data/git/Fit2Obs/v" .. (os.getenv("fit2obs_ver") or "None"), "modulefiles"))
load(pathJoin("fit2obs", (os.getenv("fit2obs_ver") or "None")))
Expand Down
6 changes: 2 additions & 4 deletions modulefiles/module_base.hercules.lua
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,10 @@ setenv("WGRIB2","wgrib2")
setenv("WGRIB","wgrib")
setenv("UTILROOT",(os.getenv("prod_util_ROOT") or "None"))

--prepend_path("MODULEPATH", pathJoin"/work/noaa/global/glopara/git/prepobs/v" .. (os.getenv("prepobs_run_ver") or "None"), "modulefiles")
prepend_path("MODULEPATH", pathJoin("/work/noaa/global/kfriedma/glopara/git/prepobs/v" .. (os.getenv("prepobs_run_ver") or "None"), "modulefiles"))
prepend_path("MODULEPATH", pathJoin"/work/noaa/global/glopara/git/prepobs/v" .. (os.getenv("prepobs_run_ver") or "None"), "modulefiles")
load(pathJoin("prepobs", (os.getenv("prepobs_run_ver") or "None")))

--prepend_path("MODULEPATH", pathJoin("/work/noaa/global/glopara/git/Fit2Obs/v" .. (os.getenv("fit2obs_ver") or "None"), "modulefiles"))
prepend_path("MODULEPATH", pathJoin("/work/noaa/global/kfriedma/glopara/git/Fit2Obs/v" .. (os.getenv("fit2obs_ver") or "None"), "modulefiles"))
prepend_path("MODULEPATH", pathJoin("/work/noaa/global/glopara/git/Fit2Obs/v" .. (os.getenv("fit2obs_ver") or "None"), "modulefiles"))
load(pathJoin("fit2obs", (os.getenv("fit2obs_ver") or "None")))

whatis("Description: GFS run environment")
2 changes: 1 addition & 1 deletion modulefiles/module_base.jet.lua
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ setenv("WGRIB2","wgrib2")
setenv("WGRIB","wgrib")
setenv("UTILROOT",(os.getenv("prod_util_ROOT") or "None"))

prepend_path("MODULEPATH", pathJoin("/lfs4/HFIP/hfv3gfs/glopara/git/prepobs/v" .. (os.getenv("prepobs_run_ver") or "None"), "modulefiles"))
prepend_path("MODULEPATH", pathJoin("/lfs5/HFIP/hfv3gfs/glopara/git/prepobs/v" .. (os.getenv("prepobs_run_ver") or "None"), "modulefiles"))
load(pathJoin("prepobs", (os.getenv("prepobs_run_ver") or "None")))

prepend_path("MODULEPATH", pathJoin("/lfs4/HFIP/hfv3gfs/glopara/git/Fit2Obs/v" .. (os.getenv("fit2obs_ver") or "None"), "modulefiles"))
Expand Down
6 changes: 2 additions & 4 deletions modulefiles/module_base.orion.lua
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,10 @@ setenv("WGRIB2","wgrib2")
setenv("WGRIB","wgrib")
setenv("UTILROOT",(os.getenv("prod_util_ROOT") or "None"))

--prepend_path("MODULEPATH", pathJoin"/work/noaa/global/glopara/git/prepobs/v" .. (os.getenv("prepobs_run_ver") or "None"), "modulefiles")
prepend_path("MODULEPATH", pathJoin("/work/noaa/global/kfriedma/glopara/git/prepobs/v" .. (os.getenv("prepobs_run_ver") or "None"), "modulefiles"))
prepend_path("MODULEPATH", pathJoin"/work/noaa/global/glopara/git/prepobs/v" .. (os.getenv("prepobs_run_ver") or "None"), "modulefiles")
load(pathJoin("prepobs", (os.getenv("prepobs_run_ver") or "None")))

--prepend_path("MODULEPATH", pathJoin("/work/noaa/global/glopara/git/Fit2Obs/v" .. (os.getenv("fit2obs_ver") or "None"), "modulefiles"))
prepend_path("MODULEPATH", pathJoin("/work/noaa/global/kfriedma/glopara/git/Fit2Obs/v" .. (os.getenv("fit2obs_ver") or "None"), "modulefiles"))
prepend_path("MODULEPATH", pathJoin("/work/noaa/global/glopara/git/Fit2Obs/v" .. (os.getenv("fit2obs_ver") or "None"), "modulefiles"))
load(pathJoin("fit2obs", (os.getenv("fit2obs_ver") or "None")))

whatis("Description: GFS run environment")
2 changes: 1 addition & 1 deletion modulefiles/module_base.wcoss2.lua
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ 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/gfsv17_v" .. (os.getenv("prepobs_run_ver") or "None"), "modulefiles"))
load(pathJoin("prepobs", (os.getenv("prepobs_run_ver") or "None")))

prepend_path("MODULEPATH", pathJoin("/lfs/h2/emc/global/save/emc.global/git/Fit2Obs/v" .. (os.getenv("fit2obs_ver") or "None"), "modulefiles"))
Expand Down
2 changes: 1 addition & 1 deletion parm/config/gfs/config.base
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ export MODE="@MODE@" # cycled/forecast-only
# Build paths relative to $HOMEgfs
export FIXgsi="${HOMEgfs}/fix/gsi"
export HOMEpost="${HOMEgfs}"
export HOMEobsproc="${BASE_GIT:-}/obsproc/v${obsproc_run_ver:-1.1.2}"
export HOMEobsproc="${BASE_GIT:-}/obsproc/v${obsproc_run_ver:-}"

# CONVENIENT utility scripts and other environment parameters
export NCP="/bin/cp -p"
Expand Down
3 changes: 1 addition & 2 deletions versions/build.gaea.ver
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
export stack_intel_ver=2023.1.0
export stack_cray_mpich_ver=8.1.25
export spack_env=gsi-addon-dev

source "${HOMEgfs:-}/versions/run.spack.ver"
source "${HOMEgfs:-}/versions/spack.ver"
export spack_mod_path="/ncrc/proj/epic/spack-stack/spack-stack-${spack_stack_ver}/envs/${spack_env}/install/modulefiles/Core"
2 changes: 1 addition & 1 deletion versions/build.hera.ver
Original file line number Diff line number Diff line change
@@ -1,5 +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"
source "${HOMEgfs:-}/versions/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/build.hercules.ver
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ 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"
source "${HOMEgfs:-}/versions/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: 1 addition & 1 deletion versions/build.jet.ver
Original file line number Diff line number Diff line change
@@ -1,5 +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"
source "${HOMEgfs:-}/versions/spack.ver"
export spack_mod_path="/lfs4/HFIP/hfv3gfs/role.epic/spack-stack/spack-stack-${spack_stack_ver}/envs/${spack_env}/install/modulefiles/Core"
2 changes: 1 addition & 1 deletion versions/build.noaacloud.ver
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
export stack_intel_ver=2021.3.0
export stack_impi_ver=2021.3.0
export spack_env=gsi-addon-env
source "${HOMEgfs:-}/versions/build.spack.ver"
source "${HOMEgfs:-}/versions/spack.ver"
export spack_mod_path="/contrib/spack-stack/spack-stack-${spack_stack_ver}/envs/gsi-addon-env/install/modulefiles/Core"
2 changes: 1 addition & 1 deletion versions/build.orion.ver
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
export stack_intel_ver=2021.9.0
export stack_impi_ver=2021.9.0
export spack_env=gsi-addon-env-rocky9
source "${HOMEgfs:-}/versions/build.spack.ver"
source "${HOMEgfs:-}/versions/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: 1 addition & 1 deletion versions/build.s4.ver
Original file line number Diff line number Diff line change
@@ -1,5 +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"
source "${HOMEgfs:-}/versions/spack.ver"
export spack_mod_path="/data/prod/jedi/spack-stack/spack-stack-${spack_stack_ver}/envs/${spack_env}/install/modulefiles/Core"
27 changes: 0 additions & 27 deletions versions/build.spack.ver

This file was deleted.

2 changes: 1 addition & 1 deletion versions/run.gaea.ver
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ export spack_env=gsi-addon-dev

export perl_ver=5.38.2

source "${HOMEgfs:-}/versions/run.spack.ver"
source "${HOMEgfs:-}/versions/spack.ver"
export spack_mod_path="/ncrc/proj/epic/spack-stack/spack-stack-${spack_stack_ver}/envs/${spack_env}/install/modulefiles/Core"
2 changes: 1 addition & 1 deletion versions/run.hera.ver
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ export R_ver=3.6.1
export gempak_ver=7.17.0
export perl_ver=5.38.0

source "${HOMEgfs:-}/versions/run.spack.ver"
source "${HOMEgfs:-}/versions/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: 1 addition & 2 deletions versions/run.hercules.ver
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,5 @@ 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/run.spack.ver"
source "${HOMEgfs:-}/versions/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: 1 addition & 1 deletion versions/run.jet.ver
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ export gempak_ver=7.4.2
# Adding perl as a module; With Rocky8, perl packages will not be from the OS
export perl_ver=5.38.0

source "${HOMEgfs:-}/versions/run.spack.ver"
source "${HOMEgfs:-}/versions/spack.ver"
export spack_mod_path="/lfs4/HFIP/hfv3gfs/role.epic/spack-stack/spack-stack-${spack_stack_ver}/envs/${spack_env}/install/modulefiles/Core"
2 changes: 1 addition & 1 deletion versions/run.noaacloud.ver
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ export stack_intel_ver=2021.3.0
export stack_impi_ver=2021.3.0
export spack_env=gsi-addon-env

source "${HOMEgfs:-}/versions/run.spack.ver"
source "${HOMEgfs:-}/versions/spack.ver"
export spack_mod_path="/contrib/spack-stack/spack-stack-${spack_stack_ver}/envs/gsi-addon-env/install/modulefiles/Core"

export cdo_ver=2.2.0
3 changes: 1 addition & 2 deletions versions/run.orion.ver
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
export stack_intel_ver=2021.9.0
export stack_impi_ver=2021.9.0
export spack_env=gsi-addon-env-rocky9

source "${HOMEgfs:-}/versions/run.spack.ver"
source "${HOMEgfs:-}/versions/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: 1 addition & 1 deletion versions/run.s4.ver
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ export spack_env=gsi-addon-env

export ncl_ver=6.4.0-precompiled

source "${HOMEgfs:-}/versions/run.spack.ver"
source "${HOMEgfs:-}/versions/spack.ver"
export spack_mod_path="/data/prod/jedi/spack-stack/spack-stack-${spack_stack_ver}/envs/${spack_env}/install/modulefiles/Core"
4 changes: 2 additions & 2 deletions versions/run.wcoss2.ver
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ export metplus_ver=3.1.1

# Development-only below

export obsproc_run_ver=1.1.2
export prepobs_run_ver=1.0.2
export obsproc_run_ver=1.2.0
export prepobs_run_ver=1.1.0

export ens_tracker_ver=feature-GFSv17_com_reorg
export fit2obs_ver=1.1.2
Expand Down
15 changes: 13 additions & 2 deletions versions/run.spack.ver → versions/spack.ver
Original file line number Diff line number Diff line change
@@ -1,16 +1,27 @@
export spack_stack_ver=1.6.0
export cmake_ver=3.23.1
export python_ver=3.11.6

export jasper_ver=2.0.32
export libpng_ver=1.6.37
export zlib_ver=1.2.13
export esmf_ver=8.5.0
export fms_ver=2023.02.01
export cdo_ver=2.2.0
export nco_ver=5.0.6

export hdf5_ver=1.14.0
export netcdf_c_ver=4.9.2
export netcdf_fortran_ver=4.6.1

export bacio_ver=2.4.1
export nemsio_ver=2.5.4
export sigio_ver=2.3.2
export w3emc_ver=2.10.0
export bufr_ver=11.7.0
export g2_ver=3.4.5
export sp_ver=2.5.0
export ip_ver=4.3.0
export gsi_ncdiag_ver=1.1.2
export g2tmpl_ver=1.10.2
export crtm_ver=2.4.0.1
Expand All @@ -29,8 +40,8 @@ export met_ver=9.1.3
export metplus_ver=3.1.1
export py_xarray_ver=2023.7.0

export obsproc_run_ver=1.1.2
export prepobs_run_ver=1.0.2
export obsproc_run_ver=1.2.0
export prepobs_run_ver=1.1.0

export ens_tracker_ver=feature-GFSv17_com_reorg
export fit2obs_ver=1.1.2
2 changes: 1 addition & 1 deletion workflow/hosts/orion.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
BASE_GIT: '/work/noaa/global/glopara/git'
BASE_GIT: '/work/noaa/global/glopara/git_rocky9'
DMPDIR: '/work/noaa/rstprod/dump'
BASE_IC: '/work/noaa/global/glopara/data/ICSDIR'
PACKAGEROOT: '/work/noaa/global/glopara/nwpara'
Expand Down
Loading