Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 11 additions & 6 deletions jobs/JREGIONAL_RUN_PYTHON_GRAPHICS
Original file line number Diff line number Diff line change
Expand Up @@ -76,23 +76,28 @@ fi
# Choose an appropriate sites file for the grid
if [[ ${PREDEF_GRID_NAME} =~ CONUS ]] ; then
sites_file=conus_raobs.txt
tiles=${TILES:-all}
elif [[ ${PREDEF_GRID_NAME} =~ AK ]] ; then
sites_file=alaska_raobs.txt
tiles=${TILES:-full}
elif [[ ${PREDEF_GRID_NAME} =~ RAP ]] ; then
sites_file=conus_raobs.txt
tiles=${TILES:-full}
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
case ${GRAPHICS_TYPE} in

"maps")

file_tmpl="${NET}.${CDATE:8:2}z.bgdawpf{FCST_TIME:03d}.tm${CDATE:8:2}.grib2"
file_tmpl="${NET}.t${CDATE:8:2}z.bgdawpf{FCST_TIME:03d}.tm00.grib2"
file_type=prs
extra_args="\
--tiles all
--all_leads \
--tiles $tiles \
--images ${PYTHON_GRAPHICS_DIR}/image_lists/rrfs_subset.yml hourly"
;;

Expand All @@ -101,9 +106,8 @@ case ${GRAPHICS_TYPE} in
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}\
--sites ${PYTHON_GRAPHICS_DIR}/static/${sites_file} \
--max_plev 100"
zip_dir=${zip_dir}/skewt
;;

*)
Expand All @@ -126,6 +130,7 @@ python -u ${PYTHON_GRAPHICS_DIR}/create_graphics.py \
-f 0 ${FCST_LEN_HRS} \
--file_tmpl ${file_tmpl} \
--file_type ${file_type} \
-m "${MODEL}" \
-n ${SLURM_CPUS_ON_NODE:-12} \
-o ${run_dir} \
-s ${CDATE} \
Expand Down
96 changes: 16 additions & 80 deletions ush/templates/FV3LAM_wflow.xml
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,6 @@ Workflow task names.

<!ENTITY RUN_ANAL_TN "run_anal_gsi">
<!ENTITY RUN_BUFR_TN "run_bufr">
<!ENTITY RUN_NCL_TN "run_ncl">
<!ENTITY RUN_NCL_ZIP_TN "run_ncl_zip">
<!ENTITY CLEAN_TN "run_clean">
<!ENTITY ARCHIVE_TN "run_archive">

Expand Down Expand Up @@ -622,98 +620,36 @@ MODULES_RUN_TASK_FP script.
************************************************************************
-->

<task name="python_skewt" cycledefs="forecast,dacycle" maxtries="{{ maxtries_run_post }}">

&RSRV_GRAPHICS;
&WALL_LIMIT_GRAPHICS;
<metatask name="python_graphics">

<walltime>{{ wtime_run_fcst }}</walltime>
<nodes>1:ppn=24</nodes>
<native>--exclusive</native>
<jobname><cyclestr>&TAG;_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>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>
<var name="graphics_type"> maps skewts </var>

<dependency>
<taskdep task="&RUN_POST_TN;_f000"/>
</dependency>
</task>

<!--
************************************************************************
************************************************************************
-->
<metatask name="&RUN_NCL_TN;">

<var name="fhr"> {% for h in range(0, fcst_len_hrs+1) %}{{ " %03d" % h }}{% endfor %} </var>

<task name="&RUN_NCL_TN;_#fhr#" cycledefs="forecast,dacycle" maxtries="{{ maxtries_run_post }}">
<task name="python_#graphics_type#" cycledefs="forecast,dacycle" maxtries="{{ maxtries_run_post }}">

&RSRV_GRAPHICS;
&WALL_LIMIT_GRAPHICS;

<command>&JOBSDIR;/../scripts/exregional_run_ncl.ksh</command>
<walltime>00:30:00</walltime>
<memory>24G</memory>
<cores>16</cores>
<jobname>&TAG;_&RUN_NCL_TN;_#fhr#</jobname>
<join><cyclestr>&LOGDIR;/&RUN_NCL_TN;_#fhr#_@Y@m@d@H.log</cyclestr></join>

<envar><name>GLOBAL_VAR_DEFNS_FP</name><value>&GLOBAL_VAR_DEFNS_FP;</value></envar>
<envar><name>START_TIME</name><value><cyclestr>@Y@m@d@H</cyclestr></value></envar>
<envar><name>FCST_TIME</name><value>#fhr#</value></envar>

<dependency>
<taskdep task="&RUN_POST_TN;_f#fhr#"/>
</dependency>

</task>

</metatask>

<!--
************************************************************************
************************************************************************
-->
<metatask mode="serial" name="&RUN_NCL_ZIP_TN;">

<var name="fhr"> {% for h in range(0, fcst_len_hrs+1) %}{{ " %03d" % h }}{% endfor %} </var>
<walltime>{{ wtime_run_fcst }}</walltime>
<nodes>1:ppn=24</nodes>
<native>--exclusive</native>
<jobname><cyclestr>&TAG;_python_@H_#graphics_type#</cyclestr></jobname>
<join><cyclestr>&LOGDIR;/python_#graphics_type#.log</cyclestr></join>

<task name="&RUN_NCL_ZIP_TN;_#fhr#" cycledefs="forecast,dacycle" maxtries="{{ maxtries_run_post }}">

&RSRV_GRAPHICS;
&WALL_LIMIT_GRAPHICS;

<command>&JOBSDIR;/../scripts/exregional_run_ncl_zip.ksh</command>
<cores>1</cores>
<walltime>00:15:00</walltime>
<memory>2G</memory>
<jobname>&TAG;_&RUN_NCL_ZIP_TN;_#fhr#</jobname>
<join><cyclestr>&LOGDIR;/&RUN_NCL_ZIP_TN;_#fhr#_@Y@m@d@H.log</cyclestr></join>
<command>&LOAD_MODULES_RUN_TASK_FP; "run_graphics" "&JOBSDIR;/JREGIONAL_RUN_PYTHON_GRAPHICS"</command>

<envar><name>GLOBAL_VAR_DEFNS_FP</name><value>&GLOBAL_VAR_DEFNS_FP;</value></envar>
<envar><name>START_TIME</name><value><cyclestr>@Y@m@d@H</cyclestr></value></envar>
<envar><name>FCST_TIME</name><value>#fhr#</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>#graphics_type#</value></envar>

<dependency>
<or>
<taskdep state="Dead" task="&RUN_POST_TN;_#fhr#"/>
<taskdep state="Dead" task="&RUN_NCL_TN;_#fhr#"/>
<taskdep task="&RUN_NCL_TN;_#fhr#"/>
</or>
<taskdep task="&RUN_POST_TN;_f000"/>
</dependency>

</task>

</metatask>
</metatask>

<!--
************************************************************************
Expand Down