Mods for HRRR-smoke verification

Author: mkavulich

parm/data_locations.yml

@@ -279,13 +279,16 @@ HRRR:
     archive_path:
       - /NCEPPROD/hpssprod/runhistory/rh{yyyy}/{yyyymm}/{yyyymmdd}
       - /NCEPPROD/hpssprod/runhistory/rh{yyyy}/{yyyymm}/{yyyymmdd}
+      - /NCEPPROD/hpssprod/runhistory/rh{yyyy}/{yyyymm}/{yyyymmdd}
     archive_internal_dir:
       - ./
       - ./
+      - ./
     archive_file_names:
       # HRRR forecasts are binned into 6 hour tar files.
       - gpfs_hps_nco_ops_com_hrrr_prod_hrrr.{yyyymmdd}_conus{bin6}.wrf.tar
       - com_hrrr_prod_hrrr.{yyyymmdd}_conus{bin6}.wrf.tar
+      - com_hrrr_v4.1_hrrr.{yyyymmdd}_conus{bin6}.wrf.tar
     file_names: &hrrr_file_names
       anl:
         - hrrr.t{hh}z.wrfprsf{fcst_hr:02d}.grib2

parm/wflow/pygraf.yaml

@@ -7,26 +7,34 @@ task_run_pygraf:
     maxtries: '1'
   envars: &default_envars
     GLOBAL_VAR_DEFNS_FP: '&GLOBAL_VAR_DEFNS_FP;'
-    PDY: !cycstr "@Y@m@d"
-    cyc: !cycstr "@H"
-    fhr: '#fhr#'
-    LOGDIR: !cycstr "&LOGDIR;"
-    nprocs: '{{ parent.nnodes * parent.ppn }}'
+    PDY:
+      cyclestr:
+        value: "@Y@m@d"
+    cyc:
+      cyclestr:
+        value: "@H"
+    LOGDIR:
+      cyclestr:
+        value: "&LOGDIR;"
+    nprocs: '{{ task_pygraf.execution.batchargs.nodes * task_pygraf.execution.batchargs.tasks_per_node }}'
     PYGRAF_DIR: "&PYGRAF_DIR;"
-    OUTDIR: !cycstr "&FCST_DIR;/pygraf"
+    OUTDIR:
+      cyclestr:
+        value: "&FCST_DIR;/pygraf"
     VX_FCST_INPUT_BASEDIR: '{{ verification.VX_FCST_INPUT_BASEDIR }}'
-    CAPTION: '{{ pygraf.caption }}'
-    RESOLUTION: '{{ pygraf.resolution }}'
-  join: !cycstr '&LOGDIR;/{{ jobname }}_@Y@m@d@H&LOGEXT;'
+    CAPTION: '{{ task_pygraf.envvars.caption }}'
+    RESOLUTION: '{{ task_pygraf.envvars.resolution }}'
+  join:
+    cyclestr:
+      value: '&LOGDIR;/{{ jobname }}_@Y@m@d@H&LOGEXT;'
+  memory: '{{ task_pygraf.execution.batchargs.memory }}'
   native: '{{ platform.SCHED_NATIVE_CMD }}'
-  nnodes: 1
-  nodes: '{{ nnodes }}:ppn={{ ppn }}'
+  nodes: '{{ task_pygraf.execution.batchargs.nodes }}:ppn={{ task_pygraf.execution.batchargs.tasks_per_node }}'
   partition: '{% if platform.get("PARTITION_DEFAULT") %}&PARTITION_DEFAULT;{% else %}None{% endif %}'
-  ppn: 24
   queue: '&QUEUE_DEFAULT;'
-  walltime: 01:00:00
+  walltime: '{{ task_pygraf.execution.batchargs.walltime }}'
 
-  command: !cycstr '&LOAD_MODULES_RUN_TASK; "pygraf" "&USHdir;/run_pygraf.sh"'
+  command: '&LOAD_MODULES_RUN_TASK; "pygraf" "&USHdir;/run_pygraf.sh"'
   dependency:
     and:
       metataskdep_check_post_output: &check_post_output

scripts/exregional_run_met_pcpcombine.sh

@@ -205,11 +205,20 @@ if [ "${FCST_OR_OBS}" = "FCST" ]; then
     PCP_COMBINE_METHOD="USER_DEFINED"
 
     if [ "${FIELD_GROUP}" = "PM25" ]; then
-    # Need to combine two fields (different PM types) and convert units from forecast files to create PM25 equivalent to obs
-      PCP_COMBINE_COMMAND="-add {FCST_PCP_COMBINE_INPUT_DIR}/{FCST_PCP_COMBINE_INPUT_TEMPLATE} 'name=\"MASSDEN\"; level=\"Z8\"; GRIB2_aerosol_type=62010; convert(x)=x*1e9;' {FCST_PCP_COMBINE_INPUT_DIR}/{FCST_PCP_COMBINE_INPUT_TEMPLATE} 'name=\"MASSDEN\"; level=\"Z8\"; GRIB2_aerosol_type=62001; GRIB2_aerosol_interval_type=0; convert(x)=x*1e9;'"
+      if [ "${FCST_SMOKE_TYPE}" = "HRRR" ]; then
+        # for HRRR, all PM 2.5 is a single variable, so just pass through
+        PCP_COMBINE_COMMAND="-add {FCST_PCP_COMBINE_INPUT_DIR}/{FCST_PCP_COMBINE_INPUT_TEMPLATE} -field 'name=\"MASSDEN\"; level=\"Z8\"; convert(x)=x*1e9;'"
+      elif [ "${FCST_SMOKE_TYPE}" = "RRFS" ]; then
+        # Need to combine two fields (different PM types) and convert units from forecast files to create PM25 equivalent to obs
+        PCP_COMBINE_COMMAND="-add {FCST_PCP_COMBINE_INPUT_DIR}/{FCST_PCP_COMBINE_INPUT_TEMPLATE} 'name=\"MASSDEN\"; level=\"Z8\"; GRIB2_aerosol_type=62010; convert(x)=x*1e9;' {FCST_PCP_COMBINE_INPUT_DIR}/{FCST_PCP_COMBINE_INPUT_TEMPLATE} 'name=\"MASSDEN\"; level=\"Z8\"; GRIB2_aerosol_type=62001; GRIB2_aerosol_interval_type=0; convert(x)=x*1e9;'"
+      fi
     elif [ "${FIELD_GROUP}" = "PM10" ]; then
-    # for PM10, command is just a passthrough
-      PCP_COMBINE_COMMAND="-add {FCST_PCP_COMBINE_INPUT_DIR}/{FCST_PCP_COMBINE_INPUT_TEMPLATE} -field 'name=\"MASSDEN\"; level=\"Z8\"; GRIB2_aerosol_type=62001; GRIB2_aerosol_interval_type=2; convert(x)=x*1e9;'"
+      if [ "${FCST_SMOKE_TYPE}" = "RRFS" ]; then
+        # for PM10, command is just a passthrough
+        PCP_COMBINE_COMMAND="-add {FCST_PCP_COMBINE_INPUT_DIR}/{FCST_PCP_COMBINE_INPUT_TEMPLATE} -field 'name=\"MASSDEN\"; level=\"Z8\"; GRIB2_aerosol_type=62001; GRIB2_aerosol_interval_type=2; convert(x)=x*1e9;'"
+      else
+        print_err_msg_exit "PM10 only available for RRFS output, not available for ${FCST_SMOKE_TYPE}"
+      fi
     fi
   fi
 elif [ "${FCST_OR_OBS}" = "OBS" ]; then

ush/config_defaults.yaml

@@ -2669,6 +2669,14 @@ verification:
 
   AIRNOW_INPUT_FORMAT: "airnowhourlyaqobs"
 
+  # FCST_SMOKE_TYPE:
+  # Different forecast data have different particulate matter variables that must be verified differently.
+  # Options are:
+  # HRRR: HRRR output contains only PM 2.5 in a variable named MASSDEN.
+  # RRFS: RRFS output contains three MASSDEN variables, one of which is PM 10 and the other two combined
+  #       are summed in PCP Combine task to get total PM 2.5 
+
+  FCST_SMOKE_TYPE: RRFS
   #
   # OBS_DATA_STORE*:
   # Location(s) to retrieve observation data from. Valid values are "aws" and/or "hpss", see
@@ -3174,6 +3182,13 @@ fire:
   FIRE_IGNITION_START_TIME: 6480
   FIRE_IGNITION_END_TIME: 7000
 
-pygraf:
-  caption: "plot"
-  resolution: 150
+task_pygraf:
+  execution:
+    batchargs:
+      memory: 60G
+      nodes: 1
+      tasks_per_node: 24
+      walltime: 00:30:00
+  envvars:
+    caption: "plot"
+    resolution: 150

ush/experiment.jsonschema

@@ -212,6 +212,13 @@
     "verification": {
       "additionalProperties": true,
       "properties": {
+        "FCST_SMOKE_TYPE": {
+          "enum": [
+            "HRRR",
+            "RRFS"
+          ],
+          "type": "string"
+        },
         "VX_APCP_ACCUMS_HRS": {
           "prefixItems": [
             {

ush/run_pygraf.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+  
+cd ${PYGRAF_DIR}
+python3 -u create_graphics.py maps -d ${VX_FCST_INPUT_BASEDIR}/${PDY}${cyc} -f 0 ${FCST_LEN_HRS} --file_type prs --file_tmpl "hrrr.t${cyc}z.wrfprsf{FCST_TIME:02d}.grib2" --images image_lists/hrrr_smoke.yml hourly -m "${CAPTION}" -n $nprocs -o $OUTDIR -s ${PDY}${cyc} -r ${RESOLUTION}
+