Modify ensemble vx task and metatask names to match those for determi…

…nistic vx. Make corresponding changes in the docs.
ufs-community · Nov 4, 2024 · ddf1a55 · ddf1a55
1 parent f1bd90a
commit ddf1a55
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 28 deletions.
diff --git a/doc/UsersGuide/BuildingRunningTesting/RunSRW.rst b/doc/UsersGuide/BuildingRunningTesting/RunSRW.rst
@@ -839,11 +839,11 @@ about metatasks.
 
 .. _VXWorkflowTasksTable:
 
-.. list-table:: Verification (VX) Workflow Tasks and Metatasks in the SRW App
+.. list-table:: Default Verification (VX) Workflow Tasks and Metatasks in the SRW App
    :widths: 5 95
    :header-rows: 1
 
-   * - Workflow Task (``taskgroup``)
+   * - Workflow (Meta)Task (``taskgroup``)
      - Task Description
 
    * - :bolditalic:`task_get_obs_ccpa` (``verify_pre.yaml``)
@@ -1004,41 +1004,41 @@ about metatasks.
        is included in ``VX_FIELD_GROUPS``, and the ones for ``UPA`` are included only if ``DO_ENSEMBLE`` is set to
        ``True`` in ``config.yaml`` and ``'UPA'`` is included in ``VX_FIELD_GROUPS``.
 
-   * - :bolditalic:`metatask_GridStat_ensmeanprob_APCP_all_accums` (``verify_ens.yaml``)
+   * - :bolditalic:`metatask_GridStat_APCP_all_accums_ensmeanprob` (``verify_ens.yaml``)
      - Set of tasks that run grid-to-grid verification of the ensemble mean of APCP and grid-to-grid probabilistic
        verification of the ensemble of APCP forecasts as a whole.  In rocoto, the tasks under this metatask for
-       ensemble mean verification are named ``run_MET_GridStat_vx_ensmean_APCP{accum_intvl}h``, and the ones for
-       ensemble probabilistic verification are named ``run_MET_GridStat_vx_ensprob_APCP{accum_intvl}h``, where
+       ensemble mean verification are named ``run_MET_GridStat_vx_APCP{accum_intvl}h_ensmean``, and the ones for
+       ensemble probabilistic verification are named ``run_MET_GridStat_vx_APCP{accum_intvl}h_ensprob``, where
        ``{accum_intvl}`` is the accumulation interval (in hours, e.g. ``01``, ``03``, ``06``, etc) for which the
        tasks are being run.  This metatask is included in the workflow only if ``DO_ENSEMBLE`` is set to ``True``
        in ``config.yaml`` and ``'APCP'`` is included in ``VX_FIELD_GROUPS``.
 
-   * - :bolditalic:`metatask_GridStat_ensmeanprob_ASNOW_all_accums` (``verify_ens.yaml``)
+   * - :bolditalic:`metatask_GridStat_ASNOW_all_accums_ensmeanprob` (``verify_ens.yaml``)
      - Set of tasks that run grid-to-grid verification of the ensemble mean of ASNOW and grid-to-grid probabilistic
        verification of the ensemble of ASNOW forecasts as a whole.  In rocoto, the tasks under this metatask for
-       ensemble mean verification are named ``run_MET_GridStat_vx_ensmean_ASNOW{accum_intvl}h``, and the ones for
-       ensemble probabilistic verification are named ``run_MET_GridStat_vx_ensprob_ASNOW{accum_intvl}h``, where
+       ensemble mean verification are named ``run_MET_GridStat_vx_ASNOW{accum_intvl}h_ensmean``, and the ones for
+       ensemble probabilistic verification are named ``run_MET_GridStat_vx_ASNOW{accum_intvl}h_ensprob``, where
        ``{accum_intvl}`` is the accumulation interval (in hours, e.g. ``01``, ``03``, ``06``, etc) for which the
        tasks are being run.  These tasks will be included in the workflow only if ``DO_ENSEMBLE`` is set to ``True``
        in ``config.yaml`` and ``'ASNOW'`` is included in ``VX_FIELD_GROUPS``.
 
-   * - :bolditalic:`metatask_GridStat_ensprob_REFC_RETOP` (``verify_ens.yaml``)
+   * - :bolditalic:`metatask_GridStat_REFC_RETOP_ensprob` (``verify_ens.yaml``)
      - Set of tasks that run grid-to-grid probabilistic verification of the ensemble of :term:`composite reflectivity`
        (represented by the verification field group ``REFC``) and :term:`echo top` (represented by the field group
        ``RETOP``).  (Note that there is no grid-to-grid verification of the ensemble mean of these quantities.)
