Updates from the recent develop branch merged into update-gaea-stack

ufs-community · Aug 10, 2023 · e13627b · e13627b
2 parents 5f81ccc + f2abb86
commit e13627b
Show file tree

Hide file tree

Showing 20 changed files with 44 additions and 67 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/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/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/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/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

diff --git 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
@@ -20,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
@@ -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
@@ -27,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

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