diff --git a/modulefiles/GDAS/hera.lua b/modulefiles/GDAS/hera.lua index c88e64040..252127613 100644 --- a/modulefiles/GDAS/hera.lua +++ b/modulefiles/GDAS/hera.lua @@ -6,7 +6,7 @@ local pkgName = myModuleName() local pkgVersion = myModuleVersion() local pkgNameVer = myModuleFullName() -prepend_path("MODULEPATH", '/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.5.1/envs/unified-env/install/modulefiles/Core') +prepend_path("MODULEPATH", '/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.6.0/envs/unified-env/install/modulefiles/Core') prepend_path("MODULEPATH", '/scratch1/NCEPDEV/da/python/opt/modulefiles/stack') -- below two lines get us access to the spack-stack modules @@ -15,40 +15,40 @@ load("stack-intel-oneapi-mpi/2021.5.1") -- JCSDA has 'jedi-fv3-env/unified-dev', but we should load these manually as needed load("cmake/3.23.1") load("gettext/0.19.8.1") -load("libunistring/1.1") -load("libidn2/2.3.4") +--load("libunistring/1.1") +--load("libidn2/2.3.4") load("pcre2/10.42") -load("curl/7.29.0") +load("curl/8.4.0") load("zlib/1.2.13") -load("git/2.40.0") +load("git/2.18.0") load("pkg-config/0.27.1") load("hdf5/1.14.0") load("parallel-netcdf/1.12.2") load("netcdf-c/4.9.2") load("nccmp/1.9.0.1") -load("netcdf-fortran/4.6.0") +load("netcdf-fortran/4.6.1") load("nco/5.0.6") load("parallelio/2.5.10") load("wget/1.14") -load("boost/1.78.0") +load("boost/1.83.0") load("bufr/12.0.1") load("git-lfs/2.10.0") load("ecbuild/3.7.2") load("openjpeg/2.3.1") -load("eccodes/2.27.0") +load("eccodes/2.32.0") load("eigen/3.4.0") -load("openblas/0.3.19") -load("eckit/1.24.4") +load("openblas/0.3.24") +load("eckit/1.24.5") load("fftw/3.3.10") load("fckit/0.11.0") load("fiat/1.2.0") load("ectrans/1.2.0") -load("atlas/0.35.0") -load("sp/2.3.3") +load("atlas/0.35.1") +load("sp/2.5.0") load("gsl-lite/0.37.0") load("libjpeg/2.1.0") load("krb5/1.15.1") -load("libtirpc/1.2.6") +load("libtirpc/1.3.3") load("hdf/4.2.15") load("jedi-cmake/1.4.0") load("libpng/1.6.37") @@ -57,16 +57,16 @@ load("libxmu/1.1.4") load("libxpm/4.11.0") load("libxaw/1.0.13") load("udunits/2.2.28") -load("ncview/2.1.8") +load("ncview/2.1.9") load("netcdf-cxx4/4.3.1") load("json/3.10.5") -load("py-pybind11/2.8.1") +load("py-pybind11/2.11.0") --load("crtm/v2.4_jedi") load("rocoto/1.3.3") load("hpc/1.2.0") -unload("python/3.10.8") -unload("python/3.9.2") +unload("python/3.10.13") +unload("py-numpy/1.22.3") load("miniconda3/4.6.14") load("gdasapp/1.0.0") diff --git a/modulefiles/GDAS/hercules.lua b/modulefiles/GDAS/hercules.lua index e989af14a..2222679da 100644 --- a/modulefiles/GDAS/hercules.lua +++ b/modulefiles/GDAS/hercules.lua @@ -6,7 +6,7 @@ local pkgName = myModuleName() local pkgVersion = myModuleVersion() local pkgNameVer = myModuleFullName() -prepend_path("MODULEPATH", '/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.5.1/envs/unified-env/install/modulefiles/Core') +prepend_path("MODULEPATH", '/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.6.0/envs/unified-env/install/modulefiles/Core') prepend_path("MODULEPATH", '/work2/noaa/da/python/opt/modulefiles/stack') -- below two lines get us access to the spack-stack modules @@ -15,65 +15,59 @@ load("stack-intel-oneapi-mpi/2021.9.0") --load("stack-python/3.10.8") -- JCSDA has 'jedi-fv3-env/unified-dev', but we should load these manually as needed load("cmake/3.23.1") -load("curl/8.1.2") +load("curl/8.4.0") load("zlib/1.2.13") -load("git/2.40.0") +load("git/2.31.1") --load("pkg-config/0.27.1") load("hdf5/1.14.0") load("parallel-netcdf/1.12.2") load("netcdf-c/4.9.2") load("nccmp/1.9.0.1") -load("netcdf-fortran/4.6.0") +load("netcdf-fortran/4.6.1") load("nco/5.0.6") load("parallelio/2.5.10") load("wget/1.21.1") -load("boost/1.78") +load("boost/1.83.0") load("bufr/12.0.1") load("git-lfs/3.1.2") load("ecbuild/3.7.2") -load("openjpeg/2.4.0") -load("eccodes/2.27.0") +load("openjpeg/2.3.1") +load("eccodes/2.32.0") load("eigen/3.4.0") -load("openblas/0.3.19") -load("eckit/1.24.4") +load("openblas/0.3.24") +load("eckit/1.24.5") load("fftw/3.3.10") load("fckit/0.11.0") load("fiat/1.2.0") load("ectrans/1.2.0") -load("atlas/0.35.0") -load("sp/2.3.3") +load("atlas/0.35.1") +load("sp/2.5.0") load("gsl-lite/0.37.0") load("libjpeg/2.1.0") load("krb5/1.20.1") -load("libtirpc/1.2.6") +load("libtirpc/1.3.3") load("hdf/4.2.15") load("jedi-cmake/1.4.0") load("libpng/1.6.37") load("libxt/1.1.5") load("libxmu/1.1.4") -load("libxpm/3.5.12") +load("libxpm/4.11.0") load("libxaw/1.0.13") load("udunits/2.2.28") -load("ncview/2.1.8") +load("ncview/2.1.9") load("netcdf-cxx4/4.3.1") -load("py-pybind11/2.8.1") +load("py-pybind11/2.11.0") --load("crtm/v2.4_jedi") load("contrib/0.1") load("noaatools/3.1") load("rocoto/1.3.5") load("hpc/1.2.0") -unload("python/3.10.8") -unload("python/3.9.2") +unload("python/3.10.13") +unload("py-numpy/1.22.3") load("miniconda3/4.6.14") load("gdasapp/1.0.0") -load("boost/1.78.0") -load("bufr/12.0.1") -load("fckit/0.11.0") -load("atlas/0.35.0") -load("py-pybind11/2.8.1") - -- below is a hack because of cmake finding the wrong python... setenv("CONDA_PREFIX", "/work2/noaa/da/python/opt/core/miniconda3/4.6.14/envs/gdasapp/") @@ -85,7 +79,6 @@ local mpinproc = '-n' setenv('MPIEXEC_EXEC', mpiexec) setenv('MPIEXEC_NPROC', mpinproc) -setenv('R2D2_CONFIG', '/work2/noaa/da/cmartin/GDASApp/R2D2_SHARED/config_orion.yaml') setenv("CRTM_FIX","/work2/noaa/da/cmartin/GDASApp/fix/crtm/2.4.0") setenv("GDASAPP_TESTDATA","/work2/noaa/da/cmartin/CI/GDASApp/data") prepend_path("PATH","/apps/contrib/NCEP/libs/hpc-stack/intel-2018.4/prod_util/1.2.2/bin") diff --git a/modulefiles/GDAS/orion.lua b/modulefiles/GDAS/orion.lua index 0625ddc4c..b5550f25c 100644 --- a/modulefiles/GDAS/orion.lua +++ b/modulefiles/GDAS/orion.lua @@ -6,15 +6,15 @@ local pkgName = myModuleName() local pkgVersion = myModuleVersion() local pkgNameVer = myModuleFullName() -prepend_path("MODULEPATH", '/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-1.5.1/envs/unified-env/install/modulefiles/Core') +prepend_path("MODULEPATH", '/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-1.6.0/envs/unified-env/install/modulefiles/Core') prepend_path("MODULEPATH", '/work2/noaa/da/python/opt/modulefiles/stack') -- below two lines get us access to the spack-stack modules load("stack-intel/2022.0.2") load("stack-intel-oneapi-mpi/2021.5.1") -- JCSDA has 'jedi-fv3-env/unified-dev', but we should load these manually as needed -load("cmake/3.22.1") -load("curl/8.1.2") +load("cmake/3.23.1") +load("curl/8.4.0") load("zlib/1.2.13") load("git/2.28.0") load("pkg-config/0.27.1") @@ -22,29 +22,29 @@ load("hdf5/1.14.0") load("parallel-netcdf/1.12.2") load("netcdf-c/4.9.2") load("nccmp/1.9.0.1") -load("netcdf-fortran/4.6.0") +load("netcdf-fortran/4.6.1") load("nco/5.0.6") load("parallelio/2.5.10") -load("wget/1.14") -load("boost/1.78") +load("wget/1.21.3") +load("boost/1.83.0") load("bufr/12.0.1") load("git-lfs/2.12.0") load("ecbuild/3.7.2") load("openjpeg/2.3.1") -load("eccodes/2.27.0") +load("eccodes/2.32.0") load("eigen/3.4.0") -load("openblas/0.3.19") -load("eckit/1.24.4") +load("openblas/0.3.24") +load("eckit/1.24.5") load("fftw/3.3.10") load("fckit/0.11.0") load("fiat/1.2.0") load("ectrans/1.2.0") -load("atlas/0.35.0") -load("sp/2.3.3") +load("atlas/0.35.1") +load("sp/2.5.0") load("gsl-lite/0.37.0") load("libjpeg/2.1.0") load("krb5/1.15.1") -load("libtirpc/1.2.6") +load("libtirpc/1.3.3") load("hdf/4.2.15") load("jedi-cmake/1.4.0") load("libpng/1.6.37") @@ -53,17 +53,17 @@ load("libxmu/1.1.4") load("libxpm/4.11.0") load("libxaw/1.0.13") load("udunits/2.2.28") -load("ncview/2.1.8") +load("ncview/2.1.9") load("netcdf-cxx4/4.3.1") -load("py-pybind11/2.8.1") +load("py-pybind11/2.11.0") --load("crtm/v2.4_jedi") load("contrib/0.1") load("noaatools/3.1") load("rocoto/1.3.3") load("hpc/1.2.0") -unload("python/3.10.8") -unload("python/3.9.2") +unload("python/3.10.13") +unload("py-numpy/1.22.3") load("miniconda3/4.6.14") load("gdasapp/1.0.0")