Revert "[develop] Enable deterministic verification to be run from st…

…aged forecast files (#566)" This reverts commit 373d1aa.
ufs-community · Feb 7, 2023 · 0412338 · 0412338
1 parent 373d1aa
commit 0412338
Show file tree

Hide file tree

Showing 49 changed files with 139 additions and 212 deletions.
diff --git a/modulefiles/tasks/hera/run_vx.local.lua b/modulefiles/tasks/hera/run_vx.local.lua
@@ -1,9 +1,3 @@
---[[
-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.
---]]
+append_path("MODULEPATH", "/contrib/anaconda/modulefiles")
 load(pathJoin("intel", os.getenv("intel_ver") or "18.0.5.274"))
-load("miniconda_regional_workflow")
+load(pathJoin("anaconda", os.getenv("anaconda_ver") or "latest"))
diff --git a/parm/FV3LAM_wflow.xml b/parm/FV3LAM_wflow.xml
@@ -781,19 +781,11 @@ the <task> tag to be identical to the ones above for other output times.
     <envar><name>ENSMEM_INDX</name><value><cyclestr>#{{ ensmem_indx_name }}#</cyclestr></value></envar>
 
     <dependency>
-      <and>
-{#- Redundant dependency to simplify jinja code.
-This dependency will always evaluate to true.  It is included because
-rocoto does not allow empty <dependency>, <and>, and other tags.  Without
-it, we'd have to include more jinja if-statements here.
-#}
-        <streq><left>TRUE</left><right>TRUE</right></streq>
         {%- if write_dopost %}
-        <taskdep task="&RUN_FCST_TN;{{ uscore_ensmem_name }}"/>
-        {%- elif run_task_run_post %}
-        <metataskdep metatask="&RUN_POST_TN;{{ uscore_ensmem_name }}"/>
+      <taskdep task="&RUN_FCST_TN;{{ uscore_ensmem_name }}"/>
+        {%- else %}
+      <metataskdep metatask="&RUN_POST_TN;{{ uscore_ensmem_name }}"/>
         {%- endif %}
-      </and>
     </dependency>
 
   </task>
@@ -930,18 +922,22 @@ it, we'd have to include more jinja if-statements here.
     {%- endif %}
 
     <dependency>
-      <and>
-{#- Redundant dependency to simplify jinja code. #}
-        <streq><left>TRUE</left><right>TRUE</right></streq>
       {%- if run_task_get_obs_ccpa %}
+      <and>
         <taskdep task="&GET_OBS_CCPA_TN;"/>
-      {%- endif %}
-      {%- if write_dopost %}
+        {%- if write_dopost %}
         <taskdep task="&RUN_FCST_TN;{{ uscore_ensmem_name }}"/>
-      {%- elif run_task_run_post %}
+        {%- else %}
         <metataskdep metatask="&RUN_POST_TN;{{ uscore_ensmem_name }}"/>
-      {%- endif %}
+        {%- endif %}
       </and>
+      {%- else %}
+        {%- if write_dopost %}
+      <taskdep task="&RUN_FCST_TN;{{ uscore_ensmem_name }}"/>
+        {%- else %}
+      <metataskdep metatask="&RUN_POST_TN;{{ uscore_ensmem_name }}"/>
+        {%- endif %}
+      {%- endif %}
     </dependency>
 
   </task>
@@ -981,18 +977,22 @@ it, we'd have to include more jinja if-statements here.
     {%- endif %}
 
     <dependency>
-      <and>
-{#- Redundant dependency to simplify jinja code. #}
-        <streq><left>TRUE</left><right>TRUE</right></streq>
       {%- if run_task_get_obs_mrms %}
+      <and>
         <taskdep task="&GET_OBS_MRMS_TN;"/>
-      {%- endif %}
-      {%- if write_dopost %}
+        {%- if write_dopost %}
         <taskdep task="&RUN_FCST_TN;{{ uscore_ensmem_name }}"/>
-      {%- elif run_task_run_post %}
+        {%- else %}
         <metataskdep metatask="&RUN_POST_TN;{{ uscore_ensmem_name }}"/>
-      {%- endif %}
+        {%- endif %}
       </and>
+      {%- else %}
+        {%- if write_dopost %}
+      <taskdep task="&RUN_FCST_TN;{{ uscore_ensmem_name }}"/>
+        {%- else %}
+      <metataskdep metatask="&RUN_POST_TN;{{ uscore_ensmem_name }}"/>
+        {%- endif %}
+      {%- endif %}
     </dependency>
 
   </task>
@@ -1032,18 +1032,22 @@ it, we'd have to include more jinja if-statements here.
     {%- endif %}
 
     <dependency>
-      <and>
-{#- Redundant dependency to simplify jinja code. #}
-      <streq><left>TRUE</left><right>TRUE</right></streq>
       {%- if run_task_get_obs_mrms %}
+      <and>
         <taskdep task="&GET_OBS_MRMS_TN;"/>
-      {%- endif %}
-      {%- if write_dopost %}
+        {%- if write_dopost %}
         <taskdep task="&RUN_FCST_TN;{{ uscore_ensmem_name }}"/>
-      {%- elif run_task_run_post %}
+        {%- else %}
         <metataskdep metatask="&RUN_POST_TN;{{ uscore_ensmem_name }}"/>
-      {%- endif %}
+        {%- endif %}
       </and>
+      {%- else %}
+        {%- if write_dopost %}
+      <taskdep task="&RUN_FCST_TN;{{ uscore_ensmem_name }}"/>
+        {%- else %}
+      <metataskdep metatask="&RUN_POST_TN;{{ uscore_ensmem_name }}"/>
+        {%- endif %}
+      {%- endif %}
     </dependency>
 
   </task>
@@ -1205,18 +1209,22 @@ it, we'd have to include more jinja if-statements here.
     {%- endif %}
 
     <dependency>
-      <and>
-{#- Redundant dependency to simplify jinja code. #}
-      <streq><left>TRUE</left><right>TRUE</right></streq>
       {%- if run_task_get_obs_ndas %}
+      <and>
         <taskdep task="&GET_OBS_NDAS_TN;"/>
-      {%- endif %}
-      {%- if write_dopost %}
+        {%- if write_dopost %}
         <taskdep task="&RUN_FCST_TN;{{ uscore_ensmem_name }}"/>
-      {%- elif run_task_run_post %}
+        {%- else %}
         <metataskdep metatask="&RUN_POST_TN;{{ uscore_ensmem_name }}"/>
-      {%- endif %}
+        {%- endif %}
       </and>
+      {%- else %}
+        {%- if write_dopost %}
+      <taskdep task="&RUN_FCST_TN;{{ uscore_ensmem_name }}"/>
+        {%- else %}
+      <metataskdep metatask="&RUN_POST_TN;{{ uscore_ensmem_name }}"/>
+        {%- endif %}
+      {%- endif %}
     </dependency>
 
   </task>

diff --git a/parm/metplus/EnsembleStat_APCP01h.conf b/parm/metplus/EnsembleStat_APCP01h.conf
@@ -28,7 +28,7 @@ INIT_INCREMENT=3600
 LEAD_SEQ = {ENV[fhr_list]}
 
 # Used in the MET config file for:  model, output_prefix
-MODEL = {ENV[VX_FCST_MODEL_NAME]}
+MODEL = {ENV[MODEL]}
 
 ENSEMBLE_STAT_DESC = NA ;; not in other file
 

diff --git a/parm/metplus/EnsembleStat_APCP03h.conf b/parm/metplus/EnsembleStat_APCP03h.conf
@@ -32,7 +32,7 @@ INIT_INCREMENT=3600
 LEAD_SEQ = {ENV[fhr_list]}
 
 # Used in the MET config file for:  model, output_prefix
-MODEL = {ENV[VX_FCST_MODEL_NAME]}
+MODEL = {ENV[MODEL]}
 FCST_NATIVE_DATA_TYPE = GRIB
 
 ENSEMBLE_STAT_DESC = NA ;; not in other file

diff --git a/parm/metplus/EnsembleStat_APCP06h.conf b/parm/metplus/EnsembleStat_APCP06h.conf
@@ -32,7 +32,7 @@ INIT_INCREMENT=3600
 LEAD_SEQ = {ENV[fhr_list]}
 
 # Used in the MET config file for:  model, output_prefix
-MODEL = {ENV[VX_FCST_MODEL_NAME]}
+MODEL = {ENV[MODEL]}
 FCST_NATIVE_DATA_TYPE = GRIB
 
 ENSEMBLE_STAT_DESC = NA ;; not in other file

diff --git a/parm/metplus/EnsembleStat_APCP24h.conf b/parm/metplus/EnsembleStat_APCP24h.conf
@@ -32,7 +32,7 @@ INIT_INCREMENT=3600
 LEAD_SEQ = {ENV[fhr_list]}
 
 # Used in the MET config file for:  model, output_prefix
-MODEL = {ENV[VX_FCST_MODEL_NAME]}
+MODEL = {ENV[MODEL]}
 FCST_NATIVE_DATA_TYPE = GRIB
 
 ENSEMBLE_STAT_DESC = NA ;; not in other file

diff --git a/parm/metplus/EnsembleStat_REFC.conf b/parm/metplus/EnsembleStat_REFC.conf
@@ -28,7 +28,7 @@ INIT_INCREMENT=3600
 LEAD_SEQ = {ENV[fhr_list]}
 
 # Used in the MET config file for:  model, output_prefix
-MODEL = {ENV[VX_FCST_MODEL_NAME]}
+MODEL = {ENV[MODEL]}
 
 ENSEMBLE_STAT_DESC = NA ;; not in other file
 

diff --git a/parm/metplus/EnsembleStat_RETOP.conf b/parm/metplus/EnsembleStat_RETOP.conf
@@ -28,7 +28,7 @@ INIT_INCREMENT=3600
 LEAD_SEQ = {ENV[fhr_list]}
 
 # Used in the MET config file for:  model, output_prefix
-MODEL = {ENV[VX_FCST_MODEL_NAME]}
+MODEL = {ENV[MODEL]}
 
 ENSEMBLE_STAT_DESC = NA ;; not in other file
 

diff --git a/parm/metplus/EnsembleStat_conus_sfc.conf b/parm/metplus/EnsembleStat_conus_sfc.conf
@@ -28,7 +28,7 @@ INIT_INCREMENT=3600
 LEAD_SEQ = {ENV[fhr_list]}
 
 # Used in the MET config file for:  model, output_prefix
-MODEL = {ENV[VX_FCST_MODEL_NAME]}
+MODEL = {ENV[MODEL]}
 
 ENSEMBLE_STAT_DESC = NA
 

diff --git a/parm/metplus/EnsembleStat_upper_air.conf b/parm/metplus/EnsembleStat_upper_air.conf
@@ -28,7 +28,7 @@ INIT_INCREMENT=3600
 LEAD_SEQ = begin_end_incr(0,{ENV[fhr_last]},6)
 
 # Used in the MET config file for:  model, output_prefix
-MODEL = {ENV[VX_FCST_MODEL_NAME]}
+MODEL = {ENV[MODEL]}
 
 ENSEMBLE_STAT_DESC = NA
 

diff --git a/parm/metplus/GridStat_APCP01h.conf b/parm/metplus/GridStat_APCP01h.conf
@@ -80,7 +80,7 @@ GRID_STAT_REGRID_SHAPE = SQUARE
 #GRID_STAT_GRID_WEIGHT_FLAG =
 
 # Name to identify model (forecast) data in output
-MODEL = {ENV[VX_FCST_MODEL_NAME]}
+MODEL = {ENV[MODEL]}
 FCST_NATIVE_DATA_TYPE = GRIB
 
 # Name to identify observation data in output

diff --git a/parm/metplus/GridStat_APCP01h_mean.conf b/parm/metplus/GridStat_APCP01h_mean.conf
@@ -80,7 +80,7 @@ GRID_STAT_REGRID_SHAPE = SQUARE
 #GRID_STAT_GRID_WEIGHT_FLAG =
 
 # Name to identify model (forecast) data in output
-MODEL = {ENV[VX_FCST_MODEL_NAME]}_mean
+MODEL = {ENV[MODEL]}_mean
 FCST_NATIVE_DATA_TYPE = GRIB
 
 # Name to identify observation data in output
@@ -157,7 +157,7 @@ FCST_IS_PROB = False
 # Only used if FCST_IS_PROB is true - sets probabilistic threshold
 FCST_GRID_STAT_PROB_THRESH = ==0.1
 
-GRID_STAT_OUTPUT_PREFIX = {ENV[VX_FCST_MODEL_NAME]}_APCP_{ENV[acc]}_{OBTYPE}_mean
+GRID_STAT_OUTPUT_PREFIX = {ENV[MODEL]}_APCP_{ENV[acc]}_{OBTYPE}_mean
 
 # Climatology data
 #GRID_STAT_CLIMO_MEAN_FILE_NAME =
@@ -253,7 +253,7 @@ STAGING_DIR = {OUTPUT_BASE}/stage/APCP_01h_mean
 [filename_templates]
 
 # Template to look for forecast input to GridStat relative to FCST_GRID_STAT_INPUT_DIR
-FCST_GRID_STAT_INPUT_TEMPLATE = ensemble_stat_{ENV[VX_FCST_MODEL_NAME]}_APCP_{ENV[acc]}_{OBTYPE}_{valid?fmt=%Y%m%d}_{valid?fmt=%H%M%S}V_ens.nc
+FCST_GRID_STAT_INPUT_TEMPLATE = ensemble_stat_{ENV[MODEL]}_APCP_{ENV[acc]}_{OBTYPE}_{valid?fmt=%Y%m%d}_{valid?fmt=%H%M%S}V_ens.nc
 
 # Template to look for observation input to GridStat relative to OBS_GRID_STAT_INPUT_DIR
 OBS_GRID_STAT_INPUT_TEMPLATE = {valid?fmt=%Y%m%d}/ccpa.t{valid?fmt=%H}z.01h.hrap.conus.gb2

diff --git a/parm/metplus/GridStat_APCP01h_prob.conf b/parm/metplus/GridStat_APCP01h_prob.conf
@@ -80,7 +80,7 @@ GRID_STAT_REGRID_SHAPE = SQUARE
 #GRID_STAT_GRID_WEIGHT_FLAG =
 
 # Name to identify model (forecast) data in output
-MODEL = {ENV[VX_FCST_MODEL_NAME]}_prob
+MODEL = {ENV[MODEL]}_prob
 FCST_NATIVE_DATA_TYPE = GRIB
 
 # Name to identify observation data in output
@@ -168,7 +168,7 @@ FCST_PROB_IN_GRIB_PDS = False
 # Only used if FCST_IS_PROB is true - sets probabilistic threshold
 FCST_GRID_STAT_PROB_THRESH = ==0.1
 
-GRID_STAT_OUTPUT_PREFIX = {ENV[VX_FCST_MODEL_NAME]}_APCP_{ENV[acc]}_{OBTYPE}_prob
+GRID_STAT_OUTPUT_PREFIX = {ENV[MODEL]}_APCP_{ENV[acc]}_{OBTYPE}_prob
 
 # Climatology data
 #GRID_STAT_CLIMO_MEAN_FILE_NAME =
@@ -264,7 +264,7 @@ STAGING_DIR = {OUTPUT_BASE}/stage/APCP_01h_prob
 [filename_templates]
 
 # Template to look for forecast input to GridStat relative to FCST_GRID_STAT_INPUT_DIR
-FCST_GRID_STAT_INPUT_TEMPLATE = ensemble_stat_{ENV[VX_FCST_MODEL_NAME]}_APCP_{ENV[acc]}_{OBTYPE}_{valid?fmt=%Y%m%d}_{valid?fmt=%H%M%S}V_ens.nc
+FCST_GRID_STAT_INPUT_TEMPLATE = ensemble_stat_{ENV[MODEL]}_APCP_{ENV[acc]}_{OBTYPE}_{valid?fmt=%Y%m%d}_{valid?fmt=%H%M%S}V_ens.nc
 
 # Template to look for observation input to GridStat relative to OBS_GRID_STAT_INPUT_DIR
 OBS_GRID_STAT_INPUT_TEMPLATE = {valid?fmt=%Y%m%d}/ccpa.t{valid?fmt=%H}z.01h.hrap.conus.gb2

diff --git a/parm/metplus/GridStat_APCP03h.conf b/parm/metplus/GridStat_APCP03h.conf
@@ -105,7 +105,7 @@ GRID_STAT_REGRID_SHAPE = SQUARE
 #GRID_STAT_GRID_WEIGHT_FLAG =
 
 # Name to identify model (forecast) data in output
-MODEL = {ENV[VX_FCST_MODEL_NAME]}
+MODEL = {ENV[MODEL]}
 FCST_NATIVE_DATA_TYPE = GRIB
 FCST_PCP_COMBINE_INPUT_DATATYPE = GRIB
 

diff --git a/parm/metplus/GridStat_APCP03h_mean.conf b/parm/metplus/GridStat_APCP03h_mean.conf
@@ -80,7 +80,7 @@ GRID_STAT_REGRID_SHAPE = SQUARE
 #GRID_STAT_GRID_WEIGHT_FLAG =
 
 # Name to identify model (forecast) data in output
-MODEL = {ENV[VX_FCST_MODEL_NAME]}_mean
+MODEL = {ENV[MODEL]}_mean
 FCST_NATIVE_DATA_TYPE = GRIB
 
 # Name to identify observation data in output
@@ -157,7 +157,7 @@ FCST_IS_PROB = False
 # Only used if FCST_IS_PROB is true - sets probabilistic threshold
 FCST_GRID_STAT_PROB_THRESH = ==0.1
 
-GRID_STAT_OUTPUT_PREFIX = {ENV[VX_FCST_MODEL_NAME]}_APCP_{ENV[acc]}_{OBTYPE}_mean
+GRID_STAT_OUTPUT_PREFIX = {ENV[MODEL]}_APCP_{ENV[acc]}_{OBTYPE}_mean
 
 # Climatology data
 #GRID_STAT_CLIMO_MEAN_FILE_NAME =
@@ -253,7 +253,7 @@ STAGING_DIR = {OUTPUT_BASE}/stage/APCP_03h_mean
 [filename_templates]
 
 # Template to look for forecast input to GridStat relative to FCST_GRID_STAT_INPUT_DIR
-FCST_GRID_STAT_INPUT_TEMPLATE = ensemble_stat_{ENV[VX_FCST_MODEL_NAME]}_APCP_{ENV[acc]}_{OBTYPE}_{valid?fmt=%Y%m%d}_{valid?fmt=%H%M%S}V_ens.nc
+FCST_GRID_STAT_INPUT_TEMPLATE = ensemble_stat_{ENV[MODEL]}_APCP_{ENV[acc]}_{OBTYPE}_{valid?fmt=%Y%m%d}_{valid?fmt=%H%M%S}V_ens.nc
 
 # Template to look for observation input to GridStat relative to OBS_GRID_STAT_INPUT_DIR
 OBS_GRID_STAT_INPUT_TEMPLATE = {OBS_GRID_STAT_INPUT_DIR}/{valid?fmt=%Y%m%d}/ccpa.t{valid?fmt=%H}z.hrap.conus.gb2_a03h

diff --git a/parm/metplus/GridStat_APCP03h_prob.conf b/parm/metplus/GridStat_APCP03h_prob.conf
@@ -80,7 +80,7 @@ GRID_STAT_REGRID_SHAPE = SQUARE
 #GRID_STAT_GRID_WEIGHT_FLAG =
 
 # Name to identify model (forecast) data in output
-MODEL = {ENV[VX_FCST_MODEL_NAME]}_prob
+MODEL = {ENV[MODEL]}_prob
 FCST_NATIVE_DATA_TYPE = GRIB
 
 # Name to identify observation data in output
@@ -167,7 +167,7 @@ FCST_PROB_IN_GRIB_PDS = False
 # Only used if FCST_IS_PROB is true - sets probabilistic threshold
 FCST_GRID_STAT_PROB_THRESH = ==0.1
 
-GRID_STAT_OUTPUT_PREFIX = {ENV[VX_FCST_MODEL_NAME]}_APCP_{ENV[acc]}_{OBTYPE}_prob
+GRID_STAT_OUTPUT_PREFIX = {ENV[MODEL]}_APCP_{ENV[acc]}_{OBTYPE}_prob
 
 # Climatology data
 #GRID_STAT_CLIMO_MEAN_FILE_NAME =
@@ -263,7 +263,7 @@ STAGING_DIR = {OUTPUT_BASE}/stage/APCP_03h_prob
 [filename_templates]
 
 # Template to look for forecast input to GridStat relative to FCST_GRID_STAT_INPUT_DIR
-FCST_GRID_STAT_INPUT_TEMPLATE = ensemble_stat_{ENV[VX_FCST_MODEL_NAME]}_APCP_{ENV[acc]}_{OBTYPE}_{valid?fmt=%Y%m%d}_{valid?fmt=%H%M%S}V_ens.nc
+FCST_GRID_STAT_INPUT_TEMPLATE = ensemble_stat_{ENV[MODEL]}_APCP_{ENV[acc]}_{OBTYPE}_{valid?fmt=%Y%m%d}_{valid?fmt=%H%M%S}V_ens.nc
 
 # Template to look for observation input to GridStat relative to OBS_GRID_STAT_INPUT_DIR
 OBS_GRID_STAT_INPUT_TEMPLATE = {OBS_GRID_STAT_INPUT_DIR}/{valid?fmt=%Y%m%d}/ccpa.t{valid?fmt=%H}z.hrap.conus.gb2_a03h

diff --git a/parm/metplus/GridStat_APCP06h.conf b/parm/metplus/GridStat_APCP06h.conf
@@ -105,7 +105,7 @@ GRID_STAT_REGRID_SHAPE = SQUARE
 #GRID_STAT_GRID_WEIGHT_FLAG =
 
 # Name to identify model (forecast) data in output
-MODEL = {ENV[VX_FCST_MODEL_NAME]}
+MODEL = {ENV[MODEL]}
 FCST_NATIVE_DATA_TYPE = GRIB
 FCST_PCP_COMBINE_INPUT_DATATYPE = GRIB
 

diff --git a/parm/metplus/GridStat_APCP06h_mean.conf b/parm/metplus/GridStat_APCP06h_mean.conf
@@ -80,7 +80,7 @@ GRID_STAT_REGRID_SHAPE = SQUARE
 #GRID_STAT_GRID_WEIGHT_FLAG =
 
 # Name to identify model (forecast) data in output
-MODEL = {ENV[VX_FCST_MODEL_NAME]}_mean
+MODEL = {ENV[MODEL]}_mean
 FCST_NATIVE_DATA_TYPE = GRIB
 
 # Name to identify observation data in output
@@ -157,7 +157,7 @@ FCST_IS_PROB = False
 # Only used if FCST_IS_PROB is true - sets probabilistic threshold
 FCST_GRID_STAT_PROB_THRESH = ==0.1
 
-GRID_STAT_OUTPUT_PREFIX = {ENV[VX_FCST_MODEL_NAME]}_APCP_{ENV[acc]}_{OBTYPE}_mean
+GRID_STAT_OUTPUT_PREFIX = {ENV[MODEL]}_APCP_{ENV[acc]}_{OBTYPE}_mean
 
 # Climatology data
 #GRID_STAT_CLIMO_MEAN_FILE_NAME =
@@ -253,7 +253,7 @@ STAGING_DIR = {OUTPUT_BASE}/stage/APCP_06h_mean
 [filename_templates]
 
 # Template to look for forecast input to GridStat relative to FCST_GRID_STAT_INPUT_DIR
-FCST_GRID_STAT_INPUT_TEMPLATE = ensemble_stat_{ENV[VX_FCST_MODEL_NAME]}_APCP_{ENV[acc]}_{OBTYPE}_{valid?fmt=%Y%m%d}_{valid?fmt=%H%M%S}V_ens.nc
+FCST_GRID_STAT_INPUT_TEMPLATE = ensemble_stat_{ENV[MODEL]}_APCP_{ENV[acc]}_{OBTYPE}_{valid?fmt=%Y%m%d}_{valid?fmt=%H%M%S}V_ens.nc
 
 # Template to look for observation input to GridStat relative to OBS_GRID_STAT_INPUT_DIR
 OBS_GRID_STAT_INPUT_TEMPLATE = {OBS_GRID_STAT_INPUT_DIR}/{valid?fmt=%Y%m%d}/ccpa.t{valid?fmt=%H}z.hrap.conus.gb2_a06h