diff --git a/modulefiles/GDAS/gaeac6.intel.lua b/modulefiles/GDAS/gaeac6.intel.lua index c890407aa..b156f7409 100644 --- a/modulefiles/GDAS/gaeac6.intel.lua +++ b/modulefiles/GDAS/gaeac6.intel.lua @@ -6,46 +6,44 @@ local pkgName = myModuleName() local pkgVersion = myModuleVersion() local pkgNameVer = myModuleFullName() -prepend_path("MODULEPATH", '/ncrc/proj/epic/spack-stack/c6/spack-stack-1.6.0/envs/unified-env/install/modulefiles/Core') +prepend_path("MODULEPATH", '/ncrc/proj/epic/spack-stack/c6/spack-stack-1.9.2/envs/ue-intel-2023.2.0/install/modulefiles/Core') +prepend_path("MODULEPATH", '/ncrc/proj/epic/spack-stack/c6/spack-stack-1.9.2/envs/ue-intel-2023.2.0/install/modulefiles/gcc/12.3.0') prepend_path("MODULEPATH", '/ncrc/proj/epic/rocoto/modulefiles') -- below two lines get us access to the spack-stack modules load("stack-intel/2023.2.0") -load("stack-cray-mpich/8.1.29") --- JCSDA has 'jedi-fv3-env/unified-dev', but we should load these manually as needed -load("cmake/3.23.1") +load("stack-cray-mpich/8.1.30") +load("stack-python/3.11.7") +load("cmake/3.27.9") load("gettext/0.20.2") ---load("libunistring/1.1") ---load("libidn2/2.3.4") -load("pcre2/10.42") -load("curl/8.4.0") +load("curl/8.10.1") load("zlib/1.2.13") load("git/2.42.0") -load("pkg-config/0.29.2") -load("hdf5/1.14.0") -load("parallel-netcdf/1.12.2") +load("hdf5/1.14.3") +load("parallel-netcdf/1.12.3") load("netcdf-c/4.9.2") -load("nccmp/1.9.0.1") +load("nccmp/1.9.1.0") load("netcdf-fortran/4.6.1") -load("nco/5.0.6") -load("parallelio/2.5.10") +load("nco/5.2.4") +load("parallelio/2.6.2") load("wget/1.21.3") -load("boost/1.83.0") -load("bufr/12.0.1") +load("Core/24.11") +load("boost/1.84.0") +load("bufr/12.1.0") load("git-lfs/2.11.0") load("ecbuild/3.7.2") load("openjpeg/2.3.1") -load("eccodes/2.32.0") +load("eccodes/2.33.0") load("eigen/3.4.0") -load("openblas/0.3.24") -load("eckit/1.24.5") +load("openblas/0.3.26") +load("eckit/1.28.3") load("fftw/3.3.10") -load("fckit/0.11.0") -load("fiat/1.2.0") +load("fckit/0.13.2") +load("fiat/1.4.1") load("ectrans/1.2.0") -load("fms/2023.04") -load("esmf/8.6.0") -load("atlas/0.35.1") +load("fms/2024.02") +load("esmf/8.8.0") +load("atlas/0.40.0") load("sp/2.5.0") load("gsl-lite/0.37.0") load("libjpeg/2.1.0") @@ -54,25 +52,22 @@ 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/4.11.0") load("libxaw/1.10.13") load("udunits/2.2.28") load("ncview/2.1.9") load("netcdf-cxx4/4.3.1") -load("json/3.10.5") -load("crtm/2.4.0.1") +load("json/3.11.3") +--load("crtm/2.4.0.1") load("rocoto/1.3.6") load("prod_util/2.1.1") -load("py-jinja2/3.0.3") -load("py-netcdf4/1.5.8") -load("py-pybind11/2.11.0") +load("py-jinja2/3.1.4") +load("py-netcdf4/1.7.1.post2") +load("py-pybind11/2.13.5") load("py-pycodestyle/2.11.0") -load("py-pyyaml/6.0") -load("py-scipy/1.11.3") -load("py-xarray/2023.7.0") +load("py-pyyaml/6.0.2") +load("py-scipy/1.13.1") +load("py-xarray/2024.7.0") load("py-f90nml/1.4.3") load("py-pip/23.1.2") diff --git a/modulefiles/GDAS/hera.intel.lua b/modulefiles/GDAS/hera.intel.lua index 1a1f0d3e5..b8a9426e8 100644 --- a/modulefiles/GDAS/hera.intel.lua +++ b/modulefiles/GDAS/hera.intel.lua @@ -6,80 +6,72 @@ local pkgName = myModuleName() local pkgVersion = myModuleVersion() local pkgNameVer = myModuleFullName() -prepend_path("MODULEPATH", '/contrib/spack-stack//spack-stack-1.6.0/envs/unified-env-rocky8/install/modulefiles/Core') ---prepend_path("MODULEPATH", '/scratch1/NCEPDEV/da/python/opt/modulefiles/stack') +prepend_path("MODULEPATH", '/contrib/spack-stack/spack-stack-1.9.2/envs/ue-oneapi-2024.2.1/install/modulefiles/Core') --- below two lines get us access to the spack-stack modules -load("stack-intel/2021.5.0") -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("pcre2/10.42") -load("curl/8.4.0") +load("stack-oneapi/2024.2.1") +load("stack-intel-oneapi-mpi/2021.13") +load("cmake/3.27.9") +load("gettext/0.22.5") +load("curl/8.10.1") load("zlib/1.2.13") -load("git/2.18.0") -load("pkg-config/0.27.1") -load("hdf5/1.14.0") -load("parallel-netcdf/1.12.2") +load("git/2.42.0") +load("hdf5/1.14.3") +load("parallel-netcdf/1.12.3") load("netcdf-c/4.9.2") -load("nccmp/1.9.0.1") +load("nccmp/1.9.1") load("netcdf-fortran/4.6.1") -load("nco/5.0.6") -load("parallelio/2.5.10") +load("nco/5.2.4") +load("parallelio/2.6.2") load("wget/1.14") -load("boost/1.83.0") -load("bufr/12.0.1") +load("boost/1.84.0") +load("bufr/12.1.0") load("git-lfs/2.10.0") load("ecbuild/3.7.2") load("openjpeg/2.3.1") -load("eccodes/2.32.0") +load("eccodes/2.33.0") load("eigen/3.4.0") load("openblas/0.3.24") -load("eckit/1.24.5") +load("eckit/1.28.3") load("fftw/3.3.10") -load("fckit/0.11.0") -load("fiat/1.2.0") ---load("ectrans/1.2.0") -load("fms/2023.04") -load("esmf/8.6.0") -load("atlas/0.35.1") +load("fckit/0.13.2") +load("fiat/1.4.1") +load("fms/2024.02") +load("esmf/8.8.0") +load("atlas/0.40.0") load("sp/2.5.0") load("gsl-lite/0.37.0") load("libjpeg/2.1.0") -load("krb5/1.20.1") +load("krb5/1.15.1") 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("libxt/1.3.0") +load("libxmu/1.2.1") load("libxpm/4.11.0") -load("libxaw/1.0.13") +load("libxaw/1.0.16") load("udunits/2.2.28") load("ncview/2.1.9") load("netcdf-cxx4/4.3.1") -load("json/3.10.5") +load("json/3.11.3") --load("crtm/v2.4_jedi") -load("rocoto/1.3.6") +load("rocoto/1.3.7") load("prod_util/2.1.1") -load("py-jinja2/3.0.3") -load("py-netcdf4/1.5.8") -load("py-pybind11/2.11.0") +load("py-jinja2/3.1.4") +load("py-netcdf4/1.7.1.post2") +load("py-pybind11/2.13.5") load("py-pycodestyle/2.11.0") -load("py-pyyaml/6.0") -load("py-scipy/1.11.3") -load("py-xarray/2023.7.0") +load("py-pyyaml/6.0.2") +load("py-scipy/1.14.1") +load("py-xarray/2024.7.0") load("py-f90nml/1.4.3") load("py-pip/23.1.2") load("py-click/8.1.7") setenv("CC","mpiicc") -setenv("FC","mpiifort") setenv("CXX","mpiicpc") +setenv("FC","mpiifort") local mpiexec = '/apps/slurm/default/bin/srun' local mpinproc = '-n' diff --git a/modulefiles/GDAS/hercules.intel.lua b/modulefiles/GDAS/hercules.intel.lua index 1870587c0..880defa98 100644 --- a/modulefiles/GDAS/hercules.intel.lua +++ b/modulefiles/GDAS/hercules.intel.lua @@ -6,77 +6,78 @@ local pkgName = myModuleName() local pkgVersion = myModuleVersion() local pkgNameVer = myModuleFullName() -prepend_path("MODULEPATH", '/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.7.0/envs/ue-intel/install/modulefiles/Core') -prepend_path("MODULEPATH", '/work2/noaa/da/python/opt/modulefiles/stack') +prepend_path("MODULEPATH", "/apps/contrib/spack-stack/spack-stack-1.9.2/envs/ue-oneapi-2024.1.0/install/modulefiles/Core") +prepend_path("MODULEPATH", "/apps/contrib/spack-stack/spack-stack-1.9.2/envs/ue-oneapi-2024.1.0/install/modulefiles/gcc/13.3.0") --- below two lines get us access to the spack-stack modules -load("stack-intel/2021.9.0") -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("stack-oneapi/2024.2.1") +load("stack-intel-oneapi-mpi/2021.13") +load("intel-oneapi-mkl/2024.2.1") +load("stack-python/3.11.7") -load("cmake/3.23.1") -load("curl/8.4.0") +load("cmake/3.27.9") +load("gettext/0.21.1") +load("curl/8.10.1") load("zlib/1.2.13") load("git/2.31.1") ---load("pkg-config/0.27.1") load("hdf5/1.14.3") load("parallel-netcdf/1.12.3") load("netcdf-c/4.9.2") load("nccmp/1.9.0.1") load("netcdf-fortran/4.6.1") -load("nco/5.1.6") +load("nco/5.2.4") load("parallelio/2.6.2") load("wget/1.21.1") load("boost/1.84.0") -load("bufr/12.0.1") +load("bufr/12.1.0") load("git-lfs/3.1.2") load("ecbuild/3.7.2") load("openjpeg/2.4.0") load("eccodes/2.33.0") load("eigen/3.4.0") load("openblas/0.3.27") -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("fms/2023.04") -load("esmf/8.6.1") -load("atlas/0.36.0") +load("eckit/1.28.3") +--load("fftw/3.3.10") +load("fckit/0.13.2") +load("fiat/1.4.1") +load("fms/2024.02") +load("esmf/8.8.0") +load("atlas/0.40.0") load("sp/2.5.0") load("gsl-lite/0.37.0") load("libjpeg/2.1.0") -load("krb5/1.20.1") +load("krb5/1.21.3") load("libtirpc/1.3.3") load("hdf/4.2.15") load("jedi-cmake/1.4.0") load("libpng/1.6.37") load("libxt/1.3.0") -load("libxmu/1.1.4") +load("libxmu/1.2.1") load("libxpm/3.5.17") -load("libxaw/1.0.15") +load("libxaw/1.0.16") load("udunits/2.2.28") load("ncview/2.1.9") load("netcdf-cxx4/4.3.1") -load("py-pybind11/2.11.0") ---load("crtm/v2.4_jedi") +load("json/3.11.3") +load("tar/1.34") +--load("crtm/v2.4.1-jedi") load("contrib/0.1") -load("noaatools/3.1") load("rocoto/1.3.7") load("prod_util/2.1.1") -load("hpc/1.2.0") -unload("python/3.10.13") -unload("py-numpy/1.22.3") -load("miniconda3/4.6.14") -load("gdasapp/1.0.0") --- 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/") +load("py-jinja2/3.1.4") +load("py-netcdf4/1.7.1.post2") +load("py-pybind11/2.13.5") +load("py-pycodestyle/2.11.0") +load("py-pyyaml/6.0.2") +load("py-scipy/1.14.1") +load("py-xarray/2024.7.0") +load("py-f90nml/1.4.3") +load("py-pip/23.1.2") +load("py-click/8.1.7") setenv("CC","mpiicc") -setenv("FC","mpiifort") setenv("CXX","mpiicpc") +setenv("FC","mpiifort") local mpiexec = '/opt/slurm/bin/srun' local mpinproc = '-n' setenv('MPIEXEC_EXEC', mpiexec) @@ -89,6 +90,6 @@ setenv("GDASAPP_UNIT_TEST_DATA_PATH", "/work2/noaa/da/role-da/GDASApp/unittestda execute{cmd="ulimit -s unlimited",modeA={"load"}} whatis("Name: ".. pkgName) -whatis("Version: ".. pkgVersion) +whatis("Version: ".. tostring(pkgVersion)) whatis("Category: GDASApp") whatis("Description: Load all libraries needed for GDASApp") diff --git a/modulefiles/GDAS/orion.intel.lua b/modulefiles/GDAS/orion.intel.lua index 2d38f94a6..e5f769351 100644 --- a/modulefiles/GDAS/orion.intel.lua +++ b/modulefiles/GDAS/orion.intel.lua @@ -6,77 +6,77 @@ local pkgName = myModuleName() local pkgVersion = myModuleVersion() local pkgNameVer = myModuleFullName() -prepend_path("MODULEPATH", '/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-1.6.0/envs/unified-env-rocky9/install/modulefiles/Core') -prepend_path("MODULEPATH", '/work2/noaa/da/python/opt/modulefiles/stack') +prepend_path("MODULEPATH", "/apps/contrib/spack-stack/spack-stack-1.9.2/envs/ue-oneapi-2024.1.0/install/modulefiles/Core") +prepend_path("MODULEPATH", "/apps/contrib/spack-stack/spack-stack-1.9.2/envs/ue-oneapi-2024.1.0/install/modulefiles/gcc/12.2.0") --- below two lines get us access to the spack-stack modules -load("stack-intel/2021.9.0") -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.4.0") +load("stack-oneapi/2024.2.1") +load("stack-intel-oneapi-mpi/2021.13") +load("stack-python/3.11.7") + +load("cmake/3.27.9") +load("gettext/0.22.5") +load("curl/8.10.1") load("zlib/1.2.13") load("git/2.31.1") ---load("pkg-config/0.27.1") -load("hdf5/1.14.0") -load("parallel-netcdf/1.12.2") +load("hdf5/1.14.3") +load("parallel-netcdf/1.12.3") load("netcdf-c/4.9.2") load("nccmp/1.9.0.1") load("netcdf-fortran/4.6.1") -load("nco/5.0.6") -load("parallelio/2.5.10") +load("nco/5.2.4") +load("parallelio/2.6.2") load("wget/1.21.1") -load("boost/1.83.0") -load("bufr/12.0.1") +load("boost/1.84.0") +load("bufr/12.1.0") load("git-lfs/3.1.2") load("ecbuild/3.7.2") -load("openjpeg/2.3.1") -load("eccodes/2.32.0") +load("openjpeg/2.4.0") +load("eccodes/2.33.0") load("eigen/3.4.0") -load("openblas/0.3.24") -load("eckit/1.24.5") +load("openblas/0.3.27") +load("eckit/1.28.3") load("fftw/3.3.10") -load("fckit/0.11.0") -load("fiat/1.2.0") -load("ectrans/1.2.0") -load("fms/2023.04") -load("esmf/8.6.0") -load("atlas/0.35.1") +load("fckit/0.13.2") +load("fiat/1.4.1") +load("fms/2024.02") +load("esmf/8.8.0") +load("atlas/0.40.0") load("sp/2.5.0") load("gsl-lite/0.37.0") load("libjpeg/2.1.0") -load("krb5/1.20.1") +load("krb5/1.21.3") 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/4.11.0") -load("libxaw/1.0.13") +load("libxt/1.3.0") +load("libxmu/1.2.1") +load("libxpm/3.5.17") +load("libxaw/1.0.16") load("udunits/2.2.28") load("ncview/2.1.9") load("netcdf-cxx4/4.3.1") -load("py-pybind11/2.11.0") ---load("crtm/v2.4_jedi") +load("json/3.11.3") +load("tar/1.34") +--load("crtm/v2.4.1-jedi") load("contrib/0.1") -load("noaatools/3.1") load("rocoto/1.3.7") load("prod_util/2.1.1") -load("hpc/1.2.0") -unload("python/3.10.13") -unload("py-numpy/1.22.3") -load("miniconda3/4.6.14") -load("gdasapp/1.0.0") - --- 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/") +load("py-jinja2/3.1.4") +load("py-netcdf4/1.7.1.post2") +load("py-pybind11/2.13.5") +load("py-pycodestyle/2.11.0") +load("py-pyyaml/6.0.2") +load("py-scipy/1.14.1") +load("py-xarray/2024.7.0") +load("py-f90nml/1.4.3") +load("py-pip/23.1.2") +load("py-click/8.1.7") setenv("CC","mpiicc") -setenv("FC","mpiifort") setenv("CXX","mpiicpc") +setenv("FC","mpiifort") local mpiexec = '/opt/slurm/bin/srun' local mpinproc = '-n' setenv('MPIEXEC_EXEC', mpiexec) @@ -89,6 +89,6 @@ setenv("GDASAPP_UNIT_TEST_DATA_PATH", "/work2/noaa/da/role-da/GDASApp/unittestda execute{cmd="ulimit -s unlimited",modeA={"load"}} whatis("Name: ".. pkgName) -whatis("Version: ".. pkgVersion) +whatis("Version: ".. tostring(pkgVersion)) whatis("Category: GDASApp") whatis("Description: Load all libraries needed for GDASApp") diff --git a/modulefiles/GDAS/ursa.intel.lua b/modulefiles/GDAS/ursa.intel.lua index 72b39377b..52fbb9af6 100644 --- a/modulefiles/GDAS/ursa.intel.lua +++ b/modulefiles/GDAS/ursa.intel.lua @@ -6,12 +6,12 @@ local pkgName = myModuleName() local pkgVersion = myModuleVersion() local pkgNameVer = myModuleFullName() -prepend_path("MODULEPATH", '/contrib/spack-stack/spack-stack-1.9.1/envs/ue-oneapi-2024.2.1/install/modulefiles/Core') +prepend_path("MODULEPATH", '/contrib/spack-stack/spack-stack-1.9.2/envs/ue-oneapi-2024.2.1/install/modulefiles/Core') load("stack-oneapi/2024.2.1") load("stack-intel-oneapi-mpi/2021.13") -load("stack-python/3.11.7") load("intel-oneapi-mkl/2024.2.1") +load("stack-python/3.11.7") load("cmake/3.30.2") load("gettext/0.22.5") @@ -33,9 +33,8 @@ load("ecbuild/3.7.2") load("openjpeg/2.3.1") load("eccodes/2.33.0") load("eigen/3.4.0") -load("openblas/0.3.24") +load("openblas/0.3.27") load("eckit/1.28.3") -load("fftw/3.3.10") load("fckit/0.13.2") load("fiat/1.4.1") load("fms/2024.02") diff --git a/test/atm/global-workflow/jjob_ens_letkf.sh b/test/atm/global-workflow/jjob_ens_letkf.sh index adfe4884a..949f905e0 100755 --- a/test/atm/global-workflow/jjob_ens_letkf.sh +++ b/test/atm/global-workflow/jjob_ens_letkf.sh @@ -53,7 +53,7 @@ cp $EXPDIR/config.base_lobsdiag_forenkf_false $EXPDIR/config.base # Execute j-job if [[ $machine = 'HERA' || $machine = 'ORION' || $machine = 'HERCULES' ]]; then - sbatch --nodes=1 --ntasks=6 --account=$ACCOUNT --qos=batch --time=00:30:00 --export=ALL --wait --output=atmensanlletkf-%j.out ${HOMEgfs}/jobs/JGLOBAL_ATMENS_ANALYSIS_LETKF + sbatch --nodes=1 --ntasks=6 --account=$ACCOUNT --qos=batch --time=00:30:00 --mem="32Gb" --export=ALL --wait --output=atmensanlletkf-%j.out ${HOMEgfs}/jobs/JGLOBAL_ATMENS_ANALYSIS_LETKF elif [[ $machine = 'URSA' ]]; then sbatch --nodes=1 --ntasks=6 --account=$ACCOUNT --qos=batch --partition=u1-compute --mem="32Gb" --time=00:30:00 --export=ALL --wait --output=atmensanlletkf-%j.out ${HOMEgfs}/jobs/JGLOBAL_ATMENS_ANALYSIS_LETKF else diff --git a/test/atm/global-workflow/jjob_var_run.sh b/test/atm/global-workflow/jjob_var_run.sh index abf6e8d38..6c7a7893f 100755 --- a/test/atm/global-workflow/jjob_var_run.sh +++ b/test/atm/global-workflow/jjob_var_run.sh @@ -50,7 +50,7 @@ fi # Execute j-job if [[ $machine = 'HERA' || $machine = 'ORION' || $machine = 'HERCULES' ]]; then - sbatch --ntasks=6 --account=$ACCOUNT --qos=batch --time=00:20:00 --export=ALL --wait --output=atmanlvar-%j.out ${HOMEgfs}/jobs/JGLOBAL_ATM_ANALYSIS_VARIATIONAL + sbatch --ntasks=6 --account=$ACCOUNT --qos=batch --time=00:30:00 --mem=96Gb --export=ALL --wait --output=atmanlvar-%j.out ${HOMEgfs}/jobs/JGLOBAL_ATM_ANALYSIS_VARIATIONAL elif [[ $machine = 'URSA' ]]; then sbatch --ntasks=6 --account=$ACCOUNT --qos=batch --partition=u1-compute --time=00:20:00 --mem=96Gb --export=ALL --wait --output=atmanlvar-%j.out ${HOMEgfs}/jobs/JGLOBAL_ATM_ANALYSIS_VARIATIONAL else