From 0b2a1efbbc4fb4546c0a07f9f6c08600b1defcd7 Mon Sep 17 00:00:00 2001
From: YaliMao-NOAA <53870326+YaliMao-NOAA@users.noreply.github.com>
Date: Fri, 13 Sep 2024 15:16:04 +0000
Subject: [PATCH] AWC request adjusted, blending wall time extended (#53)

* Extend the wall time of the job card for the additional 5 minutes of waiting UK data

* Modified scripts for the additional levels on the second request from AWC

---------

Co-authored-by: yali mao <yali.mao@dlogin06.dogwood.wcoss2.ncep.noaa.gov>
---
 dev/driver/run_JWAFS_GRIB2_0P25_BLENDING             |  2 +-
 .../blending/jwafs_grib2_0p25_blending_master.ecf    |  2 +-
 scripts/exwafs_grib2_0p25.sh                         | 12 +++++-------
 scripts/exwafs_upp.sh                                |  4 ++--
 4 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/dev/driver/run_JWAFS_GRIB2_0P25_BLENDING b/dev/driver/run_JWAFS_GRIB2_0P25_BLENDING
index 7353867..39d4ed9 100755
--- a/dev/driver/run_JWAFS_GRIB2_0P25_BLENDING
+++ b/dev/driver/run_JWAFS_GRIB2_0P25_BLENDING
@@ -3,7 +3,7 @@
 #PBS -j oe
 #PBS -o /lfs/h2/emc/ptmp/yali.mao/working_wafs/log.wafs_grib2_0p25_blending
 #PBS -N wafs_blending_0p25
-#PBS -l walltime=00:25:00
+#PBS -l walltime=00:30:00
 #PBS -l select=1:ncpus=1
 #PBS -q debug
 #PBS -l debug=true
diff --git a/ecf/scripts/grib2/0p25/blending/jwafs_grib2_0p25_blending_master.ecf b/ecf/scripts/grib2/0p25/blending/jwafs_grib2_0p25_blending_master.ecf
index a01780a..b2b4abb 100755
--- a/ecf/scripts/grib2/0p25/blending/jwafs_grib2_0p25_blending_master.ecf
+++ b/ecf/scripts/grib2/0p25/blending/jwafs_grib2_0p25_blending_master.ecf
@@ -3,7 +3,7 @@
 #PBS -j oe
 #PBS -q %QUEUE%
 #PBS -A %PROJ%-%PROJENVIR%
-#PBS -l walltime=00:25:00
+#PBS -l walltime=00:30:00
 #PBS -l select=1:ncpus=1
 #PBS -l debug=true
 
diff --git a/scripts/exwafs_grib2_0p25.sh b/scripts/exwafs_grib2_0p25.sh
index e53294c..ef721e2 100755
--- a/scripts/exwafs_grib2_0p25.sh
+++ b/scripts/exwafs_grib2_0p25.sh
@@ -21,7 +21,7 @@
 #              - Filename changes according to EE2 standard except for files sent to UK
 #              - dbn_alert subtype is changed from gfs to WAFS
 #              - Fix bugzilla 1213: Filename should use fHHH instead of FHH
-#              - Add additional levels of icing and turbulence to AWF files
+#              - Add additional levels of icing and turbulence to AWF files fhr<=36
 #####################################################################
 
 set -x
@@ -73,12 +73,10 @@ if [[ "${hazard_timewindow}" == "YES" ]]; then
     criteria1=":EDPARM:|:ICESEV:|parm=37:"
     criteria2=":CATEDR:|:MWTURB:"
     criteria3=":CBHE:|:ICAHT:"
+    # AWC requests additional low levels of icing and high level of turbulence if fhr<=36
     if ((ifhr > 36 )); then
-	extra_levels1=":977.2 mb:|:908.1 mb:|:127.7 mb:"
-	extra_levels2=":EDPARM:812 mb:|:CATEDR:812 mb:|:MWTURB:812 mb:"
-	extra_levels3=":EDPARM:724.3 mb:|:CATEDR:724.3 mb:|:MWTURB:724.3 mb:"
-	${WGRIB2} tmp_wafs_0p25.grb2 | grep -E "$criteria1|$criteria2|$criteria3" |
-	    grep -Ev "$extra_levels1|$extra_levels2|$extra_levels3" |
+	extra_levels=":977.2 mb:|:942.1 mb:|:908.1 mb:|:875.1 mb:|:127.7 mb:"
+	${WGRIB2} tmp_wafs_0p25.grb2 | grep -E "$criteria1|$criteria2|$criteria3" | grep -Ev "$extra_levels" |
             ${WGRIB2} -i tmp_wafs_0p25.grb2 -grib "${RUN}.t${cyc}z.awf.0p25.f${fhr}.grib2"
     else
 	${WGRIB2} tmp_wafs_0p25.grb2 | grep -E "${criteria1}|$criteria2|$criteria3" |
@@ -119,7 +117,7 @@ if [[ "${SENDDBN}" == "YES" ]]; then
 
     if [[ "${hazard_timewindow}" == "YES" ]]; then
         # Hazard WAFS data (ICESEV EDR CAT MWT on 100mb to 1000mb or on new ICAO levels) sent to AWC and to NOMADS for US stakeholders
-        "${DBNROOT}/bin/dbn_alert" MODEL WAFS_AWF.0P25_GB2 "${job}" "${COMOUT}/${RUN}.t${cyc}z.awf.0p25.f${fhr}.grib2"
+        "${DBNROOT}/bin/dbn_alert" MODEL WAFS_AWF_0P25_GB2 "${job}" "${COMOUT}/${RUN}.t${cyc}z.awf.0p25.f${fhr}.grib2"
 
         # Unblended US WAFS data sent to UK for blending, to the same server as 1.25 deg unblended data: wmo/grib2.tCCz.wafs_grb_wifsfFF.45
         "${DBNROOT}/bin/dbn_alert" MODEL WAFS_0P25_UBL_GB2 "${job}" "${COMOUT}/WAFS_0p25_unblended_${PDY}${cyc}f${fhr}.grib2"
diff --git a/scripts/exwafs_upp.sh b/scripts/exwafs_upp.sh
index a9ce517..cb1c844 100755
--- a/scripts/exwafs_upp.sh
+++ b/scripts/exwafs_upp.sh
@@ -62,8 +62,8 @@ GFS
 flxfile
 
 &nampgb
-  kpo=58,
-  po=97720.,90810.,84310.,81200.,78190.,75260.,72430.,69680.,67020.,64440.,61940.,59520.,57180.,54920.,52720.,50600.,48550.,46560.,44650.,42790.,41000.,39270.,37600.,35990.,34430.,32930.,31490.,30090.,28740.,27450.,26200.,25000.,23840.,22730.,21660.,20650.,19680.,18750.,17870.,17040.,16240.,15470.,14750.,14060.,13400.,12770.,12170.,11600.,11050.,10530.,10040.,9570.,9120.,8700.,8280.,7900.,7520.,7170.,
+  kpo=60,
+  po=97720.,94210.,90810.,87510.,84310.,81200.,78190.,75260.,72430.,69680.,67020.,64440.,61940.,59520.,57180.,54920.,52720.,50600.,48550.,46560.,44650.,42790.,41000.,39270.,37600.,35990.,34430.,32930.,31490.,30090.,28740.,27450.,26200.,25000.,23840.,22730.,21660.,20650.,19680.,18750.,17870.,17040.,16240.,15470.,14750.,14060.,13400.,12770.,12170.,11600.,11050.,10530.,10040.,9570.,9120.,8700.,8280.,7900.,7520.,7170.,
   popascal=.true.,
 /
 EOF