-       In rocoto, the tasks under this metatask are named ``run_MET_GridStat_vx_ensprob_{field_group}``, where
+       In rocoto, the tasks under this metatask are named ``run_MET_GridStat_vx_{field_group}_ensprob``, where
        ``{field_group}`` is the field group (in this case either ``REFC`` or ``RETOP``) for which the task is
        being run.  The task for ``REFC`` is included in the workflow only if ``DO_ENSEMBLE`` is set to ``True``
        in ``config.yaml`` and ``'REFC'`` is included in ``VX_FIELD_GROUPS``, and the one for ``RETOP`` is included 
        only if ``DO_ENSEMBLE`` is set to ``True`` in ``config.yaml`` and ``'RETOP'`` is included in ``VX_FIELD_GROUPS``.
 
-   * - :bolditalic:`metatask_PointStat_ensmeanprob_SFC_UPA` (``verify_ens.yaml``)
+   * - :bolditalic:`metatask_PointStat_SFC_UPA_ensmeanprob` (``verify_ens.yaml``)
      - Set of tasks that run grid-to-grid verification of the ensemble mean of surface fields (represented by the
        verification field group ``SFC``) and upper-air fields (represented by the verification field group ``UPA``)
        as well as grid-to-grid probabilistic verification of the ensemble of the surface and upper-air field
        forecasts as a whole.  In rocoto, the tasks under this metatask for ensemble mean verification are named
-       ``run_MET_PointStat_vx_ensmean_{field_group}``, and the ones for ensemble probabilistic verification are
-       named ``run_MET_PointStat_vx_ensprob_{field_group}``, where ``{field_group}`` is the field group (in this
+       ``run_MET_PointStat_vx_{field_group}_ensmean``, and the ones for ensemble probabilistic verification are
+       named ``run_MET_PointStat_vx_{field_group}_ensprob``, where ``{field_group}`` is the field group (in this
        case either ``SFC`` or ``UPA``) on which the task is being run.  The tasks for ``SFC`` are included in the
        workflow only if ``DO_ENSEMBLE`` is set to ``True`` in ``config.yaml`` and ``'SFC'`` is included in
        ``VX_FIELD_GROUPS``, and the ones for ``UPA`` are included only if ``DO_ENSEMBLE`` is set to ``True`` in

diff --git a/parm/wflow/verify_ens.yaml b/parm/wflow/verify_ens.yaml
@@ -192,14 +192,14 @@ metatask_GenEnsProd_EnsembleStat_SFC_UPA:
           attrs:
             task: run_MET_GenEnsProd_vx_#FIELD_GROUP#
 
-metatask_GridStat_ensmeanprob_APCP_all_accums:
+metatask_GridStat_APCP_all_accums_ensmeanprob:
   var:
     stat: MEAN PROB
     statlc: mean prob
-  metatask_GridStat_ens#statlc#_APCP_all_accums:
+  metatask_GridStat_APCP_all_accums_ens#statlc#:
     var:
       ACCUM_HH: '{% for ah in verification.VX_APCP_ACCUMS_HRS %}{% if workflow.FCST_LEN_HRS >= ah %}{{ "%02d " % ah }}{% endif %}{% endfor %}'
-    task_run_MET_GridStat_vx_ens#statlc#_APCP#ACCUM_HH#h:
+    task_run_MET_GridStat_vx_APCP#ACCUM_HH#h_ens#statlc#:
       <<: *default_task_verify_ens
       command: '&LOAD_MODULES_RUN_TASK; "run_vx" "&JOBSdir;/JREGIONAL_RUN_MET_GRIDSTAT_OR_POINTSTAT_VX_ENS#stat#"'
       envars:
@@ -219,14 +219,14 @@ metatask_GridStat_ensmeanprob_APCP_all_accums:
             attrs:
               task: run_MET_GenEnsProd_vx_APCP#ACCUM_HH#h
 
-metatask_GridStat_ensmeanprob_ASNOW_all_accums:
+metatask_GridStat_ASNOW_all_accums_ensmeanprob:
   var:
     stat: MEAN PROB
     statlc: mean prob
-  metatask_GridStat_ens#statlc#_ASNOW_all_accums:
+  metatask_GridStat_ASNOW_all_accums_ens#statlc#:
     var:
       ACCUM_HH: '{% for ah in verification.VX_ASNOW_ACCUMS_HRS %}{% if workflow.FCST_LEN_HRS >= ah %}{{ "%02d " % ah }}{% endif %}{% endfor %}'
-    task_run_MET_GridStat_vx_ens#statlc#_ASNOW#ACCUM_HH#h:
+    task_run_MET_GridStat_vx_ASNOW#ACCUM_HH#h_ens#statlc#:
       <<: *default_task_verify_ens
       command: '&LOAD_MODULES_RUN_TASK; "run_vx" "&JOBSdir;/JREGIONAL_RUN_MET_GRIDSTAT_OR_POINTSTAT_VX_ENS#stat#"'
       envars:
@@ -246,10 +246,10 @@ metatask_GridStat_ensmeanprob_ASNOW_all_accums:
             attrs:
               task: run_MET_GenEnsProd_vx_ASNOW#ACCUM_HH#h
 
-metatask_GridStat_ensprob_REFC_RETOP:
+metatask_GridStat_REFC_RETOP_ensprob:
   var:
     FIELD_GROUP: '{% for var in verification.VX_FIELD_GROUPS %}{% if var in ["REFC", "RETOP"] %}{{ "%s " % var }}{% endif %}{% endfor %}'
-  task_run_MET_GridStat_vx_ensprob_#FIELD_GROUP#:
+  task_run_MET_GridStat_vx_#FIELD_GROUP#_ensprob:
     <<: *default_task_verify_ens
     command: '&LOAD_MODULES_RUN_TASK; "run_vx" "&JOBSdir;/JREGIONAL_RUN_MET_GRIDSTAT_OR_POINTSTAT_VX_ENSPROB"'
     envars:
@@ -269,14 +269,14 @@ metatask_GridStat_ensprob_REFC_RETOP:
           attrs:
             task: run_MET_GenEnsProd_vx_#FIELD_GROUP#
 
-metatask_PointStat_ensmeanprob_SFC_UPA:
+metatask_PointStat_SFC_UPA_ensmeanprob:
   var:
     stat: MEAN PROB
     statlc: mean prob
-  metatask_PointStat_ens#statlc#_SFC_UPA:
+  metatask_PointStat_SFC_UPA_ens#statlc#:
     var:
       FIELD_GROUP: '{% for var in verification.VX_FIELD_GROUPS %}{% if var in ["SFC", "UPA"] %}{{ "%s " % var }}{% endif %}{% endfor %}'
-    task_run_MET_PointStat_vx_ens#statlc#_#FIELD_GROUP#:
+    task_run_MET_PointStat_vx_#FIELD_GROUP#_ens#statlc#:
       <<: *default_task_verify_ens
       command: '&LOAD_MODULES_RUN_TASK; "run_vx" "&JOBSdir;/JREGIONAL_RUN_MET_GRIDSTAT_OR_POINTSTAT_VX_ENS#stat#"'
       envars:

diff --git a/ush/setup.py b/ush/setup.py
@@ -741,7 +741,7 @@ def _remove_tag(tasks, tag):
            "metatask_PcpCombine_APCP_all_accums_all_mems",
            "metatask_GridStat_APCP_all_accums_all_mems",
            "metatask_GenEnsProd_EnsembleStat_APCP_all_accums",
-           "metatask_GridStat_ensmeanprob_APCP_all_accums"]
+           "metatask_GridStat_APCP_all_accums_ensmeanprob"]
 
         vx_field_groups_all_by_obtype["NOHRSC"] = ["ASNOW"]
         vx_metatasks_all_by_obtype["NOHRSC"] \
