Second set of changes from branch feature/daily_obs_tasks_hrrrcast in…

…to branch feature/daily_obs_tasks_hrrrcast_trial_mods.
gsketefian · Nov 30, 2024 · 435a930 · 435a930
1 parent 3529cce
commit 435a930
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 13 deletions.
diff --git a/parm/wflow/default_workflow.yaml b/parm/wflow/default_workflow.yaml
@@ -3,22 +3,26 @@
 #
 rocoto:
   entities:
+    ACCOUNT: '{{ user.ACCOUNT }}'
     ACCUM_HH_APCP: '{%- for ah in verification.VX_APCP_ACCUMS_HRS %}
                       {%- if workflow.FCST_LEN_HRS >= ah %}
                         {{- "%02d " % ah }}
                       {%- endif %}
                     {%- endfor %}'
-    OBS_AVAIL_INTVL_HRS_CCPA: '{{- verification.CCPA_OBS_AVAIL_INTVL_HRS }}'
     ACCUM_HH_ASNOW: '{%- for ah in verification.VX_ASNOW_ACCUMS_HRS %}
                        {%- if workflow.FCST_LEN_HRS >= ah %}
                          {{- "%02d " % ah }}
                        {%- endif %}
                      {%- endfor %}'
-    OBS_AVAIL_INTVL_HRS_NOHRSC: '{{- verification.NOHRSC_OBS_AVAIL_INTVL_HRS }}'
-    ACCOUNT: '{{ user.ACCOUNT }}'
     CCPA_OBS_DIR: '{{ verification.CCPA_OBS_DIR }}'
     COLDSTART: '{{ workflow.COLDSTART }}'
     COMINgfs: '{{ platform.get("COMINgfs") }}'
+    ENSMEM_INDICES: '{%- for mem_indx in global.ENSMEM_INDS %}
+                       {{- mem_indx ~ " " }}
+                     {%- endfor %}'
+    ENSMEM_NAMES: '{%- for mem_name in global.ENSMEM_NAMES %}
+                     {{- mem_name ~ " " }}
+                   {%- endfor %}'
     GLOBAL_VAR_DEFNS_FP: '{{ workflow.GLOBAL_VAR_DEFNS_FP }}'
     HOMEdir: '{{ user.HOMEdir }}'
     JOBSdir: '{{ user.JOBSdir }}'
@@ -43,12 +47,6 @@ rocoto:
                           {%- if global.DO_ENSEMBLE %}
                             {{- "#mem_name#" }}
                           {%- endif %}'
-    ENSMEM_INDICES: '{%- for mem_indx in global.ENSMEM_INDS %}
-                       {{- mem_indx ~ " " }}
-                     {%- endfor %}'
-    ENSMEM_NAMES: '{%- for mem_name in global.ENSMEM_NAMES %}
-                     {{- mem_name ~ " " }}
-                   {%- endfor %}'
     USHdir: '{{ user.USHdir }}'
     WARMSTART_CYCLE_DIR: '{{ workflow.WARMSTART_CYCLE_DIR }}'
     WORKFLOW_ID: '{{ workflow.WORKFLOW_ID }}'

diff --git a/scripts/exregional_run_met_gridstat_or_pointstat_vx.sh b/scripts/exregional_run_met_gridstat_or_pointstat_vx.sh
@@ -133,9 +133,9 @@ else
 # Note that ACCUM_HH will not be defined for the REFC, RETOP, SFC, and
 # UPA field groups.
   set_vx_params \
-    obtype="${OBTYPE}" \
     field_group="${FIELD_GROUP}" \
     accum_hh="${ACCUM_HH:-}" \
+    outvarname_obtype="obtype" \
     outvarname_grid_or_point="grid_or_point" \
     outvarname_fieldname_in_MET_filedir_names="FIELDNAME_IN_MET_FILEDIR_NAMES"
 
@@ -272,7 +272,7 @@ STAGING_DIR="${OUTPUT_BASE}/stage/${FIELDNAME_IN_MET_FILEDIR_NAMES}"
 #
 #-----------------------------------------------------------------------
 #
-case "$OBTYPE" in
+case "${obtype}" in
   "CCPA"|"NOHRSC")
     vx_intvl="$((10#${ACCUM_HH}))"
     vx_hr_start="${vx_intvl}"
@@ -440,7 +440,7 @@ settings="\
 # Field information.
 #
 'fieldname_in_met_filedir_names': '${FIELDNAME_IN_MET_FILEDIR_NAMES}'
-'obtype': '${OBTYPE}'
+'obtype': '${obtype}'
 'accum_hh': '${ACCUM_HH:-}'
 'accum_no_pad': '${ACCUM_NO_PAD:-}'
 'metplus_templates_dir': '${METPLUS_CONF:-}'

diff --git a/ush/setup.py b/ush/setup.py
@@ -1588,9 +1588,14 @@ def _get_location(xcs, fmt, expt_cfg):
     #
     # -----------------------------------------------------------------------
     #
+    if do_ensemble:
+        ensmem_indx_min = 1
+    else:
+        ensmem_indx_min = 0
+
     # The ensemble member indices.
     num_ens_members = global_sect["NUM_ENS_MEMBERS"]
-    ensmem_inds = [i for i in range(1,num_ens_members+1)]
+    ensmem_inds = [i for i in range(ensmem_indx_min,num_ens_members+1)]
     global_sect["ENSMEM_INDS"] = ensmem_inds
 
     # Formatted counterparts of the ensemble member indices.  These are strings.