From 678ce48fd87a58f7d01a33551bb811b601d5936f Mon Sep 17 00:00:00 2001 From: DavidHuber Date: Thu, 16 Nov 2023 14:36:50 +0000 Subject: [PATCH] Upgrade to spack-stack/1.5.1 on Hera #1868 --- modulefiles/module_base.hera.lua | 10 ++++---- modulefiles/module_gwci.hera.lua | 3 +-- modulefiles/module_gwsetup.hera.lua | 7 +++--- sorc/checkout.sh | 4 +-- versions/build.hera.ver | 27 +++++++++++++------- versions/run.hera.ver | 39 ++++++++++++++++++----------- 6 files changed, 54 insertions(+), 36 deletions(-) diff --git a/modulefiles/module_base.hera.lua b/modulefiles/module_base.hera.lua index 92cbce9ba0..08c546c31c 100644 --- a/modulefiles/module_base.hera.lua +++ b/modulefiles/module_base.hera.lua @@ -2,13 +2,13 @@ help([[ Load environment to run GFS on Hera ]]) -prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/Alexander.Richert/spack-stack-1.4.1-gw/envs/gw/install/modulefiles/Core") -prepend_path("MODULEPATH", "/scratch1/NCEPDEV/jcsda/jedipara/spack-stack/modulefiles") +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") load(pathJoin("stack-intel", os.getenv("stack_intel_ver"))) load(pathJoin("stack-intel-oneapi-mpi", os.getenv("stack_impi_ver"))) -load(pathJoin("stack-python", os.getenv("stack_python_ver"))) -load(pathJoin("miniconda", os.getenv("miniconda_ver"))) +load(pathJoin("python", os.getenv("python_ver"))) load(pathJoin("hpss", os.getenv("hpss_ver"))) load(pathJoin("gempak", os.getenv("gempak_ver"))) @@ -23,7 +23,7 @@ load(pathJoin("netcdf-c", os.getenv("netcdf_c_ver"))) load(pathJoin("netcdf-fortran", os.getenv("netcdf_fortran_ver"))) load(pathJoin("nco", os.getenv("nco_ver"))) -load(pathJoin("prod-util", os.getenv("prod_util_ver"))) +load(pathJoin("prod_util", os.getenv("prod_util_ver"))) load(pathJoin("grib-util", os.getenv("grib_util_ver"))) load(pathJoin("g2tmpl", os.getenv("g2tmpl_ver"))) load(pathJoin("gsi-ncdiag", os.getenv("gsi_ncdiag_ver"))) diff --git a/modulefiles/module_gwci.hera.lua b/modulefiles/module_gwci.hera.lua index cce41f34da..1ee7a1cde1 100644 --- a/modulefiles/module_gwci.hera.lua +++ b/modulefiles/module_gwci.hera.lua @@ -2,8 +2,7 @@ help([[ Load environment to run GFS workflow setup scripts on Hera ]]) -prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/Alexander.Richert/spack-stack-1.4.1-gw/envs/gw/install/modulefiles/Core") -prepend_path("MODULEPATH", "/scratch1/NCEPDEV/jcsda/jedipara/spack-stack/modulefiles") +prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack-1.5.1/envs/gsi-addon/install/modulefiles/Core") load(pathJoin("stack-intel", os.getenv("2021.5.0"))) load(pathJoin("stack-intel-oneapi-mpi", os.getenv("2021.5.1"))) diff --git a/modulefiles/module_gwsetup.hera.lua b/modulefiles/module_gwsetup.hera.lua index 0858353669..c86cac7b02 100644 --- a/modulefiles/module_gwsetup.hera.lua +++ b/modulefiles/module_gwsetup.hera.lua @@ -4,14 +4,13 @@ Load environment to run GFS workflow setup scripts on Hera load(pathJoin("rocoto")) -prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/Alexander.Richert/spack-stack-1.4.1-gw/envs/gw/install/modulefiles/Core") -prepend_path("MODULEPATH", "/scratch1/NCEPDEV/jcsda/jedipara/spack-stack/modulefiles") +prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.5.1/envs/gsi-addon/install/modulefiles/Core") local stack_intel_ver=os.getenv("stack_intel_ver") or "2021.5.0" -local stack_python_ver=os.getenv("stack_python_ver") or "3.9.12" +local python_ver=os.getenv("python_ver") or "3.10.8" load(pathJoin("stack-intel", stack_intel_ver)) -load(pathJoin("stack-python", stack_python_ver)) +load(pathJoin("python", python_ver)) load("py-jinja2") load("py-pyyaml") load("py-numpy") diff --git a/sorc/checkout.sh b/sorc/checkout.sh index 83b0866eb3..ce242ca4c9 100755 --- a/sorc/checkout.sh +++ b/sorc/checkout.sh @@ -156,11 +156,11 @@ checkout "ufs_model.fd" "https://github.com/ufs-community/ufs-weather-model" # Run all other checkouts simultaneously with just 1 core each to handle submodules. checkout "wxflow" "https://github.com/NOAA-EMC/wxflow" "528f5ab" & checkout "gfs_utils.fd" "https://github.com/davidhuber-noaa/gfs-utils" "feature/spack-stack" & -checkout "ufs_utils.fd" "https://github.com/ufs-community/UFS_UTILS.git" "72a0471" & +checkout "ufs_utils.fd" "https://github.com/ufs-community/UFS_UTILS.git" "892b693" & checkout "verif-global.fd" "https://github.com/NOAA-EMC/EMC_verif-global.git" "c267780" & if [[ ${checkout_gsi} == "YES" ]]; then - checkout "gsi_enkf.fd" "https://github.com/NOAA-EMC/GSI.git" "ca19008" "1" "NO" & + checkout "gsi_enkf.fd" "https://github.com/DavidHuber-NOAA/GSI.git" "spack-stack" "1" "NO" & fi if [[ ${checkout_gdas} == "YES" ]]; then diff --git a/versions/build.hera.ver b/versions/build.hera.ver index 0f7f7bb053..64a4e57dd4 100644 --- a/versions/build.hera.ver +++ b/versions/build.hera.ver @@ -1,34 +1,43 @@ +export spack_stack_ver=1.5.1 +export spack_env=gsi-addon export stack_intel_ver=2021.5.0 export stack_impi_ver=2021.5.1 +export python_ver=3.10.8 +export hpss_ver=hpss export cmake_ver=3.23.1 export gempak_ver=7.4.2 export jasper_ver=2.0.32 export libpng_ver=1.6.37 export zlib_ver=1.2.11 -export esmf_ver=8.3.0b09 -export pio_ver=2.5.2 -export fms_ver=2022.04 +export esmf_ver=8.5.0 +export fms_ver=2023.02.01 +export cdo_ver=2.0.5 +export nco_ver=5.0.6 +export ncl_ver=6.6.2 +export prod_util_ver=1.2.2 export hdf5_ver=1.14.0 export netcdf_c_ver=4.9.2 export netcdf_fortran_ver=4.6.0 export bacio_ver=2.4.1 -export w3nco_ver=2.4.1 -export nemsio_ver=2.5.2 +export nemsio_ver=2.5.4 export sigio_ver=2.3.2 -export w3emc_ver=2.9.2 +export w3emc_ver=2.10.0 export bufr_ver=11.7.0 export g2_ver=3.4.5 export sp_ver=2.3.3 -export ip_ver=3.3.3 +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 export wgrib2_ver=2.0.8 -export py_netcdf4_ver=1.5.3 -export py_pyyaml_ver=6.0 +export grib_util_ver=1.3.0 +export py_netcdf4_ver=1.5.8 +export py_pyyaml_ver=5.4.1 export py_jinja2_ver=3.1.2 export fit2obs_ver=1.0.0 +export met_ver=9.1.3 +export metplus_ver=3.1.1 diff --git a/versions/run.hera.ver b/versions/run.hera.ver index 5b730013af..8083d7e892 100644 --- a/versions/run.hera.ver +++ b/versions/run.hera.ver @@ -1,31 +1,42 @@ +export spack_stack_ver=1.5.1 +export spack_env=gsi-addon export stack_intel_ver=2021.5.0 export stack_impi_ver=2021.5.1 -export stack_python_ver=3.9.12 -export miniconda_ver=3.9.12 +export python_ver=3.10.8 export hpss_ver=hpss +export cmake_ver=3.23.1 + export gempak_ver=7.4.2 -export ncl_ver=6.6.2 export jasper_ver=2.0.32 export libpng_ver=1.6.37 +export zlib_ver=1.2.11 +export esmf_ver=8.5.0 +export fms_ver=2023.02.01 export cdo_ver=2.0.5 -export R_ver=3.5.0 +export nco_ver=5.0.6 +export ncl_ver=6.6.2 export hdf5_ver=1.14.0 export netcdf_c_ver=4.9.2 export netcdf_fortran_ver=4.6.0 -export nco_ver=5.0.6 -export prod_util_ver=1.2.2 -export grib_util_ver=1.2.3 -export g2tmpl_ver=1.10.2 +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.3.3 +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 -export bufr_ver=11.7.0 export wgrib2_ver=2.0.8 - -export obsproc_run_ver=1.1.2 -export prepobs_run_ver=1.0.1 - -export tracker_ver=feature-GFSv17_com_reorg +export py_netcdf4_ver=1.5.8 +export py_pyyaml_ver=5.4.1 +export py_jinja2_ver=3.1.2 export fit2obs_ver=1.0.0 +export met_ver=9.1.3 +export metplus_ver=3.1.1 +export tracker_ver=feature-GFSv17_com_reorg