Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
13 changes: 10 additions & 3 deletions jobs/JREGIONAL_RUN_PYTHON_GRAPHICS
Original file line number Diff line number Diff line change
Expand Up @@ -138,11 +138,18 @@ if [ "${ENSPROD:-}" = 'ensprod' ] ; then
fi

# Choose the appropriate file template for graphics type
net4=$(echo ${NET:0:4} | tr '[:upper:]' '[:lower:]')
if [ ${PREDEF_GRID_NAME} = "RRFS_CONUS_3km" ]; then
gridname="conus_3km."
elif [ ${PREDEF_GRID_NAME} = "RRFS_NA_3km" ]; then
gridname=""
fi

case ${GRAPHICS_TYPE} in

"maps")

file_tmpl="${NET}.t${CDATE:8:2}z.bg${file_id:-dawp}f{FCST_TIME:03d}.tm00.grib2"
file_tmpl="${net4}.t${CDATE:8:2}z.prslev.f{FCST_TIME:03d}.${gridname}grib2"
file_type=prs
extra_args="\
--tiles $tiles \
Expand All @@ -156,7 +163,7 @@ case ${GRAPHICS_TYPE} in

"skewts")

file_tmpl="${NET}.t${CDATE:8:2}z.bgrd3df{FCST_TIME:03d}.tm00.grib2"
file_tmpl="${net4}.t${CDATE:8:2}z.natlev.f{FCST_TIME:03d}.${gridname}grib2"
file_type=nat
extra_args="\
--sites ${PYTHON_GRAPHICS_DIR}/static/${sites_file} \
Expand All @@ -165,7 +172,7 @@ case ${GRAPHICS_TYPE} in

"enspanel")

file_tmpl="${NET}.t${CDATE:8:2}z.bgdawpf{FCST_TIME:03d}.tm00.grib2"
file_tmpl="${net4}.t${CDATE:8:2}z.prslev.f{FCST_TIME:03d}.${gridname}grib2"
file_type=prs
extra_args="\
--tiles $tiles \
Expand Down
31 changes: 0 additions & 31 deletions scripts/exregional_run_prdgen.sh
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,6 @@ ififip=${net4}.t${cyc}z.ififip.f${fhr}.${gridname}grib2
testbed=${net4}.t${cyc}z.testbed.f${fhr}.${gridname}grib2

# extract the output fields for the testbed
touch ${bgsfc}
if [[ ! -z ${TESTBED_FIELDS_FN} ]]; then
if [[ -f ${FIX_UPP}/${TESTBED_FIELDS_FN} ]]; then
wgrib2 ${postprd_dir}/${prslev} | grep -F -f ${FIX_UPP}/${TESTBED_FIELDS_FN} | wgrib2 -i -grib ${postprd_dir}/${testbed} ${postprd_dir}/${prslev}
Expand Down Expand Up @@ -247,22 +246,12 @@ if [ -f ${postprd_dir}/${ififip} ]; then
cp_vrfy ${postprd_dir}/${ififip} ${comout}/${ififip}
fi
cp_vrfy ${postprd_dir}/${testbed} ${comout}/${testbed}
ln_vrfy -sf --relative ${comout}/${prslev} ${comout}/BGDAWP_${basetime}${post_fhr}
ln_vrfy -sf --relative ${comout}/${natlev} ${comout}/BGRD3D_${basetime}${post_fhr}
if [ -f ${comout}/${ififip} ]; then
ln_vrfy -sf --relative ${comout}/${ififip} ${comout}/BGIFI_${basetime}${post_fhr}
fi
ln_vrfy -sf --relative ${comout}/${testbed} ${comout}/BGSFC_${basetime}${post_fhr}

ln_vrfy -sf --relative ${comout}/${prslev} ${comout}/${NET}.t${cyc}z.bgdawpf${fhr}.${tmmark}.grib2
wgrib2 ${comout}/${prslev} -s > ${comout}/${prslev}.idx
ln_vrfy -sf --relative ${comout}/${natlev} ${comout}/${NET}.t${cyc}z.bgrd3df${fhr}.${tmmark}.grib2
wgrib2 ${comout}/${natlev} -s > ${comout}/${natlev}.idx
if [ -f ${comout}/${ififip} ]; then
ln_vrfy -sf --relative ${comout}/${ififip} ${comout}/${NET}.t${cyc}z.bgifif${fhr}.${tmmark}.grib2
wgrib2 ${comout}/${ififip} -s > ${comout}/${ififip}.idx
fi
ln_vrfy -sf --relative ${comout}/${testbed} ${comout}/${NET}.t${cyc}z.bgsfcf${fhr}.${tmmark}.grib2
wgrib2 ${comout}/${testbed} -s > ${comout}/${testbed}.idx
# Remap to additional output grids if requested

Expand Down Expand Up @@ -414,26 +403,6 @@ if [ ${#ADDNL_OUTPUT_GRIDS[@]} -gt 0 ]; then
cp_vrfy ${bg_remap} ${comout}/${net4}.t${cyc}z.${leveltype}.f${fhr}.${grid}.grib2
wgrib2 ${comout}/${net4}.t${cyc}z.${leveltype}.f${fhr}.${grid}.grib2 -s > ${comout}/${net4}.t${cyc}z.${leveltype}.f${fhr}.${grid}.grib2.idx

if [ $leveltype = 'prslev' ]; then
ln_vrfy -fs --relative ${comout}/${net4}.t${cyc}z.${leveltype}.f${fhr}.${grid}.grib2 ${comout}/${grid}_grid/${NET}.t${cyc}z.bgdawpf${fhr}.${tmmark}.grib2
ln_vrfy -fs --relative ${comout}/${net4}.t${cyc}z.${leveltype}.f${fhr}.${grid}.grib2 ${comout}/${grid}_grid/BGDAWP_${basetime}${post_fhr}
fi

if [ $leveltype = 'natlev' ]; then
ln_vrfy -fs --relative ${comout}/${net4}.t${cyc}z.${leveltype}.f${fhr}.${grid}.grib2 ${comout}/${grid}_grid/${NET}.t${cyc}z.bgrd3df${fhr}.${tmmark}.grib2
ln_vrfy -fs --relative ${comout}/${net4}.t${cyc}z.${leveltype}.f${fhr}.${grid}.grib2 ${comout}/${grid}_grid/BGRD3D_${basetime}${post_fhr}
fi

if [[ $leveltype = 'ififip' ]] && [[ -f ${comout}/${net4}.t${cyc}z.${leveltype}.f${fhr}.${grid}.grib2 ]]; then
ln_vrfy -fs --relative ${comout}/${net4}.t${cyc}z.${leveltype}.f${fhr}.${grid}.grib2 ${comout}/${grid}_grid/${NET}.t${cyc}z.bgifif${fhr}.${tmmark}.grib2
ln_vrfy -fs --relative ${comout}/${net4}.t${cyc}z.${leveltype}.f${fhr}.${grid}.grib2 ${comout}/${grid}_grid/BGIFI_${basetime}${post_fhr}
fi

if [ $leveltype = 'testbed' ]; then
ln_vrfy -fs --relative ${comout}/${net4}.t${cyc}z.${leveltype}.f${fhr}.${grid}.grib2 ${comout}/${grid}_grid/${NET}.t${cyc}z.bgsfcf${fhr}.${tmmark}.grib2
ln_vrfy -fs --relative ${comout}/${net4}.t${cyc}z.${leveltype}.f${fhr}.${grid}.grib2 ${comout}/${grid}_grid/BGSFC_${basetime}${post_fhr}
fi

done
done
fi
Expand Down