@@ -750,22 +750,22 @@ def _remove_tag(tasks, tag):
            "metatask_PcpCombine_ASNOW_all_accums_all_mems",
            "metatask_GridStat_ASNOW_all_accums_all_mems",
            "metatask_GenEnsProd_EnsembleStat_ASNOW_all_accums",
-           "metatask_GridStat_ensmeanprob_ASNOW_all_accums"]
+           "metatask_GridStat_ASNOW_all_accums_ensmeanprob"]
 
         vx_field_groups_all_by_obtype["MRMS"] = ["REFC", "RETOP"]
         vx_metatasks_all_by_obtype["MRMS"] \
         = ["task_get_obs_mrms",
            "metatask_GridStat_REFC_RETOP_all_mems",
            "metatask_GenEnsProd_EnsembleStat_REFC_RETOP",
-           "metatask_GridStat_ensprob_REFC_RETOP"]
+           "metatask_GridStat_REFC_RETOP_ensprob"]
 
         vx_field_groups_all_by_obtype["NDAS"] = ["SFC", "UPA"]
         vx_metatasks_all_by_obtype["NDAS"] \
         = ["task_get_obs_ndas",
            "task_run_MET_Pb2nc_obs_NDAS",
            "metatask_PointStat_SFC_UPA_all_mems",
            "metatask_GenEnsProd_EnsembleStat_SFC_UPA",
-           "metatask_PointStat_ensmeanprob_SFC_UPA"]
+           "metatask_PointStat_SFC_UPA_ensmeanprob"]
 
         # If there are no field groups specified for verification, remove those
         # tasks that are common to all observation types.