From 70b9e5c9652e9f22a7df9b38ba402d84debdad25 Mon Sep 17 00:00:00 2001 From: DavidHuber Date: Wed, 17 Jan 2024 14:31:47 +0000 Subject: [PATCH 1/5] Initial update to spack-stack/1.6.0. #884 --- modulefiles/build.cheyenne.intel.lua | 2 +- modulefiles/build.hera.gnu.lua | 8 ++++---- modulefiles/build.hera.intel.lua | 8 ++++---- modulefiles/build.hercules.intel.lua | 8 ++++---- modulefiles/build.jet.intel.lua | 8 ++++---- modulefiles/build.noaacloud.intel.lua | 2 +- modulefiles/build.orion.intel.lua | 8 ++++---- modulefiles/build.s4.intel.lua | 8 ++++---- modulefiles/build.wcoss2.intel.lua | 2 +- 9 files changed, 27 insertions(+), 27 deletions(-) diff --git a/modulefiles/build.cheyenne.intel.lua b/modulefiles/build.cheyenne.intel.lua index 0c00298d8..731ea918d 100644 --- a/modulefiles/build.cheyenne.intel.lua +++ b/modulefiles/build.cheyenne.intel.lua @@ -51,7 +51,7 @@ load(pathJoin("ip", ip_ver)) nemsio_ver=os.getenv("nemsio_ver") or "2.5.2" load(pathJoin("nemsio", nemsio_ver)) -sp_ver=os.getenv("sp_ver") or "2.3.3" +sp_ver=os.getenv("sp_ver") or "2.5.0" load(pathJoin("sp", sp_ver)) w3nco_ver=os.getenv("w3nco_ver") or "2.4.1" diff --git a/modulefiles/build.hera.gnu.lua b/modulefiles/build.hera.gnu.lua index 1c5d0835a..377d05c07 100644 --- a/modulefiles/build.hera.gnu.lua +++ b/modulefiles/build.hera.gnu.lua @@ -5,7 +5,7 @@ Load environment to compile UFS_UTILS on Hera using Gnu hpss_ver=os.getenv("hpss_ver") or "" load(pathJoin("hpss", hpss_ver)) -prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.5.0/envs/unified-env-noavx512/install/modulefiles/Core") +prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.6.0/envs/unified-env/install/modulefiles/Core") -- For openmpi: prepend_path("MODULEPATH", "/scratch1/NCEPDEV/jcsda/jedipara/spack-stack/modulefiles") @@ -30,7 +30,7 @@ load(pathJoin("ip", ip_ver)) nemsio_ver=os.getenv("nemsio_ver") or "2.5.4" load(pathJoin("nemsio", nemsio_ver)) -sp_ver=os.getenv("sp_ver") or "2.3.3" +sp_ver=os.getenv("sp_ver") or "2.5.0" load(pathJoin("sp", sp_ver)) w3emc_ver=os.getenv("w3emc_ver") or "2.10.0" @@ -48,13 +48,13 @@ load(pathJoin("hdf5", hdf5_ver)) netcdf_c_ver=os.getenv("netcdf_c_ver") or "4.9.2" load(pathJoin("netcdf-c", netcdf_c_ver)) -netcdf_fortran_ver=os.getenv("netcdf_fortran_ver") or "4.6.0" +netcdf_fortran_ver=os.getenv("netcdf_fortran_ver") or "4.6.1" load(pathJoin("netcdf-fortran", netcdf_fortran_ver)) nccmp_ver=os.getenv("nccmp_ver") or "1.9.0.1" load(pathJoin("nccmp", nccmp_ver)) -esmf_ver=os.getenv("esmf_ver") or "8.4.2" +esmf_ver=os.getenv("esmf_ver") or "8.5.0" load(pathJoin("esmf", esmf_ver)) nco_ver=os.getenv("nco_ver") or "5.0.6" diff --git a/modulefiles/build.hera.intel.lua b/modulefiles/build.hera.intel.lua index 016c35ff3..882c00b84 100644 --- a/modulefiles/build.hera.intel.lua +++ b/modulefiles/build.hera.intel.lua @@ -5,7 +5,7 @@ Load environment to compile UFS_UTILS on Hera using Intel hpss_ver=os.getenv("hpss_ver") or "" load(pathJoin("hpss", hpss_ver)) -prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.5.0/envs/unified-env-noavx512/install/modulefiles/Core") +prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.6.0/envs/unified-env/install/modulefiles/Core") stack_intel_ver=os.getenv("stack_intel_ver") or "2021.5.0" load(pathJoin("stack-intel", stack_intel_ver)) @@ -28,7 +28,7 @@ load(pathJoin("ip", ip_ver)) nemsio_ver=os.getenv("nemsio_ver") or "2.5.4" load(pathJoin("nemsio", nemsio_ver)) -sp_ver=os.getenv("sp_ver") or "2.3.3" +sp_ver=os.getenv("sp_ver") or "2.5.0" load(pathJoin("sp", sp_ver)) w3emc_ver=os.getenv("w3emc_ver") or "2.10.0" @@ -49,13 +49,13 @@ load(pathJoin("libpng", png_ver)) netcdf_c_ver=os.getenv("netcdf_c_ver") or "4.9.2" load(pathJoin("netcdf-c", netcdf_c_ver)) -netcdf_fortran_ver=os.getenv("netcdf_fortran_ver") or "4.6.0" +netcdf_fortran_ver=os.getenv("netcdf_fortran_ver") or "4.6.1" load(pathJoin("netcdf-fortran", netcdf_fortran_ver)) nccmp_ver=os.getenv("nccmp_ver") or "1.9.0.1" load(pathJoin("nccmp", nccmp_ver)) -esmf_ver=os.getenv("esmf_ver") or "8.4.2" +esmf_ver=os.getenv("esmf_ver") or "8.5.0" load(pathJoin("esmf", esmf_ver)) nco_ver=os.getenv("nco_ver") or "5.0.6" diff --git a/modulefiles/build.hercules.intel.lua b/modulefiles/build.hercules.intel.lua index 161fe7255..742d924e9 100644 --- a/modulefiles/build.hercules.intel.lua +++ b/modulefiles/build.hercules.intel.lua @@ -2,7 +2,7 @@ help([[ Load environment to compile UFS_UTILS on Hercules using Intel ]]) -prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.5.0/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") stack_intel_ver=os.getenv("stack_intel_ver") or "2021.9.0" load(pathJoin("stack-intel", stack_intel_ver)) @@ -25,7 +25,7 @@ load(pathJoin("ip", ip_ver)) nemsio_ver=os.getenv("nemsio_ver") or "2.5.4" load(pathJoin("nemsio", nemsio_ver)) -sp_ver=os.getenv("sp_ver") or "2.3.3" +sp_ver=os.getenv("sp_ver") or "2.5.0" load(pathJoin("sp", sp_ver)) w3emc_ver=os.getenv("w3emc_ver") or "2.10.0" @@ -46,13 +46,13 @@ load(pathJoin("libpng", png_ver)) netcdf_c_ver=os.getenv("netcdf_c_ver") or "4.9.2" load(pathJoin("netcdf-c", netcdf_c_ver)) -netcdf_fortran_ver=os.getenv("netcdf_fortran_ver") or "4.6.0" +netcdf_fortran_ver=os.getenv("netcdf_fortran_ver") or "4.6.1" load(pathJoin("netcdf-fortran", netcdf_fortran_ver)) nccmp_ver=os.getenv("nccmp_ver") or "1.9.0.1" load(pathJoin("nccmp", nccmp_ver)) -esmf_ver=os.getenv("esmf_ver") or "8.4.2" +esmf_ver=os.getenv("esmf_ver") or "8.5.0" load(pathJoin("esmf", esmf_ver)) nco_ver=os.getenv("nco_ver") or "5.0.6" diff --git a/modulefiles/build.jet.intel.lua b/modulefiles/build.jet.intel.lua index 106d8c9b3..b2dc48a0c 100644 --- a/modulefiles/build.jet.intel.lua +++ b/modulefiles/build.jet.intel.lua @@ -5,7 +5,7 @@ Load environment to compile UFS_UTILS on Jet using Intel hpss_ver=os.getenv("hpss_ver") or "" load(pathJoin("hpss", hpss_ver)) -prepend_path("MODULEPATH", "/mnt/lfs4/HFIP/hfv3gfs/role.epic/spack-stack/spack-stack-1.5.0/envs/unified-env/install/modulefiles/Core") +prepend_path("MODULEPATH", "/mnt/lfs4/HFIP/hfv3gfs/role.epic/spack-stack/spack-stack-1.6.0/envs/unified-env/install/modulefiles/Core") stack_intel_ver=os.getenv("stack_intel_ver") or "2021.5.0" load(pathJoin("stack-intel", stack_intel_ver)) @@ -28,7 +28,7 @@ load(pathJoin("ip", ip_ver)) nemsio_ver=os.getenv("nemsio_ver") or "2.5.4" load(pathJoin("nemsio", nemsio_ver)) -sp_ver=os.getenv("sp_ver") or "2.3.3" +sp_ver=os.getenv("sp_ver") or "2.5.0" load(pathJoin("sp", sp_ver)) w3emc_ver=os.getenv("w3emc_ver") or "2.10.0" @@ -49,13 +49,13 @@ load(pathJoin("libpng", png_ver)) netcdf_c_ver=os.getenv("netcdf_c_ver") or "4.9.2" load(pathJoin("netcdf-c", netcdf_c_ver)) -netcdf_fortran_ver=os.getenv("netcdf_fortran_ver") or "4.6.0" +netcdf_fortran_ver=os.getenv("netcdf_fortran_ver") or "4.6.1" load(pathJoin("netcdf-fortran", netcdf_fortran_ver)) nccmp_ver=os.getenv("nccmp_ver") or "1.9.0.1" load(pathJoin("nccmp", nccmp_ver)) -esmf_ver=os.getenv("esmf_ver") or "8.4.2" +esmf_ver=os.getenv("esmf_ver") or "8.5.0" load(pathJoin("esmf", esmf_ver)) nco_ver=os.getenv("nco_ver") or "5.0.6" diff --git a/modulefiles/build.noaacloud.intel.lua b/modulefiles/build.noaacloud.intel.lua index 2661256d5..296c0b9b5 100644 --- a/modulefiles/build.noaacloud.intel.lua +++ b/modulefiles/build.noaacloud.intel.lua @@ -23,7 +23,7 @@ load(pathJoin("ip", ip_ver)) nemsio_ver=os.getenv("nemsio_ver") or "2.5.4" load(pathJoin("nemsio", nemsio_ver)) -sp_ver=os.getenv("sp_ver") or "2.3.3" +sp_ver=os.getenv("sp_ver") or "2.5.0" load(pathJoin("sp", sp_ver)) w3emc_ver=os.getenv("w3emc_ver") or "2.9.2" diff --git a/modulefiles/build.orion.intel.lua b/modulefiles/build.orion.intel.lua index c7f8a5cae..d9c1ec3f1 100644 --- a/modulefiles/build.orion.intel.lua +++ b/modulefiles/build.orion.intel.lua @@ -2,7 +2,7 @@ help([[ Load environment to compile UFS_UTILS on Orion using Intel ]]) -prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-1.5.0/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") stack_intel_ver=os.getenv("stack_intel_ver") or "2022.0.2" load(pathJoin("stack-intel", stack_intel_ver)) @@ -25,7 +25,7 @@ load(pathJoin("ip", ip_ver)) nemsio_ver=os.getenv("nemsio_ver") or "2.5.4" load(pathJoin("nemsio", nemsio_ver)) -sp_ver=os.getenv("sp_ver") or "2.3.3" +sp_ver=os.getenv("sp_ver") or "2.5.0" load(pathJoin("sp", sp_ver)) w3emc_ver=os.getenv("w3emc_ver") or "2.10.0" @@ -46,13 +46,13 @@ load(pathJoin("libpng", png_ver)) netcdf_c_ver=os.getenv("netcdf_c_ver") or "4.9.2" load(pathJoin("netcdf-c", netcdf_c_ver)) -netcdf_fortran_ver=os.getenv("netcdf_fortran_ver") or "4.6.0" +netcdf_fortran_ver=os.getenv("netcdf_fortran_ver") or "4.6.1" load(pathJoin("netcdf-fortran", netcdf_fortran_ver)) nccmp_ver=os.getenv("nccmp_ver") or "1.9.0.1" load(pathJoin("nccmp", nccmp_ver)) -esmf_ver=os.getenv("esmf_ver") or "8.4.2" +esmf_ver=os.getenv("esmf_ver") or "8.5.0" load(pathJoin("esmf", esmf_ver)) nco_ver=os.getenv("nco_ver") or "5.0.6" diff --git a/modulefiles/build.s4.intel.lua b/modulefiles/build.s4.intel.lua index a3870bbac..da81c537c 100644 --- a/modulefiles/build.s4.intel.lua +++ b/modulefiles/build.s4.intel.lua @@ -2,7 +2,7 @@ help([[ Load environment to compile UFS_UTILS on S4 using Intel ]]) -prepend_path("MODULEPATH", "/data/prod/jedi/spack-stack/spack-stack-1.5.0/envs/unified-env/install/modulefiles/Core") +prepend_path("MODULEPATH", "/data/prod/jedi/spack-stack/spack-stack-1.6.0/envs/unified-env/install/modulefiles/Core") stack_intel_ver=os.getenv("stack_intel_ver") or "2021.5.0" load(pathJoin("stack-intel", hpc_intel_ver)) @@ -25,7 +25,7 @@ load(pathJoin("ip", ip_ver)) nemsio_ver=os.getenv("nemsio_ver") or "2.5.4" load(pathJoin("nemsio", nemsio_ver)) -sp_ver=os.getenv("sp_ver") or "2.3.3" +sp_ver=os.getenv("sp_ver") or "2.5.0" load(pathJoin("sp", sp_ver)) w3emc_ver=os.getenv("w3emc_ver") or "2.10.0" @@ -46,13 +46,13 @@ load(pathJoin("libpng", png_ver)) netcdf_c_ver=os.getenv("netcdf_c_ver") or "4.9.2" load(pathJoin("netcdf-c", netcdf_c_ver)) -netcdf_fortran_ver=os.getenv("netcdf_fortran_ver") or "4.6.0" +netcdf_fortran_ver=os.getenv("netcdf_fortran_ver") or "4.6.1" load(pathJoin("netcdf-fortran", netcdf_fortran_ver)) nccmp_ver=os.getenv("nccmp_ver") or "1.9.0.1" load(pathJoin("nccmp", nccmp_ver)) -esmf_ver=os.getenv("esmf_ver") or "8.4.2" +esmf_ver=os.getenv("esmf_ver") or "8.5.0" load(pathJoin("esmf", esmf_ver)) nco_ver=os.getenv("nco_ver") or "5.0.6" diff --git a/modulefiles/build.wcoss2.intel.lua b/modulefiles/build.wcoss2.intel.lua index 967e41b48..61de66bec 100644 --- a/modulefiles/build.wcoss2.intel.lua +++ b/modulefiles/build.wcoss2.intel.lua @@ -47,7 +47,7 @@ load(pathJoin("nemsio", nemsio_ver)) sigio_ver=os.getenv("sigio_ver") or "2.3.2" load(pathJoin("sigio", sigio_ver)) -sp_ver=os.getenv("sp_ver") or "2.3.3" +sp_ver=os.getenv("sp_ver") or "2.5.0" load(pathJoin("sp", sp_ver)) ip_ver=os.getenv("ip_ver") or "4.0.0" From 2abc117cac608820d7f6fb31c4fcee46dc498e1b Mon Sep 17 00:00:00 2001 From: DavidHuber Date: Thu, 18 Jan 2024 15:33:24 +0000 Subject: [PATCH 2/5] Update libraries to spack-stack/1.6.0. --- ci/spack.yaml | 6 +++--- modulefiles/build.hera.gnu.lua | 2 +- modulefiles/build.hera.intel.lua | 2 +- modulefiles/build.hercules.intel.lua | 2 +- modulefiles/build.jet.intel.lua | 2 +- modulefiles/build.orion.intel.lua | 2 +- modulefiles/build.s4.intel.lua | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ci/spack.yaml b/ci/spack.yaml index 61693f700..f0db7c2ac 100644 --- a/ci/spack.yaml +++ b/ci/spack.yaml @@ -5,7 +5,7 @@ spack: compiler: [intel, gcc@10:10, apple-clang@14] specs: - netcdf-c@4.9.2 - - netcdf-fortran@4.6.0 + - netcdf-fortran@4.6.1 - bacio@2.4.1 - g2@3.4.5 - ip@4.4.0 precision=d @@ -15,8 +15,8 @@ spack: - sfcio@1.4.1 - sigio@2.3.2 - nccmp@1.9.0.1 - - parallelio@2.5.9+fortran~pnetcdf - - esmf@8.4.2~debug~xerces+external-parallelio + - parallelio@2.5.10+fortran~pnetcdf + - esmf@8.6.0 view: true concretizer: unify: when_possible diff --git a/modulefiles/build.hera.gnu.lua b/modulefiles/build.hera.gnu.lua index 377d05c07..95173c330 100644 --- a/modulefiles/build.hera.gnu.lua +++ b/modulefiles/build.hera.gnu.lua @@ -54,7 +54,7 @@ load(pathJoin("netcdf-fortran", netcdf_fortran_ver)) nccmp_ver=os.getenv("nccmp_ver") or "1.9.0.1" load(pathJoin("nccmp", nccmp_ver)) -esmf_ver=os.getenv("esmf_ver") or "8.5.0" +esmf_ver=os.getenv("esmf_ver") or "8.6.0" load(pathJoin("esmf", esmf_ver)) nco_ver=os.getenv("nco_ver") or "5.0.6" diff --git a/modulefiles/build.hera.intel.lua b/modulefiles/build.hera.intel.lua index 882c00b84..01490d7f0 100644 --- a/modulefiles/build.hera.intel.lua +++ b/modulefiles/build.hera.intel.lua @@ -55,7 +55,7 @@ load(pathJoin("netcdf-fortran", netcdf_fortran_ver)) nccmp_ver=os.getenv("nccmp_ver") or "1.9.0.1" load(pathJoin("nccmp", nccmp_ver)) -esmf_ver=os.getenv("esmf_ver") or "8.5.0" +esmf_ver=os.getenv("esmf_ver") or "8.6.0" load(pathJoin("esmf", esmf_ver)) nco_ver=os.getenv("nco_ver") or "5.0.6" diff --git a/modulefiles/build.hercules.intel.lua b/modulefiles/build.hercules.intel.lua index 742d924e9..4e2ef73e4 100644 --- a/modulefiles/build.hercules.intel.lua +++ b/modulefiles/build.hercules.intel.lua @@ -52,7 +52,7 @@ load(pathJoin("netcdf-fortran", netcdf_fortran_ver)) nccmp_ver=os.getenv("nccmp_ver") or "1.9.0.1" load(pathJoin("nccmp", nccmp_ver)) -esmf_ver=os.getenv("esmf_ver") or "8.5.0" +esmf_ver=os.getenv("esmf_ver") or "8.6.0" load(pathJoin("esmf", esmf_ver)) nco_ver=os.getenv("nco_ver") or "5.0.6" diff --git a/modulefiles/build.jet.intel.lua b/modulefiles/build.jet.intel.lua index b2dc48a0c..2a7011957 100644 --- a/modulefiles/build.jet.intel.lua +++ b/modulefiles/build.jet.intel.lua @@ -55,7 +55,7 @@ load(pathJoin("netcdf-fortran", netcdf_fortran_ver)) nccmp_ver=os.getenv("nccmp_ver") or "1.9.0.1" load(pathJoin("nccmp", nccmp_ver)) -esmf_ver=os.getenv("esmf_ver") or "8.5.0" +esmf_ver=os.getenv("esmf_ver") or "8.6.0" load(pathJoin("esmf", esmf_ver)) nco_ver=os.getenv("nco_ver") or "5.0.6" diff --git a/modulefiles/build.orion.intel.lua b/modulefiles/build.orion.intel.lua index d9c1ec3f1..fa0455b2e 100644 --- a/modulefiles/build.orion.intel.lua +++ b/modulefiles/build.orion.intel.lua @@ -52,7 +52,7 @@ load(pathJoin("netcdf-fortran", netcdf_fortran_ver)) nccmp_ver=os.getenv("nccmp_ver") or "1.9.0.1" load(pathJoin("nccmp", nccmp_ver)) -esmf_ver=os.getenv("esmf_ver") or "8.5.0" +esmf_ver=os.getenv("esmf_ver") or "8.6.0" load(pathJoin("esmf", esmf_ver)) nco_ver=os.getenv("nco_ver") or "5.0.6" diff --git a/modulefiles/build.s4.intel.lua b/modulefiles/build.s4.intel.lua index da81c537c..a107f2398 100644 --- a/modulefiles/build.s4.intel.lua +++ b/modulefiles/build.s4.intel.lua @@ -52,7 +52,7 @@ load(pathJoin("netcdf-fortran", netcdf_fortran_ver)) nccmp_ver=os.getenv("nccmp_ver") or "1.9.0.1" load(pathJoin("nccmp", nccmp_ver)) -esmf_ver=os.getenv("esmf_ver") or "8.5.0" +esmf_ver=os.getenv("esmf_ver") or "8.6.0" load(pathJoin("esmf", esmf_ver)) nco_ver=os.getenv("nco_ver") or "5.0.6" From 1309da29ad413c241e6d477bfe94e71abe036473 Mon Sep 17 00:00:00 2001 From: DavidHuber Date: Fri, 19 Jan 2024 20:05:20 +0000 Subject: [PATCH 3/5] Increased chgres sigio test wallclock request on remaining machines. --- reg_tests/chgres_cube/driver.hera.sh | 4 ++-- reg_tests/chgres_cube/driver.jet.sh | 2 +- reg_tests/chgres_cube/driver.orion.sh | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/reg_tests/chgres_cube/driver.hera.sh b/reg_tests/chgres_cube/driver.hera.sh index d7a42a80a..f0a35a397 100755 --- a/reg_tests/chgres_cube/driver.hera.sh +++ b/reg_tests/chgres_cube/driver.hera.sh @@ -35,7 +35,7 @@ module list export OUTDIR="${WORK_DIR:-/scratch2/NCEPDEV/stmp1/$LOGNAME}" export OUTDIR="${OUTDIR}/reg-tests/chgres-cube" -PROJECT_CODE="${PROJECT_CODE:-fv3-cpu}" +PROJECT_CODE="${PROJECT_CODE:-nems}" QUEUE="${QUEUE:-batch}" #----------------------------------------------------------------------------- @@ -98,7 +98,7 @@ TEST3=$(sbatch --parsable --ntasks-per-node=6 --nodes=1 -t 0:15:00 -A $PROJECT_C LOG_FILE=consistency.log04 export OMP_NUM_THREADS=6 # should match cpus-per-task -TEST4=$(sbatch --parsable --ntasks-per-node=3 --cpus-per-task=6 --nodes=2 -t 0:15:00 -A $PROJECT_CODE -q $QUEUE -J c96.gfs.sigio \ +TEST4=$(sbatch --parsable --ntasks-per-node=3 --cpus-per-task=6 --nodes=2 -t 0:25:00 -A $PROJECT_CODE -q $QUEUE -J c96.gfs.sigio \ -o $LOG_FILE -e $LOG_FILE ./c96.gfs.sigio.sh) #----------------------------------------------------------------------------- diff --git a/reg_tests/chgres_cube/driver.jet.sh b/reg_tests/chgres_cube/driver.jet.sh index 813f13cfe..a6fed567d 100755 --- a/reg_tests/chgres_cube/driver.jet.sh +++ b/reg_tests/chgres_cube/driver.jet.sh @@ -99,7 +99,7 @@ TEST3=$(sbatch --parsable --partition=xjet --nodes=2 --ntasks-per-node=6 -t 0:10 LOG_FILE=consistency.log04 export OMP_NUM_THREADS=6 # should match cpus-per-task -TEST4=$(sbatch --parsable --partition=xjet --nodes=4 --ntasks-per-node=3 --cpus-per-task=6 -t 0:20:00 \ +TEST4=$(sbatch --parsable --partition=xjet --nodes=4 --ntasks-per-node=3 --cpus-per-task=6 -t 0:25:00 \ --exclusive -A $PROJECT_CODE -q $QUEUE -J c96.gfs.sigio -o $LOG_FILE -e $LOG_FILE ./c96.gfs.sigio.sh) #----------------------------------------------------------------------------- diff --git a/reg_tests/chgres_cube/driver.orion.sh b/reg_tests/chgres_cube/driver.orion.sh index 011dd0fba..66ef97d6c 100755 --- a/reg_tests/chgres_cube/driver.orion.sh +++ b/reg_tests/chgres_cube/driver.orion.sh @@ -102,7 +102,7 @@ TEST3=$(sbatch --parsable --ntasks-per-node=6 --nodes=1 --mem=75G -t 0:15:00 -A LOG_FILE4=${LOG_FILE}04 export OMP_NUM_THREADS=6 # needs to match cpus-per-task -TEST4=$(sbatch --parsable --ntasks-per-node=3 --cpus-per-task=6 --nodes=2 --mem=75G -t 0:20:00 -A $PROJECT_CODE -q $QUEUE -J c96.gfs.sigio \ +TEST4=$(sbatch --parsable --ntasks-per-node=3 --cpus-per-task=6 --nodes=2 --mem=75G -t 0:25:00 -A $PROJECT_CODE -q $QUEUE -J c96.gfs.sigio \ --open-mode=append -o $LOG_FILE4 -e $LOG_FILE4 ./c96.gfs.sigio.sh) #----------------------------------------------------------------------------- From a92833ab65b09f476e44ca101c9b183562e97fe9 Mon Sep 17 00:00:00 2001 From: DavidHuber Date: Fri, 19 Jan 2024 20:20:42 +0000 Subject: [PATCH 4/5] Revert WCOSS2, remove cheyenne. --- modulefiles/build.cheyenne.intel.lua | 85 ---------------------------- modulefiles/build.wcoss2.intel.lua | 2 +- 2 files changed, 1 insertion(+), 86 deletions(-) delete mode 100644 modulefiles/build.cheyenne.intel.lua diff --git a/modulefiles/build.cheyenne.intel.lua b/modulefiles/build.cheyenne.intel.lua deleted file mode 100644 index 731ea918d..000000000 --- a/modulefiles/build.cheyenne.intel.lua +++ /dev/null @@ -1,85 +0,0 @@ -help([[ -Load environment to compile UFS_UTILS on Cheyenne using Intel -]]) - -cmake_ver=os.getenv("cmake_ver") or "3.22.0" -load(pathJoin("cmake", cmake_ver)) - -python_ver=os.getenv("python_ver") or "3.7.9" -load(pathJoin("python", python)) - -ncarenv_ver=os.getenv("ncarenv_ver") or "1.3" -load(pathJoin("ncarenv", ncarenv_ver)) - -intel_ver=os.getenv("intel_ver") or "2022.1" -load(pathJoin("intel", intel_ver)) - -mpt_ver=os.getenv("mpt_ver") or "2.25" -load(pathJoin("mpt", mpt_ver)) - -ncarcompilers_ver=os.getenv("ncarcompilers_ver") or "0.5.0" -load(pathJoin("ncarcompilers", ncarcompilers_ver)) - - -unload("netcdf") - - -prepend_path("MODULEPATH", "/glade/work/epicufsrt/GMTB/tools/intel/2022.1/hpc-stack-v1.2.0_6eb6/modulefiles/stack") - -hpc_ver=os.getenv("hpc_ver") or "1.2.0" -load(pathJoin("hpc", hpc_ver)) - -hpc_intel_ver=os.getenv("hpc_intel_ver") or "2022.1" -load(pathJoin("hpc-intel", hpc_intel_ver)) - -hpc_mpt_ver=os.getenv("hpc_mpt_ver") or "2.25" -load(pathJoin("hpc-mpt", hpc_mpt_ver)) - - --- ??? load("ufs_common") - - -bacio_ver=os.getenv("bacio_ver") or "2.4.1" -load(pathJoin("bacio", bacio_ver)) - -g2_ver=os.getenv("g2_ver") or "3.4.3" -load(pathJoin("g2", g2_ver)) - -ip_ver=os.getenv("ip_ver") or "3.3.3" -load(pathJoin("ip", ip_ver)) - -nemsio_ver=os.getenv("nemsio_ver") or "2.5.2" -load(pathJoin("nemsio", nemsio_ver)) - -sp_ver=os.getenv("sp_ver") or "2.5.0" -load(pathJoin("sp", sp_ver)) - -w3nco_ver=os.getenv("w3nco_ver") or "2.4.1" -load(pathJoin("w3nco", w3nco_ver)) - -sigio_ver=os.getenv("sigio_ver") or "2.3.2" -load(pathJoin("sigio", sigio_ver)) - - - -sfcio_ver=os.getenv("sfcio_ver") or "1.4.1" -load(pathJoin("sfcio", sfcio_ver)) - -netcdf_ver=os.getenv("netcdf_ver") or "4.7.4" -load(pathJoin("netcdf", netcdf_ver)) - -esmf_ver=os.getenv("esmf_ver") or "8.3.0b09" -load(pathJoin("esmf", esmf_ver)) - -setenv("CMAKE_C_COMPILER","icc") -setenv("CMAKE_Fortran_COMPILER","ifort") - --- From UFS Model build modulefile... --- setenv("CC", "mpicc") --- setenv("CXX", "mpicxx") --- setenv("FC", "mpif90") --- setenv("CMAKE_Platform", "cheyenne.intel") - - -whatis("Description: UFS_UTILS build environment") - diff --git a/modulefiles/build.wcoss2.intel.lua b/modulefiles/build.wcoss2.intel.lua index 61de66bec..967e41b48 100644 --- a/modulefiles/build.wcoss2.intel.lua +++ b/modulefiles/build.wcoss2.intel.lua @@ -47,7 +47,7 @@ load(pathJoin("nemsio", nemsio_ver)) sigio_ver=os.getenv("sigio_ver") or "2.3.2" load(pathJoin("sigio", sigio_ver)) -sp_ver=os.getenv("sp_ver") or "2.5.0" +sp_ver=os.getenv("sp_ver") or "2.3.3" load(pathJoin("sp", sp_ver)) ip_ver=os.getenv("ip_ver") or "4.0.0" From 29eb5723ade95821116f70696f472f25a3e645cb Mon Sep 17 00:00:00 2001 From: DavidHuber Date: Thu, 25 Jan 2024 14:12:32 +0000 Subject: [PATCH 5/5] Remove cheyenne reference. --- sorc/machine-setup.sh | 8 -------- 1 file changed, 8 deletions(-) diff --git a/sorc/machine-setup.sh b/sorc/machine-setup.sh index e7dfd2d09..9d7267697 100644 --- a/sorc/machine-setup.sh +++ b/sorc/machine-setup.sh @@ -38,14 +38,6 @@ elif [[ -d /scratch1 ]] ; then fi target=hera module purge -elif [[ -d /glade ]] ; then - # We are on NCAR Cheyenne - if ( ! eval module help > /dev/null 2>&1 ) ; then - echo load the module command 1>&2 - . /glade/u/apps/ch/opt/lmod/8.1.7/lmod/8.1.7/init/sh - fi - target=cheyenne - module purge elif [[ -d /lustre && -d /ncrc ]] ; then # We are on GAEA. if ( ! eval module help > /dev/null 2>&1 ) ; then