[develop] MET_verification: use modules met, metplus (ufs-community#826)

* Use modules met and metplus installed in a software stack for MET verification tasks. Do not use explicitly set paths in machine files or config.yaml files. Use env. variables METPLUS_PATH, MET_INSTALL_DIR from the modulefiles. Retire MET_BIN_EXEC variables, use standard "bin". Modules met/10.1.2 and metplus/4.1.3 are used. Newer versions, met/11.0.2 and metplus/5.0.2, require additional code changes. * Updated Orion stack location due to a mandatory transition to a new role account and space, under /work/noaa/epic/role-epic/. New stack is under /work/noaa/epic/role-epic/contrib/orion/hpc-stack/intel-2022.1.2/. SRW fundamental tests have been run successfully with the updated stack, as well as GSI regression tests and UFS-WM regression tests. Miniconda3 with all the environments has been installed in a new Orion location, under /work/noaa/epic/role-epic/contrib/orion/miniconda3/ and updated in modulefiles. --------- Co-authored-by: Natalie Perlin <[email protected]> Co-authored-by: Natalie Perlin <[email protected]> Co-authored-by: Natalie Perlin <[email protected]>
EdwardSnyder-NOAA · Aug 9, 2023 · f2abb86 · f2abb86
1 parent 26b3ac8
commit f2abb86
Show file tree

Hide file tree

Showing 33 changed files with 51 additions and 114 deletions.
diff --git 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
@@ -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,28 +666,21 @@ 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 <SetUpPythonEnv>`. 
-
-.. 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 <https://dtcenter.org/community-code/metplus/metplus-4-1-existing-builds>`__ 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 <MetplusComponent>`.
+Users who want to use the METplus verification suite to evaluate their forecasts need to add additional information to their ``ush/machine/<platform>.yaml`` or ``config.yaml`` file. Other users may skip to the :ref:`next section <SetUpPythonEnv>`. 
 
 .. note::
- If METplus users update their METplus installation, they must update the module load statements in ``ufs-srweather-app/modulefiles/tasks/<machine>/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/<platform>/run_vx.local`` file to correspond to their system's updated installation:
 
  .. code-block:: console
  
  module use -a </path/to/met/modulefiles/>
  module load met/<version.X.X>
+ module load metplus/<version.X.X>
 
-To use METplus verification, the path to the MET and METplus directories must be added to ``config.yaml``:
-
-.. code-block:: console
-
- platform:
- METPLUS_PATH: </path/to/METplus/METplus-4.1.0>
- MET_INSTALL_DIR: </path/to/met/10.1.0>
+.. 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 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
@@ -110,21 +110,14 @@ where ``<path/to/ufs-srweather-app/ush>`` 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 <https://github.com/ufs-community/ufs-srweather-app/wiki/Supported-Platforms-and-Compilers>`__ 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/<platform>.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/<platform>/run_vx.local (run_vx.local.lua modulefile)
 
 .. code-block:: console
 
  user:
  ACCOUNT: <my_account>
  platform:
  MODEL: FV3_GFS_v16_SUBCONUS_3km
- MET_INSTALL_DIR: </path/to/met/x.x.x> # Example: MET_INSTALL_DIR: /contrib/met/10.1.1
- METPLUS_PATH: </path/to/METplus/METplus-x.x.x> # Example: METPLUS_PATH: /contrib/METplus/METplus-4.1.1
- # Add MET_BIN_EXEC variable to config.yaml
- MET_BIN_EXEC: bin
- CCPA_OBS_DIR: </path/to/Indy-Severe-Weather/obs_data/ccpa/proc>
- MRMS_OBS_DIR: </path/to/Indy-Severe-Weather/obs_data/mrms/proc>
- NDAS_OBS_DIR: </path/to/Indy-Severe-Weather/obs_data/ndas/proc>
  workflow:
  EXPT_SUBDIR: <any_name_you_like>
  DATE_FIRST_CYCL: '2019061500'

diff --git 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/cheyenne/run_vx.local.lua 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
@@ -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
@@ -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
@@ -1 +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/noaacloud/run_vx.local.lua 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/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/tasks/orion/run_vx.local.lua 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")
diff --git 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

diff --git 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/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:

diff --git a/scripts/exregional_run_met_genensprod_or_ensemblestat.sh b/scripts/exregional_run_met_genensprod_or_ensemblestat.sh
@@ -293,9 +293,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
@@ -294,9 +294,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
@@ -256,9 +256,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
@@ -212,9 +212,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
@@ -161,9 +161,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
@@ -244,9 +244,6 @@ fi
 #
 #-----------------------------------------------------------------------
 #
-export MET_INSTALL_DIR
-export METPLUS_PATH
-export MET_BIN_EXEC
 export METPLUS_CONF
 export LOGDIR
 #

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
@@ -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") }}'

diff --git 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
@@ -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
@@ -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
@@ -354,9 +342,6 @@ platform:
  #
  #-----------------------------------------------------------------------
  #
- MET_INSTALL_DIR: ""
- MET_BIN_EXEC: ""
- METPLUS_PATH: ""
  CCPA_OBS_DIR: ""
  NOHRSC_OBS_DIR: ""
  MRMS_OBS_DIR: ""

diff --git 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
@@ -25,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
@@ -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
@@ -25,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/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
@@ -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
@@ -26,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/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
@@ -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