From 47eb1fe0741f1ee4686d0e461d09768fdf208ac4 Mon Sep 17 00:00:00 2001 From: Ratko Vasic Date: Wed, 18 Oct 2023 20:18:09 +0000 Subject: [PATCH 01/37] Start spack=stack 1.5.0 with Hera --- modulefiles/build_hera_intel.lua | 4 ++-- modulefiles/srw_common.lua | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modulefiles/build_hera_intel.lua b/modulefiles/build_hera_intel.lua index f04f4d4df1..2a7520996c 100644 --- a/modulefiles/build_hera_intel.lua +++ b/modulefiles/build_hera_intel.lua @@ -8,7 +8,7 @@ whatis([===[Loads libraries needed for building the UFS SRW App on Hera ]===]) prepend_path("MODULEPATH","/contrib/sutils/modulefiles") load("sutils") -prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.4.1/envs/unified-env/install/modulefiles/Core") +prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.5.0/envs/unified-env/install/modulefiles/Core") prepend_path("MODULEPATH", "/scratch1/NCEPDEV/jcsda/jedipara/spack-stack/modulefiles") stack_intel_ver=os.getenv("stack_intel_ver") or "2021.5.0" @@ -17,7 +17,7 @@ load(pathJoin("stack-intel", stack_intel_ver)) stack_impi_ver=os.getenv("stack_impi_ver") or "2021.5.1" load(pathJoin("stack-intel-oneapi-mpi", stack_impi_ver)) -stack_python_ver=os.getenv("stack_python_ver") or "3.9.12" +stack_python_ver=os.getenv("stack_python_ver") or "3.10.8" load(pathJoin("stack-python", stack_python_ver)) cmake_ver=os.getenv("cmake_ver") or "3.20.1" diff --git a/modulefiles/srw_common.lua b/modulefiles/srw_common.lua index 6cd326a1f8..a36730f2ca 100644 --- a/modulefiles/srw_common.lua +++ b/modulefiles/srw_common.lua @@ -12,12 +12,12 @@ load("bacio/2.4.1") load("crtm/2.4.0") load("g2/3.4.5") load("g2tmpl/1.10.2") -load("ip/3.3.3") +load("ip/4.3.0") load("sp/2.3.3") -load("w3emc/2.9.2") +load("w3emc/2.10.0") load_any("gftl-shared/v1.5.0","gftl-shared/1.5.0") -load_any("yafyaml/v0.5.1","yafyaml/0.5.1") +-- load_any("yafyaml/v0.5.1","yafyaml/0.5.1") load("mapl/2.35.2-esmf-8.4.2") load_any("nemsio/2.5.2","nemsio/2.5.4") From 36e8d3204e82099380a436de168c7db5ddd10e7d Mon Sep 17 00:00:00 2001 From: Ratko Vasic Date: Wed, 25 Oct 2023 18:52:34 +0000 Subject: [PATCH 02/37] MetPlus version update. --- modulefiles/tasks/hera/run_vx.local.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modulefiles/tasks/hera/run_vx.local.lua b/modulefiles/tasks/hera/run_vx.local.lua index 8dccf5e63c..cb64e9a38a 100644 --- a/modulefiles/tasks/hera/run_vx.local.lua +++ b/modulefiles/tasks/hera/run_vx.local.lua @@ -1,8 +1,8 @@ --[[ Compiler-specific modules are used for met and metplus libraries --]] -local met_ver = (os.getenv("met_ver") or "10.1.1") -local metplus_ver = (os.getenv("metplus_ver") or "4.1.1") +local met_ver = (os.getenv("met_ver") or "11.1.0") +local metplus_ver = (os.getenv("metplus_ver") or "5.1.0") if (mode() == "load") then load(pathJoin("met", met_ver)) load(pathJoin("metplus",metplus_ver)) From 7cdabd20d695de28cbbda66df0bc0955f52b730f Mon Sep 17 00:00:00 2001 From: Ratko Vasic Date: Fri, 3 Nov 2023 12:43:28 -0500 Subject: [PATCH 03/37] Replace spack-stack 1.4.1 with 1.5.0 on Orion Remove depreciated variabled from met+ params --- modulefiles/build_orion_intel.lua | 4 ++-- modulefiles/tasks/orion/run_vx.local.lua | 6 +++--- parm/metplus/EnsembleStat_APCP01h.conf | 12 ------------ parm/metplus/EnsembleStat_APCPgt01h.conf | 12 ------------ parm/metplus/EnsembleStat_ASNOW.conf | 12 ------------ parm/metplus/EnsembleStat_REFC.conf | 12 ------------ parm/metplus/EnsembleStat_RETOP.conf | 12 ------------ parm/metplus/EnsembleStat_SFC.conf | 12 ------------ parm/metplus/EnsembleStat_UPA.conf | 12 ------------ 9 files changed, 5 insertions(+), 89 deletions(-) diff --git a/modulefiles/build_orion_intel.lua b/modulefiles/build_orion_intel.lua index 1ecd3fdab3..4aca97c00d 100644 --- a/modulefiles/build_orion_intel.lua +++ b/modulefiles/build_orion_intel.lua @@ -5,12 +5,12 @@ the MSU machine Orion using Intel-2022.1.2 whatis([===[Loads libraries needed for building the UFS SRW App on Orion ]===]) -prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/spack-stack-1.4.1/envs/unified-env/install/modulefiles/Core") +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/da/role-da/spack-stack/modulefiles") load("stack-intel/2022.0.2") load("stack-intel-oneapi-mpi/2021.5.1") -load("stack-python/3.9.7") +load("stack-python/3.10.8") load("cmake/3.22.1") load("srw_common") diff --git a/modulefiles/tasks/orion/run_vx.local.lua b/modulefiles/tasks/orion/run_vx.local.lua index 62646d0992..d7d64ab665 100644 --- a/modulefiles/tasks/orion/run_vx.local.lua +++ b/modulefiles/tasks/orion/run_vx.local.lua @@ -1,8 +1,8 @@ --[[ Compiler-specific modules are used for met and metplus libraries --]] -local met_ver = (os.getenv("met_ver") or "10.1.1") -local metplus_ver = (os.getenv("metplus_ver") or "4.1.1") +local met_ver = (os.getenv("met_ver") or "11.1.0") +local metplus_ver = (os.getenv("metplus_ver") or "5.1.0") if (mode() == "load") then load(pathJoin("met", met_ver)) load(pathJoin("metplus",metplus_ver)) @@ -22,4 +22,4 @@ if (mode() == "unload") then unload(pathJoin("met", met_ver)) unload(pathJoin("metplus",metplus_ver)) end -load("python_srw") +load("python/3.10.8") diff --git a/parm/metplus/EnsembleStat_APCP01h.conf b/parm/metplus/EnsembleStat_APCP01h.conf index aa85f5dc51..f5f80996d8 100644 --- a/parm/metplus/EnsembleStat_APCP01h.conf +++ b/parm/metplus/EnsembleStat_APCP01h.conf @@ -166,18 +166,6 @@ ENSEMBLE_STAT_OUTPUT_FLAG_ORANK = STAT ENSEMBLE_STAT_OUTPUT_FLAG_SSVAR = STAT ENSEMBLE_STAT_OUTPUT_FLAG_RELP = STAT -ENSEMBLE_STAT_ENSEMBLE_FLAG_LATLON = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_MEAN = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_STDEV = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_MINUS = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_PLUS = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_MIN = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_MAX = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_RANGE = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_VLD_COUNT = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_FREQUENCY = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_NEP = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_NMEP = FALSE ENSEMBLE_STAT_ENSEMBLE_FLAG_RANK = FALSE ENSEMBLE_STAT_ENSEMBLE_FLAG_WEIGHT = FALSE # diff --git a/parm/metplus/EnsembleStat_APCPgt01h.conf b/parm/metplus/EnsembleStat_APCPgt01h.conf index e748642b9b..5f0c476d25 100644 --- a/parm/metplus/EnsembleStat_APCPgt01h.conf +++ b/parm/metplus/EnsembleStat_APCPgt01h.conf @@ -173,18 +173,6 @@ ENSEMBLE_STAT_OUTPUT_FLAG_ORANK = STAT ENSEMBLE_STAT_OUTPUT_FLAG_SSVAR = STAT ENSEMBLE_STAT_OUTPUT_FLAG_RELP = STAT -ENSEMBLE_STAT_ENSEMBLE_FLAG_LATLON = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_MEAN = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_STDEV = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_MINUS = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_PLUS = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_MIN = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_MAX = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_RANGE = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_VLD_COUNT = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_FREQUENCY = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_NEP = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_NMEP = FALSE ENSEMBLE_STAT_ENSEMBLE_FLAG_RANK = FALSE ENSEMBLE_STAT_ENSEMBLE_FLAG_WEIGHT = FALSE # diff --git a/parm/metplus/EnsembleStat_ASNOW.conf b/parm/metplus/EnsembleStat_ASNOW.conf index f472a109ff..34369bbebf 100644 --- a/parm/metplus/EnsembleStat_ASNOW.conf +++ b/parm/metplus/EnsembleStat_ASNOW.conf @@ -166,18 +166,6 @@ ENSEMBLE_STAT_OUTPUT_FLAG_ORANK = STAT ENSEMBLE_STAT_OUTPUT_FLAG_SSVAR = STAT ENSEMBLE_STAT_OUTPUT_FLAG_RELP = STAT -ENSEMBLE_STAT_ENSEMBLE_FLAG_LATLON = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_MEAN = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_STDEV = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_MINUS = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_PLUS = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_MIN = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_MAX = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_RANGE = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_VLD_COUNT = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_FREQUENCY = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_NEP = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_NMEP = FALSE ENSEMBLE_STAT_ENSEMBLE_FLAG_RANK = FALSE ENSEMBLE_STAT_ENSEMBLE_FLAG_WEIGHT = FALSE # diff --git a/parm/metplus/EnsembleStat_REFC.conf b/parm/metplus/EnsembleStat_REFC.conf index d6fe4874c8..daaee7104b 100644 --- a/parm/metplus/EnsembleStat_REFC.conf +++ b/parm/metplus/EnsembleStat_REFC.conf @@ -168,18 +168,6 @@ ENSEMBLE_STAT_OUTPUT_FLAG_ORANK = STAT ENSEMBLE_STAT_OUTPUT_FLAG_SSVAR = STAT ENSEMBLE_STAT_OUTPUT_FLAG_RELP = STAT -ENSEMBLE_STAT_ENSEMBLE_FLAG_LATLON = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_MEAN = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_STDEV = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_MINUS = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_PLUS = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_MIN = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_MAX = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_RANGE = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_VLD_COUNT = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_FREQUENCY = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_NEP = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_NMEP = FALSE ENSEMBLE_STAT_ENSEMBLE_FLAG_RANK = FALSE ENSEMBLE_STAT_ENSEMBLE_FLAG_WEIGHT = FALSE # diff --git a/parm/metplus/EnsembleStat_RETOP.conf b/parm/metplus/EnsembleStat_RETOP.conf index 55ac5fc8b1..e09e4a656f 100644 --- a/parm/metplus/EnsembleStat_RETOP.conf +++ b/parm/metplus/EnsembleStat_RETOP.conf @@ -168,18 +168,6 @@ ENSEMBLE_STAT_OUTPUT_FLAG_ORANK = STAT ENSEMBLE_STAT_OUTPUT_FLAG_SSVAR = STAT ENSEMBLE_STAT_OUTPUT_FLAG_RELP = STAT -ENSEMBLE_STAT_ENSEMBLE_FLAG_LATLON = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_MEAN = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_STDEV = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_MINUS = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_PLUS = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_MIN = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_MAX = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_RANGE = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_VLD_COUNT = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_FREQUENCY = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_NEP = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_NMEP = FALSE ENSEMBLE_STAT_ENSEMBLE_FLAG_RANK = FALSE ENSEMBLE_STAT_ENSEMBLE_FLAG_WEIGHT = FALSE # diff --git a/parm/metplus/EnsembleStat_SFC.conf b/parm/metplus/EnsembleStat_SFC.conf index 14c5c7b85a..f60fe6cb73 100644 --- a/parm/metplus/EnsembleStat_SFC.conf +++ b/parm/metplus/EnsembleStat_SFC.conf @@ -169,18 +169,6 @@ ENSEMBLE_STAT_OUTPUT_FLAG_ORANK = STAT ENSEMBLE_STAT_OUTPUT_FLAG_SSVAR = STAT ENSEMBLE_STAT_OUTPUT_FLAG_RELP = STAT -ENSEMBLE_STAT_ENSEMBLE_FLAG_LATLON = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_MEAN = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_STDEV = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_MINUS = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_PLUS = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_MIN = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_MAX = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_RANGE = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_VLD_COUNT = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_FREQUENCY = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_NEP = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_NMEP = FALSE ENSEMBLE_STAT_ENSEMBLE_FLAG_RANK = FALSE ENSEMBLE_STAT_ENSEMBLE_FLAG_WEIGHT = FALSE # diff --git a/parm/metplus/EnsembleStat_UPA.conf b/parm/metplus/EnsembleStat_UPA.conf index 4bc2bad3d0..3f0f3d6c59 100644 --- a/parm/metplus/EnsembleStat_UPA.conf +++ b/parm/metplus/EnsembleStat_UPA.conf @@ -169,18 +169,6 @@ ENSEMBLE_STAT_OUTPUT_FLAG_ORANK = STAT ENSEMBLE_STAT_OUTPUT_FLAG_SSVAR = STAT ENSEMBLE_STAT_OUTPUT_FLAG_RELP = STAT -ENSEMBLE_STAT_ENSEMBLE_FLAG_LATLON = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_MEAN = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_STDEV = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_MINUS = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_PLUS = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_MIN = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_MAX = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_RANGE = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_VLD_COUNT = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_FREQUENCY = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_NEP = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_NMEP = FALSE ENSEMBLE_STAT_ENSEMBLE_FLAG_RANK = FALSE ENSEMBLE_STAT_ENSEMBLE_FLAG_WEIGHT = FALSE # From 2c8c32c7b92d7e8b020f8fde916391f04c241d4c Mon Sep 17 00:00:00 2001 From: Ratko Vasic Date: Tue, 7 Nov 2023 10:48:27 -0600 Subject: [PATCH 04/37] Upgrade spack stack from 1.4.1 to 1.5.0 on Orion. --- modulefiles/build_orion_intel.lua | 1 - modulefiles/tasks/orion/run_vx.local.lua | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/modulefiles/build_orion_intel.lua b/modulefiles/build_orion_intel.lua index 4aca97c00d..241b658c88 100644 --- a/modulefiles/build_orion_intel.lua +++ b/modulefiles/build_orion_intel.lua @@ -17,7 +17,6 @@ load("srw_common") load("nccmp/1.9.0.1") load("nco/5.0.6") -load("ufs-pyenv") load("wget") setenv("CMAKE_C_COMPILER","mpiicc") diff --git a/modulefiles/tasks/orion/run_vx.local.lua b/modulefiles/tasks/orion/run_vx.local.lua index d7d64ab665..6e52663c54 100644 --- a/modulefiles/tasks/orion/run_vx.local.lua +++ b/modulefiles/tasks/orion/run_vx.local.lua @@ -22,4 +22,4 @@ if (mode() == "unload") then unload(pathJoin("met", met_ver)) unload(pathJoin("metplus",metplus_ver)) end -load("python/3.10.8") +load("ufs-pyenv") From a4cbf03e9508f417a9135fd9f30da9d9d52ee499 Mon Sep 17 00:00:00 2001 From: Ratko Vasic Date: Tue, 7 Nov 2023 10:50:42 -0600 Subject: [PATCH 05/37] Upgrade spack stack from 1.4.1 to 1.5.0 on Hercules. --- modulefiles/build_hercules_intel.lua | 9 ++++----- modulefiles/tasks/hercules/run_vx.local.lua | 6 +++--- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/modulefiles/build_hercules_intel.lua b/modulefiles/build_hercules_intel.lua index 1772460542..1cb402b8a6 100644 --- a/modulefiles/build_hercules_intel.lua +++ b/modulefiles/build_hercules_intel.lua @@ -5,19 +5,18 @@ the MSU machine Hercules using intel-oneapi-compilers/2022.2.1 whatis([===[Loads libraries needed for building the UFS SRW App on Hercules ]===]) -prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.4.1/envs/unified-env/install/modulefiles/Core") +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/da/role-da/spack-stack/modulefiles") -load("stack-intel/2021.7.1") -load("stack-intel-oneapi-mpi/2021.7.1") -load("stack-python/3.9.14") +load("stack-intel/2021.9.0") +load("stack-intel-oneapi-mpi/2021.9.0") +load("stack-python/3.10.8") load("cmake/3.26.3") load("srw_common") load("nccmp/1.9.0.1") load("nco/5.0.6") -load("ufs-pyenv") setenv("CFLAGS","-diag-disable=10441") setenv("FFLAGS","-diag-disable=10441") diff --git a/modulefiles/tasks/hercules/run_vx.local.lua b/modulefiles/tasks/hercules/run_vx.local.lua index 8dccf5e63c..83949cff83 100644 --- a/modulefiles/tasks/hercules/run_vx.local.lua +++ b/modulefiles/tasks/hercules/run_vx.local.lua @@ -1,8 +1,8 @@ --[[ Compiler-specific modules are used for met and metplus libraries --]] -local met_ver = (os.getenv("met_ver") or "10.1.1") -local metplus_ver = (os.getenv("metplus_ver") or "4.1.1") +local met_ver = (os.getenv("met_ver") or "11.1.0") +local metplus_ver = (os.getenv("metplus_ver") or "5.1.0") if (mode() == "load") then load(pathJoin("met", met_ver)) load(pathJoin("metplus",metplus_ver)) @@ -22,4 +22,4 @@ if (mode() == "unload") then unload(pathJoin("met", met_ver)) unload(pathJoin("metplus",metplus_ver)) end -load("python_srw") +load("ufs-pyenv") From 927e99f2de150bad39b36e08714bea53c5dd97dd Mon Sep 17 00:00:00 2001 From: Ratko Vasic Date: Tue, 7 Nov 2023 16:53:44 +0000 Subject: [PATCH 06/37] Upgrade spack stack from 1.4.1 to 1.5.0 on Jet. --- modulefiles/build_jet_intel.lua | 5 ++--- modulefiles/tasks/jet/get_extrn_ics.local.lua | 1 + modulefiles/tasks/jet/get_extrn_lbcs.local.lua | 1 + modulefiles/tasks/jet/get_obs.local.lua | 1 + modulefiles/tasks/jet/plot_allvars.local.lua | 1 + modulefiles/tasks/jet/python_srw.lua | 1 + modulefiles/tasks/jet/run_vx.local.lua | 6 +++--- modulefiles/wflow_jet.lua | 1 + 8 files changed, 11 insertions(+), 6 deletions(-) diff --git a/modulefiles/build_jet_intel.lua b/modulefiles/build_jet_intel.lua index fd19234474..e687531ac8 100644 --- a/modulefiles/build_jet_intel.lua +++ b/modulefiles/build_jet_intel.lua @@ -5,12 +5,12 @@ the NOAA RDHPC machine Jet using Intel-2021.5.0 whatis([===[Loads libraries needed for building the UFS SRW App on Jet ]===]) -prepend_path("MODULEPATH","/mnt/lfs4/HFIP/hfv3gfs/role.epic/spack-stack/spack-stack-1.4.1/envs/unified-env/install/modulefiles/Core") +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", "/lfs4/HFIP/hfv3gfs/spack-stack/modulefiles") load("stack-intel/2021.5.0") load("stack-intel-oneapi-mpi/2021.5.1") -load("stack-python/3.9.12") +load("stack-python/3.10.8") load("cmake/3.23.1") load("srw_common") @@ -18,7 +18,6 @@ load("srw_common") load("prod-util/1.2.2") load("nccmp/1.9.0.1") load("nco/5.0.6") -load("ufs-pyenv") setenv("CMAKE_C_COMPILER","mpiicc") setenv("CMAKE_CXX_COMPILER","mpiicpc") diff --git a/modulefiles/tasks/jet/get_extrn_ics.local.lua b/modulefiles/tasks/jet/get_extrn_ics.local.lua index acf81facb1..dcca3116d8 100644 --- a/modulefiles/tasks/jet/get_extrn_ics.local.lua +++ b/modulefiles/tasks/jet/get_extrn_ics.local.lua @@ -1,2 +1,3 @@ load("hpss") +unload("python") load("python_srw") diff --git a/modulefiles/tasks/jet/get_extrn_lbcs.local.lua b/modulefiles/tasks/jet/get_extrn_lbcs.local.lua index acf81facb1..dcca3116d8 100644 --- a/modulefiles/tasks/jet/get_extrn_lbcs.local.lua +++ b/modulefiles/tasks/jet/get_extrn_lbcs.local.lua @@ -1,2 +1,3 @@ load("hpss") +unload("python") load("python_srw") diff --git a/modulefiles/tasks/jet/get_obs.local.lua b/modulefiles/tasks/jet/get_obs.local.lua index acf81facb1..dcca3116d8 100644 --- a/modulefiles/tasks/jet/get_obs.local.lua +++ b/modulefiles/tasks/jet/get_obs.local.lua @@ -1,2 +1,3 @@ load("hpss") +unload("python") load("python_srw") diff --git a/modulefiles/tasks/jet/plot_allvars.local.lua b/modulefiles/tasks/jet/plot_allvars.local.lua index ef4f248966..6ded51c704 100644 --- a/modulefiles/tasks/jet/plot_allvars.local.lua +++ b/modulefiles/tasks/jet/plot_allvars.local.lua @@ -1,3 +1,4 @@ +unload("python") prepend_path("MODULEPATH","/mnt/lfs4/HFIP/hfv3gfs/role.epic/miniconda3/modulefiles") load(pathJoin("miniconda3", os.getenv("miniconda3_ver") or "4.12.0")) diff --git a/modulefiles/tasks/jet/python_srw.lua b/modulefiles/tasks/jet/python_srw.lua index 3c7987be18..f7d0c64878 100644 --- a/modulefiles/tasks/jet/python_srw.lua +++ b/modulefiles/tasks/jet/python_srw.lua @@ -1,3 +1,4 @@ +unload("python") prepend_path("MODULEPATH","/mnt/lfs4/HFIP/hfv3gfs/role.epic/miniconda3/modulefiles") load(pathJoin("miniconda3", os.getenv("miniconda3_ver") or "4.12.0")) diff --git a/modulefiles/tasks/jet/run_vx.local.lua b/modulefiles/tasks/jet/run_vx.local.lua index 8dccf5e63c..83949cff83 100644 --- a/modulefiles/tasks/jet/run_vx.local.lua +++ b/modulefiles/tasks/jet/run_vx.local.lua @@ -1,8 +1,8 @@ --[[ Compiler-specific modules are used for met and metplus libraries --]] -local met_ver = (os.getenv("met_ver") or "10.1.1") -local metplus_ver = (os.getenv("metplus_ver") or "4.1.1") +local met_ver = (os.getenv("met_ver") or "11.1.0") +local metplus_ver = (os.getenv("metplus_ver") or "5.1.0") if (mode() == "load") then load(pathJoin("met", met_ver)) load(pathJoin("metplus",metplus_ver)) @@ -22,4 +22,4 @@ if (mode() == "unload") then unload(pathJoin("met", met_ver)) unload(pathJoin("metplus",metplus_ver)) end -load("python_srw") +load("ufs-pyenv") diff --git a/modulefiles/wflow_jet.lua b/modulefiles/wflow_jet.lua index 5f109429dc..4a93c632bf 100644 --- a/modulefiles/wflow_jet.lua +++ b/modulefiles/wflow_jet.lua @@ -6,6 +6,7 @@ the NOAA RDHPC machine Jet whatis([===[Loads libraries needed for running the UFS SRW App on Jet ]===]) load("rocoto") +unload("python") load("set_pythonpath") prepend_path("MODULEPATH","/mnt/lfs4/HFIP/hfv3gfs/role.epic/miniconda3/modulefiles") From 2c4322ca23eec513af46799513a32e91dfa4bdb9 Mon Sep 17 00:00:00 2001 From: Ratko Vasic Date: Wed, 8 Nov 2023 01:54:27 +0000 Subject: [PATCH 07/37] Upgrade spack stack from 1.4.1 to 1.5.0 on Hera(Intel). --- modulefiles/build_hera_intel.lua | 1 - modulefiles/tasks/hera/get_extrn_ics.local.lua | 1 + modulefiles/tasks/hera/get_extrn_lbcs.local.lua | 1 + modulefiles/tasks/hera/get_obs.local.lua | 1 + modulefiles/tasks/hera/nexus_gfs_sfc.local.lua | 1 + modulefiles/tasks/hera/plot_allvars.local.lua | 1 + modulefiles/tasks/hera/python_srw.lua | 1 + modulefiles/tasks/hera/run_vx.local.lua | 2 +- modulefiles/wflow_hera.lua | 1 + 9 files changed, 8 insertions(+), 2 deletions(-) diff --git a/modulefiles/build_hera_intel.lua b/modulefiles/build_hera_intel.lua index 2a7520996c..2beaff8370 100644 --- a/modulefiles/build_hera_intel.lua +++ b/modulefiles/build_hera_intel.lua @@ -27,7 +27,6 @@ load("srw_common") load(pathJoin("nccmp", os.getenv("nccmp_ver") or "1.9.0.1")) load(pathJoin("nco", os.getenv("nco_ver") or "4.9.3")) -load("ufs-pyenv") setenv("CMAKE_C_COMPILER","mpiicc") setenv("CMAKE_CXX_COMPILER","mpiicpc") diff --git a/modulefiles/tasks/hera/get_extrn_ics.local.lua b/modulefiles/tasks/hera/get_extrn_ics.local.lua index acf81facb1..dcca3116d8 100644 --- a/modulefiles/tasks/hera/get_extrn_ics.local.lua +++ b/modulefiles/tasks/hera/get_extrn_ics.local.lua @@ -1,2 +1,3 @@ load("hpss") +unload("python") load("python_srw") diff --git a/modulefiles/tasks/hera/get_extrn_lbcs.local.lua b/modulefiles/tasks/hera/get_extrn_lbcs.local.lua index acf81facb1..dcca3116d8 100644 --- a/modulefiles/tasks/hera/get_extrn_lbcs.local.lua +++ b/modulefiles/tasks/hera/get_extrn_lbcs.local.lua @@ -1,2 +1,3 @@ load("hpss") +unload("python") load("python_srw") diff --git a/modulefiles/tasks/hera/get_obs.local.lua b/modulefiles/tasks/hera/get_obs.local.lua index acf81facb1..dcca3116d8 100644 --- a/modulefiles/tasks/hera/get_obs.local.lua +++ b/modulefiles/tasks/hera/get_obs.local.lua @@ -1,2 +1,3 @@ load("hpss") +unload("python") load("python_srw") diff --git a/modulefiles/tasks/hera/nexus_gfs_sfc.local.lua b/modulefiles/tasks/hera/nexus_gfs_sfc.local.lua index acf81facb1..dcca3116d8 100644 --- a/modulefiles/tasks/hera/nexus_gfs_sfc.local.lua +++ b/modulefiles/tasks/hera/nexus_gfs_sfc.local.lua @@ -1,2 +1,3 @@ load("hpss") +unload("python") load("python_srw") diff --git a/modulefiles/tasks/hera/plot_allvars.local.lua b/modulefiles/tasks/hera/plot_allvars.local.lua index 7934169824..69649a6a0e 100644 --- a/modulefiles/tasks/hera/plot_allvars.local.lua +++ b/modulefiles/tasks/hera/plot_allvars.local.lua @@ -1,3 +1,4 @@ +unload("python") prepend_path("MODULEPATH","/scratch1/NCEPDEV/nems/role.epic/miniconda3/modulefiles") load(pathJoin("miniconda3", os.getenv("miniconda3_ver") or "4.12.0")) diff --git a/modulefiles/tasks/hera/python_srw.lua b/modulefiles/tasks/hera/python_srw.lua index 62ddf7d9e8..5535fcda8b 100644 --- a/modulefiles/tasks/hera/python_srw.lua +++ b/modulefiles/tasks/hera/python_srw.lua @@ -1,3 +1,4 @@ +unload("python") prepend_path("MODULEPATH","/scratch1/NCEPDEV/nems/role.epic/miniconda3/modulefiles") load(pathJoin("miniconda3", os.getenv("miniconda3_ver") or "4.12.0")) diff --git a/modulefiles/tasks/hera/run_vx.local.lua b/modulefiles/tasks/hera/run_vx.local.lua index cb64e9a38a..83949cff83 100644 --- a/modulefiles/tasks/hera/run_vx.local.lua +++ b/modulefiles/tasks/hera/run_vx.local.lua @@ -22,4 +22,4 @@ if (mode() == "unload") then unload(pathJoin("met", met_ver)) unload(pathJoin("metplus",metplus_ver)) end -load("python_srw") +load("ufs-pyenv") diff --git a/modulefiles/wflow_hera.lua b/modulefiles/wflow_hera.lua index 5d6ebeed1d..863b66cedd 100644 --- a/modulefiles/wflow_hera.lua +++ b/modulefiles/wflow_hera.lua @@ -7,6 +7,7 @@ whatis([===[Loads libraries needed for running the UFS SRW App on Hera ]===]) load("rocoto") load("set_pythonpath") +unload("python") prepend_path("MODULEPATH","/scratch1/NCEPDEV/nems/role.epic/miniconda3/modulefiles") load(pathJoin("miniconda3", os.getenv("miniconda3_ver") or "4.12.0")) From 2a77d8daecd7ac5da99f9e2277755e6bd2690bbc Mon Sep 17 00:00:00 2001 From: Ratko Vasic Date: Wed, 8 Nov 2023 15:56:38 +0000 Subject: [PATCH 08/37] Upgrade spack stack from 1.4.1 to 1.5.0 on Hera(GNU). --- modulefiles/build_hera_gnu.lua | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/modulefiles/build_hera_gnu.lua b/modulefiles/build_hera_gnu.lua index 578ed64cbb..c6900885d0 100644 --- a/modulefiles/build_hera_gnu.lua +++ b/modulefiles/build_hera_gnu.lua @@ -5,12 +5,12 @@ the NOAA RDHPC machine Hera using GNU 9.2.0 whatis([===[Loads libraries needed for building the UFS SRW App on Hera using GNU 9.2.0 ]===]) -prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.4.1/envs/unified-env/install/modulefiles/Core") +prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.5.0/envs/unified-env/install/modulefiles/Core") prepend_path("MODULEPATH", "/scratch1/NCEPDEV/jcsda/jedipara/spack-stack/modulefiles") load("stack-gcc/9.2.0") load("stack-openmpi/4.1.5") -load("stack-python/3.9.12") +load("stack-python/3.10.8") load("cmake/3.23.1") load("srw_common") @@ -18,7 +18,6 @@ load("srw_common") load(pathJoin("nccmp", os.getenv("nccmp_ver") or "1.9.0.1")) load(pathJoin("nco", os.getenv("nco_ver") or "5.0.6")) load(pathJoin("openblas", os.getenv("openblas_ver") or "0.3.19")) -load("ufs-pyenv") setenv("CMAKE_C_COMPILER","mpicc") setenv("CMAKE_CXX_COMPILER","mpicxx") From 70ac453f091ea9858fffff7b782c1077130e2162 Mon Sep 17 00:00:00 2001 From: Ratko Vasic Date: Thu, 9 Nov 2023 21:33:23 +0000 Subject: [PATCH 09/37] Upgrade spack stack from 1.4.1 to 1.5.0 on Gaea C5. --- modulefiles/build_gaea-c5_intel.lua | 20 ++++++++------- modulefiles/srw_common.lua | 1 - .../tasks/gaea-c5/plot_allvars.local.lua | 1 + modulefiles/tasks/gaea-c5/python_srw.lua | 2 +- modulefiles/tasks/gaea-c5/run_vx.local.lua | 25 ++++++++++++++++--- modulefiles/tasks/orion/run_vx.local.lua | 4 +-- 6 files changed, 37 insertions(+), 16 deletions(-) diff --git a/modulefiles/build_gaea-c5_intel.lua b/modulefiles/build_gaea-c5_intel.lua index 84d05290d7..003311a7b6 100644 --- a/modulefiles/build_gaea-c5_intel.lua +++ b/modulefiles/build_gaea-c5_intel.lua @@ -5,18 +5,21 @@ the NOAA RDHPC machine Gaea C5 using Intel-2023.1.0 whatis([===[Loads libraries needed for building the UFS SRW App on Gaea C5 ]===]) -load(pathJoin("cmake", os.getenv("cmake_ver") or "3.23.1")) +prepend_path("MODULEPATH","/lustre/f2/dev/role.epic/contrib/spack-stack/c5/spack-stack-1.5.0/envs/unified-env/install/modulefiles/Core") +stack_intel_ver=os.getenv("stack_intel_ver") or "2023.1.0" +load(pathJoin("stack-intel", stack_intel_ver)) -prepend_path("MODULEPATH","/lustre/f2/dev/role.epic/contrib/C5/hpc-stack/intel-classic-2023.1.0/modulefiles/stack") -load(pathJoin("hpc", os.getenv("hpc_ver") or "1.2.0")) -load(pathJoin("intel-classic", os.getenv("intel_classic_ver") or "2023.1.0")) -load(pathJoin("cray-mpich", os.getenv("cray_mpich_ver") or "8.1.25")) -load(pathJoin("hpc-intel-classic", os.getenv("hpc_intel_classic_ver") or "2023.1.0")) -load(pathJoin("hpc-cray-mpich", os.getenv("hpc_cray_mpich_ver") or "8.1.25")) +stack_mpich_ver=os.getenv("stack_mpich_ver") or "8.1.25" +load(pathJoin("stack-cray-mpich", stack_mpich_ver)) + +stack_python_ver=os.getenv("stack_python_ver") or "3.10.8" +load(pathJoin("stack-python", stack_python_ver)) + +cmake_ver=os.getenv("cmake_ver") or "3.23.1" +load(pathJoin("cmake", cmake_ver)) load("srw_common") -unload("darshan-runtime/3.4.0") setenv("CFLAGS","-diag-disable=10441") setenv("FFLAGS","-diag-disable=10441") @@ -27,4 +30,3 @@ setenv("CMAKE_C_COMPILER","cc") setenv("CMAKE_Fortran_COMPILER","ftn") setenv("CMAKE_CXX_COMPILER","CC") setenv("CMAKE_Platform","gaea-c5.intel") - diff --git a/modulefiles/srw_common.lua b/modulefiles/srw_common.lua index a36730f2ca..56072e0f3f 100644 --- a/modulefiles/srw_common.lua +++ b/modulefiles/srw_common.lua @@ -17,7 +17,6 @@ load("sp/2.3.3") load("w3emc/2.10.0") load_any("gftl-shared/v1.5.0","gftl-shared/1.5.0") --- load_any("yafyaml/v0.5.1","yafyaml/0.5.1") load("mapl/2.35.2-esmf-8.4.2") load_any("nemsio/2.5.2","nemsio/2.5.4") diff --git a/modulefiles/tasks/gaea-c5/plot_allvars.local.lua b/modulefiles/tasks/gaea-c5/plot_allvars.local.lua index 7c2e3a9ba2..f05e675032 100644 --- a/modulefiles/tasks/gaea-c5/plot_allvars.local.lua +++ b/modulefiles/tasks/gaea-c5/plot_allvars.local.lua @@ -1,3 +1,4 @@ +unload("python") prepend_path("MODULEPATH","/lustre/f2/dev/role.epic/contrib/C5/miniconda3/modulefiles") load(pathJoin("miniconda3", os.getenv("miniconda3_ver") or "4.12.0")) diff --git a/modulefiles/tasks/gaea-c5/python_srw.lua b/modulefiles/tasks/gaea-c5/python_srw.lua index 673aa800b8..191f7bf29a 100644 --- a/modulefiles/tasks/gaea-c5/python_srw.lua +++ b/modulefiles/tasks/gaea-c5/python_srw.lua @@ -1,4 +1,4 @@ -unload("miniconda3") +unload("python") prepend_path("MODULEPATH","/lustre/f2/dev/role.epic/contrib/C5/miniconda3/modulefiles") load(pathJoin("miniconda3", os.getenv("miniconda3_ver") or "4.12.0")) diff --git a/modulefiles/tasks/gaea-c5/run_vx.local.lua b/modulefiles/tasks/gaea-c5/run_vx.local.lua index 5979a8db96..83949cff83 100644 --- a/modulefiles/tasks/gaea-c5/run_vx.local.lua +++ b/modulefiles/tasks/gaea-c5/run_vx.local.lua @@ -1,6 +1,25 @@ --[[ Compiler-specific modules are used for met and metplus libraries --]] -load(pathJoin("met", os.getenv("met_ver") or "10.1.2")) -load(pathJoin("metplus", os.getenv("metplus_ver") or "4.1.3")) -load("python_srw") +local met_ver = (os.getenv("met_ver") or "11.1.0") +local metplus_ver = (os.getenv("metplus_ver") or "5.1.0") +if (mode() == "load") then + load(pathJoin("met", met_ver)) + load(pathJoin("metplus",metplus_ver)) +end +local base_met = os.getenv("met_ROOT") or os.getenv("MET_ROOT") +local base_metplus = os.getenv("metplus_ROOT") or os.getenv("METPLUS_ROOT") + +setenv("MET_INSTALL_DIR", base_met) +setenv("MET_BIN_EXEC", pathJoin(base_met,"bin")) +setenv("MET_BASE", pathJoin(base_met,"share/met")) +setenv("MET_VERSION", met_ver) +setenv("METPLUS_VERSION", metplus_ver) +setenv("METPLUS_ROOT", base_metplus) +setenv("METPLUS_PATH", base_metplus) + +if (mode() == "unload") then + unload(pathJoin("met", met_ver)) + unload(pathJoin("metplus",metplus_ver)) +end +load("ufs-pyenv") diff --git a/modulefiles/tasks/orion/run_vx.local.lua b/modulefiles/tasks/orion/run_vx.local.lua index 6e52663c54..83949cff83 100644 --- a/modulefiles/tasks/orion/run_vx.local.lua +++ b/modulefiles/tasks/orion/run_vx.local.lua @@ -3,7 +3,7 @@ Compiler-specific modules are used for met and metplus libraries --]] local met_ver = (os.getenv("met_ver") or "11.1.0") local metplus_ver = (os.getenv("metplus_ver") or "5.1.0") -if (mode() == "load") then +if (mode() == "load") then load(pathJoin("met", met_ver)) load(pathJoin("metplus",metplus_ver)) end @@ -18,7 +18,7 @@ setenv("METPLUS_VERSION", metplus_ver) setenv("METPLUS_ROOT", base_metplus) setenv("METPLUS_PATH", base_metplus) -if (mode() == "unload") then +if (mode() == "unload") then unload(pathJoin("met", met_ver)) unload(pathJoin("metplus",metplus_ver)) end From 302bb26df121c4ffc438962b1e5fa15b922dcb5e Mon Sep 17 00:00:00 2001 From: Ratko Vasic Date: Fri, 10 Nov 2023 06:37:36 +0000 Subject: [PATCH 10/37] Upgrade spack stack from 1.4.1 to 1.5.0 on Gaea C4. --- modulefiles/build_gaea_intel.lua | 18 +++++++++++------- modulefiles/tasks/gaea/plot_allvars.local.lua | 1 + modulefiles/tasks/gaea/python_srw.lua | 1 + modulefiles/tasks/gaea/run_vx.local.lua | 6 +++--- 4 files changed, 16 insertions(+), 10 deletions(-) diff --git a/modulefiles/build_gaea_intel.lua b/modulefiles/build_gaea_intel.lua index df93eb2f17..f4f41b3416 100644 --- a/modulefiles/build_gaea_intel.lua +++ b/modulefiles/build_gaea_intel.lua @@ -8,18 +8,22 @@ whatis([===[Loads libraries needed for building the UFS SRW App on Gaea ]===]) unload("intel") unload("cray-mpich") unload("cray-python") -unload("darshan") -prepend_path("MODULEPATH", "/lustre/f2/dev/wpo/role.epic/contrib/spack-stack/spack-stack-1.4.1-c4/envs/unified-env/install/modulefiles/Core") +prepend_path("MODULEPATH", "/lustre/f2/dev/wpo/role.epic/contrib/spack-stack/c4/spack-stack-1.5.0/envs/unified-env/install/modulefiles/Core") prepend_path("MODULEPATH", "/lustre/f2/pdata/esrl/gsd/spack-stack/modulefiles") +stack_intel_ver=os.getenv("stack_intel_ver") or "2022.0.2" +load(pathJoin("stack-intel", stack_intel_ver)) -load("stack-intel/2022.0.2") -load("stack-cray-mpich/7.7.20") -load("stack-python/3.9.12") -load("cmake/3.23.1") +stack_mpich_ver=os.getenv("stack_mpich_ver") or "7.7.20" +load(pathJoin("stack-cray-mpich", stack_mpich_ver)) + +stack_python_ver=os.getenv("stack_python_ver") or "3.10.8" +load(pathJoin("stack-python", stack_python_ver)) + +cmake_ver=os.getenv("cmake_ver") or "3.23.1" +load(pathJoin("cmake", cmake_ver)) load("srw_common") -load("ufs-pyenv") -- Need at runtime load("alps") diff --git a/modulefiles/tasks/gaea/plot_allvars.local.lua b/modulefiles/tasks/gaea/plot_allvars.local.lua index 5cd4d13325..61f185f2b4 100644 --- a/modulefiles/tasks/gaea/plot_allvars.local.lua +++ b/modulefiles/tasks/gaea/plot_allvars.local.lua @@ -1,3 +1,4 @@ +unload("python") prepend_path("MODULEPATH","/lustre/f2/dev/role.epic/contrib/miniconda3/modulefiles") load(pathJoin("miniconda3", os.getenv("miniconda3_ver") or "4.12.0")) diff --git a/modulefiles/tasks/gaea/python_srw.lua b/modulefiles/tasks/gaea/python_srw.lua index a18856b8d2..08b9ec6c1f 100644 --- a/modulefiles/tasks/gaea/python_srw.lua +++ b/modulefiles/tasks/gaea/python_srw.lua @@ -1,3 +1,4 @@ +unload("python") prepend_path("MODULEPATH","/lustre/f2/dev/role.epic/contrib/miniconda3/modulefiles") load(pathJoin("miniconda3", os.getenv("miniconda3_ver") or "4.12.0")) diff --git a/modulefiles/tasks/gaea/run_vx.local.lua b/modulefiles/tasks/gaea/run_vx.local.lua index 8dccf5e63c..83949cff83 100644 --- a/modulefiles/tasks/gaea/run_vx.local.lua +++ b/modulefiles/tasks/gaea/run_vx.local.lua @@ -1,8 +1,8 @@ --[[ Compiler-specific modules are used for met and metplus libraries --]] -local met_ver = (os.getenv("met_ver") or "10.1.1") -local metplus_ver = (os.getenv("metplus_ver") or "4.1.1") +local met_ver = (os.getenv("met_ver") or "11.1.0") +local metplus_ver = (os.getenv("metplus_ver") or "5.1.0") if (mode() == "load") then load(pathJoin("met", met_ver)) load(pathJoin("metplus",metplus_ver)) @@ -22,4 +22,4 @@ if (mode() == "unload") then unload(pathJoin("met", met_ver)) unload(pathJoin("metplus",metplus_ver)) end -load("python_srw") +load("ufs-pyenv") From eb49214fe2266f49ec0fee738a3cfd328dc007a4 Mon Sep 17 00:00:00 2001 From: Parallel Works app-run user Date: Tue, 14 Nov 2023 17:47:47 +0000 Subject: [PATCH 11/37] spack-stack/1.5.0 updates for NOAA cloud platforms --- modulefiles/build_noaacloud_intel.lua | 2 +- modulefiles/srw_common.lua | 15 +++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/modulefiles/build_noaacloud_intel.lua b/modulefiles/build_noaacloud_intel.lua index 82a432f822..6ea89ac2db 100644 --- a/modulefiles/build_noaacloud_intel.lua +++ b/modulefiles/build_noaacloud_intel.lua @@ -5,7 +5,7 @@ the NOAA cloud using Intel-oneapi whatis([===[Loads libraries needed for building the UFS SRW App on NOAA cloud ]===]) -prepend_path("MODULEPATH", "/contrib/EPIC/spack-stack/spack-stack-1.4.1/envs/unified-dev/install/modulefiles/Core") +prepend_path("MODULEPATH", "/contrib/EPIC/spack-stack/spack-stack-1.5.0/envs/unified-env/install/modulefiles/Core") prepend_path("MODULEPATH", "/apps/modules/modulefiles") prepend_path("PATH", "/contrib/EPIC/bin") load("stack-intel") diff --git a/modulefiles/srw_common.lua b/modulefiles/srw_common.lua index 6cd326a1f8..f9702dfcee 100644 --- a/modulefiles/srw_common.lua +++ b/modulefiles/srw_common.lua @@ -1,10 +1,10 @@ -load_any("jasper/2.0.25","jasper/2.0.32") -load_any("zlib/1.2.11","zlib/1.2.13") +load_any("jasper") +load_any("zlib") load_any("png/1.6.37","libpng/1.6.37") load_any("netcdf/4.9.2","netcdf-c/4.9.2") load_any("netcdf/4.9.2","netcdf-fortran/4.6.0") -load_any("pio/2.5.10","parallelio/2.5.9","parallelio/2.5.10") +load_any("pio/2.5.10","parallelio") load("esmf/8.4.2") load("fms/2023.01") @@ -12,15 +12,14 @@ load("bacio/2.4.1") load("crtm/2.4.0") load("g2/3.4.5") load("g2tmpl/1.10.2") -load("ip/3.3.3") +load("ip/4.3.0") load("sp/2.3.3") -load("w3emc/2.9.2") +load("w3emc/2.10.0") -load_any("gftl-shared/v1.5.0","gftl-shared/1.5.0") -load_any("yafyaml/v0.5.1","yafyaml/0.5.1") +load_any("gftl-shared") load("mapl/2.35.2-esmf-8.4.2") -load_any("nemsio/2.5.2","nemsio/2.5.4") +load_any("nemsio") load("sfcio/1.4.1") load("sigio/2.3.2") load("w3nco/2.4.1") From 59bd966dbdcbfc766812ee3760a4152c8ab2c780 Mon Sep 17 00:00:00 2001 From: Parallel Works app-run user Date: Wed, 15 Nov 2023 06:33:48 +0000 Subject: [PATCH 12/37] NOAA cloud modulefiles adapted for spack-stack-1.5.0 --- modulefiles/tasks/noaacloud/plot_allvars.local.lua | 6 +++++- modulefiles/tasks/noaacloud/python_srw.lua | 3 ++- modulefiles/tasks/noaacloud/run_vx.local.lua | 6 +++--- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/modulefiles/tasks/noaacloud/plot_allvars.local.lua b/modulefiles/tasks/noaacloud/plot_allvars.local.lua index 602d60842f..c995f83bb8 100644 --- a/modulefiles/tasks/noaacloud/plot_allvars.local.lua +++ b/modulefiles/tasks/noaacloud/plot_allvars.local.lua @@ -1 +1,5 @@ -prepend_path("PATH", "/contrib/EPIC/miniconda3/4.12.0/envs/regional_workflow/bin") +unload("python") +append_path("MODULEPATH","/work/noaa/epic/role-epic/contrib/hercules/miniconda3/modulefiles") +load(pathJoin("miniconda3", os.getenv("miniconda3_ver") or "4.12.0")) + +setenv("SRW_ENV", "regional_workflow") diff --git a/modulefiles/tasks/noaacloud/python_srw.lua b/modulefiles/tasks/noaacloud/python_srw.lua index ed1e785a4c..2f2c28bf7e 100644 --- a/modulefiles/tasks/noaacloud/python_srw.lua +++ b/modulefiles/tasks/noaacloud/python_srw.lua @@ -1,4 +1,5 @@ -prepend_path("MODULEPATH","/contrib/EPIC/miniconda3/modulefiles") +unload("python") +append_path("MODULEPATH","/contrib/EPIC/miniconda3/modulefiles") load(pathJoin("miniconda3", os.getenv("miniconda3_ver") or "4.12.0")) setenv("SRW_ENV", "workflow_tools") diff --git a/modulefiles/tasks/noaacloud/run_vx.local.lua b/modulefiles/tasks/noaacloud/run_vx.local.lua index 8dccf5e63c..83949cff83 100644 --- a/modulefiles/tasks/noaacloud/run_vx.local.lua +++ b/modulefiles/tasks/noaacloud/run_vx.local.lua @@ -1,8 +1,8 @@ --[[ Compiler-specific modules are used for met and metplus libraries --]] -local met_ver = (os.getenv("met_ver") or "10.1.1") -local metplus_ver = (os.getenv("metplus_ver") or "4.1.1") +local met_ver = (os.getenv("met_ver") or "11.1.0") +local metplus_ver = (os.getenv("metplus_ver") or "5.1.0") if (mode() == "load") then load(pathJoin("met", met_ver)) load(pathJoin("metplus",metplus_ver)) @@ -22,4 +22,4 @@ if (mode() == "unload") then unload(pathJoin("met", met_ver)) unload(pathJoin("metplus",metplus_ver)) end -load("python_srw") +load("ufs-pyenv") From 9aa884f194e9da89714f3ce3e3f42113972e9bdd Mon Sep 17 00:00:00 2001 From: Parallel Works app-run user Date: Wed, 15 Nov 2023 12:53:58 +0000 Subject: [PATCH 13/37] modified modulefiles/tasks/noaacloud/plot_allvars.local.lua --- modulefiles/tasks/noaacloud/plot_allvars.local.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modulefiles/tasks/noaacloud/plot_allvars.local.lua b/modulefiles/tasks/noaacloud/plot_allvars.local.lua index c995f83bb8..cc122f69b2 100644 --- a/modulefiles/tasks/noaacloud/plot_allvars.local.lua +++ b/modulefiles/tasks/noaacloud/plot_allvars.local.lua @@ -1,5 +1,5 @@ unload("python") -append_path("MODULEPATH","/work/noaa/epic/role-epic/contrib/hercules/miniconda3/modulefiles") +append_path("MODULEPATH","/contrib/EPIC/miniconda3/modulefiles") load(pathJoin("miniconda3", os.getenv("miniconda3_ver") or "4.12.0")) setenv("SRW_ENV", "regional_workflow") From 281b9fc92debf00d2a27727cd9eab7deea9f516a Mon Sep 17 00:00:00 2001 From: Parallel Works app-run user Date: Wed, 15 Nov 2023 20:02:58 +0000 Subject: [PATCH 14/37] updates for ush/machine/noaacloud.yaml --- ush/machine/noaacloud.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/ush/machine/noaacloud.yaml b/ush/machine/noaacloud.yaml index a949fd0594..6577667bf6 100644 --- a/ush/machine/noaacloud.yaml +++ b/ush/machine/noaacloud.yaml @@ -5,6 +5,7 @@ platform: TEST_CCPA_OBS_DIR: /contrib/EPIC/UFS_SRW_data/develop/obs_data/ccpa/proc TEST_MRMS_OBS_DIR: /contrib/EPIC/UFS_SRW_data/develop/obs_data/mrms/proc TEST_NDAS_OBS_DIR: /contrib/EPIC/UFS_SRW_data/develop/obs_data/ndas/proc + DOMAIN_PREGEN_BASEDIR: /contrib/EPIC/UFS_SRW_data/develop/FV3LAM_pregen REMOVE_MEMORY: True RUN_CMD_FCST: mpiexec -np ${PE_MEMBER01} RUN_CMD_POST: mpiexec -np $nprocs From 45bee75e9b5afe2cfa9d4d6d51f4d63036fd9cfa Mon Sep 17 00:00:00 2001 From: Ratko Vasic Date: Wed, 15 Nov 2023 21:49:53 +0000 Subject: [PATCH 15/37] For Hera (Intel and GNU), switch environment from /envs/unified-env to /envs/unified-env-noavx512 --- modulefiles/build_hera_gnu.lua | 2 +- modulefiles/build_hera_intel.lua | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modulefiles/build_hera_gnu.lua b/modulefiles/build_hera_gnu.lua index c6900885d0..c1f57e2115 100644 --- a/modulefiles/build_hera_gnu.lua +++ b/modulefiles/build_hera_gnu.lua @@ -5,7 +5,7 @@ the NOAA RDHPC machine Hera using GNU 9.2.0 whatis([===[Loads libraries needed for building the UFS SRW App on Hera using GNU 9.2.0 ]===]) -prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.5.0/envs/unified-env/install/modulefiles/Core") +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/jcsda/jedipara/spack-stack/modulefiles") load("stack-gcc/9.2.0") diff --git a/modulefiles/build_hera_intel.lua b/modulefiles/build_hera_intel.lua index 2beaff8370..500d410dc5 100644 --- a/modulefiles/build_hera_intel.lua +++ b/modulefiles/build_hera_intel.lua @@ -8,7 +8,7 @@ whatis([===[Loads libraries needed for building the UFS SRW App on Hera ]===]) prepend_path("MODULEPATH","/contrib/sutils/modulefiles") load("sutils") -prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.5.0/envs/unified-env/install/modulefiles/Core") +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/jcsda/jedipara/spack-stack/modulefiles") stack_intel_ver=os.getenv("stack_intel_ver") or "2021.5.0" From a257d5fa525685ceba6d273cb235f74dc5cfdff4 Mon Sep 17 00:00:00 2001 From: Ratko Vasic Date: Wed, 15 Nov 2023 22:01:05 +0000 Subject: [PATCH 16/37] Per @MichaelLuken's suggestion made changes in loading modules and in Jenkinsfile --- .cicd/Jenkinsfile | 15 ++++----------- modulefiles/tasks/hera/aqm_lbcs.local.lua | 1 + .../hera/miniconda_regional_workflow_cmaq.lua | 1 + modulefiles/tasks/hercules/aqm_lbcs.local.lua | 1 + .../hercules/miniconda_regional_workflow_cmaq.lua | 1 + modulefiles/tasks/orion/aqm_lbcs.local.lua | 1 + .../orion/miniconda_regional_workflow_cmaq.lua | 1 + 7 files changed, 10 insertions(+), 11 deletions(-) diff --git a/.cicd/Jenkinsfile b/.cicd/Jenkinsfile index 6e453f6f25..4211c37b3f 100644 --- a/.cicd/Jenkinsfile +++ b/.cicd/Jenkinsfile @@ -14,11 +14,10 @@ pipeline { // Use the line below to enable the PW AWS cluster // choice(name: 'SRW_PLATFORM_FILTER', choices: ['all', 'cheyenne', 'gaea', 'gaea-c5', 'hera', 'jet', 'orion', 'hercules', 'pclusternoaav2use1'], description: 'Specify the platform(s) to use') // choice(name: 'SRW_PLATFORM_FILTER', choices: ['all', 'cheyenne', 'gaea', 'gaea-c5', 'hera', 'jet', 'orion', 'hercules'], description: 'Specify the platform(s) to use') - choice(name: 'SRW_PLATFORM_FILTER', choices: ['all', 'gaea', 'gaea-c5', 'hera', 'jet', 'orion', 'hercules'], description: 'Specify the platform(s) to use') + choice(name: 'SRW_PLATFORM_FILTER', choices: ['all', 'derecho', 'gaea', 'gaea-c5', 'hera', 'jet', 'orion', 'hercules'], description: 'Specify the platform(s) to use') // Allow job runner to filter based on compiler choice(name: 'SRW_COMPILER_FILTER', choices: ['all', 'gnu', 'intel'], description: 'Specify the compiler(s) to use to build') - // Uncomment the following line to re-enable comprehensive tests - // booleanParam name: 'SRW_WE2E_COMPREHENSIVE_TESTS', defaultValue: false, description: 'Whether to execute the comprehensive end-to-end tests' + booleanParam name: 'SRW_WE2E_COMPREHENSIVE_TESTS', defaultValue: false, description: 'Whether to execute the comprehensive end-to-end tests' } stages { @@ -89,7 +88,7 @@ pipeline { axis { name 'SRW_PLATFORM' // values 'cheyenne', 'gaea', 'gaea-c5', 'hera', 'jet', 'orion', 'hercules' //, 'pclusternoaav2use1', 'azclusternoaav2eus1', 'gclusternoaav2usc1' - values 'gaea', 'gaea-c5', 'hera', 'jet', 'orion', 'hercules' //, 'pclusternoaav2use1', 'azclusternoaav2eus1', 'gclusternoaav2usc1' + values 'derecho', 'gaea', 'gaea-c5', 'hera', 'jet', 'orion', 'hercules' //, 'pclusternoaav2use1', 'azclusternoaav2eus1', 'gclusternoaav2usc1' } axis { @@ -103,7 +102,7 @@ pipeline { exclude { axis { name 'SRW_PLATFORM' - values 'gaea', 'gaea-c5', 'jet', 'orion', 'hercules' //, 'pclusternoaav2use1' , 'azclusternoaav2eus1', 'gclusternoaav2usc1' + values 'derecho', 'gaea', 'gaea-c5', 'jet', 'orion', 'hercules' //, 'pclusternoaav2use1' , 'azclusternoaav2eus1', 'gclusternoaav2usc1' } axis { @@ -184,11 +183,6 @@ pipeline { dir ("${env.SRW_PLATFORM}") { echo "Testing SRW (${env.SRW_COMPILER}) on ${env.SRW_PLATFORM} (using ${env.WORKSPACE}/${env.SRW_PLATFORM})" - // Remove the following line to re-enable comprehensive tests - sh 'SRW_WE2E_COMPREHENSIVE_TESTS=false bash --login "${WORKSPACE}/${SRW_PLATFORM}/.cicd/scripts/srw_test.sh"' - - // Uncomment the following block to re-enable comprehensive tests - /* // If executing for a Pull Request, check for the run_we2e_comprehensive_tests. If set, // override the value of the SRW_WE2E_COMPREHENSIVE_TESTS parameter script { @@ -205,7 +199,6 @@ pipeline { sh "SRW_WE2E_COMPREHENSIVE_TESTS=${run_we2e_comprehensive_tests}" + ' bash --login "${WORKSPACE}/${SRW_PLATFORM}/.cicd/scripts/srw_test.sh"' } - */ } } diff --git a/modulefiles/tasks/hera/aqm_lbcs.local.lua b/modulefiles/tasks/hera/aqm_lbcs.local.lua index 23370a8d60..5a7b0cece6 100644 --- a/modulefiles/tasks/hera/aqm_lbcs.local.lua +++ b/modulefiles/tasks/hera/aqm_lbcs.local.lua @@ -1 +1,2 @@ load(pathJoin("nco", os.getenv("nco_ver") or "4.9.3")) +load("miniconda_regional_workflow_cmaq") diff --git a/modulefiles/tasks/hera/miniconda_regional_workflow_cmaq.lua b/modulefiles/tasks/hera/miniconda_regional_workflow_cmaq.lua index c0094e0ab2..b68584bfa4 100644 --- a/modulefiles/tasks/hera/miniconda_regional_workflow_cmaq.lua +++ b/modulefiles/tasks/hera/miniconda_regional_workflow_cmaq.lua @@ -1,3 +1,4 @@ +unload("python") prepend_path("MODULEPATH","/scratch1/NCEPDEV/nems/role.epic/miniconda3/modulefiles") load(pathJoin("miniconda3", os.getenv("miniconda3_ver") or "4.12.0")) diff --git a/modulefiles/tasks/hercules/aqm_lbcs.local.lua b/modulefiles/tasks/hercules/aqm_lbcs.local.lua index 23370a8d60..5a7b0cece6 100644 --- a/modulefiles/tasks/hercules/aqm_lbcs.local.lua +++ b/modulefiles/tasks/hercules/aqm_lbcs.local.lua @@ -1 +1,2 @@ load(pathJoin("nco", os.getenv("nco_ver") or "4.9.3")) +load("miniconda_regional_workflow_cmaq") diff --git a/modulefiles/tasks/hercules/miniconda_regional_workflow_cmaq.lua b/modulefiles/tasks/hercules/miniconda_regional_workflow_cmaq.lua index c785373386..9d98d325d4 100644 --- a/modulefiles/tasks/hercules/miniconda_regional_workflow_cmaq.lua +++ b/modulefiles/tasks/hercules/miniconda_regional_workflow_cmaq.lua @@ -1,3 +1,4 @@ +unload("python") prepend_path("MODULEPATH","/work/noaa/epic/role-epic/contrib/hercules/miniconda3/modulefiles") load(pathJoin("miniconda3", os.getenv("miniconda3_ver") or "4.12.0")) diff --git a/modulefiles/tasks/orion/aqm_lbcs.local.lua b/modulefiles/tasks/orion/aqm_lbcs.local.lua index 23370a8d60..5a7b0cece6 100644 --- a/modulefiles/tasks/orion/aqm_lbcs.local.lua +++ b/modulefiles/tasks/orion/aqm_lbcs.local.lua @@ -1 +1,2 @@ load(pathJoin("nco", os.getenv("nco_ver") or "4.9.3")) +load("miniconda_regional_workflow_cmaq") diff --git a/modulefiles/tasks/orion/miniconda_regional_workflow_cmaq.lua b/modulefiles/tasks/orion/miniconda_regional_workflow_cmaq.lua index 890f642185..d3fd79f2b4 100644 --- a/modulefiles/tasks/orion/miniconda_regional_workflow_cmaq.lua +++ b/modulefiles/tasks/orion/miniconda_regional_workflow_cmaq.lua @@ -1,3 +1,4 @@ +unload("python") prepend_path("MODULEPATH","/work/noaa/epic/role-epic/contrib/orion/miniconda3/modulefiles") load(pathJoin("miniconda3", os.getenv("miniconda3_ver") or "4.12.0")) From e55292fb488d50654f20a368b0fd04da1086370e Mon Sep 17 00:00:00 2001 From: Parallel Works app-run user Date: Thu, 16 Nov 2023 00:58:19 +0000 Subject: [PATCH 17/37] revert changes in modulefiles/srw_common.lua --- modulefiles/srw_common.lua | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modulefiles/srw_common.lua b/modulefiles/srw_common.lua index f9702dfcee..56072e0f3f 100644 --- a/modulefiles/srw_common.lua +++ b/modulefiles/srw_common.lua @@ -1,10 +1,10 @@ -load_any("jasper") -load_any("zlib") +load_any("jasper/2.0.25","jasper/2.0.32") +load_any("zlib/1.2.11","zlib/1.2.13") load_any("png/1.6.37","libpng/1.6.37") load_any("netcdf/4.9.2","netcdf-c/4.9.2") load_any("netcdf/4.9.2","netcdf-fortran/4.6.0") -load_any("pio/2.5.10","parallelio") +load_any("pio/2.5.10","parallelio/2.5.9","parallelio/2.5.10") load("esmf/8.4.2") load("fms/2023.01") @@ -16,10 +16,10 @@ load("ip/4.3.0") load("sp/2.3.3") load("w3emc/2.10.0") -load_any("gftl-shared") +load_any("gftl-shared/v1.5.0","gftl-shared/1.5.0") load("mapl/2.35.2-esmf-8.4.2") -load_any("nemsio") +load_any("nemsio/2.5.2","nemsio/2.5.4") load("sfcio/1.4.1") load("sigio/2.3.2") load("w3nco/2.4.1") From 9634fff2b65e460ae4267f51adc701d735cbc6d7 Mon Sep 17 00:00:00 2001 From: Ratko Vasic Date: Thu, 30 Nov 2023 02:27:43 +0000 Subject: [PATCH 18/37] Update with develop --- modulefiles/tasks/gaea-c5/plot_allvars.local.lua | 4 ---- modulefiles/tasks/gaea-c5/python_srw.lua | 4 ---- modulefiles/tasks/gaea/plot_allvars.local.lua | 4 ---- modulefiles/tasks/gaea/python_srw.lua | 4 ---- modulefiles/tasks/hera/plot_allvars.local.lua | 4 ---- modulefiles/tasks/jet/plot_allvars.local.lua | 4 ---- modulefiles/tasks/jet/python_srw.lua | 4 ---- modulefiles/tasks/noaacloud/python_srw.lua | 4 ---- modulefiles/wflow_hera.lua | 3 --- 9 files changed, 35 deletions(-) diff --git a/modulefiles/tasks/gaea-c5/plot_allvars.local.lua b/modulefiles/tasks/gaea-c5/plot_allvars.local.lua index 7f09f87d87..b7e9528710 100644 --- a/modulefiles/tasks/gaea-c5/plot_allvars.local.lua +++ b/modulefiles/tasks/gaea-c5/plot_allvars.local.lua @@ -1,6 +1,2 @@ ---unload("python") ---prepend_path("MODULEPATH","/lustre/f2/dev/role.epic/contrib/C5/miniconda3/modulefiles") ---load(pathJoin("miniconda3", os.getenv("miniconda3_ver") or "4.12.0")) ---setenv("SRW_ENV", "regional_workflow") load("conda") setenv("SRW_ENV", "srw_graphics") diff --git a/modulefiles/tasks/gaea-c5/python_srw.lua b/modulefiles/tasks/gaea-c5/python_srw.lua index 8afc341bca..a8b57c694e 100644 --- a/modulefiles/tasks/gaea-c5/python_srw.lua +++ b/modulefiles/tasks/gaea-c5/python_srw.lua @@ -1,7 +1,3 @@ ---unload("python") ---prepend_path("MODULEPATH","/lustre/f2/dev/role.epic/contrib/C5/miniconda3/modulefiles") ---load(pathJoin("miniconda3", os.getenv("miniconda3_ver") or "4.12.0")) ---setenv("SRW_ENV", "workflow_tools") unload("miniconda3") load("conda") setenv("SRW_ENV", "srw_app") diff --git a/modulefiles/tasks/gaea/plot_allvars.local.lua b/modulefiles/tasks/gaea/plot_allvars.local.lua index a8a275758f..b7e9528710 100644 --- a/modulefiles/tasks/gaea/plot_allvars.local.lua +++ b/modulefiles/tasks/gaea/plot_allvars.local.lua @@ -1,6 +1,2 @@ ---unload("python") ---prepend_path("MODULEPATH","/lustre/f2/dev/role.epic/contrib/miniconda3/modulefiles") ---load(pathJoin("miniconda3", os.getenv("miniconda3_ver") or "4.12.0")) ---setenv("SRW_ENV", "regional_workflow") load("conda") setenv("SRW_ENV", "srw_graphics") diff --git a/modulefiles/tasks/gaea/python_srw.lua b/modulefiles/tasks/gaea/python_srw.lua index 8cb3916696..a2dd45084c 100644 --- a/modulefiles/tasks/gaea/python_srw.lua +++ b/modulefiles/tasks/gaea/python_srw.lua @@ -1,6 +1,2 @@ ---unload("python") ---prepend_path("MODULEPATH","/lustre/f2/dev/role.epic/contrib/miniconda3/modulefiles") ---load(pathJoin("miniconda3", os.getenv("miniconda3_ver") or "4.12.0")) ---setenv("SRW_ENV", "workflow_tools") load("conda") setenv("SRW_ENV", "srw_app") diff --git a/modulefiles/tasks/hera/plot_allvars.local.lua b/modulefiles/tasks/hera/plot_allvars.local.lua index 4781129085..b7e9528710 100644 --- a/modulefiles/tasks/hera/plot_allvars.local.lua +++ b/modulefiles/tasks/hera/plot_allvars.local.lua @@ -1,6 +1,2 @@ ---unload("python") ---prepend_path("MODULEPATH","/scratch1/NCEPDEV/nems/role.epic/miniconda3/modulefiles") ---load(pathJoin("miniconda3", os.getenv("miniconda3_ver") or "4.12.0")) ---setenv("SRW_ENV", "regional_workflow") load("conda") setenv("SRW_ENV", "srw_graphics") diff --git a/modulefiles/tasks/jet/plot_allvars.local.lua b/modulefiles/tasks/jet/plot_allvars.local.lua index 61e0954b13..b7e9528710 100644 --- a/modulefiles/tasks/jet/plot_allvars.local.lua +++ b/modulefiles/tasks/jet/plot_allvars.local.lua @@ -1,6 +1,2 @@ ---unload("python") ---prepend_path("MODULEPATH","/mnt/lfs4/HFIP/hfv3gfs/role.epic/miniconda3/modulefiles") ---load(pathJoin("miniconda3", os.getenv("miniconda3_ver") or "4.12.0")) ---setenv("SRW_ENV", "regional_workflow") load("conda") setenv("SRW_ENV", "srw_graphics") diff --git a/modulefiles/tasks/jet/python_srw.lua b/modulefiles/tasks/jet/python_srw.lua index bcc82ec2ed..a2dd45084c 100644 --- a/modulefiles/tasks/jet/python_srw.lua +++ b/modulefiles/tasks/jet/python_srw.lua @@ -1,6 +1,2 @@ ---unload("python") ---prepend_path("MODULEPATH","/mnt/lfs4/HFIP/hfv3gfs/role.epic/miniconda3/modulefiles") ---load(pathJoin("miniconda3", os.getenv("miniconda3_ver") or "4.12.0")) ---setenv("SRW_ENV", "workflow_tools") load("conda") setenv("SRW_ENV", "srw_app") diff --git a/modulefiles/tasks/noaacloud/python_srw.lua b/modulefiles/tasks/noaacloud/python_srw.lua index a7373b4d45..a2dd45084c 100644 --- a/modulefiles/tasks/noaacloud/python_srw.lua +++ b/modulefiles/tasks/noaacloud/python_srw.lua @@ -1,6 +1,2 @@ ---unload("python") ---append_path("MODULEPATH","/contrib/EPIC/miniconda3/modulefiles") ---load(pathJoin("miniconda3", os.getenv("miniconda3_ver") or "4.12.0")) ---setenv("SRW_ENV", "workflow_tools") load("conda") setenv("SRW_ENV", "srw_app") diff --git a/modulefiles/wflow_hera.lua b/modulefiles/wflow_hera.lua index 21b10f4a6d..832f40bb73 100644 --- a/modulefiles/wflow_hera.lua +++ b/modulefiles/wflow_hera.lua @@ -7,9 +7,6 @@ whatis([===[Loads libraries needed for running the UFS SRW App on Hera ]===]) load("rocoto") load("set_pythonpath") ---unload("python") ---prepend_path("MODULEPATH","/scratch1/NCEPDEV/nems/role.epic/miniconda3/modulefiles") ---load(pathJoin("miniconda3", os.getenv("miniconda3_ver") or "4.12.0")) load("conda") if mode() == "load" then From b66dc3cf0103e763930f94c32ddbc65df8479099 Mon Sep 17 00:00:00 2001 From: Natalie Perlin Date: Sat, 9 Dec 2023 08:34:31 -0500 Subject: [PATCH 19/37] Include changes from release/public-v2.2.0 branch for gaea-c5, for runscripts --- jobs/JREGIONAL_AQM_ICS | 2 +- jobs/JREGIONAL_AQM_LBCS | 2 +- jobs/JREGIONAL_BIAS_CORRECTION_O3 | 2 +- jobs/JREGIONAL_BIAS_CORRECTION_PM25 | 2 +- jobs/JREGIONAL_CHECK_POST_OUTPUT | 2 +- jobs/JREGIONAL_FIRE_EMISSION | 2 +- jobs/JREGIONAL_GET_EXTRN_MDL_FILES | 2 +- jobs/JREGIONAL_MAKE_GRID | 2 +- jobs/JREGIONAL_MAKE_ICS | 2 +- jobs/JREGIONAL_MAKE_LBCS | 2 +- jobs/JREGIONAL_MAKE_OROG | 2 +- jobs/JREGIONAL_MAKE_SFC_CLIMO | 2 +- jobs/JREGIONAL_NEXUS_EMISSION | 2 +- jobs/JREGIONAL_NEXUS_GFS_SFC | 2 +- jobs/JREGIONAL_NEXUS_POST_SPLIT | 2 +- jobs/JREGIONAL_PLOT_ALLVARS | 2 +- jobs/JREGIONAL_POINT_SOURCE | 2 +- jobs/JREGIONAL_POST_STAT_O3 | 2 +- jobs/JREGIONAL_POST_STAT_PM25 | 2 +- jobs/JREGIONAL_PRE_POST_STAT | 2 +- jobs/JREGIONAL_RUN_FCST | 2 +- jobs/JREGIONAL_RUN_MET_GENENSPROD_OR_ENSEMBLESTAT | 2 +- jobs/JREGIONAL_RUN_MET_GRIDSTAT_OR_POINTSTAT_VX | 2 +- jobs/JREGIONAL_RUN_MET_GRIDSTAT_OR_POINTSTAT_VX_ENSMEAN | 2 +- jobs/JREGIONAL_RUN_MET_GRIDSTAT_OR_POINTSTAT_VX_ENSPROB | 2 +- jobs/JREGIONAL_RUN_MET_PB2NC_OBS | 2 +- jobs/JREGIONAL_RUN_MET_PCPCOMBINE | 2 +- jobs/JREGIONAL_RUN_POST | 2 +- jobs/JREGIONAL_RUN_PRDGEN | 2 +- modulefiles/build_gaea-c5_intel.lua | 3 +++ modulefiles/tasks/gaea-c5/python_srw.lua | 1 + scripts/exregional_aqm_ics.sh | 2 +- scripts/exregional_aqm_lbcs.sh | 2 +- scripts/exregional_bias_correction_o3.sh | 2 +- scripts/exregional_bias_correction_pm25.sh | 2 +- scripts/exregional_check_post_output.sh | 2 +- scripts/exregional_fire_emission.sh | 2 +- scripts/exregional_get_extrn_mdl_files.sh | 2 +- scripts/exregional_make_grid.sh | 3 ++- scripts/exregional_make_ics.sh | 2 +- scripts/exregional_make_lbcs.sh | 2 +- scripts/exregional_make_orog.sh | 2 +- scripts/exregional_make_sfc_climo.sh | 2 +- scripts/exregional_nexus_emission.sh | 2 +- scripts/exregional_nexus_gfs_sfc.sh | 2 +- scripts/exregional_nexus_post_split.sh | 2 +- scripts/exregional_point_source.sh | 2 +- scripts/exregional_post_stat_o3.sh | 2 +- scripts/exregional_post_stat_pm25.sh | 2 +- scripts/exregional_pre_post_stat.sh | 2 +- scripts/exregional_run_fcst.sh | 2 +- scripts/exregional_run_met_genensprod_or_ensemblestat.sh | 2 +- scripts/exregional_run_met_gridstat_or_pointstat_vx.sh | 2 +- .../exregional_run_met_gridstat_or_pointstat_vx_ensmean.sh | 2 +- .../exregional_run_met_gridstat_or_pointstat_vx_ensprob.sh | 2 +- scripts/exregional_run_met_pb2nc_obs.sh | 2 +- scripts/exregional_run_met_pcpcombine.sh | 2 +- scripts/exregional_run_post.sh | 2 +- scripts/exregional_run_prdgen.sh | 4 ++-- scripts/exregional_run_prdgen_subpiece.sh | 2 +- ush/wrappers/job_cards/qsub/get_ics.qsub | 2 +- ush/wrappers/job_cards/qsub/get_lbcs.qsub | 2 +- ush/wrappers/job_cards/qsub/make_grid.qsub | 2 +- ush/wrappers/job_cards/qsub/make_ics.qsub | 2 +- ush/wrappers/job_cards/qsub/make_lbcs.qsub | 2 +- ush/wrappers/job_cards/qsub/make_orog.qsub | 2 +- ush/wrappers/job_cards/qsub/make_sfc_climo.qsub | 2 +- ush/wrappers/job_cards/qsub/run_fcst.qsub | 2 +- ush/wrappers/job_cards/qsub/run_post.qsub | 2 +- ush/wrappers/run_fcst.sh | 2 +- ush/wrappers/run_get_ics.sh | 2 +- ush/wrappers/run_get_lbcs.sh | 2 +- ush/wrappers/run_gridensvx.sh | 2 +- ush/wrappers/run_gridvx.sh | 2 +- ush/wrappers/run_make_grid.sh | 2 +- ush/wrappers/run_make_ics.sh | 2 +- ush/wrappers/run_make_lbcs.sh | 2 +- ush/wrappers/run_make_orog.sh | 2 +- ush/wrappers/run_make_sfc_climo.sh | 2 +- ush/wrappers/run_pointensvx.sh | 2 +- ush/wrappers/run_pointvx.sh | 2 +- ush/wrappers/run_post.sh | 2 +- ush/wrappers/run_process_lightning.sh | 2 +- ush/wrappers/run_process_radarref.sh | 2 +- 84 files changed, 88 insertions(+), 83 deletions(-) diff --git a/jobs/JREGIONAL_AQM_ICS b/jobs/JREGIONAL_AQM_ICS index ce3e539cc9..5c8ba9c8dd 100755 --- a/jobs/JREGIONAL_AQM_ICS +++ b/jobs/JREGIONAL_AQM_ICS @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # #----------------------------------------------------------------------- diff --git a/jobs/JREGIONAL_AQM_LBCS b/jobs/JREGIONAL_AQM_LBCS index 7f13d12fa1..c711f90288 100755 --- a/jobs/JREGIONAL_AQM_LBCS +++ b/jobs/JREGIONAL_AQM_LBCS @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # #----------------------------------------------------------------------- diff --git a/jobs/JREGIONAL_BIAS_CORRECTION_O3 b/jobs/JREGIONAL_BIAS_CORRECTION_O3 index 6586d4427c..ddcef59494 100755 --- a/jobs/JREGIONAL_BIAS_CORRECTION_O3 +++ b/jobs/JREGIONAL_BIAS_CORRECTION_O3 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # #----------------------------------------------------------------------- diff --git a/jobs/JREGIONAL_BIAS_CORRECTION_PM25 b/jobs/JREGIONAL_BIAS_CORRECTION_PM25 index a0c0ba1b4a..7e08b02a12 100755 --- a/jobs/JREGIONAL_BIAS_CORRECTION_PM25 +++ b/jobs/JREGIONAL_BIAS_CORRECTION_PM25 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # #----------------------------------------------------------------------- diff --git a/jobs/JREGIONAL_CHECK_POST_OUTPUT b/jobs/JREGIONAL_CHECK_POST_OUTPUT index b9c1868282..2b1fe69bbb 100755 --- a/jobs/JREGIONAL_CHECK_POST_OUTPUT +++ b/jobs/JREGIONAL_CHECK_POST_OUTPUT @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # #----------------------------------------------------------------------- diff --git a/jobs/JREGIONAL_FIRE_EMISSION b/jobs/JREGIONAL_FIRE_EMISSION index ee540cfa6e..fdb6e57b0a 100755 --- a/jobs/JREGIONAL_FIRE_EMISSION +++ b/jobs/JREGIONAL_FIRE_EMISSION @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # #----------------------------------------------------------------------- diff --git a/jobs/JREGIONAL_GET_EXTRN_MDL_FILES b/jobs/JREGIONAL_GET_EXTRN_MDL_FILES index 6d8dd23c7e..8efd332dd9 100755 --- a/jobs/JREGIONAL_GET_EXTRN_MDL_FILES +++ b/jobs/JREGIONAL_GET_EXTRN_MDL_FILES @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # #----------------------------------------------------------------------- diff --git a/jobs/JREGIONAL_MAKE_GRID b/jobs/JREGIONAL_MAKE_GRID index 0a6adfe277..844d782bc7 100755 --- a/jobs/JREGIONAL_MAKE_GRID +++ b/jobs/JREGIONAL_MAKE_GRID @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # #----------------------------------------------------------------------- diff --git a/jobs/JREGIONAL_MAKE_ICS b/jobs/JREGIONAL_MAKE_ICS index 5ff0b3e4d8..1e38f4058d 100755 --- a/jobs/JREGIONAL_MAKE_ICS +++ b/jobs/JREGIONAL_MAKE_ICS @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # #----------------------------------------------------------------------- diff --git a/jobs/JREGIONAL_MAKE_LBCS b/jobs/JREGIONAL_MAKE_LBCS index 0070654cbe..4c524e26a6 100755 --- a/jobs/JREGIONAL_MAKE_LBCS +++ b/jobs/JREGIONAL_MAKE_LBCS @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # #----------------------------------------------------------------------- diff --git a/jobs/JREGIONAL_MAKE_OROG b/jobs/JREGIONAL_MAKE_OROG index 8f50c134ff..b6f674e5ee 100755 --- a/jobs/JREGIONAL_MAKE_OROG +++ b/jobs/JREGIONAL_MAKE_OROG @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # #----------------------------------------------------------------------- diff --git a/jobs/JREGIONAL_MAKE_SFC_CLIMO b/jobs/JREGIONAL_MAKE_SFC_CLIMO index fe7773230c..eee25b193a 100755 --- a/jobs/JREGIONAL_MAKE_SFC_CLIMO +++ b/jobs/JREGIONAL_MAKE_SFC_CLIMO @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # #----------------------------------------------------------------------- diff --git a/jobs/JREGIONAL_NEXUS_EMISSION b/jobs/JREGIONAL_NEXUS_EMISSION index 0f1a00d1a6..915de0f054 100755 --- a/jobs/JREGIONAL_NEXUS_EMISSION +++ b/jobs/JREGIONAL_NEXUS_EMISSION @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # #----------------------------------------------------------------------- diff --git a/jobs/JREGIONAL_NEXUS_GFS_SFC b/jobs/JREGIONAL_NEXUS_GFS_SFC index 5930762106..5fc05f86db 100755 --- a/jobs/JREGIONAL_NEXUS_GFS_SFC +++ b/jobs/JREGIONAL_NEXUS_GFS_SFC @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # #----------------------------------------------------------------------- diff --git a/jobs/JREGIONAL_NEXUS_POST_SPLIT b/jobs/JREGIONAL_NEXUS_POST_SPLIT index fc21421f8d..7cb8a55bf0 100755 --- a/jobs/JREGIONAL_NEXUS_POST_SPLIT +++ b/jobs/JREGIONAL_NEXUS_POST_SPLIT @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # #----------------------------------------------------------------------- diff --git a/jobs/JREGIONAL_PLOT_ALLVARS b/jobs/JREGIONAL_PLOT_ALLVARS index 49eb422c3a..5e59abd93d 100755 --- a/jobs/JREGIONAL_PLOT_ALLVARS +++ b/jobs/JREGIONAL_PLOT_ALLVARS @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # #----------------------------------------------------------------------- diff --git a/jobs/JREGIONAL_POINT_SOURCE b/jobs/JREGIONAL_POINT_SOURCE index d3a02b7534..57000dd599 100755 --- a/jobs/JREGIONAL_POINT_SOURCE +++ b/jobs/JREGIONAL_POINT_SOURCE @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # #----------------------------------------------------------------------- diff --git a/jobs/JREGIONAL_POST_STAT_O3 b/jobs/JREGIONAL_POST_STAT_O3 index af8652e05d..a522d00dbb 100755 --- a/jobs/JREGIONAL_POST_STAT_O3 +++ b/jobs/JREGIONAL_POST_STAT_O3 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # #----------------------------------------------------------------------- diff --git a/jobs/JREGIONAL_POST_STAT_PM25 b/jobs/JREGIONAL_POST_STAT_PM25 index 81ec818075..cd86879a73 100755 --- a/jobs/JREGIONAL_POST_STAT_PM25 +++ b/jobs/JREGIONAL_POST_STAT_PM25 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # #----------------------------------------------------------------------- diff --git a/jobs/JREGIONAL_PRE_POST_STAT b/jobs/JREGIONAL_PRE_POST_STAT index 41cb25d6a0..640c629bce 100755 --- a/jobs/JREGIONAL_PRE_POST_STAT +++ b/jobs/JREGIONAL_PRE_POST_STAT @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # #----------------------------------------------------------------------- diff --git a/jobs/JREGIONAL_RUN_FCST b/jobs/JREGIONAL_RUN_FCST index 383739e172..a7f7c96031 100755 --- a/jobs/JREGIONAL_RUN_FCST +++ b/jobs/JREGIONAL_RUN_FCST @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # #----------------------------------------------------------------------- diff --git a/jobs/JREGIONAL_RUN_MET_GENENSPROD_OR_ENSEMBLESTAT b/jobs/JREGIONAL_RUN_MET_GENENSPROD_OR_ENSEMBLESTAT index 0f70f0f285..707697b5ab 100755 --- a/jobs/JREGIONAL_RUN_MET_GENENSPROD_OR_ENSEMBLESTAT +++ b/jobs/JREGIONAL_RUN_MET_GENENSPROD_OR_ENSEMBLESTAT @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # #----------------------------------------------------------------------- diff --git a/jobs/JREGIONAL_RUN_MET_GRIDSTAT_OR_POINTSTAT_VX b/jobs/JREGIONAL_RUN_MET_GRIDSTAT_OR_POINTSTAT_VX index a9f7d3ae98..0301e9946a 100755 --- a/jobs/JREGIONAL_RUN_MET_GRIDSTAT_OR_POINTSTAT_VX +++ b/jobs/JREGIONAL_RUN_MET_GRIDSTAT_OR_POINTSTAT_VX @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # #----------------------------------------------------------------------- diff --git a/jobs/JREGIONAL_RUN_MET_GRIDSTAT_OR_POINTSTAT_VX_ENSMEAN b/jobs/JREGIONAL_RUN_MET_GRIDSTAT_OR_POINTSTAT_VX_ENSMEAN index 249a0a81bd..ab08320f33 100755 --- a/jobs/JREGIONAL_RUN_MET_GRIDSTAT_OR_POINTSTAT_VX_ENSMEAN +++ b/jobs/JREGIONAL_RUN_MET_GRIDSTAT_OR_POINTSTAT_VX_ENSMEAN @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # #----------------------------------------------------------------------- diff --git a/jobs/JREGIONAL_RUN_MET_GRIDSTAT_OR_POINTSTAT_VX_ENSPROB b/jobs/JREGIONAL_RUN_MET_GRIDSTAT_OR_POINTSTAT_VX_ENSPROB index 7239b7367c..7da98212ac 100755 --- a/jobs/JREGIONAL_RUN_MET_GRIDSTAT_OR_POINTSTAT_VX_ENSPROB +++ b/jobs/JREGIONAL_RUN_MET_GRIDSTAT_OR_POINTSTAT_VX_ENSPROB @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # #----------------------------------------------------------------------- diff --git a/jobs/JREGIONAL_RUN_MET_PB2NC_OBS b/jobs/JREGIONAL_RUN_MET_PB2NC_OBS index 552d855214..e36e72418f 100755 --- a/jobs/JREGIONAL_RUN_MET_PB2NC_OBS +++ b/jobs/JREGIONAL_RUN_MET_PB2NC_OBS @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # #----------------------------------------------------------------------- diff --git a/jobs/JREGIONAL_RUN_MET_PCPCOMBINE b/jobs/JREGIONAL_RUN_MET_PCPCOMBINE index 2722a8e646..7364ed96c9 100755 --- a/jobs/JREGIONAL_RUN_MET_PCPCOMBINE +++ b/jobs/JREGIONAL_RUN_MET_PCPCOMBINE @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # #----------------------------------------------------------------------- diff --git a/jobs/JREGIONAL_RUN_POST b/jobs/JREGIONAL_RUN_POST index 459431522f..b4327667a0 100755 --- a/jobs/JREGIONAL_RUN_POST +++ b/jobs/JREGIONAL_RUN_POST @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # #----------------------------------------------------------------------- diff --git a/jobs/JREGIONAL_RUN_PRDGEN b/jobs/JREGIONAL_RUN_PRDGEN index 6621db1727..2d30ced9db 100755 --- a/jobs/JREGIONAL_RUN_PRDGEN +++ b/jobs/JREGIONAL_RUN_PRDGEN @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # #----------------------------------------------------------------------- diff --git a/modulefiles/build_gaea-c5_intel.lua b/modulefiles/build_gaea-c5_intel.lua index 003311a7b6..4b90930f76 100644 --- a/modulefiles/build_gaea-c5_intel.lua +++ b/modulefiles/build_gaea-c5_intel.lua @@ -20,6 +20,9 @@ load(pathJoin("cmake", cmake_ver)) load("srw_common") +unload("darshan-runtime/3.4.0") +unload("cray-pmi/6.1.10") + setenv("CFLAGS","-diag-disable=10441") setenv("FFLAGS","-diag-disable=10441") diff --git a/modulefiles/tasks/gaea-c5/python_srw.lua b/modulefiles/tasks/gaea-c5/python_srw.lua index a8b57c694e..66f3fb4203 100644 --- a/modulefiles/tasks/gaea-c5/python_srw.lua +++ b/modulefiles/tasks/gaea-c5/python_srw.lua @@ -1,3 +1,4 @@ unload("miniconda3") load("conda") setenv("SRW_ENV", "srw_app") +load("darshan-runtime/3.4.0") diff --git a/scripts/exregional_aqm_ics.sh b/scripts/exregional_aqm_ics.sh index c59bf87f81..676cc4ed90 100755 --- a/scripts/exregional_aqm_ics.sh +++ b/scripts/exregional_aqm_ics.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # #----------------------------------------------------------------------- diff --git a/scripts/exregional_aqm_lbcs.sh b/scripts/exregional_aqm_lbcs.sh index 24bac24ad7..09a33d40a2 100755 --- a/scripts/exregional_aqm_lbcs.sh +++ b/scripts/exregional_aqm_lbcs.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # #----------------------------------------------------------------------- diff --git a/scripts/exregional_bias_correction_o3.sh b/scripts/exregional_bias_correction_o3.sh index 79ed056f59..709cc1957d 100755 --- a/scripts/exregional_bias_correction_o3.sh +++ b/scripts/exregional_bias_correction_o3.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # #----------------------------------------------------------------------- diff --git a/scripts/exregional_bias_correction_pm25.sh b/scripts/exregional_bias_correction_pm25.sh index 05348ecbc8..9503f744c9 100755 --- a/scripts/exregional_bias_correction_pm25.sh +++ b/scripts/exregional_bias_correction_pm25.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # #----------------------------------------------------------------------- diff --git a/scripts/exregional_check_post_output.sh b/scripts/exregional_check_post_output.sh index d088e218cd..bab7599eb4 100755 --- a/scripts/exregional_check_post_output.sh +++ b/scripts/exregional_check_post_output.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # #----------------------------------------------------------------------- diff --git a/scripts/exregional_fire_emission.sh b/scripts/exregional_fire_emission.sh index a2e9f9b44d..e1d2101477 100755 --- a/scripts/exregional_fire_emission.sh +++ b/scripts/exregional_fire_emission.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # #----------------------------------------------------------------------- diff --git a/scripts/exregional_get_extrn_mdl_files.sh b/scripts/exregional_get_extrn_mdl_files.sh index ffdcceef00..018a30c285 100755 --- a/scripts/exregional_get_extrn_mdl_files.sh +++ b/scripts/exregional_get_extrn_mdl_files.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # #----------------------------------------------------------------------- diff --git a/scripts/exregional_make_grid.sh b/scripts/exregional_make_grid.sh index 88472a8343..755e1c95c4 100755 --- a/scripts/exregional_make_grid.sh +++ b/scripts/exregional_make_grid.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # #----------------------------------------------------------------------- @@ -70,6 +70,7 @@ else print_info_msg "$VERBOSE" " All executables will be submitted with command \'${RUN_CMD_SERIAL}\'." fi + # #----------------------------------------------------------------------- # diff --git a/scripts/exregional_make_ics.sh b/scripts/exregional_make_ics.sh index d52bf25ec4..b42c086624 100755 --- a/scripts/exregional_make_ics.sh +++ b/scripts/exregional_make_ics.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # #----------------------------------------------------------------------- diff --git a/scripts/exregional_make_lbcs.sh b/scripts/exregional_make_lbcs.sh index 08cd0dda18..72f9369ff6 100755 --- a/scripts/exregional_make_lbcs.sh +++ b/scripts/exregional_make_lbcs.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # #----------------------------------------------------------------------- diff --git a/scripts/exregional_make_orog.sh b/scripts/exregional_make_orog.sh index f595d405a0..4fcf34a4ad 100755 --- a/scripts/exregional_make_orog.sh +++ b/scripts/exregional_make_orog.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # #----------------------------------------------------------------------- diff --git a/scripts/exregional_make_sfc_climo.sh b/scripts/exregional_make_sfc_climo.sh index d641fd6267..868029a488 100755 --- a/scripts/exregional_make_sfc_climo.sh +++ b/scripts/exregional_make_sfc_climo.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # #----------------------------------------------------------------------- diff --git a/scripts/exregional_nexus_emission.sh b/scripts/exregional_nexus_emission.sh index 8c0f904b94..d1153d95b7 100755 --- a/scripts/exregional_nexus_emission.sh +++ b/scripts/exregional_nexus_emission.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # #----------------------------------------------------------------------- diff --git a/scripts/exregional_nexus_gfs_sfc.sh b/scripts/exregional_nexus_gfs_sfc.sh index 01207e5666..c34d2c30ae 100755 --- a/scripts/exregional_nexus_gfs_sfc.sh +++ b/scripts/exregional_nexus_gfs_sfc.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # #----------------------------------------------------------------------- diff --git a/scripts/exregional_nexus_post_split.sh b/scripts/exregional_nexus_post_split.sh index a2e2a63b2a..390e0dcce6 100755 --- a/scripts/exregional_nexus_post_split.sh +++ b/scripts/exregional_nexus_post_split.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # #----------------------------------------------------------------------- diff --git a/scripts/exregional_point_source.sh b/scripts/exregional_point_source.sh index 8eee83337c..aeec8f3925 100755 --- a/scripts/exregional_point_source.sh +++ b/scripts/exregional_point_source.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # #----------------------------------------------------------------------- diff --git a/scripts/exregional_post_stat_o3.sh b/scripts/exregional_post_stat_o3.sh index 266cfe67f9..94306d7336 100755 --- a/scripts/exregional_post_stat_o3.sh +++ b/scripts/exregional_post_stat_o3.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # #----------------------------------------------------------------------- diff --git a/scripts/exregional_post_stat_pm25.sh b/scripts/exregional_post_stat_pm25.sh index 47ee326fb4..dc054b87a3 100755 --- a/scripts/exregional_post_stat_pm25.sh +++ b/scripts/exregional_post_stat_pm25.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # #----------------------------------------------------------------------- diff --git a/scripts/exregional_pre_post_stat.sh b/scripts/exregional_pre_post_stat.sh index 33bbd75a41..44f4637684 100755 --- a/scripts/exregional_pre_post_stat.sh +++ b/scripts/exregional_pre_post_stat.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # #----------------------------------------------------------------------- diff --git a/scripts/exregional_run_fcst.sh b/scripts/exregional_run_fcst.sh index 6dfad9673b..c5519d923c 100755 --- a/scripts/exregional_run_fcst.sh +++ b/scripts/exregional_run_fcst.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # #----------------------------------------------------------------------- diff --git a/scripts/exregional_run_met_genensprod_or_ensemblestat.sh b/scripts/exregional_run_met_genensprod_or_ensemblestat.sh index 9ccb2d1b25..1041c9b994 100755 --- a/scripts/exregional_run_met_genensprod_or_ensemblestat.sh +++ b/scripts/exregional_run_met_genensprod_or_ensemblestat.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # #----------------------------------------------------------------------- diff --git a/scripts/exregional_run_met_gridstat_or_pointstat_vx.sh b/scripts/exregional_run_met_gridstat_or_pointstat_vx.sh index 46c93ee299..f71930dfb0 100755 --- a/scripts/exregional_run_met_gridstat_or_pointstat_vx.sh +++ b/scripts/exregional_run_met_gridstat_or_pointstat_vx.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # #----------------------------------------------------------------------- diff --git a/scripts/exregional_run_met_gridstat_or_pointstat_vx_ensmean.sh b/scripts/exregional_run_met_gridstat_or_pointstat_vx_ensmean.sh index bf3a8280a1..d50827a52c 100755 --- a/scripts/exregional_run_met_gridstat_or_pointstat_vx_ensmean.sh +++ b/scripts/exregional_run_met_gridstat_or_pointstat_vx_ensmean.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # #----------------------------------------------------------------------- diff --git a/scripts/exregional_run_met_gridstat_or_pointstat_vx_ensprob.sh b/scripts/exregional_run_met_gridstat_or_pointstat_vx_ensprob.sh index 89c128eeed..89b8ae98b3 100755 --- a/scripts/exregional_run_met_gridstat_or_pointstat_vx_ensprob.sh +++ b/scripts/exregional_run_met_gridstat_or_pointstat_vx_ensprob.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # #----------------------------------------------------------------------- diff --git a/scripts/exregional_run_met_pb2nc_obs.sh b/scripts/exregional_run_met_pb2nc_obs.sh index be0f0a2b91..07e08f31db 100755 --- a/scripts/exregional_run_met_pb2nc_obs.sh +++ b/scripts/exregional_run_met_pb2nc_obs.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # #----------------------------------------------------------------------- diff --git a/scripts/exregional_run_met_pcpcombine.sh b/scripts/exregional_run_met_pcpcombine.sh index cb047163cb..b45a54330e 100755 --- a/scripts/exregional_run_met_pcpcombine.sh +++ b/scripts/exregional_run_met_pcpcombine.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # #----------------------------------------------------------------------- diff --git a/scripts/exregional_run_post.sh b/scripts/exregional_run_post.sh index 76a1196329..edf35ef2a4 100755 --- a/scripts/exregional_run_post.sh +++ b/scripts/exregional_run_post.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # #----------------------------------------------------------------------- diff --git a/scripts/exregional_run_prdgen.sh b/scripts/exregional_run_prdgen.sh index bf7a9b8e83..8fc72dff1c 100755 --- a/scripts/exregional_run_prdgen.sh +++ b/scripts/exregional_run_prdgen.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # #----------------------------------------------------------------------- @@ -212,7 +212,7 @@ sed -n -e '1,500p' $DATAprdgen/prslevf${fhr}.txt >& $DATAprdgen/hi_pr_1.txt sed -n -e '501,$p' $DATAprdgen/prslevf${fhr}.txt >& $DATAprdgen/hi_pr_2.txt # Create script to execute production generation tasks in parallel using CFP -echo "#!/bin/bash" > $DATAprdgen/poescript_${fhr} +echo "#!/usr/bin/env bash" > $DATAprdgen/poescript_${fhr} echo "export DATA=${DATAprdgen}" >> $DATAprdgen/poescript_${fhr} echo "export COMOUT=${COMOUT}" >> $DATAprdgen/poescript_${fhr} diff --git a/scripts/exregional_run_prdgen_subpiece.sh b/scripts/exregional_run_prdgen_subpiece.sh index 0b0b08630a..37e52c46fe 100755 --- a/scripts/exregional_run_prdgen_subpiece.sh +++ b/scripts/exregional_run_prdgen_subpiece.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ################################################################################ #### UNIX Script Documentation Block # . . diff --git a/ush/wrappers/job_cards/qsub/get_ics.qsub b/ush/wrappers/job_cards/qsub/get_ics.qsub index da3343808a..10af488c4c 100644 --- a/ush/wrappers/job_cards/qsub/get_ics.qsub +++ b/ush/wrappers/job_cards/qsub/get_ics.qsub @@ -1,4 +1,4 @@ -#! /bin/sh +#!/usr/bin/env bash #PBS -A epic #PBS -l select=1:mpiprocs=1:ncpus=1:mem=2G #PBS -q main diff --git a/ush/wrappers/job_cards/qsub/get_lbcs.qsub b/ush/wrappers/job_cards/qsub/get_lbcs.qsub index 1095e1ed95..b99e0d3c12 100644 --- a/ush/wrappers/job_cards/qsub/get_lbcs.qsub +++ b/ush/wrappers/job_cards/qsub/get_lbcs.qsub @@ -1,4 +1,4 @@ -#! /bin/sh +#!/usr/bin/env bash #PBS -A epic #PBS -l select=1:mpiprocs=1:ncpus=1:mem=2G #PBS -q main diff --git a/ush/wrappers/job_cards/qsub/make_grid.qsub b/ush/wrappers/job_cards/qsub/make_grid.qsub index a26aeb1878..fb207e2e06 100644 --- a/ush/wrappers/job_cards/qsub/make_grid.qsub +++ b/ush/wrappers/job_cards/qsub/make_grid.qsub @@ -1,4 +1,4 @@ -#! /bin/sh +#!/usr/bin/env bash #PBS -A epic #PBS -l select=1:mpiprocs=24:ncpus=24 #PBS -q main diff --git a/ush/wrappers/job_cards/qsub/make_ics.qsub b/ush/wrappers/job_cards/qsub/make_ics.qsub index 193114f26f..3fad9f0ec1 100644 --- a/ush/wrappers/job_cards/qsub/make_ics.qsub +++ b/ush/wrappers/job_cards/qsub/make_ics.qsub @@ -1,4 +1,4 @@ -#! /bin/sh +#!/usr/bin/env bash #PBS -A epic #PBS -l select=4:mpiprocs=12:ncpus=12 #PBS -q main diff --git a/ush/wrappers/job_cards/qsub/make_lbcs.qsub b/ush/wrappers/job_cards/qsub/make_lbcs.qsub index 83ae53bd91..72c66a355e 100644 --- a/ush/wrappers/job_cards/qsub/make_lbcs.qsub +++ b/ush/wrappers/job_cards/qsub/make_lbcs.qsub @@ -1,4 +1,4 @@ -#! /bin/sh +#!/usr/bin/env bash #PBS -A epic #PBS -l select=4:mpiprocs=12:ncpus=12 #PBS -q main diff --git a/ush/wrappers/job_cards/qsub/make_orog.qsub b/ush/wrappers/job_cards/qsub/make_orog.qsub index 8ab292f8b2..473a9e54c6 100644 --- a/ush/wrappers/job_cards/qsub/make_orog.qsub +++ b/ush/wrappers/job_cards/qsub/make_orog.qsub @@ -1,4 +1,4 @@ -#! /bin/sh +#!/usr/bin/env bash #PBS -A epic #PBS -l select=1:mpiprocs=24:ncpus=24 #PBS -q main diff --git a/ush/wrappers/job_cards/qsub/make_sfc_climo.qsub b/ush/wrappers/job_cards/qsub/make_sfc_climo.qsub index 8103ea6e6f..46ac2d0f6f 100644 --- a/ush/wrappers/job_cards/qsub/make_sfc_climo.qsub +++ b/ush/wrappers/job_cards/qsub/make_sfc_climo.qsub @@ -1,4 +1,4 @@ -#! /bin/sh +#!/usr/bin/env bash #PBS -A epic #PBS -l select=2:mpiprocs=24:ncpus=24 #PBS -q main diff --git a/ush/wrappers/job_cards/qsub/run_fcst.qsub b/ush/wrappers/job_cards/qsub/run_fcst.qsub index 931a84ce4c..31500164fb 100644 --- a/ush/wrappers/job_cards/qsub/run_fcst.qsub +++ b/ush/wrappers/job_cards/qsub/run_fcst.qsub @@ -1,4 +1,4 @@ -#! /bin/sh +#!/usr/bin/env bash #PBS -A epic #PBS -l select=1:mpiprocs=36:ncpus=36 #PBS -q main diff --git a/ush/wrappers/job_cards/qsub/run_post.qsub b/ush/wrappers/job_cards/qsub/run_post.qsub index 296ce7b59e..78dd8e834d 100644 --- a/ush/wrappers/job_cards/qsub/run_post.qsub +++ b/ush/wrappers/job_cards/qsub/run_post.qsub @@ -1,4 +1,4 @@ -#! /bin/sh +#!/usr/bin/env bash #PBS -A epic #PBS -j oe -o run_post.log #PBS -l select=2:mpiprocs=24:ncpus=24 diff --git a/ush/wrappers/run_fcst.sh b/ush/wrappers/run_fcst.sh index 93cc009b58..7450de7cc5 100755 --- a/ush/wrappers/run_fcst.sh +++ b/ush/wrappers/run_fcst.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash export GLOBAL_VAR_DEFNS_FP="${EXPTDIR}/var_defns.sh" set -xa source ${GLOBAL_VAR_DEFNS_FP} diff --git a/ush/wrappers/run_get_ics.sh b/ush/wrappers/run_get_ics.sh index 4cba2a86e5..0ee521a67d 100755 --- a/ush/wrappers/run_get_ics.sh +++ b/ush/wrappers/run_get_ics.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash export GLOBAL_VAR_DEFNS_FP="${EXPTDIR}/var_defns.sh" set -xa source ${GLOBAL_VAR_DEFNS_FP} diff --git a/ush/wrappers/run_get_lbcs.sh b/ush/wrappers/run_get_lbcs.sh index 3447d9f224..543ab6e47d 100755 --- a/ush/wrappers/run_get_lbcs.sh +++ b/ush/wrappers/run_get_lbcs.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash export GLOBAL_VAR_DEFNS_FP="${EXPTDIR}/var_defns.sh" set -xa source ${GLOBAL_VAR_DEFNS_FP} diff --git a/ush/wrappers/run_gridensvx.sh b/ush/wrappers/run_gridensvx.sh index 6134e6f33a..d3cb0c12ae 100755 --- a/ush/wrappers/run_gridensvx.sh +++ b/ush/wrappers/run_gridensvx.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash # Stand-alone script to run grid-to-grid ensemble verification export GLOBAL_VAR_DEFNS_FP="${EXPTDIR}/var_defns.sh" diff --git a/ush/wrappers/run_gridvx.sh b/ush/wrappers/run_gridvx.sh index 9b6f0e3979..9a5d55b046 100755 --- a/ush/wrappers/run_gridvx.sh +++ b/ush/wrappers/run_gridvx.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash # Stand-alone script to run grid-to-grid verification export GLOBAL_VAR_DEFNS_FP="${EXPTDIR}/var_defns.sh" diff --git a/ush/wrappers/run_make_grid.sh b/ush/wrappers/run_make_grid.sh index deff13c0ee..2d55beaf94 100755 --- a/ush/wrappers/run_make_grid.sh +++ b/ush/wrappers/run_make_grid.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash export GLOBAL_VAR_DEFNS_FP="${EXPTDIR}/var_defns.sh" set -xa source ${GLOBAL_VAR_DEFNS_FP} diff --git a/ush/wrappers/run_make_ics.sh b/ush/wrappers/run_make_ics.sh index b3e4333d9d..5c629722fc 100755 --- a/ush/wrappers/run_make_ics.sh +++ b/ush/wrappers/run_make_ics.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash export GLOBAL_VAR_DEFNS_FP="${EXPTDIR}/var_defns.sh" set -xa source ${GLOBAL_VAR_DEFNS_FP} diff --git a/ush/wrappers/run_make_lbcs.sh b/ush/wrappers/run_make_lbcs.sh index 2cd59c47a2..27c94c127f 100755 --- a/ush/wrappers/run_make_lbcs.sh +++ b/ush/wrappers/run_make_lbcs.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash export GLOBAL_VAR_DEFNS_FP="${EXPTDIR}/var_defns.sh" set -xa source ${GLOBAL_VAR_DEFNS_FP} diff --git a/ush/wrappers/run_make_orog.sh b/ush/wrappers/run_make_orog.sh index 81bdd5787b..5f02ff9599 100755 --- a/ush/wrappers/run_make_orog.sh +++ b/ush/wrappers/run_make_orog.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash export GLOBAL_VAR_DEFNS_FP="${EXPTDIR}/var_defns.sh" set -xa source ${GLOBAL_VAR_DEFNS_FP} diff --git a/ush/wrappers/run_make_sfc_climo.sh b/ush/wrappers/run_make_sfc_climo.sh index 455a8fdf45..fab33f75d6 100755 --- a/ush/wrappers/run_make_sfc_climo.sh +++ b/ush/wrappers/run_make_sfc_climo.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash export GLOBAL_VAR_DEFNS_FP="${EXPTDIR}/var_defns.sh" set -xa source ${GLOBAL_VAR_DEFNS_FP} diff --git a/ush/wrappers/run_pointensvx.sh b/ush/wrappers/run_pointensvx.sh index 87ad3e2e30..ca1c63952f 100755 --- a/ush/wrappers/run_pointensvx.sh +++ b/ush/wrappers/run_pointensvx.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash # Stand-alone script to run grid-to-point ensemble verification export GLOBAL_VAR_DEFNS_FP="${EXPTDIR}/var_defns.sh" diff --git a/ush/wrappers/run_pointvx.sh b/ush/wrappers/run_pointvx.sh index d59a57ed5f..e6754d8e78 100755 --- a/ush/wrappers/run_pointvx.sh +++ b/ush/wrappers/run_pointvx.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash # Stand-alone script to run grid-to-point verification export GLOBAL_VAR_DEFNS_FP="${EXPTDIR}/var_defns.sh" diff --git a/ush/wrappers/run_post.sh b/ush/wrappers/run_post.sh index 4a4a57513e..46ef104365 100755 --- a/ush/wrappers/run_post.sh +++ b/ush/wrappers/run_post.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash export GLOBAL_VAR_DEFNS_FP="${EXPTDIR}/var_defns.sh" set -xa source ${GLOBAL_VAR_DEFNS_FP} diff --git a/ush/wrappers/run_process_lightning.sh b/ush/wrappers/run_process_lightning.sh index d183d3adcd..1b6668136e 100755 --- a/ush/wrappers/run_process_lightning.sh +++ b/ush/wrappers/run_process_lightning.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash export GLOBAL_VAR_DEFNS_FP="${EXPTDIR}/var_defns.sh" set -xa source ${GLOBAL_VAR_DEFNS_FP} diff --git a/ush/wrappers/run_process_radarref.sh b/ush/wrappers/run_process_radarref.sh index 694b79b4f8..39475b81be 100755 --- a/ush/wrappers/run_process_radarref.sh +++ b/ush/wrappers/run_process_radarref.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash export GLOBAL_VAR_DEFNS_FP="${EXPTDIR}/var_defns.sh" set -xa source ${GLOBAL_VAR_DEFNS_FP} From 0b0914f024b476ae3f90a37606130316dca4e047 Mon Sep 17 00:00:00 2001 From: Natalie Perlin Date: Wed, 20 Dec 2023 09:43:15 -0500 Subject: [PATCH 20/37] correct devclean.sh, devbuild.sh and Gaea-c5 modulefiles --- devbuild.sh | 11 +++++++++-- devclean.sh | 8 +++++--- modulefiles/tasks/gaea-c5/plot_allvars.local.lua | 8 ++++++-- modulefiles/tasks/gaea-c5/python_srw.lua | 8 ++++++-- modulefiles/tasks/gaea-c5/run_vx.local.lua | 2 +- modulefiles/wflow_gaea-c5.lua | 5 +++-- 6 files changed, 30 insertions(+), 12 deletions(-) diff --git a/devbuild.sh b/devbuild.sh index 6ec2615e23..3ea90e2fd3 100755 --- a/devbuild.sh +++ b/devbuild.sh @@ -212,6 +212,11 @@ printf "PLATFORM(MACHINE)=${PLATFORM}\n" >&2 if [ "${PLATFORM}" = "wcoss2" ]; then BUILD_CONDA="off" fi +# Conda is not used on Gaea-c5 F2 filesystem +# it needs to be reevaluated when moved to F2 filesystem +if [ "${PLATFORM}" = "gaea-c5" ]; then + BUILD_CONDA="off" +fi # build conda and conda environments, if requested. if [ "${BUILD_CONDA}" = "on" ] ; then @@ -244,8 +249,10 @@ if [ "${BUILD_CONDA}" = "on" ] ; then fi else - source ${CONDA_BUILD_DIR}/etc/profile.d/conda.sh - conda activate + if [ -d "${CONDA_BUILD_DIR}" ] ; then + source ${CONDA_BUILD_DIR}/etc/profile.d/conda.sh + conda activate + fi fi # Conda environment should have linux utilities to perform these tasks on macos. diff --git a/devclean.sh b/devclean.sh index 8d13b0f061..2bdd8e9626 100755 --- a/devclean.sh +++ b/devclean.sh @@ -137,10 +137,12 @@ elif [ "${CLEAN}" = true ]; then "${INSTALL_DIR}/lib64" \ "${SRW_DIR}/manage_externals/manic" \ ) - for directory in $directories; do - [[ -d $directory ]] && rm -rfv $directory - done + if [ ${#directories[@]} -ge 1 ]; then + for dir in ${directories[@]}; do + [[ -d "${dir}" ]] && rm -rfv ${dir} + done echo " " + fi fi # Clean all the submodules if requested. Note: Need to check out them again before attempting subsequent builds, by sourcing ${SRW_DIR}/manage_externals/checkout_externals if [ ${INCLUDE_SUB_MODULES} == true ]; then diff --git a/modulefiles/tasks/gaea-c5/plot_allvars.local.lua b/modulefiles/tasks/gaea-c5/plot_allvars.local.lua index b7e9528710..2ce42ff57f 100644 --- a/modulefiles/tasks/gaea-c5/plot_allvars.local.lua +++ b/modulefiles/tasks/gaea-c5/plot_allvars.local.lua @@ -1,2 +1,6 @@ -load("conda") -setenv("SRW_ENV", "srw_graphics") +unload("miniconda3") +unload("python") +prepend_path("MODULEPATH","/lustre/f2/dev/role.epic/contrib/C5/miniconda3/modulefiles") +load(pathJoin("miniconda3", os.getenv("miniconda3_ver") or "4.12.0")) + +setenv("SRW_ENV", "regional_workflow") diff --git a/modulefiles/tasks/gaea-c5/python_srw.lua b/modulefiles/tasks/gaea-c5/python_srw.lua index 66f3fb4203..0ae31da067 100644 --- a/modulefiles/tasks/gaea-c5/python_srw.lua +++ b/modulefiles/tasks/gaea-c5/python_srw.lua @@ -1,4 +1,8 @@ unload("miniconda3") -load("conda") -setenv("SRW_ENV", "srw_app") +unload("python") +prepend_path("MODULEPATH","/lustre/f2/dev/role.epic/contrib/C5/miniconda3/modulefiles") +load(pathJoin("miniconda3", os.getenv("miniconda3_ver") or "4.12.0")) + +setenv("SRW_ENV", "workflow_tools") + load("darshan-runtime/3.4.0") diff --git a/modulefiles/tasks/gaea-c5/run_vx.local.lua b/modulefiles/tasks/gaea-c5/run_vx.local.lua index 83949cff83..cb64e9a38a 100644 --- a/modulefiles/tasks/gaea-c5/run_vx.local.lua +++ b/modulefiles/tasks/gaea-c5/run_vx.local.lua @@ -22,4 +22,4 @@ if (mode() == "unload") then unload(pathJoin("met", met_ver)) unload(pathJoin("metplus",metplus_ver)) end -load("ufs-pyenv") +load("python_srw") diff --git a/modulefiles/wflow_gaea-c5.lua b/modulefiles/wflow_gaea-c5.lua index 5f9d93e58f..12467dfd74 100644 --- a/modulefiles/wflow_gaea-c5.lua +++ b/modulefiles/wflow_gaea-c5.lua @@ -7,7 +7,8 @@ whatis([===[Loads libraries needed for running the UFS SRW App on gaea ]===]) unload("python") load("set_pythonpath") -load("conda") +prepend_path("MODULEPATH","/lustre/f2/dev/role.epic/contrib/C5/miniconda3/modulefiles") +load(pathJoin("miniconda3", os.getenv("miniconda3_ver") or "4.12.0")) prepend_path("MODULEPATH","/lustre/f2/dev/role.epic/contrib/C5/rocoto/modulefiles") load("rocoto") @@ -15,6 +16,6 @@ pushenv("MKLROOT", "/opt/intel/oneapi/mkl/2023.1.0/") if mode() == "load" then LmodMsgRaw([===[Please do the following to activate conda: - > conda activate srw_app + > conda activate workflow_tools ]===]) end From 8a5f038bfa472a7e25f3b7a2478e31d04f0905f4 Mon Sep 17 00:00:00 2001 From: Ratko Vasic Date: Tue, 2 Jan 2024 16:37:35 +0000 Subject: [PATCH 21/37] Gaea-C5, special case when loading conda environment. Replace srw_app with workflow_tools. --- ush/load_modules_wflow.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ush/load_modules_wflow.sh b/ush/load_modules_wflow.sh index 67499f4888..cf33a43f3f 100755 --- a/ush/load_modules_wflow.sh +++ b/ush/load_modules_wflow.sh @@ -62,7 +62,12 @@ task failed: $has_mu && set +u if [ ! -z $(command -v conda) ]; then +# Gaea-C5 special case missing jinja2 + if [ "${machine}" == "gaea-c5" ]; then + conda activate workflow_tools + else conda activate srw_app + fi fi $has_mu && set -u From bfc8e29326079c31309d78324fa0bf558ab91889 Mon Sep 17 00:00:00 2001 From: Ratko Vasic Date: Tue, 2 Jan 2024 11:27:36 -0700 Subject: [PATCH 22/37] Add library versions for hpc-stack used by Derecho --- modulefiles/srw_common.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modulefiles/srw_common.lua b/modulefiles/srw_common.lua index 56072e0f3f..ead04bedd5 100644 --- a/modulefiles/srw_common.lua +++ b/modulefiles/srw_common.lua @@ -12,9 +12,9 @@ load("bacio/2.4.1") load("crtm/2.4.0") load("g2/3.4.5") load("g2tmpl/1.10.2") -load("ip/4.3.0") +load_any("ip/4.0.0","ip/4.3.0") load("sp/2.3.3") -load("w3emc/2.10.0") +load_any("w3emc/2.9.2","w3emc/2.10.0") load_any("gftl-shared/v1.5.0","gftl-shared/1.5.0") load("mapl/2.35.2-esmf-8.4.2") From 0cf89e3765d235656c9ca209bb2648a75df05a8c Mon Sep 17 00:00:00 2001 From: Ratko Vasic Date: Tue, 2 Jan 2024 18:38:26 +0000 Subject: [PATCH 23/37] Gaea-C5, special case when loading conda environment. Replace srw_app with workflow_tools in .cicd/scripts/srw_ftest.sh --- .cicd/scripts/srw_ftest.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.cicd/scripts/srw_ftest.sh b/.cicd/scripts/srw_ftest.sh index 4b8b672905..d54cafcafd 100755 --- a/.cicd/scripts/srw_ftest.sh +++ b/.cicd/scripts/srw_ftest.sh @@ -85,7 +85,12 @@ module load build_${platform,,}_${SRW_COMPILER} module load wflow_${platform,,} [[ ${FORGIVE_CONDA} == true ]] && set +e +u # Some platforms have incomplete python3 or conda support, but wouldn't necessarily block workflow tests -conda activate srw_app +# Gaea-C5 special case missing jinja2 +if [ "${platform}" == "gaea-c5" ]; then + conda activate workflow_tools +else + conda activate srw_app +fi set -e -u export PYTHONPATH=${workspace}/ush/python_utils/workflow-tools:${workspace}/ush/python_utils/workflow-tools/src From 126ca9b30d11391122aeae1efd97035a0fc5d82f Mon Sep 17 00:00:00 2001 From: "michael.lueken" Date: Thu, 4 Jan 2024 07:56:40 -0600 Subject: [PATCH 24/37] Update run_vx.local.lua to allow verification tests to run on Orion. --- modulefiles/tasks/orion/run_vx.local.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modulefiles/tasks/orion/run_vx.local.lua b/modulefiles/tasks/orion/run_vx.local.lua index bd38c02d8c..1fa9617365 100644 --- a/modulefiles/tasks/orion/run_vx.local.lua +++ b/modulefiles/tasks/orion/run_vx.local.lua @@ -1,6 +1,8 @@ --[[ Compiler-specific modules are used for met and metplus libraries --]] +load("build_orion_intel") + local met_ver = (os.getenv("met_ver") or "11.1.0") local metplus_ver = (os.getenv("metplus_ver") or "5.1.0") if (mode() == "load") then From aff60ac1b823e8dfc267c89f0f37a6296d98a220 Mon Sep 17 00:00:00 2001 From: "michael.lueken" Date: Fri, 5 Jan 2024 19:17:19 +0000 Subject: [PATCH 25/37] Disable comprehensive tests on Derecho that fail due to issues in UFS_UTILS. --- .../WE2E/machine_suites/comprehensive.derecho | 63 ++++++++++++++++++- 1 file changed, 62 insertions(+), 1 deletion(-) mode change 120000 => 100644 tests/WE2E/machine_suites/comprehensive.derecho diff --git a/tests/WE2E/machine_suites/comprehensive.derecho b/tests/WE2E/machine_suites/comprehensive.derecho deleted file mode 120000 index 18a56d9739..0000000000 --- a/tests/WE2E/machine_suites/comprehensive.derecho +++ /dev/null @@ -1 +0,0 @@ -comprehensive.orion \ No newline at end of file diff --git a/tests/WE2E/machine_suites/comprehensive.derecho b/tests/WE2E/machine_suites/comprehensive.derecho new file mode 100644 index 0000000000..8bfa9e5e5e --- /dev/null +++ b/tests/WE2E/machine_suites/comprehensive.derecho @@ -0,0 +1,62 @@ +2020_CAD +community +custom_ESGgrid +#custom_ESGgrid_Central_Asia_3km +custom_ESGgrid_IndianOcean_6km +#custom_ESGgrid_NewZealand_3km +custom_ESGgrid_Peru_12km +custom_ESGgrid_SF_1p1km +custom_GFDLgrid__GFDLgrid_USE_NUM_CELLS_IN_FILENAMES_eq_FALSE +custom_GFDLgrid +deactivate_tasks +get_from_AWS_ics_GEFS_lbcs_GEFS_fmt_grib2_2022040400_ensemble_2mems +get_from_NOMADS_ics_FV3GFS_lbcs_FV3GFS +grid_CONUS_25km_GFDLgrid_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16 +#grid_CONUS_3km_GFDLgrid_ics_FV3GFS_lbcs_FV3GFS_suite_RRFS_v1beta +#grid_RRFS_AK_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16_plot +grid_RRFS_AK_3km_ics_FV3GFS_lbcs_FV3GFS_suite_HRRR +grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_RAP +grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16_plot +grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_HRRR +grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_RRFS_v1beta +grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2 +grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16_plot +grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v17_p8_plot +grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_HRRR +grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_RAP +grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_RRFS_v1beta +grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_RAP_suite_RAP +grid_RRFS_CONUS_25km_ics_GSMGFS_lbcs_GSMGFS_suite_GFS_v15p2 +grid_RRFS_CONUS_25km_ics_NAM_lbcs_NAM_suite_GFS_v16 +grid_RRFS_CONUS_25km_ics_NAM_lbcs_NAM_suite_RRFS_v1beta +grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2 +grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15_thompson_mynn_lam3km +grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16 +grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_HRRR +grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_RRFS_v1beta +grid_RRFS_CONUScompact_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16 +grid_RRFS_CONUScompact_13km_ics_HRRR_lbcs_RAP_suite_HRRR +grid_RRFS_CONUScompact_13km_ics_HRRR_lbcs_RAP_suite_RRFS_v1beta +grid_RRFS_CONUScompact_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16 +grid_RRFS_CONUScompact_25km_ics_HRRR_lbcs_HRRR_suite_HRRR +grid_RRFS_CONUScompact_25km_ics_HRRR_lbcs_RAP_suite_RRFS_v1beta +grid_RRFS_CONUScompact_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16 +grid_RRFS_CONUScompact_3km_ics_HRRR_lbcs_RAP_suite_HRRR +grid_RRFS_CONUScompact_3km_ics_HRRR_lbcs_RAP_suite_RRFS_v1beta +grid_RRFS_NA_13km_ics_FV3GFS_lbcs_FV3GFS_suite_RAP +grid_SUBCONUS_Ind_3km_ics_FV3GFS_lbcs_FV3GFS_suite_WoFS_v0 +grid_SUBCONUS_Ind_3km_ics_HRRR_lbcs_HRRR_suite_HRRR +grid_SUBCONUS_Ind_3km_ics_HRRR_lbcs_RAP_suite_WoFS_v0 +grid_SUBCONUS_Ind_3km_ics_NAM_lbcs_NAM_suite_GFS_v16 +grid_SUBCONUS_Ind_3km_ics_RAP_lbcs_RAP_suite_RRFS_v1beta_plot +MET_ensemble_verification_only_vx +MET_verification_only_vx +nco +nco_ensemble +nco_grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16 +nco_grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_timeoffset_suite_GFS_v16 +nco_grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15_thompson_mynn_lam3km +nco_grid_RRFS_CONUScompact_25km_ics_HRRR_lbcs_RAP_suite_HRRR +pregen_grid_orog_sfc_climo +specify_EXTRN_MDL_SYSBASEDIR_ICS_LBCS +specify_template_filenames From ada1af29c0ce07db9d50d23bcc924a8cb9a96fbd Mon Sep 17 00:00:00 2001 From: "michael.lueken" Date: Thu, 18 Jan 2024 12:41:32 -0600 Subject: [PATCH 26/37] Remove Gaea from Jenkinsfile. --- .cicd/Jenkinsfile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.cicd/Jenkinsfile b/.cicd/Jenkinsfile index fce81204d9..7d1c06591e 100644 --- a/.cicd/Jenkinsfile +++ b/.cicd/Jenkinsfile @@ -10,11 +10,11 @@ pipeline { parameters { // Allow job runner to filter based on platform // Use the line below to enable all PW clusters - // choice(name: 'SRW_PLATFORM_FILTER', choices: ['all', 'cheyenne', 'gaea', 'gaea-c5', 'hera', 'jet', 'orion', 'hercules', 'pclusternoaav2use1', 'azclusternoaav2eus1', 'gclusternoaav2usc1'], description: 'Specify the platform(s) to use') + // choice(name: 'SRW_PLATFORM_FILTER', choices: ['all', 'cheyenne', 'gaea-c5', 'hera', 'jet', 'orion', 'hercules', 'pclusternoaav2use1', 'azclusternoaav2eus1', 'gclusternoaav2usc1'], description: 'Specify the platform(s) to use') // Use the line below to enable the PW AWS cluster - // choice(name: 'SRW_PLATFORM_FILTER', choices: ['all', 'cheyenne', 'gaea', 'gaea-c5', 'hera', 'jet', 'orion', 'hercules', 'pclusternoaav2use1'], description: 'Specify the platform(s) to use') - // choice(name: 'SRW_PLATFORM_FILTER', choices: ['all', 'cheyenne', 'gaea', 'gaea-c5', 'hera', 'jet', 'orion', 'hercules'], description: 'Specify the platform(s) to use') - choice(name: 'SRW_PLATFORM_FILTER', choices: ['all', 'derecho', 'gaea', 'gaea-c5', 'hera', 'jet', 'orion', 'hercules'], description: 'Specify the platform(s) to use') + // choice(name: 'SRW_PLATFORM_FILTER', choices: ['all', 'cheyenne', 'gaea-c5', 'hera', 'jet', 'orion', 'hercules', 'pclusternoaav2use1'], description: 'Specify the platform(s) to use') + // choice(name: 'SRW_PLATFORM_FILTER', choices: ['all', 'cheyenne', 'gaea-c5', 'hera', 'jet', 'orion', 'hercules'], description: 'Specify the platform(s) to use') + choice(name: 'SRW_PLATFORM_FILTER', choices: ['all', 'derecho', 'gaea-c5', 'hera', 'jet', 'orion', 'hercules'], description: 'Specify the platform(s) to use') // Allow job runner to filter based on compiler choice(name: 'SRW_COMPILER_FILTER', choices: ['all', 'gnu', 'intel'], description: 'Specify the compiler(s) to use to build') booleanParam name: 'SRW_WE2E_COMPREHENSIVE_TESTS', defaultValue: false, description: 'Whether to execute the comprehensive end-to-end tests' @@ -87,8 +87,8 @@ pipeline { axes { axis { name 'SRW_PLATFORM' - // values 'cheyenne', 'gaea', 'gaea-c5', 'hera', 'jet', 'orion', 'hercules' //, 'pclusternoaav2use1', 'azclusternoaav2eus1', 'gclusternoaav2usc1' - values 'derecho', 'gaea', 'gaea-c5', 'hera', 'jet', 'orion', 'hercules' //, 'pclusternoaav2use1', 'azclusternoaav2eus1', 'gclusternoaav2usc1' + // values 'cheyenne', 'gaea-c5', 'hera', 'jet', 'orion', 'hercules' //, 'pclusternoaav2use1', 'azclusternoaav2eus1', 'gclusternoaav2usc1' + values 'derecho', 'gaea-c5', 'hera', 'jet', 'orion', 'hercules' //, 'pclusternoaav2use1', 'azclusternoaav2eus1', 'gclusternoaav2usc1' } axis { @@ -102,7 +102,7 @@ pipeline { exclude { axis { name 'SRW_PLATFORM' - values 'derecho', 'gaea', 'gaea-c5', 'jet', 'orion', 'hercules' //, 'pclusternoaav2use1' , 'azclusternoaav2eus1', 'gclusternoaav2usc1' + values 'derecho', 'gaea-c5', 'jet', 'orion', 'hercules' //, 'pclusternoaav2use1' , 'azclusternoaav2eus1', 'gclusternoaav2usc1' } axis { From e7d7322308c9cdbb1333c63b72b966d9df5f3a52 Mon Sep 17 00:00:00 2001 From: Natalie Perlin Date: Tue, 23 Jan 2024 07:56:10 -0700 Subject: [PATCH 27/37] Updates for Derecho spack-stack-1.5.0 --- devclean.sh | 1 - etc/lmod-setup.csh | 7 ++--- etc/lmod-setup.sh | 7 ++--- modulefiles/build_derecho_intel.lua | 31 +++++-------------- modulefiles/srw_common.lua | 22 ++++++------- modulefiles/tasks/derecho/aqm_ics.local.lua | 3 +- modulefiles/tasks/derecho/aqm_lbcs.local.lua | 3 +- .../tasks/derecho/pre_post_stat.local.lua | 2 +- modulefiles/tasks/derecho/run_vx.local.lua | 10 ++++-- .../tasks/derecho/run_vx.local.lua_bac | 29 +++++++++++++++++ sorc/CMakeLists.txt | 3 -- 11 files changed, 61 insertions(+), 57 deletions(-) create mode 100644 modulefiles/tasks/derecho/run_vx.local.lua_bac diff --git a/devclean.sh b/devclean.sh index 2bdd8e9626..01ace7a7d9 100755 --- a/devclean.sh +++ b/devclean.sh @@ -135,7 +135,6 @@ elif [ "${CLEAN}" = true ]; then "${INSTALL_DIR}/include" \ "${INSTALL_DIR}/lib" \ "${INSTALL_DIR}/lib64" \ - "${SRW_DIR}/manage_externals/manic" \ ) if [ ${#directories[@]} -ge 1 ]; then for dir in ${directories[@]}; do diff --git a/etc/lmod-setup.csh b/etc/lmod-setup.csh index dc8fb2b064..92a4394893 100644 --- a/etc/lmod-setup.csh +++ b/etc/lmod-setup.csh @@ -37,14 +37,11 @@ else if ( "$L_MACHINE" == singularity ) then module purge -else if ( "$L_MACHINE" == gaea ) then - source /lustre/f2/dev/role.epic/contrib/Lmod_init.csh - else if ( "$L_MACHINE" == gaea-c5 ) then - source /lustre/f2/dev/role.epic/contrib/Lmod_init_C5.csh + module reset else if ( "$L_MACHINE" == derecho ) then - module reset + module purge else if ( "$L_MACHINE" == odin ) then module unload modules diff --git a/etc/lmod-setup.sh b/etc/lmod-setup.sh index 8a6b651958..7328dea76f 100644 --- a/etc/lmod-setup.sh +++ b/etc/lmod-setup.sh @@ -44,14 +44,11 @@ elif [ "$L_MACHINE" = singularity ]; then module purge -elif [ "$L_MACHINE" = gaea ]; then - source /lustre/f2/dev/role.epic/contrib/Lmod_init.sh - elif [ "$L_MACHINE" = gaea-c5 ]; then - source /lustre/f2/dev/role.epic/contrib/Lmod_init_C5.sh + module reset elif [ "$L_MACHINE" = derecho ]; then - module reset + module purge elif [ "$L_MACHINE" = odin ]; then module unload modules diff --git a/modulefiles/build_derecho_intel.lua b/modulefiles/build_derecho_intel.lua index 7c7f3c771e..d434e8ecd3 100644 --- a/modulefiles/build_derecho_intel.lua +++ b/modulefiles/build_derecho_intel.lua @@ -1,35 +1,18 @@ help([[ This module loads libraries for building the UFS SRW App on -the CISL machine Derecho (Cray) using Intel-classic-2023.0.0 +the CISL machine Derecho (Cray) using Intel@2021.10.0 ]]) -whatis([===[Loads libraries needed for building the UFS SRW App on Cheyenne ]===]) +whatis([===[Loads libraries needed for building the UFS SRW App on Derecho ]===]) -load(pathJoin("cmake", os.getenv("cmake_ver") or "3.26.3")) -load(pathJoin("ncarenv", os.getenv("ncarenv_ver") or "23.06")) -load(pathJoin("craype", os.getenv("craype_ver") or "2.7.20")) - -unload("netcdf") -unload("hdf5") -load(pathJoin("intel-classic", os.getenv("intel_classic_ver") or "2023.0.0")) -load(pathJoin("cray-mpich", os.getenv("cray_mpich_ver") or "8.1.25")) - -prepend_path("MODULEPATH","/glade/work/epicufsrt/contrib/derecho/hpc-stack/intel-classic-2023.0.0/modulefiles/stack") -load(pathJoin("hpc", os.getenv("hpc_ver") or "1.2.0")) -load(pathJoin("hpc-intel-classic", os.getenv("hpc_intel_classic_ver") or "2023.0.0")) -load(pathJoin("hpc-cray-mpich", os.getenv("hpc_cray_mpich_ver") or "8.1.25")) +prepend_path("MODULEPATH","/lustre/desc1/scratch/epicufsrt/contrib/modulefiles_extra") +prepend_path("MODULEPATH", "/glade/work/epicufsrt/contrib/spack-stack/derecho/spack-stack-1.5.0/envs/unified-env/install/modulefiles/Core") -load(pathJoin("ncarcompilers", os.getenv("ncarcompilers_ver") or "1.0.0")) -load(pathJoin("mkl", os.getenv("mkl_ver") or "2023.0.0")) +load(pathJoin("stack-intel", os.getenv("stack_intel_ver") or "2021.10.0")) +load(pathJoin("stack-cray-mpich", os.getenv("stack_cray_mpich_ver") or "8.1.25")) +load(pathJoin("cmake", os.getenv("cmake_ver") or "3.26.3")) load("srw_common") -setenv("CC","cc") -setenv("FC","ftn") -setenv("CXX","CC") - -setenv("CMAKE_C_COMPILER","cc") -setenv("CMAKE_CXX_COMPILER","CC") -setenv("CMAKE_Fortran_COMPILER","ftn") setenv("CMAKE_Platform","derecho.intel") diff --git a/modulefiles/srw_common.lua b/modulefiles/srw_common.lua index ead04bedd5..2bcbc1f5f7 100644 --- a/modulefiles/srw_common.lua +++ b/modulefiles/srw_common.lua @@ -1,10 +1,10 @@ -load_any("jasper/2.0.25","jasper/2.0.32") -load_any("zlib/1.2.11","zlib/1.2.13") -load_any("png/1.6.37","libpng/1.6.37") +load("jasper/2.0.32") +load("zlib/1.2.13") +load("libpng/1.6.37") -load_any("netcdf/4.9.2","netcdf-c/4.9.2") -load_any("netcdf/4.9.2","netcdf-fortran/4.6.0") -load_any("pio/2.5.10","parallelio/2.5.9","parallelio/2.5.10") +load("netcdf-c/4.9.2") +load("netcdf-fortran/4.6.0") +load("parallelio/2.5.10") load("esmf/8.4.2") load("fms/2023.01") @@ -12,17 +12,17 @@ load("bacio/2.4.1") load("crtm/2.4.0") load("g2/3.4.5") load("g2tmpl/1.10.2") -load_any("ip/4.0.0","ip/4.3.0") +load("ip/4.3.0") load("sp/2.3.3") -load_any("w3emc/2.9.2","w3emc/2.10.0") +load("w3emc/2.10.0") -load_any("gftl-shared/v1.5.0","gftl-shared/1.5.0") +load("gftl-shared/1.5.0") load("mapl/2.35.2-esmf-8.4.2") -load_any("nemsio/2.5.2","nemsio/2.5.4") +load("nemsio/2.5.4") load("sfcio/1.4.1") load("sigio/2.3.2") load("w3nco/2.4.1") -load_any("wrf_io/1.2.0","wrf-io/1.2.0") +load("wrf-io/1.2.0") load_any("wgrib2/2.0.8","wgrib2/3.1.1") diff --git a/modulefiles/tasks/derecho/aqm_ics.local.lua b/modulefiles/tasks/derecho/aqm_ics.local.lua index 1040aab9a6..26b28db2c5 100644 --- a/modulefiles/tasks/derecho/aqm_ics.local.lua +++ b/modulefiles/tasks/derecho/aqm_ics.local.lua @@ -1,3 +1,2 @@ -load(pathJoin("cmake", os.getenv("cmake_ver") or "3.22.0")) -load("nco/4.9.5") +load("nco/5.0.6") load("python_srw_cmaq") diff --git a/modulefiles/tasks/derecho/aqm_lbcs.local.lua b/modulefiles/tasks/derecho/aqm_lbcs.local.lua index 1040aab9a6..26b28db2c5 100644 --- a/modulefiles/tasks/derecho/aqm_lbcs.local.lua +++ b/modulefiles/tasks/derecho/aqm_lbcs.local.lua @@ -1,3 +1,2 @@ -load(pathJoin("cmake", os.getenv("cmake_ver") or "3.22.0")) -load("nco/4.9.5") +load("nco/5.0.6") load("python_srw_cmaq") diff --git a/modulefiles/tasks/derecho/pre_post_stat.local.lua b/modulefiles/tasks/derecho/pre_post_stat.local.lua index 7dcdc5969b..26b28db2c5 100644 --- a/modulefiles/tasks/derecho/pre_post_stat.local.lua +++ b/modulefiles/tasks/derecho/pre_post_stat.local.lua @@ -1,2 +1,2 @@ -load("nco/4.9.5") +load("nco/5.0.6") load("python_srw_cmaq") diff --git a/modulefiles/tasks/derecho/run_vx.local.lua b/modulefiles/tasks/derecho/run_vx.local.lua index 54cc632c21..b7f9df757c 100644 --- a/modulefiles/tasks/derecho/run_vx.local.lua +++ b/modulefiles/tasks/derecho/run_vx.local.lua @@ -1,8 +1,10 @@ --[[ Compiler-specific modules are used for met and metplus libraries --]] -local met_ver = (os.getenv("met_ver") or "10.1.2") -local metplus_ver = (os.getenv("metplus_ver") or "4.1.3") +--load("build_derecho_intel") + +local met_ver = (os.getenv("met_ver") or "11.1.0") +local metplus_ver = (os.getenv("metplus_ver") or "5.1.0") if (mode() == "load") then load(pathJoin("met", met_ver)) load(pathJoin("metplus",metplus_ver)) @@ -22,4 +24,6 @@ if (mode() == "unload") then unload(pathJoin("met", met_ver)) unload(pathJoin("metplus",metplus_ver)) end -load("python_srw") +load("ufs-pyenv") +--load("stack-python/3.10.8") +--load("python_srw") diff --git a/modulefiles/tasks/derecho/run_vx.local.lua_bac b/modulefiles/tasks/derecho/run_vx.local.lua_bac new file mode 100644 index 0000000000..7d9c4dfd62 --- /dev/null +++ b/modulefiles/tasks/derecho/run_vx.local.lua_bac @@ -0,0 +1,29 @@ +--[[ +Compiler-specific modules are used for met and metplus libraries +--]] +load("build_derecho_intel") + +local met_ver = (os.getenv("met_ver") or "11.1.0") +local metplus_ver = (os.getenv("metplus_ver") or "5.1.0") +if (mode() == "load") then + load(pathJoin("met", met_ver)) + load(pathJoin("metplus",metplus_ver)) +end +local base_met = os.getenv("met_ROOT") or os.getenv("MET_ROOT") +local base_metplus = os.getenv("metplus_ROOT") or os.getenv("METPLUS_ROOT") + +setenv("MET_INSTALL_DIR", base_met) +setenv("MET_BIN_EXEC", pathJoin(base_met,"bin")) +setenv("MET_BASE", pathJoin(base_met,"share/met")) +setenv("MET_VERSION", met_ver) +setenv("METPLUS_VERSION", metplus_ver) +setenv("METPLUS_ROOT", base_metplus) +setenv("METPLUS_PATH", base_metplus) + +if (mode() == "unload") then + unload(pathJoin("met", met_ver)) + unload(pathJoin("metplus",metplus_ver)) +end +--load("ufs-pyenv") +load("stack-python/3.10.8") +load("python_srw") diff --git a/sorc/CMakeLists.txt b/sorc/CMakeLists.txt index 4c076a1ede..e84319ad6e 100644 --- a/sorc/CMakeLists.txt +++ b/sorc/CMakeLists.txt @@ -45,9 +45,6 @@ if (BUILD_UFS) list(APPEND UFS_WEATHER_MODEL_ARGS "-DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}" "-DCCPP_SUITES=${CCPP_SUITES}" - "-DCMAKE_C_COMPILER=${MPI_C_COMPILER}" - "-DCMAKE_CXX_COMPILER=${MPI_CXX_COMPILER}" - "-DCMAKE_Fortran_COMPILER=${MPI_Fortran_COMPILER}" "-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}" "-DCMAKE_MODULE_PATH=${MAPL_ROOT}/share/MAPL/cmake" "-DNETCDF_DIR=$ENV{NETCDF}" From 1abb20a92f567da3a825b13be7f6319df3eabdcf Mon Sep 17 00:00:00 2001 From: Natalie Perlin Date: Wed, 24 Jan 2024 08:48:32 -0700 Subject: [PATCH 28/37] Derecho module update for met/metplus tasks, run_vx.local.lua --- modulefiles/tasks/derecho/run_vx.local.lua | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/modulefiles/tasks/derecho/run_vx.local.lua b/modulefiles/tasks/derecho/run_vx.local.lua index b7f9df757c..2613f8ae0e 100644 --- a/modulefiles/tasks/derecho/run_vx.local.lua +++ b/modulefiles/tasks/derecho/run_vx.local.lua @@ -1,7 +1,6 @@ --[[ Compiler-specific modules are used for met and metplus libraries --]] ---load("build_derecho_intel") local met_ver = (os.getenv("met_ver") or "11.1.0") local metplus_ver = (os.getenv("metplus_ver") or "5.1.0") @@ -25,5 +24,5 @@ if (mode() == "unload") then unload(pathJoin("metplus",metplus_ver)) end load("ufs-pyenv") ---load("stack-python/3.10.8") ---load("python_srw") +load("conda") +setenv("SRW_ENV", "srw_app") From c22a4c4405b4382e24b85f0945d8800286558f8c Mon Sep 17 00:00:00 2001 From: Natalie Perlin Date: Wed, 24 Jan 2024 08:53:01 -0700 Subject: [PATCH 29/37] Derecho module update for met/metplus tasks --- .../tasks/derecho/run_vx.local.lua_bac | 29 ------------------- 1 file changed, 29 deletions(-) delete mode 100644 modulefiles/tasks/derecho/run_vx.local.lua_bac diff --git a/modulefiles/tasks/derecho/run_vx.local.lua_bac b/modulefiles/tasks/derecho/run_vx.local.lua_bac deleted file mode 100644 index 7d9c4dfd62..0000000000 --- a/modulefiles/tasks/derecho/run_vx.local.lua_bac +++ /dev/null @@ -1,29 +0,0 @@ ---[[ -Compiler-specific modules are used for met and metplus libraries ---]] -load("build_derecho_intel") - -local met_ver = (os.getenv("met_ver") or "11.1.0") -local metplus_ver = (os.getenv("metplus_ver") or "5.1.0") -if (mode() == "load") then - load(pathJoin("met", met_ver)) - load(pathJoin("metplus",metplus_ver)) -end -local base_met = os.getenv("met_ROOT") or os.getenv("MET_ROOT") -local base_metplus = os.getenv("metplus_ROOT") or os.getenv("METPLUS_ROOT") - -setenv("MET_INSTALL_DIR", base_met) -setenv("MET_BIN_EXEC", pathJoin(base_met,"bin")) -setenv("MET_BASE", pathJoin(base_met,"share/met")) -setenv("MET_VERSION", met_ver) -setenv("METPLUS_VERSION", metplus_ver) -setenv("METPLUS_ROOT", base_metplus) -setenv("METPLUS_PATH", base_metplus) - -if (mode() == "unload") then - unload(pathJoin("met", met_ver)) - unload(pathJoin("metplus",metplus_ver)) -end ---load("ufs-pyenv") -load("stack-python/3.10.8") -load("python_srw") From 10280d08028eda7176c6c33cd4ad141ee10940ff Mon Sep 17 00:00:00 2001 From: Michael Lueken Date: Wed, 24 Jan 2024 21:06:52 +0000 Subject: [PATCH 30/37] Several fixes following the Slurm update on Jet and fallout from merging PR #994: * run_vx.local.lua files were updated to load the srw_app conda environment for verification tasks. * wflow_jet.lua file was updated to remove unload("python") and load("set_pythonpath"). * verify_pre.yaml was updated to add native: '{% if platform.get("SCHED_NATIVE_CMD_HPSS") %}{{ platform.SCHED_NATIVE_CMD_HPSS }}{% else %}{{ platform.SCHED_NATIVE_CMD}}{% endif %}' to the get_verification_obs tasks. * comprehensive.derecho was updated to add the MET_ensemble_verification_winter_wx verification test. * jet.yaml was updated to add SCHED_NATIVE_CMD_HPSS: -n 1 --export=NONE to allow the service partition to work. --- modulefiles/tasks/hera/run_vx.local.lua | 2 ++ modulefiles/tasks/hercules/run_vx.local.lua | 2 ++ modulefiles/tasks/jet/run_vx.local.lua | 2 ++ modulefiles/tasks/noaacloud/run_vx.local.lua | 2 ++ modulefiles/wflow_jet.lua | 2 -- parm/wflow/verify_pre.yaml | 4 ++++ tests/WE2E/machine_suites/comprehensive.derecho | 1 + ush/machine/jet.yaml | 1 + 8 files changed, 14 insertions(+), 2 deletions(-) diff --git a/modulefiles/tasks/hera/run_vx.local.lua b/modulefiles/tasks/hera/run_vx.local.lua index 83949cff83..737fc4f7cc 100644 --- a/modulefiles/tasks/hera/run_vx.local.lua +++ b/modulefiles/tasks/hera/run_vx.local.lua @@ -23,3 +23,5 @@ if (mode() == "unload") then unload(pathJoin("metplus",metplus_ver)) end load("ufs-pyenv") +load("conda") +setenv("SRW_ENV", "srw_app") diff --git a/modulefiles/tasks/hercules/run_vx.local.lua b/modulefiles/tasks/hercules/run_vx.local.lua index 83949cff83..737fc4f7cc 100644 --- a/modulefiles/tasks/hercules/run_vx.local.lua +++ b/modulefiles/tasks/hercules/run_vx.local.lua @@ -23,3 +23,5 @@ if (mode() == "unload") then unload(pathJoin("metplus",metplus_ver)) end load("ufs-pyenv") +load("conda") +setenv("SRW_ENV", "srw_app") diff --git a/modulefiles/tasks/jet/run_vx.local.lua b/modulefiles/tasks/jet/run_vx.local.lua index 83949cff83..737fc4f7cc 100644 --- a/modulefiles/tasks/jet/run_vx.local.lua +++ b/modulefiles/tasks/jet/run_vx.local.lua @@ -23,3 +23,5 @@ if (mode() == "unload") then unload(pathJoin("metplus",metplus_ver)) end load("ufs-pyenv") +load("conda") +setenv("SRW_ENV", "srw_app") diff --git a/modulefiles/tasks/noaacloud/run_vx.local.lua b/modulefiles/tasks/noaacloud/run_vx.local.lua index 83949cff83..737fc4f7cc 100644 --- a/modulefiles/tasks/noaacloud/run_vx.local.lua +++ b/modulefiles/tasks/noaacloud/run_vx.local.lua @@ -23,3 +23,5 @@ if (mode() == "unload") then unload(pathJoin("metplus",metplus_ver)) end load("ufs-pyenv") +load("conda") +setenv("SRW_ENV", "srw_app") diff --git a/modulefiles/wflow_jet.lua b/modulefiles/wflow_jet.lua index af5d51a506..b3cb7895d7 100644 --- a/modulefiles/wflow_jet.lua +++ b/modulefiles/wflow_jet.lua @@ -6,8 +6,6 @@ the NOAA RDHPC machine Jet whatis([===[Loads libraries needed for running the UFS SRW App on Jet ]===]) load("rocoto") -unload("python") -load("set_pythonpath") load("conda") diff --git a/parm/wflow/verify_pre.yaml b/parm/wflow/verify_pre.yaml index bc1ca11078..eb1a7eb796 100644 --- a/parm/wflow/verify_pre.yaml +++ b/parm/wflow/verify_pre.yaml @@ -30,6 +30,7 @@ task_get_obs_ccpa: OBS_DIR: '&CCPA_OBS_DIR;' OBTYPE: 'CCPA' FHR: '{% for h in range(0, workflow.FCST_LEN_HRS+1) %}{{ " %02d" % h }}{% endfor %}' + native: '{% if platform.get("SCHED_NATIVE_CMD_HPSS") %}{{ platform.SCHED_NATIVE_CMD_HPSS }}{% else %}{{ platform.SCHED_NATIVE_CMD}}{% endif %}' partition: '{% if platform.get("PARTITION_HPSS") %}&PARTITION_HPSS;{% else %}None{% endif %}' queue: "&QUEUE_HPSS;" walltime: 00:45:00 @@ -42,6 +43,7 @@ task_get_obs_nohrsc: OBS_DIR: '&NOHRSC_OBS_DIR;' OBTYPE: 'NOHRSC' FHR: '{% for h in range(0, workflow.FCST_LEN_HRS+1) %}{{ " %02d" % h }}{% endfor %}' + native: '{% if platform.get("SCHED_NATIVE_CMD_HPSS") %}{{ platform.SCHED_NATIVE_CMD_HPSS }}{% else %}{{ platform.SCHED_NATIVE_CMD}}{% endif %}' partition: '{% if platform.get("PARTITION_HPSS") %}&PARTITION_HPSS;{% else %}None{% endif %}' queue: "&QUEUE_HPSS;" walltime: 00:45:00 @@ -55,6 +57,7 @@ task_get_obs_mrms: OBTYPE: 'MRMS' VAR: 'REFC RETOP' FHR: '{% for h in range(0, workflow.FCST_LEN_HRS+1) %}{{ " %02d" % h }}{% endfor %}' + native: '{% if platform.get("SCHED_NATIVE_CMD_HPSS") %}{{ platform.SCHED_NATIVE_CMD_HPSS }}{% else %}{{ platform.SCHED_NATIVE_CMD}}{% endif %}' partition: '{% if platform.get("PARTITION_HPSS") %}&PARTITION_HPSS;{% else %}None{% endif %}' queue: "&QUEUE_HPSS;" walltime: 00:45:00 @@ -68,6 +71,7 @@ task_get_obs_ndas: FHR: '{% for h in range(0, workflow.FCST_LEN_HRS+1) %}{{ " %02d" % h }}{% endfor %}' command: '&LOAD_MODULES_RUN_TASK_FP; "get_obs" "&JOBSdir;/JREGIONAL_GET_VERIF_OBS"' queue: "&QUEUE_HPSS;" + native: '{% if platform.get("SCHED_NATIVE_CMD_HPSS") %}{{ platform.SCHED_NATIVE_CMD_HPSS }}{% else %}{{ platform.SCHED_NATIVE_CMD}}{% endif %}' partition: '{% if platform.get("PARTITION_HPSS") %}&PARTITION_HPSS;{% else %}None{% endif %}' walltime: 02:00:00 diff --git a/tests/WE2E/machine_suites/comprehensive.derecho b/tests/WE2E/machine_suites/comprehensive.derecho index 8bfa9e5e5e..5bf5b4db24 100644 --- a/tests/WE2E/machine_suites/comprehensive.derecho +++ b/tests/WE2E/machine_suites/comprehensive.derecho @@ -50,6 +50,7 @@ grid_SUBCONUS_Ind_3km_ics_HRRR_lbcs_RAP_suite_WoFS_v0 grid_SUBCONUS_Ind_3km_ics_NAM_lbcs_NAM_suite_GFS_v16 grid_SUBCONUS_Ind_3km_ics_RAP_lbcs_RAP_suite_RRFS_v1beta_plot MET_ensemble_verification_only_vx +MET_ensemble_verification_winter_wx MET_verification_only_vx nco nco_ensemble diff --git a/ush/machine/jet.yaml b/ush/machine/jet.yaml index b5cb19cd0b..93d375ee02 100644 --- a/ush/machine/jet.yaml +++ b/ush/machine/jet.yaml @@ -19,6 +19,7 @@ platform: RUN_CMD_SERIAL: time RUN_CMD_UTILS: srun --export=ALL SCHED_NATIVE_CMD: --export=NONE + SCHED_NATIVE_CMD_HPSS: -n 1 --export=NONE PRE_TASK_CMDS: '{ ulimit -s unlimited; ulimit -a; }' TEST_EXTRN_MDL_SOURCE_BASEDIR: /mnt/lfs4/HFIP/hfv3gfs/role.epic/UFS_SRW_data/develop/input_model_data TEST_PREGEN_BASEDIR: /mnt/lfs4/HFIP/hfv3gfs/role.epic/UFS_SRW_data/develop/FV3LAM_pregen From f60b12fdf3340d8f2ba273df00fde901aa063bc8 Mon Sep 17 00:00:00 2001 From: RatkoVasic-NOAA <37597874+RatkoVasic-NOAA@users.noreply.github.com> Date: Thu, 25 Jan 2024 11:34:36 -0500 Subject: [PATCH 31/37] Update build_gaea-c5_intel from F2 to F5 --- modulefiles/build_gaea-c5_intel.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modulefiles/build_gaea-c5_intel.lua b/modulefiles/build_gaea-c5_intel.lua index 4b90930f76..ecf21dcc8d 100644 --- a/modulefiles/build_gaea-c5_intel.lua +++ b/modulefiles/build_gaea-c5_intel.lua @@ -5,7 +5,7 @@ the NOAA RDHPC machine Gaea C5 using Intel-2023.1.0 whatis([===[Loads libraries needed for building the UFS SRW App on Gaea C5 ]===]) -prepend_path("MODULEPATH","/lustre/f2/dev/role.epic/contrib/spack-stack/c5/spack-stack-1.5.0/envs/unified-env/install/modulefiles/Core") +prepend_path("MODULEPATH","/ncrc/proj/epic/spack-stack/spack-stack-1.6.0/envs/unified-env/install/modulefiles/Core") stack_intel_ver=os.getenv("stack_intel_ver") or "2023.1.0" load(pathJoin("stack-intel", stack_intel_ver)) From 07f01629327b79c26bc54af9f2cb468ad4e68bb8 Mon Sep 17 00:00:00 2001 From: RatkoVasic-NOAA <37597874+RatkoVasic-NOAA@users.noreply.github.com> Date: Thu, 25 Jan 2024 11:41:42 -0500 Subject: [PATCH 32/37] Update wflow_gaea-c5 switch from F2 to F5 --- modulefiles/wflow_gaea-c5.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modulefiles/wflow_gaea-c5.lua b/modulefiles/wflow_gaea-c5.lua index 12467dfd74..3073aa0522 100644 --- a/modulefiles/wflow_gaea-c5.lua +++ b/modulefiles/wflow_gaea-c5.lua @@ -7,9 +7,9 @@ whatis([===[Loads libraries needed for running the UFS SRW App on gaea ]===]) unload("python") load("set_pythonpath") -prepend_path("MODULEPATH","/lustre/f2/dev/role.epic/contrib/C5/miniconda3/modulefiles") +prepend_path("MODULEPATH","/ncrc/proj/epic/miniconda3/modulefiles/") load(pathJoin("miniconda3", os.getenv("miniconda3_ver") or "4.12.0")) -prepend_path("MODULEPATH","/lustre/f2/dev/role.epic/contrib/C5/rocoto/modulefiles") +prepend_path("MODULEPATH","/ncrc/proj/epic/rocoto/modulefiles/") load("rocoto") pushenv("MKLROOT", "/opt/intel/oneapi/mkl/2023.1.0/") From bdbc32b2aeaae91817116b30526c7dfffabd9b9e Mon Sep 17 00:00:00 2001 From: Ratko Vasic Date: Thu, 25 Jan 2024 16:52:16 +0000 Subject: [PATCH 33/37] Switch paths to miniconda (F2-F5 filesystems) --- modulefiles/tasks/gaea-c5/plot_allvars.local.lua | 2 +- modulefiles/tasks/gaea-c5/python_srw.lua | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modulefiles/tasks/gaea-c5/plot_allvars.local.lua b/modulefiles/tasks/gaea-c5/plot_allvars.local.lua index 2ce42ff57f..624b869bdb 100644 --- a/modulefiles/tasks/gaea-c5/plot_allvars.local.lua +++ b/modulefiles/tasks/gaea-c5/plot_allvars.local.lua @@ -1,6 +1,6 @@ unload("miniconda3") unload("python") -prepend_path("MODULEPATH","/lustre/f2/dev/role.epic/contrib/C5/miniconda3/modulefiles") +prepend_path("MODULEPATH","/ncrc/proj/epic/miniconda3/modulefiles") load(pathJoin("miniconda3", os.getenv("miniconda3_ver") or "4.12.0")) setenv("SRW_ENV", "regional_workflow") diff --git a/modulefiles/tasks/gaea-c5/python_srw.lua b/modulefiles/tasks/gaea-c5/python_srw.lua index 0ae31da067..b6107cc465 100644 --- a/modulefiles/tasks/gaea-c5/python_srw.lua +++ b/modulefiles/tasks/gaea-c5/python_srw.lua @@ -1,6 +1,6 @@ unload("miniconda3") unload("python") -prepend_path("MODULEPATH","/lustre/f2/dev/role.epic/contrib/C5/miniconda3/modulefiles") +prepend_path("MODULEPATH","/ncrc/proj/epic/miniconda3/modulefiles") load(pathJoin("miniconda3", os.getenv("miniconda3_ver") or "4.12.0")) setenv("SRW_ENV", "workflow_tools") From a765861e5d021f2a8cb16afaca8c72c1365c0ba2 Mon Sep 17 00:00:00 2001 From: RatkoVasic-NOAA <37597874+RatkoVasic-NOAA@users.noreply.github.com> Date: Thu, 25 Jan 2024 12:03:24 -0500 Subject: [PATCH 34/37] Update Jenkinsfile - rename gaea-c5 to gaeac5 --- .cicd/Jenkinsfile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.cicd/Jenkinsfile b/.cicd/Jenkinsfile index 7d1c06591e..e6c483143a 100644 --- a/.cicd/Jenkinsfile +++ b/.cicd/Jenkinsfile @@ -10,11 +10,11 @@ pipeline { parameters { // Allow job runner to filter based on platform // Use the line below to enable all PW clusters - // choice(name: 'SRW_PLATFORM_FILTER', choices: ['all', 'cheyenne', 'gaea-c5', 'hera', 'jet', 'orion', 'hercules', 'pclusternoaav2use1', 'azclusternoaav2eus1', 'gclusternoaav2usc1'], description: 'Specify the platform(s) to use') + // choice(name: 'SRW_PLATFORM_FILTER', choices: ['all', 'cheyenne', 'gaeac5', 'hera', 'jet', 'orion', 'hercules', 'pclusternoaav2use1', 'azclusternoaav2eus1', 'gclusternoaav2usc1'], description: 'Specify the platform(s) to use') // Use the line below to enable the PW AWS cluster - // choice(name: 'SRW_PLATFORM_FILTER', choices: ['all', 'cheyenne', 'gaea-c5', 'hera', 'jet', 'orion', 'hercules', 'pclusternoaav2use1'], description: 'Specify the platform(s) to use') - // choice(name: 'SRW_PLATFORM_FILTER', choices: ['all', 'cheyenne', 'gaea-c5', 'hera', 'jet', 'orion', 'hercules'], description: 'Specify the platform(s) to use') - choice(name: 'SRW_PLATFORM_FILTER', choices: ['all', 'derecho', 'gaea-c5', 'hera', 'jet', 'orion', 'hercules'], description: 'Specify the platform(s) to use') + // choice(name: 'SRW_PLATFORM_FILTER', choices: ['all', 'cheyenne', 'gaeac5', 'hera', 'jet', 'orion', 'hercules', 'pclusternoaav2use1'], description: 'Specify the platform(s) to use') + // choice(name: 'SRW_PLATFORM_FILTER', choices: ['all', 'cheyenne', 'gaeac5', 'hera', 'jet', 'orion', 'hercules'], description: 'Specify the platform(s) to use') + choice(name: 'SRW_PLATFORM_FILTER', choices: ['all', 'derecho', 'gaeac5', 'hera', 'jet', 'orion', 'hercules'], description: 'Specify the platform(s) to use') // Allow job runner to filter based on compiler choice(name: 'SRW_COMPILER_FILTER', choices: ['all', 'gnu', 'intel'], description: 'Specify the compiler(s) to use to build') booleanParam name: 'SRW_WE2E_COMPREHENSIVE_TESTS', defaultValue: false, description: 'Whether to execute the comprehensive end-to-end tests' @@ -87,8 +87,8 @@ pipeline { axes { axis { name 'SRW_PLATFORM' - // values 'cheyenne', 'gaea-c5', 'hera', 'jet', 'orion', 'hercules' //, 'pclusternoaav2use1', 'azclusternoaav2eus1', 'gclusternoaav2usc1' - values 'derecho', 'gaea-c5', 'hera', 'jet', 'orion', 'hercules' //, 'pclusternoaav2use1', 'azclusternoaav2eus1', 'gclusternoaav2usc1' + // values 'cheyenne', 'gaeac5', 'hera', 'jet', 'orion', 'hercules' //, 'pclusternoaav2use1', 'azclusternoaav2eus1', 'gclusternoaav2usc1' + values 'derecho', 'gaeac5', 'hera', 'jet', 'orion', 'hercules' //, 'pclusternoaav2use1', 'azclusternoaav2eus1', 'gclusternoaav2usc1' } axis { @@ -102,7 +102,7 @@ pipeline { exclude { axis { name 'SRW_PLATFORM' - values 'derecho', 'gaea-c5', 'jet', 'orion', 'hercules' //, 'pclusternoaav2use1' , 'azclusternoaav2eus1', 'gclusternoaav2usc1' + values 'derecho', 'gaeac5', 'jet', 'orion', 'hercules' //, 'pclusternoaav2use1' , 'azclusternoaav2eus1', 'gclusternoaav2usc1' } axis { From c962d1120bfe7239df2791c56ccb4211444cc7f1 Mon Sep 17 00:00:00 2001 From: Ratko Vasic Date: Thu, 15 Feb 2024 18:07:13 +0000 Subject: [PATCH 35/37] Remove gaea-C4 --- .cicd/scripts/wrapper_srw_ftest.sh | 5 -- devbuild.sh | 2 +- modulefiles/build_gaea_intel.lua | 39 -------------- modulefiles/tasks/gaea/plot_allvars.local.lua | 2 - modulefiles/tasks/gaea/python_srw.lua | 2 - modulefiles/tasks/gaea/run_vx.local.lua | 25 --------- modulefiles/wflow_gaea.lua | 19 ------- tests/WE2E/machine_suites/comprehensive.gaea | 1 - tests/WE2E/machine_suites/coverage.gaea | 11 ---- tests/WE2E/setup_WE2E_tests.sh | 2 +- tests/build.sh | 2 +- ush/machine/gaea.yaml | 51 ------------------- ush/valid_param_vals.yaml | 2 +- ush/wrappers/job_cards/sbatch/get_ics.sbatch | 4 -- ush/wrappers/job_cards/sbatch/get_lbcs.sbatch | 4 -- .../job_cards/sbatch/make_grid.sbatch | 5 -- ush/wrappers/job_cards/sbatch/make_ics.sbatch | 5 -- .../job_cards/sbatch/make_lbcs.sbatch | 5 -- .../job_cards/sbatch/make_orog.sbatch | 5 -- .../job_cards/sbatch/make_sfc_climo.sbatch | 5 -- ush/wrappers/job_cards/sbatch/run_fcst.sbatch | 5 -- ush/wrappers/job_cards/sbatch/run_post.sbatch | 4 -- 22 files changed, 4 insertions(+), 201 deletions(-) delete mode 100644 modulefiles/build_gaea_intel.lua delete mode 100644 modulefiles/tasks/gaea/plot_allvars.local.lua delete mode 100644 modulefiles/tasks/gaea/python_srw.lua delete mode 100644 modulefiles/tasks/gaea/run_vx.local.lua delete mode 100644 modulefiles/wflow_gaea.lua delete mode 120000 tests/WE2E/machine_suites/comprehensive.gaea delete mode 100644 tests/WE2E/machine_suites/coverage.gaea delete mode 100644 ush/machine/gaea.yaml diff --git a/.cicd/scripts/wrapper_srw_ftest.sh b/.cicd/scripts/wrapper_srw_ftest.sh index 2e35b43b89..e4afaf9e98 100755 --- a/.cicd/scripts/wrapper_srw_ftest.sh +++ b/.cicd/scripts/wrapper_srw_ftest.sh @@ -23,11 +23,6 @@ else fi # Customize wrapper scripts -if [[ "${SRW_PLATFORM}" == gaea ]]; then - sed -i '15i #SBATCH --clusters=c4' ${WORKSPACE}/${SRW_PLATFORM}/.cicd/scripts/${workflow_cmd}_srw_ftest.sh - sed -i 's|qos=batch|qos=windfall|g' ${WORKSPACE}/${SRW_PLATFORM}/.cicd/scripts/${workflow_cmd}_srw_ftest.sh -fi - if [[ "${SRW_PLATFORM}" == gaea-c5 ]]; then sed -i '15i #SBATCH --clusters=c5' ${WORKSPACE}/${SRW_PLATFORM}/.cicd/scripts/${workflow_cmd}_srw_ftest.sh sed -i 's|qos=batch|qos=normal|g' ${WORKSPACE}/${SRW_PLATFORM}/.cicd/scripts/${workflow_cmd}_srw_ftest.sh diff --git a/devbuild.sh b/devbuild.sh index 3ea90e2fd3..9136b86e7a 100755 --- a/devbuild.sh +++ b/devbuild.sh @@ -288,7 +288,7 @@ set -eu # automatically determine compiler if [ -z "${COMPILER}" ] ; then case ${PLATFORM} in - jet|hera|gaea|gaea-c5) COMPILER=intel ;; + jet|hera|gaea-c5) COMPILER=intel ;; orion) COMPILER=intel ;; wcoss2) COMPILER=intel ;; cheyenne) COMPILER=intel ;; diff --git a/modulefiles/build_gaea_intel.lua b/modulefiles/build_gaea_intel.lua deleted file mode 100644 index f4f41b3416..0000000000 --- a/modulefiles/build_gaea_intel.lua +++ /dev/null @@ -1,39 +0,0 @@ -help([[ -This module loads libraries for building the UFS SRW App on -the NOAA RDHPC machine Gaea using Intel-2022.0.2 -]]) - -whatis([===[Loads libraries needed for building the UFS SRW App on Gaea ]===]) - -unload("intel") -unload("cray-mpich") -unload("cray-python") - -prepend_path("MODULEPATH", "/lustre/f2/dev/wpo/role.epic/contrib/spack-stack/c4/spack-stack-1.5.0/envs/unified-env/install/modulefiles/Core") -prepend_path("MODULEPATH", "/lustre/f2/pdata/esrl/gsd/spack-stack/modulefiles") -stack_intel_ver=os.getenv("stack_intel_ver") or "2022.0.2" -load(pathJoin("stack-intel", stack_intel_ver)) - -stack_mpich_ver=os.getenv("stack_mpich_ver") or "7.7.20" -load(pathJoin("stack-cray-mpich", stack_mpich_ver)) - -stack_python_ver=os.getenv("stack_python_ver") or "3.10.8" -load(pathJoin("stack-python", stack_python_ver)) - -cmake_ver=os.getenv("cmake_ver") or "3.23.1" -load(pathJoin("cmake", cmake_ver)) - -load("srw_common") --- Need at runtime -load("alps") - -setenv("CC","cc") -setenv("FC","ftn") -setenv("CXX","CC") -setenv("CMAKE_C_COMPILER","cc") -setenv("CMAKE_CXX_COMPILER","CC") -setenv("CMAKE_Fortran_COMPILER","ftn") -setenv("CMAKE_Platform","gaea.intel") - -setenv("CFLAGS","-diag-disable=10441") -setenv("FFLAGS","-diag-disable=10441 -fp-model source") diff --git a/modulefiles/tasks/gaea/plot_allvars.local.lua b/modulefiles/tasks/gaea/plot_allvars.local.lua deleted file mode 100644 index b7e9528710..0000000000 --- a/modulefiles/tasks/gaea/plot_allvars.local.lua +++ /dev/null @@ -1,2 +0,0 @@ -load("conda") -setenv("SRW_ENV", "srw_graphics") diff --git a/modulefiles/tasks/gaea/python_srw.lua b/modulefiles/tasks/gaea/python_srw.lua deleted file mode 100644 index a2dd45084c..0000000000 --- a/modulefiles/tasks/gaea/python_srw.lua +++ /dev/null @@ -1,2 +0,0 @@ -load("conda") -setenv("SRW_ENV", "srw_app") diff --git a/modulefiles/tasks/gaea/run_vx.local.lua b/modulefiles/tasks/gaea/run_vx.local.lua deleted file mode 100644 index 83949cff83..0000000000 --- a/modulefiles/tasks/gaea/run_vx.local.lua +++ /dev/null @@ -1,25 +0,0 @@ ---[[ -Compiler-specific modules are used for met and metplus libraries ---]] -local met_ver = (os.getenv("met_ver") or "11.1.0") -local metplus_ver = (os.getenv("metplus_ver") or "5.1.0") -if (mode() == "load") then - load(pathJoin("met", met_ver)) - load(pathJoin("metplus",metplus_ver)) -end -local base_met = os.getenv("met_ROOT") or os.getenv("MET_ROOT") -local base_metplus = os.getenv("metplus_ROOT") or os.getenv("METPLUS_ROOT") - -setenv("MET_INSTALL_DIR", base_met) -setenv("MET_BIN_EXEC", pathJoin(base_met,"bin")) -setenv("MET_BASE", pathJoin(base_met,"share/met")) -setenv("MET_VERSION", met_ver) -setenv("METPLUS_VERSION", metplus_ver) -setenv("METPLUS_ROOT", base_metplus) -setenv("METPLUS_PATH", base_metplus) - -if (mode() == "unload") then - unload(pathJoin("met", met_ver)) - unload(pathJoin("metplus",metplus_ver)) -end -load("ufs-pyenv") diff --git a/modulefiles/wflow_gaea.lua b/modulefiles/wflow_gaea.lua deleted file mode 100644 index 83c83d5e92..0000000000 --- a/modulefiles/wflow_gaea.lua +++ /dev/null @@ -1,19 +0,0 @@ -help([[ -This module loads python environement for running the UFS SRW App on -the NOAA RDHPC machine Gaea -]]) - -whatis([===[Loads libraries needed for running the UFS SRW App on gaea ]===]) - -unload("python") - -load("conda") -prepend_path("MODULEPATH","/lustre/f2/dev/role.epic/contrib/rocoto/modulefiles") -load("rocoto") -load("alps") - -if mode() == "load" then - LmodMsgRaw([===[Please do the following to activate conda: - > conda activate srw_app -]===]) -end diff --git a/tests/WE2E/machine_suites/comprehensive.gaea b/tests/WE2E/machine_suites/comprehensive.gaea deleted file mode 120000 index 18a56d9739..0000000000 --- a/tests/WE2E/machine_suites/comprehensive.gaea +++ /dev/null @@ -1 +0,0 @@ -comprehensive.orion \ No newline at end of file diff --git a/tests/WE2E/machine_suites/coverage.gaea b/tests/WE2E/machine_suites/coverage.gaea deleted file mode 100644 index 4ff7f61f3c..0000000000 --- a/tests/WE2E/machine_suites/coverage.gaea +++ /dev/null @@ -1,11 +0,0 @@ -community -custom_ESGgrid_NewZealand_3km -grid_RRFS_CONUScompact_13km_ics_HRRR_lbcs_RAP_suite_RRFS_v1beta -grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_RAP -grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_HRRR -grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15_thompson_mynn_lam3km -grid_RRFS_CONUScompact_25km_ics_HRRR_lbcs_HRRR_suite_HRRR -grid_RRFS_CONUScompact_3km_ics_HRRR_lbcs_RAP_suite_RRFS_v1beta -grid_SUBCONUS_Ind_3km_ics_RAP_lbcs_RAP_suite_RRFS_v1beta_plot -nco_ensemble -nco_grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15_thompson_mynn_lam3km diff --git a/tests/WE2E/setup_WE2E_tests.sh b/tests/WE2E/setup_WE2E_tests.sh index 0bfe5c2a56..0644102c06 100755 --- a/tests/WE2E/setup_WE2E_tests.sh +++ b/tests/WE2E/setup_WE2E_tests.sh @@ -45,7 +45,7 @@ function usage { } -machines=( hera jet cheyenne derecho orion wcoss2 gaea gaea-c5 odin singularity macos noaacloud ) +machines=( hera jet cheyenne derecho orion wcoss2 gaea-c5 odin singularity macos noaacloud ) if [ "$1" = "-h" ] ; then usage ; fi [[ $# -le 2 ]] && usage diff --git a/tests/build.sh b/tests/build.sh index b1d7a00091..caf0e2b0ae 100755 --- a/tests/build.sh +++ b/tests/build.sh @@ -21,7 +21,7 @@ function usage() { exit 1 } -machines=( hera jet cheyenne derecho orion hercules wcoss2 gaea gaea-c5 odin singularity macos noaacloud ) +machines=( hera jet cheyenne derecho orion hercules wcoss2 gaea-c5 odin singularity macos noaacloud ) [[ $# -gt 4 ]] && usage diff --git a/ush/machine/gaea.yaml b/ush/machine/gaea.yaml deleted file mode 100644 index f2abbc55c5..0000000000 --- a/ush/machine/gaea.yaml +++ /dev/null @@ -1,51 +0,0 @@ -platform: - WORKFLOW_MANAGER: rocoto - NCORES_PER_NODE: 32 - SCHED: slurm - TEST_CCPA_OBS_DIR: /lustre/f2/dev/role.epic/contrib/UFS_SRW_data/develop/obs_data/ccpa/proc - TEST_MRMS_OBS_DIR: /lustre/f2/dev/role.epic/contrib/UFS_SRW_data/develop/obs_data/mrms/proc - TEST_NDAS_OBS_DIR: /lustre/f2/dev/role.epic/contrib/UFS_SRW_data/develop/obs_data/ndas/proc - TEST_NOHRSC_OBS_DIR: /lustre/f2/dev/role.epic/contrib/UFS_SRW_data/develop/obs_data/nohrsc/proc - DOMAIN_PREGEN_BASEDIR: /lustre/f2/dev/role.epic/contrib/UFS_SRW_data/develop/FV3LAM_pregen - QUEUE_DEFAULT: windfall - QUEUE_FCST: windfall - QUEUE_HPSS: windfall - REMOVE_MEMORY: True - PARTITION_HPSS: eslogin - RUN_CMD_FCST: srun --export=ALL -n ${PE_MEMBER01} - RUN_CMD_POST: srun --export=ALL -n $nprocs - RUN_CMD_PRDGEN: srun --export=ALL -n $nprocs - RUN_CMD_SERIAL: time - RUN_CMD_UTILS: srun --export=ALL -n $nprocs - SCHED_NATIVE_CMD: --clusters=c4 --export=NONE - SCHED_NATIVE_CMD_HPSS: --clusters=es --export=NONE - PRE_TASK_CMDS: '{ ulimit -s unlimited; ulimit -a; }' - TEST_EXTRN_MDL_SOURCE_BASEDIR: /lustre/f2/dev/role.epic/contrib/UFS_SRW_data/develop/input_model_data - TEST_PREGEN_BASEDIR: /lustre/f2/dev/role.epic/contrib/UFS_SRW_data/develop/FV3LAM_pregen - TEST_ALT_EXTRN_MDL_SYSBASEDIR_ICS: /lustre/f2/dev/role.epic/contrib/UFS_SRW_data/develop/dummy_FV3GFS_sys_dir - TEST_ALT_EXTRN_MDL_SYSBASEDIR_LBCS: /lustre/f2/dev/role.epic/contrib/UFS_SRW_data/develop/dummy_FV3GFS_sys_dir - TEST_VX_FCST_INPUT_BASEDIR: '{{ "/lustre/f2/dev/role.epic/contrib/UFS_SRW_data/develop/output_data/fcst_" }}{{ "ens" if (global.NUM_ENS_MEMBERS > 0) else "det" }}{{ "/{{workflow.PREDEF_GRID_NAME}}" }}{% raw %}{% endraw %}' - FIXaer: /lustre/f2/dev/role.epic/contrib/UFS_SRW_data/develop/fix/fix_aer - FIXgsm: /lustre/f2/dev/role.epic/contrib/UFS_SRW_data/develop/fix/fix_am - FIXlut: /lustre/f2/dev/role.epic/contrib/UFS_SRW_data/develop/fix/fix_lut - FIXorg: /lustre/f2/dev/role.epic/contrib/UFS_SRW_data/develop/fix/fix_orog - FIXsfc: /lustre/f2/dev/role.epic/contrib/UFS_SRW_data/develop/fix/fix_sfc_climo - FIXshp: /lustre/f2/dev/role.epic/contrib/UFS_SRW_data/develop/NaturalEarth - EXTRN_MDL_DATA_STORES: aws -data: - ics_lbcs: - FV3GFS: - nemsio: /lustre/f2/dev/role.epic/contrib/UFS_SRW_data/develop/input_model_data/FV3GFS/nemsio/${yyyymmdd}${hh} - grib2: /lustre/f2/dev/role.epic/contrib/UFS_SRW_data/develop/input_model_data/FV3GFS/grib2/${yyyymmdd}${hh} - RAP: /lustre/f2/dev/role.epic/contrib/UFS_SRW_data/develop/input_model_data/RAP/${yyyymmdd}${hh} - HRRR: /lustre/f2/dev/role.epic/contrib/UFS_SRW_data/develop/input_model_data/HRRR/${yyyymmdd}${hh} -rocoto: - tasks: - metatask_run_ensemble: - task_run_fcst_mem#mem#: - cores: '{{ task_run_fcst.PE_MEMBER01 // 1 }}' - native: '--cpus-per-task {{ task_run_fcst.OMP_NUM_THREADS_RUN_FCST|int }} --exclusive {{ platform.SCHED_NATIVE_CMD }}' - nodes: - nnodes: - nodesize: - ppn: diff --git a/ush/valid_param_vals.yaml b/ush/valid_param_vals.yaml index 1c19cadf79..f432c0bd76 100644 --- a/ush/valid_param_vals.yaml +++ b/ush/valid_param_vals.yaml @@ -4,7 +4,7 @@ valid_vals_RUN_ENVIR: ["nco", "community"] valid_vals_VERBOSE: [True, False] valid_vals_DEBUG: [True, False] -valid_vals_MACHINE: ["HERA", "WCOSS2", "ORION", "HERCULES", "JET", "ODIN", "CHEYENNE", "DERECHO", "STAMPEDE", "LINUX", "MACOS", "NOAACLOUD", "SINGULARITY", "GAEA", "GAEA-C5"] +valid_vals_MACHINE: ["HERA", "WCOSS2", "ORION", "HERCULES", "JET", "ODIN", "CHEYENNE", "DERECHO", "STAMPEDE", "LINUX", "MACOS", "NOAACLOUD", "SINGULARITY", "GAEA-C5"] valid_vals_SCHED: ["slurm", "pbspro", "lsf", "lsfcray", "none"] valid_vals_FCST_MODEL: ["ufs-weather-model"] valid_vals_WORKFLOW_MANAGER: ["rocoto", "ecflow", "none"] diff --git a/ush/wrappers/job_cards/sbatch/get_ics.sbatch b/ush/wrappers/job_cards/sbatch/get_ics.sbatch index 44e67f3c44..5aca1c2e7f 100644 --- a/ush/wrappers/job_cards/sbatch/get_ics.sbatch +++ b/ush/wrappers/job_cards/sbatch/get_ics.sbatch @@ -28,7 +28,3 @@ $USHdir/load_modules_run_task.sh "get_extrn_ics" $JOBSdir/JREGIONAL_GET_EXTRN_MD # Gaea-c5 differences: ##SBATCH --qos=normal ##SBATCH --clusters=es --partition=eslogin_c5 --export=NONE - -# Gaea differences: -##SBATCH --qos=windfall -##SBATCH --clusters=es --export=NONE diff --git a/ush/wrappers/job_cards/sbatch/get_lbcs.sbatch b/ush/wrappers/job_cards/sbatch/get_lbcs.sbatch index d5f037153b..fc747ece40 100644 --- a/ush/wrappers/job_cards/sbatch/get_lbcs.sbatch +++ b/ush/wrappers/job_cards/sbatch/get_lbcs.sbatch @@ -28,7 +28,3 @@ $USHdir/load_modules_run_task.sh "get_extrn_lbcs" $JOBSdir/JREGIONAL_GET_EXTRN_M # Gaea-c5 differences: ##SBATCH --qos=normal ##SBATCH --clusters=es --partition=eslogin_c5 --export=NONE - -# Gaea differences: -##SBATCH --qos=windfall -##SBATCH --clusters=es --export=NONE diff --git a/ush/wrappers/job_cards/sbatch/make_grid.sbatch b/ush/wrappers/job_cards/sbatch/make_grid.sbatch index d452d64426..b8866af36f 100644 --- a/ush/wrappers/job_cards/sbatch/make_grid.sbatch +++ b/ush/wrappers/job_cards/sbatch/make_grid.sbatch @@ -22,11 +22,6 @@ $USHdir/load_modules_run_task.sh "make_grid" $JOBSdir/JREGIONAL_MAKE_GRID ##SBATCH --clusters=c5 --partition=batch --export=NONE #export nprocs='24' -# Gaea differences: -##SBATCH --qos=windfall -##SBATCH --clusters=c4 --export=NONE -#export nprocs='24' - # Jet differences: ##SBATCH --partition=sjet,vjet,kjet,xjet #export nprocs='24' diff --git a/ush/wrappers/job_cards/sbatch/make_ics.sbatch b/ush/wrappers/job_cards/sbatch/make_ics.sbatch index 20b18605a0..512eefeae5 100644 --- a/ush/wrappers/job_cards/sbatch/make_ics.sbatch +++ b/ush/wrappers/job_cards/sbatch/make_ics.sbatch @@ -28,11 +28,6 @@ $USHdir/load_modules_run_task.sh "make_ics" $JOBSdir/JREGIONAL_MAKE_ICS ##SBATCH --clusters=c5 --partition=batch --export=NONE #export nprocs='48' -# Gaea differences: -##SBATCH --qos=windfall -##SBATCH --clusters=c4 --export=NONE -#export nprocs='48' - # Jet differences: ##SBATCH --partition=sjet,vjet,kjet,xjet #export nprocs='48' diff --git a/ush/wrappers/job_cards/sbatch/make_lbcs.sbatch b/ush/wrappers/job_cards/sbatch/make_lbcs.sbatch index a0ab0071a4..ab1d1312c8 100644 --- a/ush/wrappers/job_cards/sbatch/make_lbcs.sbatch +++ b/ush/wrappers/job_cards/sbatch/make_lbcs.sbatch @@ -30,11 +30,6 @@ $USHdir/load_modules_run_task.sh "make_lbcs" $JOBSdir/JREGIONAL_MAKE_LBCS ##SBATCH --clusters=c5 --partition=batch --export=NONE #export nprocs='48' -# Gaea differences: -##SBATCH --qos=windfall -##SBATCH --clusters=c4 --export=NONE -#export nprocs='48' - # Jet differences: ##SBATCH --partition=sjet,vjet,kjet,xjet #export nprocs='48' diff --git a/ush/wrappers/job_cards/sbatch/make_orog.sbatch b/ush/wrappers/job_cards/sbatch/make_orog.sbatch index eebed3b5ce..3b440cbd42 100644 --- a/ush/wrappers/job_cards/sbatch/make_orog.sbatch +++ b/ush/wrappers/job_cards/sbatch/make_orog.sbatch @@ -22,11 +22,6 @@ $USHdir/load_modules_run_task.sh "make_orog" $JOBSdir/JREGIONAL_MAKE_OROG ##SBATCH --clusters=c5 --partition=batch --export=NONE #export nprocs='24' -# Gaea differences: -##SBATCH --qos=windfall -##SBATCH --clusters=c4 --export=NONE -#export nprocs='24' - # Jet differences: ##SBATCH --partition=sjet,vjet,kjet,xjet #export nprocs='24' diff --git a/ush/wrappers/job_cards/sbatch/make_sfc_climo.sbatch b/ush/wrappers/job_cards/sbatch/make_sfc_climo.sbatch index 47c7aed043..b791288922 100644 --- a/ush/wrappers/job_cards/sbatch/make_sfc_climo.sbatch +++ b/ush/wrappers/job_cards/sbatch/make_sfc_climo.sbatch @@ -22,11 +22,6 @@ $USHdir/load_modules_run_task.sh "make_sfc_climo" $JOBSdir/JREGIONAL_MAKE_SFC_CL ##SBATCH --clusters=c5 --partition=batch --export=NONE #export nprocs='48' -# Gaea differences: -##SBATCH --qos=windfall -##SBATCH --clusters=c4 --export=NONE -#export nprocs='48' - # Jet differences: ##SBATCH --partition=sjet,vjet,kjet,xjet #export nprocs='48' diff --git a/ush/wrappers/job_cards/sbatch/run_fcst.sbatch b/ush/wrappers/job_cards/sbatch/run_fcst.sbatch index 6a146a5627..75abd6fc03 100644 --- a/ush/wrappers/job_cards/sbatch/run_fcst.sbatch +++ b/ush/wrappers/job_cards/sbatch/run_fcst.sbatch @@ -26,11 +26,6 @@ $USHdir/load_modules_run_task.sh "run_fcst" $JOBSdir/JREGIONAL_RUN_FCST ##SBATCH --clusters=c5 --partition=batch --export=NONE #export nprocs='48' -# Gaea differences: -##SBATCH --qos=windfall -##SBATCH --clusters=c4 --export=NONE -#export nprocs='48' - # Jet differences: ##SBATCH --partition=sjet,vjet,kjet,xjet diff --git a/ush/wrappers/job_cards/sbatch/run_post.sbatch b/ush/wrappers/job_cards/sbatch/run_post.sbatch index 5b180b82e1..c2a24a7f5e 100644 --- a/ush/wrappers/job_cards/sbatch/run_post.sbatch +++ b/ush/wrappers/job_cards/sbatch/run_post.sbatch @@ -30,10 +30,6 @@ done ##SBATCH --qos=normal ##SBATCH --clusters=c5 --partition=batch --export=NONE -# Gaea differences: -##SBATCH --qos=windfall -##SBATCH --clusters=c4 --export=NONE - # Jet differences: ##SBATCH --partition=sjet,vjet,kjet,xjet From a9660c8681d6f364981cc319b22d41a423b03a13 Mon Sep 17 00:00:00 2001 From: RatkoVasic-NOAA <37597874+RatkoVasic-NOAA@users.noreply.github.com> Date: Thu, 15 Feb 2024 14:32:47 -0500 Subject: [PATCH 36/37] Update build_noaacloud_intel.lua --- modulefiles/build_noaacloud_intel.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modulefiles/build_noaacloud_intel.lua b/modulefiles/build_noaacloud_intel.lua index 6ea89ac2db..50f1aec9ab 100644 --- a/modulefiles/build_noaacloud_intel.lua +++ b/modulefiles/build_noaacloud_intel.lua @@ -5,7 +5,7 @@ the NOAA cloud using Intel-oneapi whatis([===[Loads libraries needed for building the UFS SRW App on NOAA cloud ]===]) -prepend_path("MODULEPATH", "/contrib/EPIC/spack-stack/spack-stack-1.5.0/envs/unified-env/install/modulefiles/Core") +prepend_path("MODULEPATH", "/contrib/spack-stack/spack-stack-1.5.0/envs/unified-env/install/modulefiles/Core") prepend_path("MODULEPATH", "/apps/modules/modulefiles") prepend_path("PATH", "/contrib/EPIC/bin") load("stack-intel") From ee75b12f61f40f29ee4fde106be81e100ea65bcf Mon Sep 17 00:00:00 2001 From: "michael.lueken" Date: Thu, 15 Feb 2024 19:42:37 +0000 Subject: [PATCH 37/37] Comment out gaeac5 in Jenkinsfile --- .cicd/Jenkinsfile | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.cicd/Jenkinsfile b/.cicd/Jenkinsfile index e6c483143a..86af5dded4 100644 --- a/.cicd/Jenkinsfile +++ b/.cicd/Jenkinsfile @@ -13,8 +13,8 @@ pipeline { // choice(name: 'SRW_PLATFORM_FILTER', choices: ['all', 'cheyenne', 'gaeac5', 'hera', 'jet', 'orion', 'hercules', 'pclusternoaav2use1', 'azclusternoaav2eus1', 'gclusternoaav2usc1'], description: 'Specify the platform(s) to use') // Use the line below to enable the PW AWS cluster // choice(name: 'SRW_PLATFORM_FILTER', choices: ['all', 'cheyenne', 'gaeac5', 'hera', 'jet', 'orion', 'hercules', 'pclusternoaav2use1'], description: 'Specify the platform(s) to use') - // choice(name: 'SRW_PLATFORM_FILTER', choices: ['all', 'cheyenne', 'gaeac5', 'hera', 'jet', 'orion', 'hercules'], description: 'Specify the platform(s) to use') - choice(name: 'SRW_PLATFORM_FILTER', choices: ['all', 'derecho', 'gaeac5', 'hera', 'jet', 'orion', 'hercules'], description: 'Specify the platform(s) to use') + // choice(name: 'SRW_PLATFORM_FILTER', choices: ['all', 'derecho', 'gaeac5', 'hera', 'jet', 'orion', 'hercules'], description: 'Specify the platform(s) to use') + choice(name: 'SRW_PLATFORM_FILTER', choices: ['all', 'derecho', 'hera', 'jet', 'orion', 'hercules'], description: 'Specify the platform(s) to use') // Allow job runner to filter based on compiler choice(name: 'SRW_COMPILER_FILTER', choices: ['all', 'gnu', 'intel'], description: 'Specify the compiler(s) to use to build') booleanParam name: 'SRW_WE2E_COMPREHENSIVE_TESTS', defaultValue: false, description: 'Whether to execute the comprehensive end-to-end tests' @@ -87,8 +87,8 @@ pipeline { axes { axis { name 'SRW_PLATFORM' - // values 'cheyenne', 'gaeac5', 'hera', 'jet', 'orion', 'hercules' //, 'pclusternoaav2use1', 'azclusternoaav2eus1', 'gclusternoaav2usc1' - values 'derecho', 'gaeac5', 'hera', 'jet', 'orion', 'hercules' //, 'pclusternoaav2use1', 'azclusternoaav2eus1', 'gclusternoaav2usc1' + // values 'derecho', 'gaeac5', 'hera', 'jet', 'orion', 'hercules' //, 'pclusternoaav2use1', 'azclusternoaav2eus1', 'gclusternoaav2usc1' + values 'derecho', 'hera', 'jet', 'orion', 'hercules' //, 'pclusternoaav2use1', 'azclusternoaav2eus1', 'gclusternoaav2usc1' } axis { @@ -102,7 +102,8 @@ pipeline { exclude { axis { name 'SRW_PLATFORM' - values 'derecho', 'gaeac5', 'jet', 'orion', 'hercules' //, 'pclusternoaav2use1' , 'azclusternoaav2eus1', 'gclusternoaav2usc1' + // values 'derecho', 'gaeac5', 'jet', 'orion', 'hercules' //, 'pclusternoaav2use1' , 'azclusternoaav2eus1', 'gclusternoaav2usc1' + values 'derecho', 'jet', 'orion', 'hercules' //, 'pclusternoaav2use1' , 'azclusternoaav2eus1', 'gclusternoaav2usc1' } axis {