From b0b56d45797e4629702858599310065fbf8440be Mon Sep 17 00:00:00 2001 From: Natalie Perlin Date: Thu, 8 Jun 2023 15:48:04 +0000 Subject: [PATCH 01/12] modulefiles for tasks to include met, metplus modules --- modulefiles/tasks/cheyenne/run_vx.local.lua | 6 ++++++ modulefiles/tasks/gaea/run_vx.local.lua | 6 +++++- modulefiles/tasks/hera/run_vx.local.lua | 9 +++------ modulefiles/tasks/jet/run_vx.local.lua | 9 ++++++--- modulefiles/tasks/noaacloud/run_vx.local.lua | 6 ++++++ modulefiles/tasks/orion/run_vx.local.lua | 6 ++++++ 6 files changed, 32 insertions(+), 10 deletions(-) create mode 100644 modulefiles/tasks/cheyenne/run_vx.local.lua create mode 100644 modulefiles/tasks/noaacloud/run_vx.local.lua create mode 100644 modulefiles/tasks/orion/run_vx.local.lua diff --git a/modulefiles/tasks/cheyenne/run_vx.local.lua b/modulefiles/tasks/cheyenne/run_vx.local.lua new file mode 100644 index 0000000000..5979a8db96 --- /dev/null +++ b/modulefiles/tasks/cheyenne/run_vx.local.lua @@ -0,0 +1,6 @@ +--[[ +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") diff --git a/modulefiles/tasks/gaea/run_vx.local.lua b/modulefiles/tasks/gaea/run_vx.local.lua index 9833c539aa..5979a8db96 100644 --- a/modulefiles/tasks/gaea/run_vx.local.lua +++ b/modulefiles/tasks/gaea/run_vx.local.lua @@ -1,2 +1,6 @@ +--[[ +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") -prepend_path("LD_LIBRARY_PATH", "/ncrc/sw/gaea-cle7/python/3.9/anaconda-base/envs/noaa_py3.9/lib") diff --git a/modulefiles/tasks/hera/run_vx.local.lua b/modulefiles/tasks/hera/run_vx.local.lua index f2a338e635..5979a8db96 100644 --- a/modulefiles/tasks/hera/run_vx.local.lua +++ b/modulefiles/tasks/hera/run_vx.local.lua @@ -1,9 +1,6 @@ --[[ -Loading intel is really only necessary when running verification tasks -with the COMPILER experiment parameter set to "gnu" because in that case, -the intel libraries aren't loaded, but the MET/METplus vx software still -needs them because it's built using the intel compiler. This line can -be removed if/when there is a version of MET/METplus built using GNU. +Compiler-specific modules are used for met and metplus libraries --]] -load(pathJoin("intel", os.getenv("intel_ver") or "18.0.5.274")) +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") diff --git a/modulefiles/tasks/jet/run_vx.local.lua b/modulefiles/tasks/jet/run_vx.local.lua index 13b6b4b954..5979a8db96 100644 --- a/modulefiles/tasks/jet/run_vx.local.lua +++ b/modulefiles/tasks/jet/run_vx.local.lua @@ -1,3 +1,6 @@ -append_path("MODULEPATH", "/contrib/anaconda/modulefiles") -load(pathJoin("intel", os.getenv("intel_ver") or "18.0.5.274")) -load(pathJoin("anaconda", os.getenv("anaconda_ver") or "5.3.1")) +--[[ +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") diff --git a/modulefiles/tasks/noaacloud/run_vx.local.lua b/modulefiles/tasks/noaacloud/run_vx.local.lua new file mode 100644 index 0000000000..5979a8db96 --- /dev/null +++ b/modulefiles/tasks/noaacloud/run_vx.local.lua @@ -0,0 +1,6 @@ +--[[ +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") diff --git a/modulefiles/tasks/orion/run_vx.local.lua b/modulefiles/tasks/orion/run_vx.local.lua new file mode 100644 index 0000000000..5979a8db96 --- /dev/null +++ b/modulefiles/tasks/orion/run_vx.local.lua @@ -0,0 +1,6 @@ +--[[ +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") From e00b55094840a0675c13ecade5d5b9e688b91e9e Mon Sep 17 00:00:00 2001 From: Natalie Perlin Date: Thu, 8 Jun 2023 15:50:42 +0000 Subject: [PATCH 02/12] Remove explicit definition of variables METPLUS_PATH,MET_INSTALL_DIR,MET_BIN_EXEC --- ush/config.community.yaml | 2 -- ush/config.da_cycling.yaml | 2 -- ush/config_defaults.yaml | 15 --------------- ush/machine/cheyenne.yaml | 3 --- ush/machine/gaea.yaml | 3 --- ush/machine/hera.yaml | 3 --- ush/machine/jet.yaml | 3 --- ush/machine/linux.yaml | 3 --- ush/machine/macos.yaml | 3 --- ush/machine/noaacloud.yaml | 3 --- ush/machine/orion.yaml | 3 --- 11 files changed, 43 deletions(-) diff --git a/ush/config.community.yaml b/ush/config.community.yaml index 565f8ec613..417b9edb91 100644 --- a/ush/config.community.yaml +++ b/ush/config.community.yaml @@ -6,8 +6,6 @@ user: MACHINE: hera ACCOUNT: an_account platform: - MET_INSTALL_DIR: "" - METPLUS_PATH: "" CCPA_OBS_DIR: "" MRMS_OBS_DIR: "" NDAS_OBS_DIR: "" diff --git a/ush/config.da_cycling.yaml b/ush/config.da_cycling.yaml index da8b1b8278..105a813f2c 100644 --- a/ush/config.da_cycling.yaml +++ b/ush/config.da_cycling.yaml @@ -6,8 +6,6 @@ user: MACHINE: hera ACCOUNT: an_account platform: - MET_INSTALL_DIR: "" - METPLUS_PATH: "" CCPA_OBS_DIR: "" MRMS_OBS_DIR: "" NDAS_OBS_DIR: "" diff --git a/ush/config_defaults.yaml b/ush/config_defaults.yaml index 0087e85c21..f06692e818 100644 --- a/ush/config_defaults.yaml +++ b/ush/config_defaults.yaml @@ -233,18 +233,6 @@ platform: # # Set METplus parameters. Definitions: # - # MET_INSTALL_DIR: - # Location to top-level directory of MET installation. - # - # MET_BIN_EXEC: - # Subdirectory containing MET binaries e.g. "bin" - # - # METPLUS_PATH: - # Location to top-level directory of METplus installation. - # - # MET_BIN_EXEC - # Name of subdirectory where METplus executables are installed. - # # CCPA_OBS_DIR: # User-specified location of top-level directory where CCPA hourly # precipitation files used by METplus are located. This parameter @@ -332,9 +320,6 @@ platform: # #----------------------------------------------------------------------- # - MET_INSTALL_DIR: "" - MET_BIN_EXEC: "" - METPLUS_PATH: "" CCPA_OBS_DIR: "" MRMS_OBS_DIR: "" NDAS_OBS_DIR: "" diff --git a/ush/machine/cheyenne.yaml b/ush/machine/cheyenne.yaml index c738a772fc..318a6692c7 100644 --- a/ush/machine/cheyenne.yaml +++ b/ush/machine/cheyenne.yaml @@ -5,9 +5,6 @@ platform: CCPA_OBS_DIR: /glade/work/epicufsrt/contrib/UFS_SRW_data/develop/obs_data/ccpa/proc MRMS_OBS_DIR: /glade/work/epicufsrt/contrib/UFS_SRW_data/develop/obs_data/mrms/proc NDAS_OBS_DIR: /glade/work/epicufsrt/contrib/UFS_SRW_data/develop/obs_data/ndas/proc - METPLUS_PATH: /glade/p/ral/jntp/MET/METplus/METplus-4.1.1 - MET_BIN_EXEC: bin - MET_INSTALL_DIR: /glade/p/ral/jntp/MET/MET_releases/10.1.1 DOMAIN_PREGEN_BASEDIR: /glade/work/epicufsrt/contrib/UFS_SRW_data/develop/FV3LAM_pregen QUEUE_DEFAULT: regular QUEUE_FCST: regular diff --git a/ush/machine/gaea.yaml b/ush/machine/gaea.yaml index 9653d74c45..b2414d6448 100644 --- a/ush/machine/gaea.yaml +++ b/ush/machine/gaea.yaml @@ -5,9 +5,6 @@ platform: CCPA_OBS_DIR: /lustre/f2/dev/role.epic/contrib/UFS_SRW_data/develop/obs_data/ccpa/proc MRMS_OBS_DIR: /lustre/f2/dev/role.epic/contrib/UFS_SRW_data/develop/obs_data/mrms/proc NDAS_OBS_DIR: /lustre/f2/dev/role.epic/contrib/UFS_SRW_data/develop/obs_data/ndas/proc - METPLUS_PATH: /usw/met/METplus/METplus-4.1.3 - MET_BIN_EXEC: bin - MET_INSTALL_DIR: /usw/met/10.1.2 DOMAIN_PREGEN_BASEDIR: /lustre/f2/dev/role.epic/contrib/UFS_SRW_data/develop/FV3LAM_pregen QUEUE_DEFAULT: normal QUEUE_FCST: normal diff --git a/ush/machine/hera.yaml b/ush/machine/hera.yaml index e1ad70c4f1..12a1a620ec 100644 --- a/ush/machine/hera.yaml +++ b/ush/machine/hera.yaml @@ -5,9 +5,6 @@ platform: CCPA_OBS_DIR: /scratch1/NCEPDEV/nems/role.epic/UFS_SRW_data/develop/obs_data/ccpa/proc MRMS_OBS_DIR: /scratch1/NCEPDEV/nems/role.epic/UFS_SRW_data/develop/obs_data/mrms/proc NDAS_OBS_DIR: /scratch1/NCEPDEV/nems/role.epic/UFS_SRW_data/develop/obs_data/ndas/proc - METPLUS_PATH: /contrib/METplus/METplus-4.1.1 - MET_BIN_EXEC: bin - MET_INSTALL_DIR: /contrib/met/10.1.1 DOMAIN_PREGEN_BASEDIR: /scratch1/NCEPDEV/nems/role.epic/UFS_SRW_data/develop/FV3LAM_pregen PARTITION_DEFAULT: hera QUEUE_DEFAULT: batch diff --git a/ush/machine/jet.yaml b/ush/machine/jet.yaml index 2309d0ee89..3a754dd39a 100644 --- a/ush/machine/jet.yaml +++ b/ush/machine/jet.yaml @@ -5,9 +5,6 @@ platform: CCPA_OBS_DIR: /mnt/lfs4/HFIP/hfv3gfs/role.epic/UFS_SRW_data/develop/obs_data/ccpa/proc MRMS_OBS_DIR: /mnt/lfs4/HFIP/hfv3gfs/role.epic/UFS_SRW_data/develop/obs_data/mrms/proc NDAS_OBS_DIR: /mnt/lfs4/HFIP/hfv3gfs/role.epic/UFS_SRW_data/develop/obs_data/ndas/proc - METPLUS_PATH: /contrib/met/METplus/METplus-4.1.1 - MET_BIN_EXEC: bin - MET_INSTALL_DIR: /contrib/met/10.1.1 DOMAIN_PREGEN_BASEDIR: /mnt/lfs4/HFIP/hfv3gfs/role.epic/UFS_SRW_data/develop/FV3LAM_pregen PARTITION_DEFAULT: sjet,vjet,kjet,xjet QUEUE_DEFAULT: batch diff --git a/ush/machine/linux.yaml b/ush/machine/linux.yaml index ae18b57b19..bc4c28c97f 100644 --- a/ush/machine/linux.yaml +++ b/ush/machine/linux.yaml @@ -6,9 +6,6 @@ platform: CCPA_OBS_DIR: /home/username/DATA/UFS/obs_data/ccpa/proc MRMS_OBS_DIR: /home/username/DATA/UFS/obs_data/mrms/proc NDAS_OBS_DIR: /home/username/DATA/UFS/obs_data/ndas/proc - METPLUS_PATH: "" - MET_BIN_EXEC: bin - MET_INSTALL_DIR: "" DOMAIN_PREGEN_BASEDIR: /home/username/DATA/UFS/FV3LAM_pregen RUN_CMD_FCST: mpirun -n ${PE_MEMBER01} RUN_CMD_POST: mpirun diff --git a/ush/machine/macos.yaml b/ush/machine/macos.yaml index 756c3b734d..6f6e3c2121 100644 --- a/ush/machine/macos.yaml +++ b/ush/machine/macos.yaml @@ -7,9 +7,6 @@ platform: MRMS_OBS_DIR: /Users/username/DATA/UFS/obs_data/mrms/proc NDAS_OBS_DIR: /Users/username/DATA/UFS/obs_data/ndas/proc DOMAIN_PREGEN_BASEDIR: /Users/username/DATA/UFS/FV3LAM_pregen - METPLUS_PATH: "" - MET_BIN_EXEC: bin - MET_INSTALL_DIR: "" RUN_CMD_FCST: mpirun -n ${PE_MEMBER01} RUN_CMD_POST: mpirun RUN_CMD_PRDGEN: mpirun diff --git a/ush/machine/noaacloud.yaml b/ush/machine/noaacloud.yaml index 6f35de59d8..3cdeec244c 100644 --- a/ush/machine/noaacloud.yaml +++ b/ush/machine/noaacloud.yaml @@ -5,9 +5,6 @@ platform: CCPA_OBS_DIR: /contrib/EPIC/UFS_SRW_data/develop/obs_data/ccpa/proc MRMS_OBS_DIR: /contrib/EPIC/UFS_SRW_data/develop/obs_data/mrms/proc NDAS_OBS_DIR: /contrib/EPIC/UFS_SRW_data/develop/obs_data/ndas/proc - METPLUS_PATH: /contrib/EPIC/spack-stack/envs/srw-develop-intel/install/intel/2021.3.0/metplus - MET_BIN_EXEC: bin - MET_INSTALL_DIR: /contrib/EPIC/spack-stack/envs/srw-develop-intel/install/intel/2021.3.0/met REMOVE_MEMORY: True RUN_CMD_FCST: mpiexec -np ${PE_MEMBER01} RUN_CMD_POST: mpiexec -np $nprocs diff --git a/ush/machine/orion.yaml b/ush/machine/orion.yaml index 14221024f3..a057d33028 100644 --- a/ush/machine/orion.yaml +++ b/ush/machine/orion.yaml @@ -5,9 +5,6 @@ platform: CCPA_OBS_DIR: /work/noaa/epic-ps/role-epic-ps/UFS_SRW_data/develop/obs_data/ccpa/proc MRMS_OBS_DIR: /work/noaa/epic-ps/role-epic-ps/UFS_SRW_data/develop/obs_data/mrms/proc NDAS_OBS_DIR: /work/noaa/epic-ps/role-epic-ps/UFS_SRW_data/develop/obs_data/ndas/proc - METPLUS_PATH: /apps/contrib/MET/METplus/METplus-4.1.1 - MET_BIN_EXEC: bin - MET_INSTALL_DIR: /apps/contrib/MET/10.1.1 DOMAIN_PREGEN_BASEDIR: /work/noaa/epic-ps/role-epic-ps/UFS_SRW_data/develop/FV3LAM_pregen PARTITION_DEFAULT: orion QUEUE_DEFAULT: batch From 71b58432490a4c1a04d7e03fdc82878b01abd8b3 Mon Sep 17 00:00:00 2001 From: Natalie Perlin Date: Thu, 8 Jun 2023 15:52:48 +0000 Subject: [PATCH 03/12] not used MET_BIN_EXEC --- parm/metplus/common.conf | 2 +- scripts/exregional_run_met_genensprod_or_ensemblestat.sh | 1 - scripts/exregional_run_met_gridstat_or_pointstat_vx.sh | 1 - scripts/exregional_run_met_gridstat_or_pointstat_vx_ensmean.sh | 1 - scripts/exregional_run_met_gridstat_or_pointstat_vx_ensprob.sh | 1 - scripts/exregional_run_met_pb2nc_obs.sh | 1 - scripts/exregional_run_met_pcpcombine.sh | 1 - ush/machine/wcoss2.yaml | 3 +-- 8 files changed, 2 insertions(+), 9 deletions(-) diff --git a/parm/metplus/common.conf b/parm/metplus/common.conf index 52a0dbdadc..bac1b6bc1a 100644 --- a/parm/metplus/common.conf +++ b/parm/metplus/common.conf @@ -6,7 +6,7 @@ METPLUS_BASE = {ENV[METPLUS_PATH]} # Met install location MET_INSTALL_DIR = {ENV[MET_INSTALL_DIR]} MET_BASE = {MET_INSTALL_DIR}/share/met -MET_BIN_DIR = {MET_INSTALL_DIR}/{ENV[MET_BIN_EXEC]} +MET_BIN_DIR = {MET_INSTALL_DIR}/bin # Location of METplus parm directory METPLUS_PARM_BASE = {ENV[METPLUS_CONF]} diff --git a/scripts/exregional_run_met_genensprod_or_ensemblestat.sh b/scripts/exregional_run_met_genensprod_or_ensemblestat.sh index 49e2dfdd91..29eb940db5 100755 --- a/scripts/exregional_run_met_genensprod_or_ensemblestat.sh +++ b/scripts/exregional_run_met_genensprod_or_ensemblestat.sh @@ -286,7 +286,6 @@ fi # export MET_INSTALL_DIR export METPLUS_PATH -export MET_BIN_EXEC export METPLUS_CONF export LOGDIR # diff --git a/scripts/exregional_run_met_gridstat_or_pointstat_vx.sh b/scripts/exregional_run_met_gridstat_or_pointstat_vx.sh index a6a30671b6..7e834d5b17 100755 --- a/scripts/exregional_run_met_gridstat_or_pointstat_vx.sh +++ b/scripts/exregional_run_met_gridstat_or_pointstat_vx.sh @@ -284,7 +284,6 @@ fi # export MET_INSTALL_DIR export METPLUS_PATH -export MET_BIN_EXEC export METPLUS_CONF export LOGDIR # 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 c8cb4d9cac..2e9541250a 100755 --- a/scripts/exregional_run_met_gridstat_or_pointstat_vx_ensmean.sh +++ b/scripts/exregional_run_met_gridstat_or_pointstat_vx_ensmean.sh @@ -248,7 +248,6 @@ ACCUM_NO_PAD=$( printf "%0d" "${ACCUM_HH}" ) # export MET_INSTALL_DIR export METPLUS_PATH -export MET_BIN_EXEC export METPLUS_CONF export LOGDIR # 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 473a17dcf5..4785336cad 100755 --- a/scripts/exregional_run_met_gridstat_or_pointstat_vx_ensprob.sh +++ b/scripts/exregional_run_met_gridstat_or_pointstat_vx_ensprob.sh @@ -207,7 +207,6 @@ ACCUM_NO_PAD=$( printf "%0d" "${ACCUM_HH}" ) # export MET_INSTALL_DIR export METPLUS_PATH -export MET_BIN_EXEC export METPLUS_CONF export LOGDIR # diff --git a/scripts/exregional_run_met_pb2nc_obs.sh b/scripts/exregional_run_met_pb2nc_obs.sh index 95feb701f4..3593e393b4 100755 --- a/scripts/exregional_run_met_pb2nc_obs.sh +++ b/scripts/exregional_run_met_pb2nc_obs.sh @@ -163,7 +163,6 @@ fi # export MET_INSTALL_DIR export METPLUS_PATH -export MET_BIN_EXEC export METPLUS_CONF export LOGDIR # diff --git a/scripts/exregional_run_met_pcpcombine.sh b/scripts/exregional_run_met_pcpcombine.sh index a40bece103..af7db8d0d7 100755 --- a/scripts/exregional_run_met_pcpcombine.sh +++ b/scripts/exregional_run_met_pcpcombine.sh @@ -246,7 +246,6 @@ fi # export MET_INSTALL_DIR export METPLUS_PATH -export MET_BIN_EXEC export METPLUS_CONF export LOGDIR # diff --git a/ush/machine/wcoss2.yaml b/ush/machine/wcoss2.yaml index 2703451bf1..e0cd67b03c 100644 --- a/ush/machine/wcoss2.yaml +++ b/ush/machine/wcoss2.yaml @@ -6,8 +6,7 @@ platform: MRMS_OBS_DIR: /lfs/h2/emc/lam/noscrub/UFS_SRW_App/develop/obs_data/mrms/proc NDAS_OBS_DIR: /lfs/h2/emc/lam/noscrub/UFS_SRW_App/develop/obs_data/ndas/proc METPLUS_PATH: /apps/ops/para/libs/intel/19.1.3.304/metplus/4.1.1 - MET_BIN_EXEC: bin - MET_INSTALL_DIR: /apps/ops/para/libs/intel/19.1.3.304/met/10.1.1 + MET_ROOT: /apps/ops/para/libs/intel/19.1.3.304/met/10.1.1 DOMAIN_PREGEN_BASEDIR: /lfs/h2/emc/lam/noscrub/UFS_SRW_App/develop/FV3LAM_pregen QUEUE_DEFAULT: dev QUEUE_FCST: dev From 9d327015d2a278f424c00da06e5d9e18af732e24 Mon Sep 17 00:00:00 2001 From: Natalie Perlin Date: Mon, 31 Jul 2023 16:01:11 -0500 Subject: [PATCH 04/12] update Orion stacks to use new role-epic account space --- modulefiles/build_orion_intel.lua | 2 +- modulefiles/tasks/orion/python_srw.lua | 2 +- modulefiles/wflow_orion.lua | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modulefiles/build_orion_intel.lua b/modulefiles/build_orion_intel.lua index 3b150e6d48..79eb5c6487 100644 --- a/modulefiles/build_orion_intel.lua +++ b/modulefiles/build_orion_intel.lua @@ -11,7 +11,7 @@ load("noaatools") load(pathJoin("cmake", os.getenv("cmake_ver") or "3.22.1")) load(pathJoin("python", os.getenv("python_ver") or "3.9.2")) -prepend_path("MODULEPATH","/work/noaa/epic-ps/role-epic-ps/hpc-stack/libs/intel-2022.1.2/modulefiles/stack") +prepend_path("MODULEPATH","/work/noaa/epic/role-epic/contrib/orion/hpc-stack/intel-2022.1.2/modulefiles/stack") load(pathJoin("hpc", os.getenv("hpc_ver") or "1.2.0")) load(pathJoin("hpc-intel", os.getenv("hpc_intel_ver") or "2022.1.2")) load(pathJoin("hpc-impi", os.getenv("hpc_impi_ver") or "2022.1.2")) diff --git a/modulefiles/tasks/orion/python_srw.lua b/modulefiles/tasks/orion/python_srw.lua index c7e25d3ad4..449ce23f31 100644 --- a/modulefiles/tasks/orion/python_srw.lua +++ b/modulefiles/tasks/orion/python_srw.lua @@ -1,5 +1,5 @@ unload("python") -append_path("MODULEPATH","/work/noaa/epic-ps/role-epic-ps/miniconda3/modulefiles") +append_path("MODULEPATH","/work/noaa/epic/role-epic/contrib/orion/miniconda3/modulefiles") load(pathJoin("miniconda3", os.getenv("miniconda3_ver") or "4.12.0")) setenv("SRW_ENV", "workflow_tools") diff --git a/modulefiles/wflow_orion.lua b/modulefiles/wflow_orion.lua index 46da63f5d4..ed72ff2245 100644 --- a/modulefiles/wflow_orion.lua +++ b/modulefiles/wflow_orion.lua @@ -11,7 +11,7 @@ load("wget") load("set_pythonpath") unload("python") -append_path("MODULEPATH","/work/noaa/epic-ps/role-epic-ps/miniconda3/modulefiles") +append_path("MODULEPATH","/work/noaa/epic/role-epic/contrib/orion/miniconda3/modulefiles") load(pathJoin("miniconda3", os.getenv("miniconda3_ver") or "4.12.0")) if mode() == "load" then From bce7bdaf56a7fe3eb9a785c70d414e3915fde881 Mon Sep 17 00:00:00 2001 From: Natalie Perlin Date: Tue, 1 Aug 2023 14:18:30 -0500 Subject: [PATCH 05/12] updates to met verification modules --- ush/machine/cheyenne.yaml | 1 + ush/machine/gaea.yaml | 1 + ush/machine/jet.yaml | 1 + ush/machine/noaacloud.yaml | 1 + ush/machine/orion.yaml | 1 + 5 files changed, 5 insertions(+) diff --git a/ush/machine/cheyenne.yaml b/ush/machine/cheyenne.yaml index 5444f24af6..30d523e688 100644 --- a/ush/machine/cheyenne.yaml +++ b/ush/machine/cheyenne.yaml @@ -22,6 +22,7 @@ platform: TEST_PREGEN_BASEDIR: /glade/work/epicufsrt/contrib/UFS_SRW_data/develop/FV3LAM_pregen TEST_ALT_EXTRN_MDL_SYSBASEDIR_ICS: /glade/work/epicufsrt/contrib/UFS_SRW_data/develop/dummy_FV3GFS_sys_dir TEST_ALT_EXTRN_MDL_SYSBASEDIR_LBCS: /glade/work/epicufsrt/contrib/UFS_SRW_data/develop/dummy_FV3GFS_sys_dir + TEST_VX_FCST_INPUT_BASEDIR: '{{ "/glade/work/epicufsrt/contrib/UFS_SRW_data/develop/output_data/fcst_" }}{{ "ens" if (global.NUM_ENS_MEMBERS > 0) else "det" }}{{ "/{{workflow.PREDEF_GRID_NAME}}" }}{% raw %}{% endraw %}' FIXaer: /glade/work/epicufsrt/contrib/UFS_SRW_data/develop/fix/fix_aer FIXgsi: /glade/work/epicufsrt/contrib/UFS_SRW_data/develop/fix/fix_gsi FIXgsm: /glade/work/epicufsrt/contrib/UFS_SRW_data/develop/fix/fix_am diff --git a/ush/machine/gaea.yaml b/ush/machine/gaea.yaml index 22e25dc5f3..a170bc2a6b 100644 --- a/ush/machine/gaea.yaml +++ b/ush/machine/gaea.yaml @@ -22,6 +22,7 @@ platform: 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 FIXgsi: /lustre/f2/dev/role.epic/contrib/UFS_SRW_data/develop/fix/fix_gsi FIXgsm: /lustre/f2/dev/role.epic/contrib/UFS_SRW_data/develop/fix/fix_am diff --git a/ush/machine/jet.yaml b/ush/machine/jet.yaml index 3a754dd39a..3ab36517d4 100644 --- a/ush/machine/jet.yaml +++ b/ush/machine/jet.yaml @@ -23,6 +23,7 @@ platform: TEST_PREGEN_BASEDIR: /mnt/lfs4/HFIP/hfv3gfs/role.epic/UFS_SRW_data/develop/FV3LAM_pregen TEST_ALT_EXTRN_MDL_SYSBASEDIR_ICS: /mnt/lfs4/HFIP/hfv3gfs/role.epic/UFS_SRW_data/develop/dummy_FV3GFS_sys_dir TEST_ALT_EXTRN_MDL_SYSBASEDIR_LBCS: /mnt/lfs4/HFIP/hfv3gfs/role.epic/UFS_SRW_data/develop/dummy_FV3GFS_sys_dir + TEST_VX_FCST_INPUT_BASEDIR: '{{ "/mnt/lfs4/HFIP/hfv3gfs/role.epic/UFS_SRW_data/develop/output_data/fcst_" }}{{ "ens" if (global.NUM_ENS_MEMBERS > 0) else "det" }}{{ "/{{workflow.PREDEF_GRID_NAME}}" }}{% raw %}{% endraw %}' FIXaer: /mnt/lfs4/HFIP/hfv3gfs/role.epic/UFS_SRW_data/develop/fix/fix_aer FIXgsi: /mnt/lfs4/HFIP/hfv3gfs/role.epic/UFS_SRW_data/develop/fix/fix_gsi FIXgsm: /mnt/lfs4/HFIP/hfv3gfs/role.epic/UFS_SRW_data/develop/fix/fix_am diff --git a/ush/machine/noaacloud.yaml b/ush/machine/noaacloud.yaml index 3cdeec244c..6b16023914 100644 --- a/ush/machine/noaacloud.yaml +++ b/ush/machine/noaacloud.yaml @@ -17,6 +17,7 @@ platform: TEST_PREGEN_BASEDIR: /contrib/EPIC/UFS_SRW_data/develop/FV3LAM_pregen TEST_ALT_EXTRN_MDL_SYSBASEDIR_ICS: /contrib/EPIC/UFS_SRW_data/develop/dummy_FV3GFS_sys_dir TEST_ALT_EXTRN_MDL_SYSBASEDIR_LBCS: /contrib/EPIC/UFS_SRW_data/develop/dummy_FV3GFS_sys_dir + TEST_VX_FCST_INPUT_BASEDIR: '{{ "/contrib/EPIC/UFS_SRW_data/develop/output_data/fcst_" }}{{ "ens" if (global.NUM_ENS_MEMBERS > 0) else "det" }}{{ "/{{workflow.PREDEF_GRID_NAME}}" }}{% raw %}{% endraw %}' FIXaer: /contrib/EPIC/UFS_SRW_data/develop/fix/fix_aer FIXgsi: /contrib/EPIC/UFS_SRW_data/develop/fix/fix_gsi FIXgsm: /contrib/EPIC/UFS_SRW_data/develop/fix/fix_am diff --git a/ush/machine/orion.yaml b/ush/machine/orion.yaml index b8491406a3..21a1dffaf8 100644 --- a/ush/machine/orion.yaml +++ b/ush/machine/orion.yaml @@ -24,6 +24,7 @@ platform: TEST_EXTRN_MDL_SOURCE_BASEDIR: /work/noaa/epic-ps/role-epic-ps/UFS_SRW_data/develop/input_model_data TEST_AQM_INPUT_BASEDIR: /work/noaa/epic-ps/role-epic-ps/UFS_SRW_data/develop/aqm_data TEST_PREGEN_BASEDIR: /work/noaa/epic-ps/role-epic-ps/UFS_SRW_data/develop/FV3LAM_pregen + TEST_VX_FCST_INPUT_BASEDIR: '{{ "/work/noaa/epic-ps/role-epic-ps/UFS_SRW_data/develop/output_data/fcst_" }}{{ "ens" if (global.NUM_ENS_MEMBERS > 0) else "det" }}{{ "/{{workflow.PREDEF_GRID_NAME}}" }}{% raw %}{% endraw %}' FIXaer: /work/noaa/epic-ps/role-epic-ps/UFS_SRW_data/develop/fix/fix_aer FIXgsi: /work/noaa/epic-ps/role-epic-ps/UFS_SRW_data/develop/fix/fix_gsi FIXgsm: /work/noaa/epic-ps/role-epic-ps/UFS_SRW_data/develop/fix/fix_am From ac4bd866bbf26bbf64e554081bab097ebdc8ec85 Mon Sep 17 00:00:00 2001 From: Natalie Perlin Date: Tue, 1 Aug 2023 14:27:53 -0500 Subject: [PATCH 06/12] configuration fix for MET_ensemble_verification_only_vx_time_lag test --- .../config.MET_ensemble_verification_only_vx_time_lag.yaml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/tests/WE2E/test_configs/verification/config.MET_ensemble_verification_only_vx_time_lag.yaml b/tests/WE2E/test_configs/verification/config.MET_ensemble_verification_only_vx_time_lag.yaml index ded24b22f4..b38eef188b 100644 --- a/tests/WE2E/test_configs/verification/config.MET_ensemble_verification_only_vx_time_lag.yaml +++ b/tests/WE2E/test_configs/verification/config.MET_ensemble_verification_only_vx_time_lag.yaml @@ -31,11 +31,6 @@ global: NUM_ENS_MEMBERS: 2 ENS_TIME_LAG_HRS: '[ 0, 12 ]' -platform: - CCPA_OBS_DIR: '/scratch2/BMC/fv3lam/ens_design_RRFS/obs_data/ccpa/proc' - MRMS_OBS_DIR: '/scratch2/BMC/fv3lam/ens_design_RRFS/obs_data/mrms/proc' - NDAS_OBS_DIR: '/scratch2/BMC/fv3lam/ens_design_RRFS/obs_data/ndas/proc' - verification: VX_FCST_MODEL_NAME: FV3_GFS_v15p2_CONUS_25km VX_FCST_INPUT_BASEDIR: '{{ platform.get("TEST_VX_FCST_INPUT_BASEDIR") }}' From 6a44b741be56af747482b1d055bb01ab45cf2100 Mon Sep 17 00:00:00 2001 From: Natalie Perlin Date: Wed, 2 Aug 2023 15:42:17 +0000 Subject: [PATCH 07/12] Updated exregional_run_met_*.sh files, removed MET_INSTALL_DIR and METPLUS_PATH variables --- scripts/exregional_run_met_genensprod_or_ensemblestat.sh | 2 -- scripts/exregional_run_met_gridstat_or_pointstat_vx.sh | 2 -- scripts/exregional_run_met_gridstat_or_pointstat_vx_ensmean.sh | 2 -- scripts/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 -- 6 files changed, 12 deletions(-) diff --git a/scripts/exregional_run_met_genensprod_or_ensemblestat.sh b/scripts/exregional_run_met_genensprod_or_ensemblestat.sh index 550c93d21a..9ccb2d1b25 100755 --- a/scripts/exregional_run_met_genensprod_or_ensemblestat.sh +++ b/scripts/exregional_run_met_genensprod_or_ensemblestat.sh @@ -293,8 +293,6 @@ fi # #----------------------------------------------------------------------- # -export MET_INSTALL_DIR -export METPLUS_PATH export METPLUS_CONF export LOGDIR # diff --git a/scripts/exregional_run_met_gridstat_or_pointstat_vx.sh b/scripts/exregional_run_met_gridstat_or_pointstat_vx.sh index 9b3c02de24..46c93ee299 100755 --- a/scripts/exregional_run_met_gridstat_or_pointstat_vx.sh +++ b/scripts/exregional_run_met_gridstat_or_pointstat_vx.sh @@ -294,8 +294,6 @@ fi # #----------------------------------------------------------------------- # -export MET_INSTALL_DIR -export METPLUS_PATH export METPLUS_CONF export LOGDIR # 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 979cfd3ed1..bf3a8280a1 100755 --- a/scripts/exregional_run_met_gridstat_or_pointstat_vx_ensmean.sh +++ b/scripts/exregional_run_met_gridstat_or_pointstat_vx_ensmean.sh @@ -256,8 +256,6 @@ ACCUM_NO_PAD=$( printf "%0d" "${ACCUM_HH}" ) # #----------------------------------------------------------------------- # -export MET_INSTALL_DIR -export METPLUS_PATH export METPLUS_CONF export LOGDIR # 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 faffd410b6..89c128eeed 100755 --- a/scripts/exregional_run_met_gridstat_or_pointstat_vx_ensprob.sh +++ b/scripts/exregional_run_met_gridstat_or_pointstat_vx_ensprob.sh @@ -212,8 +212,6 @@ ACCUM_NO_PAD=$( printf "%0d" "${ACCUM_HH}" ) # #----------------------------------------------------------------------- # -export MET_INSTALL_DIR -export METPLUS_PATH export METPLUS_CONF export LOGDIR # diff --git a/scripts/exregional_run_met_pb2nc_obs.sh b/scripts/exregional_run_met_pb2nc_obs.sh index 717eb7a644..be0f0a2b91 100755 --- a/scripts/exregional_run_met_pb2nc_obs.sh +++ b/scripts/exregional_run_met_pb2nc_obs.sh @@ -161,8 +161,6 @@ fi # #----------------------------------------------------------------------- # -export MET_INSTALL_DIR -export METPLUS_PATH export METPLUS_CONF export LOGDIR # diff --git a/scripts/exregional_run_met_pcpcombine.sh b/scripts/exregional_run_met_pcpcombine.sh index 1e598afd9a..cb047163cb 100755 --- a/scripts/exregional_run_met_pcpcombine.sh +++ b/scripts/exregional_run_met_pcpcombine.sh @@ -244,8 +244,6 @@ fi # #----------------------------------------------------------------------- # -export MET_INSTALL_DIR -export METPLUS_PATH export METPLUS_CONF export LOGDIR # From 2789514d44632e1d5b2dac427e0cce35950662f0 Mon Sep 17 00:00:00 2001 From: Natalie Perlin Date: Wed, 2 Aug 2023 16:39:22 +0000 Subject: [PATCH 08/12] Documentation changes (preliminary) for using met, metplus modules --- docs/UsersGuide/source/ConfigWorkflow.rst | 9 --------- docs/UsersGuide/source/RunSRW.rst | 22 ++++------------------ docs/UsersGuide/source/VXCases.rst | 9 +-------- 3 files changed, 5 insertions(+), 35 deletions(-) diff --git a/docs/UsersGuide/source/ConfigWorkflow.rst b/docs/UsersGuide/source/ConfigWorkflow.rst index e4355d6f4c..717640e8a2 100644 --- a/docs/UsersGuide/source/ConfigWorkflow.rst +++ b/docs/UsersGuide/source/ConfigWorkflow.rst @@ -130,15 +130,6 @@ METplus Parameters ``MODEL``: (Default: "") A descriptive name of the user's choice for the model being verified. -``MET_INSTALL_DIR``: (Default: "") - Path to top-level directory of MET installation. - -``METPLUS_PATH``: (Default: "") - Path to top-level directory of METplus installation. - -``MET_BIN_EXEC``: (Default: "") - Name of subdirectory where METplus executables are installed. - .. _METParamNote: .. note:: diff --git a/docs/UsersGuide/source/RunSRW.rst b/docs/UsersGuide/source/RunSRW.rst index 9b1645c15d..cd272d88ef 100644 --- a/docs/UsersGuide/source/RunSRW.rst +++ b/docs/UsersGuide/source/RunSRW.rst @@ -169,7 +169,7 @@ Configuration parameters in the ``config_defaults.yaml`` file appear in :numref: | | ENV_INIT_SCRIPTS_FPS, PRE_TASK_CMDS, PARTITION_DEFAULT, QUEUE_DEFAULT,| | | PARTITION_HPSS, QUEUE_HPSS, PARTITION_FCST, QUEUE_FCST, | | | RUN_CMD_UTILS, RUN_CMD_FCST, RUN_CMD_POST, SLURM_NATIVE_CMD, | - | | MODEL, MET_INSTALL_DIR, METPLUS_PATH, MET_BIN_EXEC, CCPA_OBS_DIR, | + | | MODEL, CCPA_OBS_DIR, | | | MRMS_OBS_DIR, NDAS_OBS_DIR, NOHRSC_OBS_DIR | +-----------------------------+-----------------------------------------------------------------------+ | Workflow | WORKFLOW_ID, USE_CRON_TO_RELAUNCH, CRON_RELAUNCH_INTVL_MNTS, | @@ -272,10 +272,6 @@ The user must specify certain basic experiment configuration information in a `` +--------------------------------+-------------------+------------------------------------+ | MODEL | "" | "FV3_GFS_v16_CONUS_25km" | +--------------------------------+-------------------+------------------------------------+ - | METPLUS_PATH | "" | "" | - +--------------------------------+-------------------+------------------------------------+ - | MET_INSTALL_DIR | "" | "" | - +--------------------------------+-------------------+------------------------------------+ | CCPA_OBS_DIR | "" | "" | +--------------------------------+-------------------+------------------------------------+ | NOHRSC_OBS_DIR | "" | "" | @@ -670,10 +666,7 @@ This can be helpful when conducting multiple experiments with different types of Configure METplus Verification Suite (Optional) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Users who want to use the METplus verification suite to evaluate their forecasts need to add additional information to their ``config.yaml`` file. Other users may skip to the :ref:`next section `. - -.. attention:: - METplus *installation* is not included as part of the build process for this release of the SRW App. However, METplus is preinstalled on many `Level 1 & 2 `__ systems. For the v2.1.0 release, METplus *use* is supported on systems with a functioning METplus installation, although installation itself is not supported. For more information about METplus, see :numref:`Section %s `. +Users who want to use the METplus verification suite to evaluate their forecasts need to add additional information to their ``ush/machine/.yaml`` or ``config.yaml`` file. Other users may skip to the :ref:`next section `. .. note:: If METplus users update their METplus installation, they must update the module load statements in ``ufs-srweather-app/modulefiles/tasks//run_vx.local`` file to correspond to their system's updated installation: @@ -682,16 +675,9 @@ Users who want to use the METplus verification suite to evaluate their forecasts module use -a module load met/ + module load metplus/ -To use METplus verification, the path to the MET and METplus directories must be added to ``config.yaml``: - -.. code-block:: console - - platform: - METPLUS_PATH: - MET_INSTALL_DIR: - -To turn on verification tasks in the workflow, include the ``parm/wflow/verify.yaml`` file in the ``rocoto: tasks: taskgroups:`` section of ``config.yaml``. +To use METplus verification, MET and METplus modules need to be installed. To turn on verification tasks in the workflow, include the ``parm/wflow/verify.yaml`` file in the ``rocoto: tasks: taskgroups:`` section of ``config.yaml``. .. code-block:: console diff --git a/docs/UsersGuide/source/VXCases.rst b/docs/UsersGuide/source/VXCases.rst index 2198ce10c4..6b569bd419 100644 --- a/docs/UsersGuide/source/VXCases.rst +++ b/docs/UsersGuide/source/VXCases.rst @@ -110,7 +110,7 @@ where ```` is replaced by the actual path to the Then, edit the configuration file (``config.yaml``) to include the variables and values in the sample configuration excerpt below (variables not listed below do not need to be changed or removed). Users must be sure to substitute values in ``<>`` with values appropriate to their system. .. note:: - Users working on a `Level 1 platform `__ do not need to add or update the following variables: ``MET_INSTALL_DIR``, ``METPLUS_PATH``, ``MET_BIN_EXEC``, ``CCPA_OBS_DIR``, ``MRMS_OBS_DIR``, and ``NDAS_OBS_DIR`` + Variables ``CCPA_OBS_DIR``, ``MRMS_OBS_DIR``, and ``NDAS_OBS_DIR`` are set in the ./ush/machine.yaml configuration. Variables ``MET_INSTALL_DIR``, ``METPLUS_PATH``, ``MET_BIN_EXEC`` are set in modulefiles for met/xx.x.x and metplus/x.x.x, when the modules are loaded in ./modulefiles/tasks//run_vx.local (run_vx.local.lua modulefile) .. code-block:: console @@ -118,13 +118,6 @@ Then, edit the configuration file (``config.yaml``) to include the variables and ACCOUNT: platform: MODEL: FV3_GFS_v16_SUBCONUS_3km - MET_INSTALL_DIR: # Example: MET_INSTALL_DIR: /contrib/met/10.1.1 - METPLUS_PATH: # Example: METPLUS_PATH: /contrib/METplus/METplus-4.1.1 - # Add MET_BIN_EXEC variable to config.yaml - MET_BIN_EXEC: bin - CCPA_OBS_DIR: - MRMS_OBS_DIR: - NDAS_OBS_DIR: workflow: EXPT_SUBDIR: DATE_FIRST_CYCL: '2019061500' From ea5c6a4e8fab084407c63ffd331e910180d50bdf Mon Sep 17 00:00:00 2001 From: Natalie Perlin <68030316+natalie-perlin@users.noreply.github.com> Date: Thu, 3 Aug 2023 12:31:47 -0400 Subject: [PATCH 09/12] Update VXCases.rst --- docs/UsersGuide/source/VXCases.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/UsersGuide/source/VXCases.rst b/docs/UsersGuide/source/VXCases.rst index 6b569bd419..4b01a283dc 100644 --- a/docs/UsersGuide/source/VXCases.rst +++ b/docs/UsersGuide/source/VXCases.rst @@ -110,7 +110,7 @@ where ```` is replaced by the actual path to the Then, edit the configuration file (``config.yaml``) to include the variables and values in the sample configuration excerpt below (variables not listed below do not need to be changed or removed). Users must be sure to substitute values in ``<>`` with values appropriate to their system. .. note:: - Variables ``CCPA_OBS_DIR``, ``MRMS_OBS_DIR``, and ``NDAS_OBS_DIR`` are set in the ./ush/machine.yaml configuration. Variables ``MET_INSTALL_DIR``, ``METPLUS_PATH``, ``MET_BIN_EXEC`` are set in modulefiles for met/xx.x.x and metplus/x.x.x, when the modules are loaded in ./modulefiles/tasks//run_vx.local (run_vx.local.lua modulefile) + Variables ``CCPA_OBS_DIR``, ``MRMS_OBS_DIR``, and ``NDAS_OBS_DIR`` are set in the ./ush/machine/.yaml configuration. Variables ``MET_INSTALL_DIR``, ``METPLUS_PATH``, ``MET_BIN_EXEC`` are set in modulefiles for met/xx.x.x and metplus/x.x.x, when the modules are loaded in ./modulefiles/tasks//run_vx.local (run_vx.local.lua modulefile) .. code-block:: console From a04fe7162f59fbfde14f75e3f67a5272813a64ff Mon Sep 17 00:00:00 2001 From: Natalie Perlin <68030316+natalie-perlin@users.noreply.github.com> Date: Thu, 3 Aug 2023 12:41:00 -0400 Subject: [PATCH 10/12] Update RunSRW.rst A note on documentation changes - preliminary change suggested. --- docs/UsersGuide/source/RunSRW.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/UsersGuide/source/RunSRW.rst b/docs/UsersGuide/source/RunSRW.rst index cd272d88ef..a06c55e50c 100644 --- a/docs/UsersGuide/source/RunSRW.rst +++ b/docs/UsersGuide/source/RunSRW.rst @@ -677,6 +677,9 @@ Users who want to use the METplus verification suite to evaluate their forecasts module load met/ module load metplus/ +.. note:: + PRELIMINARY CHANGES, NEEDS TO BE UPDATE IN A SECTION BELOW: for the recent changes in develop, there are several verify_*.yaml files, verify_pre.yaml, verify_ens.yaml, verify_det.yaml. Documentation below still mentions a single `veryfy.yaml` file. + To use METplus verification, MET and METplus modules need to be installed. To turn on verification tasks in the workflow, include the ``parm/wflow/verify.yaml`` file in the ``rocoto: tasks: taskgroups:`` section of ``config.yaml``. .. code-block:: console From 2dd44013718169c5209afaf36e6276f55df9d263 Mon Sep 17 00:00:00 2001 From: Natalie Perlin <68030316+natalie-perlin@users.noreply.github.com> Date: Thu, 3 Aug 2023 12:47:51 -0400 Subject: [PATCH 11/12] Update RunSRW.rst Use instead of for consistency --- docs/UsersGuide/source/RunSRW.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/UsersGuide/source/RunSRW.rst b/docs/UsersGuide/source/RunSRW.rst index a06c55e50c..4d8f78d7d4 100644 --- a/docs/UsersGuide/source/RunSRW.rst +++ b/docs/UsersGuide/source/RunSRW.rst @@ -666,10 +666,10 @@ This can be helpful when conducting multiple experiments with different types of Configure METplus Verification Suite (Optional) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Users who want to use the METplus verification suite to evaluate their forecasts need to add additional information to their ``ush/machine/.yaml`` or ``config.yaml`` file. Other users may skip to the :ref:`next section `. +Users who want to use the METplus verification suite to evaluate their forecasts need to add additional information to their ``ush/machine/.yaml`` or ``config.yaml`` file. Other users may skip to the :ref:`next section `. .. note:: - If METplus users update their METplus installation, they must update the module load statements in ``ufs-srweather-app/modulefiles/tasks//run_vx.local`` file to correspond to their system's updated installation: + If METplus users update their METplus installation, they must update the module load statements in ``ufs-srweather-app/modulefiles/tasks//run_vx.local`` file to correspond to their system's updated installation: .. code-block:: console From 39767e2993b66550ef803ed3ed1e4de1adee212a Mon Sep 17 00:00:00 2001 From: Natalie Perlin Date: Tue, 8 Aug 2023 18:28:47 +0000 Subject: [PATCH 12/12] walltime increase for met verification tasks to allow longer runs on Hera+gnu/9.2 compilers --- parm/wflow/verify_ens.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/parm/wflow/verify_ens.yaml b/parm/wflow/verify_ens.yaml index b45d2e977e..c4d455461c 100644 --- a/parm/wflow/verify_ens.yaml +++ b/parm/wflow/verify_ens.yaml @@ -137,6 +137,7 @@ metatask_GenEnsProd_EnsembleStat_NDAS: MET_TOOL: 'GENENSPROD' OBTYPE: 'NDAS' ACCUM_HH: '01' + walltime: 02:30:00 dependency: and: # The Pb2nc task (which is run only for obs) must be complete because @@ -152,6 +153,7 @@ metatask_GenEnsProd_EnsembleStat_NDAS: envars: <<: *envars_GenEnsProd_NDAS MET_TOOL: 'ENSEMBLESTAT' + walltime: 01:00:00 dependency: taskdep_genensprod: attrs: