From 40b93f281dfbd0a3f3aae575801c2ab7081f4171 Mon Sep 17 00:00:00 2001
From: Christina Holt <Christina.Holt@noaa.gov>
Date: Mon, 25 Jan 2021 21:14:56 +0000
Subject: [PATCH 1/9] Adding new job file for python graphics.

---
 jobs/JREGIONAL_RUN_PYTHON_GRAPHICS | 118 +++++++++++++++++++++++++++++
 1 file changed, 118 insertions(+)
 create mode 100755 jobs/JREGIONAL_RUN_PYTHON_GRAPHICS

diff --git a/jobs/JREGIONAL_RUN_PYTHON_GRAPHICS b/jobs/JREGIONAL_RUN_PYTHON_GRAPHICS
new file mode 100755
index 000000000..8d73d6720
--- /dev/null
+++ b/jobs/JREGIONAL_RUN_PYTHON_GRAPHICS
@@ -0,0 +1,118 @@
+#!/bin/bash
+
+#
+#-----------------------------------------------------------------------
+#
+# This script runs the post-processor (UPP) on the NetCDF output files
+# of the write component of the FV3-LAM model.
+#
+#-----------------------------------------------------------------------
+#
+
+#
+#-----------------------------------------------------------------------
+#
+# Source the variable definitions file and the bash utility functions.
+#
+#-----------------------------------------------------------------------
+#
+. ${GLOBAL_VAR_DEFNS_FP}
+. $USHDIR/source_util_funcs.sh
+#
+#-----------------------------------------------------------------------
+#
+# Save current shell options (in a global array).  Then set new options
+# for this script/function.
+#
+#-----------------------------------------------------------------------
+#
+{ save_shell_opts; set -u -x; } > /dev/null 2>&1
+#
+#-----------------------------------------------------------------------
+#
+# Get the full path to the file in which this script/function is located 
+# (scrfunc_fp), the name of that file (scrfunc_fn), and the directory in
+# which the file is located (scrfunc_dir).
+#
+#-----------------------------------------------------------------------
+#
+scrfunc_fp=$( readlink -f "${BASH_SOURCE[0]}" )
+scrfunc_fn=$( basename "${scrfunc_fp}" )
+scrfunc_dir=$( dirname "${scrfunc_fp}" )
+#
+#-----------------------------------------------------------------------
+#
+# Print message indicating entry into script.
+#
+#-----------------------------------------------------------------------
+#
+print_info_msg "
+========================================================================
+Entering script:  \"${scrfunc_fn}\"
+In directory:     \"${scrfunc_dir}\"
+
+This is the J-job script for the task that runs the post-processor (UPP)
+on the output files corresponding to a specified forecast hour.
+========================================================================"
+#
+#-----------------------------------------------------------------------
+#
+# Set the run directory and post directories.
+#
+#-----------------------------------------------------------------------
+#
+
+if [ "${RUN_ENVIR}" = "nco" ]; then
+  COMOUT="${COMOUT_BASEDIR}/$RUN.$PDY/$cyc${SLASH_ENSMEM_SUBDIR}"
+  postprd_dir="$COMOUT"
+  run_dir="${COMOUT}/pyprd"
+else
+  postprd_dir="${run_dir}/postprd"
+  run_dir="${CYCLE_DIR}${SLASH_ENSMEM_SUBDIR}/pyprd"
+fi
+
+mkdir_vrfy -p "${run_dir}"
+#
+#-----------------------------------------------------------------------
+#
+# Call the ex-script for this J-job and pass to it the necessary varia-
+# bles.
+#
+#-----------------------------------------------------------------------
+#
+python ${PYTHON_GRAPHICS_DIR}/create_graphics.py \
+  skewts \
+  -d ${post_dir} \
+  -f 0 ${FCST_LEN_HRS} \
+  --file_tmpl "RRFS_CONUS.t${CDATE:8:2}z.bgrd3df{FCST_TIME:03d}.tm${CDATE:8:2}.grib2"
+  --file_type nat \
+  --max_plev 100 \
+  -n ${SLURM_CPUS_ON_NODE:-12} \
+  -o ${run_dir} \
+  -s ${CDATE} \
+  --sites ${PYSCRIPTS}/static/conus_raobs.txt \
+  -z ${run_dir}/skewt ||
+print_err_msg_exit "\
+Call to pyscript \"${scrfunc_fn}\" failed."
+#
+#-----------------------------------------------------------------------
+#
+# Print exit message.
+#
+#-----------------------------------------------------------------------
+#
+print_info_msg "
+========================================================================
+Exiting script:  \"${scrfunc_fn}\"
+In directory:    \"${scrfunc_dir}\"
+========================================================================"
+#
+#-----------------------------------------------------------------------
+#
+# Restore the shell options saved at the beginning of this script/func-
+# tion.
+#
+#-----------------------------------------------------------------------
+#
+{ restore_shell_opts; } > /dev/null 2>&1
+

From f2a13698d552215472382b8222033af7d189aad6 Mon Sep 17 00:00:00 2001
From: Christina Holt <Christina.Holt@noaa.gov>
Date: Mon, 25 Jan 2021 21:26:06 +0000
Subject: [PATCH 2/9] Adding XML task for Python SkewTs.

---
 jobs/JREGIONAL_RUN_PYTHON_GRAPHICS |  2 +-
 ush/setup.sh                       | 21 +++++++++++++++++++++
 ush/templates/FV3LAM_wflow.xml     | 29 ++++++++++++++++++++++++++++-
 3 files changed, 50 insertions(+), 2 deletions(-)

diff --git a/jobs/JREGIONAL_RUN_PYTHON_GRAPHICS b/jobs/JREGIONAL_RUN_PYTHON_GRAPHICS
index 8d73d6720..19d5c7be1 100755
--- a/jobs/JREGIONAL_RUN_PYTHON_GRAPHICS
+++ b/jobs/JREGIONAL_RUN_PYTHON_GRAPHICS
@@ -81,7 +81,7 @@ mkdir_vrfy -p "${run_dir}"
 #-----------------------------------------------------------------------
 #
 python ${PYTHON_GRAPHICS_DIR}/create_graphics.py \
-  skewts \
+  ${GRAPHICS_TYPE} \
   -d ${post_dir} \
   -f 0 ${FCST_LEN_HRS} \
   --file_tmpl "RRFS_CONUS.t${CDATE:8:2}z.bgrd3df{FCST_TIME:03d}.tm${CDATE:8:2}.grib2"
diff --git a/ush/setup.sh b/ush/setup.sh
index c27e0ad03..9dab50adb 100755
--- a/ush/setup.sh
+++ b/ush/setup.sh
@@ -804,6 +804,26 @@ Please clone the external repository containing the code in this directory,
 build the executable, and then rerun the workflow."
 fi
 #
+# Get the base directory of the Python Graphics code.
+#
+external_name="python_graphics"
+PYTHON_GRAPHICS_DIR=$( \
+  get_manage_externals_config_property \
+  "${mng_extrns_cfg_fn}" "${external_name}" "${property_name}" ) || \
+  print_err_msg_exit "\
+  Call to function get_manage_externals_config_property failed."
+
+PYTHON_GRAPHICS_DIR="${SR_WX_APP_TOP_DIR}/${PYTHON_GRAPHICS_DIR}"
+if [ ! -d "${PYTHON_GRAPHICS_DIR}" ]; then
+  print_err_msg_exit "
+The base directory in which the Python Graphics source code should be located
+(PYTHON_GRAPHICS_DIR) does not exist:
+  PYTHON_GRAPHICS_DIR = \"${PYTHON_GRAPHICS_DIR}\"
+Please clone the external repository containing the code in this directory,
+build the executable, and then rerun the workflow."
+fi
+#
+#
 #-----------------------------------------------------------------------
 #
 # Make sure that USE_CUSTOM_POST_CONFIG_FILE is set to a valid value.
@@ -2363,6 +2383,7 @@ UFS_UTILS_DIR="${UFS_UTILS_DIR}"
 SFC_CLIMO_INPUT_DIR="${SFC_CLIMO_INPUT_DIR}"
 TOPO_DIR="${TOPO_DIR}"
 EMC_POST_DIR="${EMC_POST_DIR}"
+PYTHON_GRAPHICS_DIR="${PYTHON_GRAPHICS_DIR}"
 
 ARCHIVEDIR="${ARCHIVEDIR}"
 NCARG_ROOT="${NCARG_ROOT}"
diff --git a/ush/templates/FV3LAM_wflow.xml b/ush/templates/FV3LAM_wflow.xml
index e35388434..fbbc28f0d 100644
--- a/ush/templates/FV3LAM_wflow.xml
+++ b/ush/templates/FV3LAM_wflow.xml
@@ -70,7 +70,6 @@ tasks other than GET_EXTRN_ICS_TN, GET_EXTRN_LBCS_TN, and RUN_FCST_TN;
 the "HPSS" type is used for the GET_EXTRN_ICS_TN and GET_EXTRN_LBCS_TN 
 tasks; and the "FCST" type is used for the RUN_FCST_TN task.
 -->
-
 {%- if partition_default is not none %}
 <!ENTITY RSRV_DEFAULT "<account>&ACCOUNT;</account><queue>&QUEUE_DEFAULT;</queue><partition>{{ partition_default }}</partition>">
 {%- else %}
@@ -86,6 +85,7 @@ tasks; and the "FCST" type is used for the RUN_FCST_TN task.
 {%- else %}
 <!ENTITY RSRV_FCST    "<account>&ACCOUNT;</account><queue>&QUEUE_FCST;</queue>">
 {%- endif %}
+<!ENTITY RSRV_GRAPH   "<account>&ACCOUNT;</account><{{ queue_default_tag }}>&QUEUE_FCST;</{{ queue_default_tag }}><partition>&GRAPHICS_PARTITION;</partition>">
 
 <!ENTITY DEADLINE_PRE      "16:00:00">
 <!ENTITY DEADLINE_FCST     "23:30:00">
@@ -481,6 +481,33 @@ MODULES_RUN_TASK_FP script.
   </metatask>
 {% endif %}
 
+<!--
+************************************************************************
+************************************************************************
+-->
+
+  <task name="python_skewt" maxtries="1">
+
+      &RSRV_GRAPHICS;
+      &WALL_LIMIT_GRAPHICS;
+
+      <walltime>{{ wtime_run_fcst }}</walltime>
+      <nodes>1:ppn=1</nodes>
+      <native>--exclusive<native>
+      <jobname><cyclestr>python_@H_skewt</cyclestr></jobname>
+      <join><cyclestr>&LOGDIR;/python_skewt.log</cyclestr></join>
+
+      <command>&LOAD_MODULES_RUN_TASK_FP; "run_graphics" "&JOBSDIR;/JREGIONAL_RUN_PYTHON_GRAPHICS"</command>
+
+      <envar><name>CDATE</name><value><cyclestr>@Y@m@d@H</cyclestr></value></envar>
+      <envar><name>SLASH_ENSMEM_SUBDIR</name><value><cyclestr>{{ slash_ensmem_subdir }}</cyclestr></value></envar>
+      <envar><name>GRAPHICS_TYPE</name><value>skewts</value>
+
+      <dependency>
+        <datadep age="300"><cyclestr>&DATAROOT;/@Y@m@d@H/postprd/wrfnat_hrconus_00.grib2</cyclestr></datadep>
+      </dependency>
+    </task>
+
 <!--
 ************************************************************************
 ************************************************************************

From 55603c432b6c47f44c7095bb70d16cc07e263e5f Mon Sep 17 00:00:00 2001
From: Christina Holt <Christina.Holt@noaa.gov>
Date: Mon, 1 Feb 2021 21:31:36 +0000
Subject: [PATCH 3/9] Set up correct run time environment.

---
 jobs/JREGIONAL_RUN_PYTHON_GRAPHICS |  9 ++++----
 ush/templates/FV3LAM_wflow.xml     | 34 +++++++++++++++++-------------
 2 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/jobs/JREGIONAL_RUN_PYTHON_GRAPHICS b/jobs/JREGIONAL_RUN_PYTHON_GRAPHICS
index 19d5c7be1..2876881fd 100755
--- a/jobs/JREGIONAL_RUN_PYTHON_GRAPHICS
+++ b/jobs/JREGIONAL_RUN_PYTHON_GRAPHICS
@@ -80,17 +80,18 @@ mkdir_vrfy -p "${run_dir}"
 #
 #-----------------------------------------------------------------------
 #
-python ${PYTHON_GRAPHICS_DIR}/create_graphics.py \
+cd_vrfy ${PYTHON_GRAPHICS_DIR}
+python -u ${PYTHON_GRAPHICS_DIR}/create_graphics.py \
   ${GRAPHICS_TYPE} \
-  -d ${post_dir} \
+  -d ${postprd_dir} \
   -f 0 ${FCST_LEN_HRS} \
-  --file_tmpl "RRFS_CONUS.t${CDATE:8:2}z.bgrd3df{FCST_TIME:03d}.tm${CDATE:8:2}.grib2"
+  --file_tmpl "RRFS_CONUS.t${CDATE:8:2}z.bgrd3df{FCST_TIME:03d}.tm${CDATE:8:2}.grib2" \
   --file_type nat \
   --max_plev 100 \
   -n ${SLURM_CPUS_ON_NODE:-12} \
   -o ${run_dir} \
   -s ${CDATE} \
-  --sites ${PYSCRIPTS}/static/conus_raobs.txt \
+  --sites ${PYTHON_GRAPHICS_DIR}/static/conus_raobs.txt \
   -z ${run_dir}/skewt ||
 print_err_msg_exit "\
 Call to pyscript \"${scrfunc_fn}\" failed."
diff --git a/ush/templates/FV3LAM_wflow.xml b/ush/templates/FV3LAM_wflow.xml
index fbbc28f0d..18f725514 100644
--- a/ush/templates/FV3LAM_wflow.xml
+++ b/ush/templates/FV3LAM_wflow.xml
@@ -86,6 +86,7 @@ tasks; and the "FCST" type is used for the RUN_FCST_TN task.
 <!ENTITY RSRV_FCST    "<account>&ACCOUNT;</account><queue>&QUEUE_FCST;</queue>">
 {%- endif %}
 <!ENTITY RSRV_GRAPH   "<account>&ACCOUNT;</account><{{ queue_default_tag }}>&QUEUE_FCST;</{{ queue_default_tag }}><partition>&GRAPHICS_PARTITION;</partition>">
+<!ENTITY RSRV_GRAPHICS   "<account>&ACCOUNT;</account><{{ queue_default_tag }}>&QUEUE_FCST;</{{ queue_default_tag }}><partition>kjet,xjet</partition>">
 
 <!ENTITY DEADLINE_PRE      "16:00:00">
 <!ENTITY DEADLINE_FCST     "23:30:00">
@@ -488,25 +489,28 @@ MODULES_RUN_TASK_FP script.
 
   <task name="python_skewt" maxtries="1">
 
-      &RSRV_GRAPHICS;
-      &WALL_LIMIT_GRAPHICS;
+    &RSRV_GRAPHICS;
+    &WALL_LIMIT_GRAPHICS;
 
-      <walltime>{{ wtime_run_fcst }}</walltime>
-      <nodes>1:ppn=1</nodes>
-      <native>--exclusive<native>
-      <jobname><cyclestr>python_@H_skewt</cyclestr></jobname>
-      <join><cyclestr>&LOGDIR;/python_skewt.log</cyclestr></join>
+    <walltime>{{ wtime_run_fcst }}</walltime>
+    <nodes>1:ppn=24</nodes>
+    <native>--exclusive</native>
+    <jobname><cyclestr>python_@H_skewt</cyclestr></jobname>
+    <join><cyclestr>&LOGDIR;/python_skewt.log</cyclestr></join>
 
-      <command>&LOAD_MODULES_RUN_TASK_FP; "run_graphics" "&JOBSDIR;/JREGIONAL_RUN_PYTHON_GRAPHICS"</command>
+    <command>&LOAD_MODULES_RUN_TASK_FP; "run_graphics" "&JOBSDIR;/JREGIONAL_RUN_PYTHON_GRAPHICS"</command>
 
-      <envar><name>CDATE</name><value><cyclestr>@Y@m@d@H</cyclestr></value></envar>
-      <envar><name>SLASH_ENSMEM_SUBDIR</name><value><cyclestr>{{ slash_ensmem_subdir }}</cyclestr></value></envar>
-      <envar><name>GRAPHICS_TYPE</name><value>skewts</value>
+    <envar><name>GLOBAL_VAR_DEFNS_FP</name><value>&GLOBAL_VAR_DEFNS_FP;</value></envar>
+    <envar><name>PDY</name><value><cyclestr>@Y@m@d</cyclestr></value></envar>
+    <envar><name>cyc</name><value><cyclestr>@H</cyclestr></value></envar>
+    <envar><name>CDATE</name><value><cyclestr>@Y@m@d@H</cyclestr></value></envar>
+    <envar><name>SLASH_ENSMEM_SUBDIR</name><value><cyclestr>{{ slash_ensmem_subdir }}</cyclestr></value></envar>
+    <envar><name>GRAPHICS_TYPE</name><value>skewts</value></envar>
 
-      <dependency>
-        <datadep age="300"><cyclestr>&DATAROOT;/@Y@m@d@H/postprd/wrfnat_hrconus_00.grib2</cyclestr></datadep>
-      </dependency>
-    </task>
+    <dependency>
+      <taskdep task="&RUN_POST_TN;_f000"/>
+    </dependency>
+  </task>
 
 <!--
 ************************************************************************

From 398785c988897cf898717c34cebd156851aff2a4 Mon Sep 17 00:00:00 2001
From: Christina Holt <Christina.Holt@noaa.gov>
Date: Mon, 1 Feb 2021 21:32:08 +0000
Subject: [PATCH 4/9] Fix logic syntax.

---
 ush/set_extrn_mdl_params.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ush/set_extrn_mdl_params.sh b/ush/set_extrn_mdl_params.sh
index e903b70ff..f55c94fab 100644
--- a/ush/set_extrn_mdl_params.sh
+++ b/ush/set_extrn_mdl_params.sh
@@ -43,7 +43,7 @@ local func_name="${FUNCNAME[0]}"
 #
 #-----------------------------------------------------------------------
 #
-if [ "${RUN_ENVIR}" = "nco" & -z ${COMINgfs} ]; then
+if [[ "${RUN_ENVIR}" == "nco" && ! -z ${COMINgfs} ]]; then
 
   EXTRN_MDL_SYSBASEDIR_ICS="$COMINgfs"
 
@@ -199,7 +199,7 @@ esac
 #
 #-----------------------------------------------------------------------
 #
-if [ "${RUN_ENVIR}" = "nco" & -z ${COMINgfs} ]; then
+if [[ "${RUN_ENVIR}" == "nco" && ! -z ${COMINgfs} ]]; then
 
   EXTRN_MDL_SYSBASEDIR_LBCS="$COMINgfs"
 

From 46754440fe2d3f02492659550eaded4e58c2e034 Mon Sep 17 00:00:00 2001
From: Christina Holt <Christina.Holt@noaa.gov>
Date: Mon, 1 Feb 2021 21:42:02 +0000
Subject: [PATCH 5/9] Add modulefile for jet graphics

---
 modulefiles/tasks/jet/run_graphics.local | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 modulefiles/tasks/jet/run_graphics.local

diff --git a/modulefiles/tasks/jet/run_graphics.local b/modulefiles/tasks/jet/run_graphics.local
new file mode 100644
index 000000000..542cc7f45
--- /dev/null
+++ b/modulefiles/tasks/jet/run_graphics.local
@@ -0,0 +1,10 @@
+#%Module
+
+module purge
+
+module use -a /contrib/miniconda3/modulefiles
+module load miniconda3
+
+system "set +u"
+system "source activate pygraf"
+system "set -u"

From c378632bc6623480120352f7bfa42814d38350fa Mon Sep 17 00:00:00 2001
From: Christina Holt <Christina.Holt@noaa.gov>
Date: Tue, 2 Feb 2021 21:20:40 +0000
Subject: [PATCH 6/9] Fix bad merge.

---
 ush/templates/FV3LAM_wflow.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/ush/templates/FV3LAM_wflow.xml b/ush/templates/FV3LAM_wflow.xml
index 18f725514..d3326b45b 100644
--- a/ush/templates/FV3LAM_wflow.xml
+++ b/ush/templates/FV3LAM_wflow.xml
@@ -85,8 +85,7 @@ tasks; and the "FCST" type is used for the RUN_FCST_TN task.
 {%- else %}
 <!ENTITY RSRV_FCST    "<account>&ACCOUNT;</account><queue>&QUEUE_FCST;</queue>">
 {%- endif %}
-<!ENTITY RSRV_GRAPH   "<account>&ACCOUNT;</account><{{ queue_default_tag }}>&QUEUE_FCST;</{{ queue_default_tag }}><partition>&GRAPHICS_PARTITION;</partition>">
-<!ENTITY RSRV_GRAPHICS   "<account>&ACCOUNT;</account><{{ queue_default_tag }}>&QUEUE_FCST;</{{ queue_default_tag }}><partition>kjet,xjet</partition>">
+<!ENTITY RSRV_GRAPHICS   "<account>&ACCOUNT;</account><queue>&QUEUE_FCST;</queue><partition>kjet,xjet</partition>">
 
 <!ENTITY DEADLINE_PRE      "16:00:00">
 <!ENTITY DEADLINE_FCST     "23:30:00">

From a6faf6ae8fdb0cd013f0fafd2b155ce884f839fe Mon Sep 17 00:00:00 2001
From: Christina Holt <Christina.Holt@noaa.gov>
Date: Wed, 3 Feb 2021 18:11:20 +0000
Subject: [PATCH 7/9] Add flexibility for CONUS/AK maps and skewts.

---
 jobs/JREGIONAL_RUN_PYTHON_GRAPHICS | 46 ++++++++++++++++++++++++++----
 1 file changed, 41 insertions(+), 5 deletions(-)

diff --git a/jobs/JREGIONAL_RUN_PYTHON_GRAPHICS b/jobs/JREGIONAL_RUN_PYTHON_GRAPHICS
index 2876881fd..5d0238732 100755
--- a/jobs/JREGIONAL_RUN_PYTHON_GRAPHICS
+++ b/jobs/JREGIONAL_RUN_PYTHON_GRAPHICS
@@ -71,6 +71,43 @@ else
   run_dir="${CYCLE_DIR}${SLASH_ENSMEM_SUBDIR}/pyprd"
 fi
 
+# Choose an appropriate sites file for the grid
+if [[ ${PREDEF_GRID_NAME} =~ CONUS ]] ; then
+  sites_file=conus_raobs.txt
+elif [[ ${PREDEF_GRID_NAME} =~ AK ]] ; then
+  sites_file=alaska_raobs.txt
+else
+  print_err_msg_exit "\
+  Choice of sites file is ambiguous. Please help."
+fi
+
+# Choose the appropriate file template for graphics type
+
+case ${GRAPHICS_TYPE} in 
+
+  "maps")
+
+    file_tmpl="${NET}.${CDATE:8:2}z.bgdawpf{FCST_TIME:03d}.tm${CDATE:8:2}.grib2"
+    file_type=prs
+    extra_args="\
+      --tiles all
+      --images ${PYTHON_GRAPHICS_DIR}/image_lists/rrfs_subset.yml hourly"
+    ;;
+
+  "skewts")
+
+    file_tmpl="${NET}.t${CDATE:8:2}z.bgrd3df{FCST_TIME:03d}.tm00.grib2"
+    file_type=nat
+    extra_args="\
+      --sites ${PYTHON_GRAPHICS_DIR}/static/${sites_file}\
+      --max_plev 100"
+    ;;
+
+  *)
+    print_err_msg_exit "\
+      GRAPHICS_TYPE \"${GRAPHICS_TYPE}\" is not recognized."
+    ;;
+esac
 mkdir_vrfy -p "${run_dir}"
 #
 #-----------------------------------------------------------------------
@@ -85,14 +122,13 @@ python -u ${PYTHON_GRAPHICS_DIR}/create_graphics.py \
   ${GRAPHICS_TYPE} \
   -d ${postprd_dir} \
   -f 0 ${FCST_LEN_HRS} \
-  --file_tmpl "RRFS_CONUS.t${CDATE:8:2}z.bgrd3df{FCST_TIME:03d}.tm${CDATE:8:2}.grib2" \
-  --file_type nat \
-  --max_plev 100 \
+  --file_tmpl ${file_tmpl} \
+  --file_type ${file_type} \
   -n ${SLURM_CPUS_ON_NODE:-12} \
   -o ${run_dir} \
   -s ${CDATE} \
-  --sites ${PYTHON_GRAPHICS_DIR}/static/conus_raobs.txt \
-  -z ${run_dir}/skewt ||
+  -z ${run_dir}/skewt \
+  ${extra_args} ||
 print_err_msg_exit "\
 Call to pyscript \"${scrfunc_fn}\" failed."
 #

From 0bfd3979ec502f430752f82b2d60071da7a47f46 Mon Sep 17 00:00:00 2001
From: Christina Holt <Christina.Holt@noaa.gov>
Date: Mon, 8 Feb 2021 21:36:42 +0000
Subject: [PATCH 8/9] Minor fixes found during review.

---
 jobs/JREGIONAL_RUN_PYTHON_GRAPHICS | 7 +++----
 ush/templates/FV3LAM_wflow.xml     | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/jobs/JREGIONAL_RUN_PYTHON_GRAPHICS b/jobs/JREGIONAL_RUN_PYTHON_GRAPHICS
index 5d0238732..638449040 100755
--- a/jobs/JREGIONAL_RUN_PYTHON_GRAPHICS
+++ b/jobs/JREGIONAL_RUN_PYTHON_GRAPHICS
@@ -3,8 +3,8 @@
 #
 #-----------------------------------------------------------------------
 #
-# This script runs the post-processor (UPP) on the NetCDF output files
-# of the write component of the FV3-LAM model.
+# This script runs the adb_graphics create_graphics driver for creating
+# PNG figures and zipping them for dissemination to the web.
 #
 #-----------------------------------------------------------------------
 #
@@ -112,8 +112,7 @@ mkdir_vrfy -p "${run_dir}"
 #
 #-----------------------------------------------------------------------
 #
-# Call the ex-script for this J-job and pass to it the necessary varia-
-# bles.
+# Call the graphics driver script.
 #
 #-----------------------------------------------------------------------
 #
diff --git a/ush/templates/FV3LAM_wflow.xml b/ush/templates/FV3LAM_wflow.xml
index d3326b45b..02472d3f1 100644
--- a/ush/templates/FV3LAM_wflow.xml
+++ b/ush/templates/FV3LAM_wflow.xml
@@ -486,7 +486,7 @@ MODULES_RUN_TASK_FP script.
 ************************************************************************
 -->
 
-  <task name="python_skewt" maxtries="1">
+  <task name="python_skewt" cycledefs="forecast" maxtries="{{ maxtries_run_post }}>
 
     &RSRV_GRAPHICS;
     &WALL_LIMIT_GRAPHICS;

From 5765abb82f2738115ab12c8d3ae4c87f121e183a Mon Sep 17 00:00:00 2001
From: Christina Holt <Christina.Holt@noaa.gov>
Date: Mon, 8 Feb 2021 21:40:18 +0000
Subject: [PATCH 9/9] Fix syntax error.

---
 ush/templates/FV3LAM_wflow.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ush/templates/FV3LAM_wflow.xml b/ush/templates/FV3LAM_wflow.xml
index 2b032eab1..afb538309 100644
--- a/ush/templates/FV3LAM_wflow.xml
+++ b/ush/templates/FV3LAM_wflow.xml
@@ -486,7 +486,7 @@ MODULES_RUN_TASK_FP script.
 ************************************************************************
 -->
 
-  <task name="python_skewt" cycledefs="forecast" maxtries="{{ maxtries_run_post }}>
+  <task name="python_skewt" cycledefs="forecast" maxtries="{{ maxtries_run_post }}">
 
     &RSRV_GRAPHICS;
     &WALL_LIMIT_GRAPHICS;