Merge pull request #157 from JessicaMeixner-NOAA/feature/gfsv16b-wave…

…grids Adding wave grids to grib interpolation
NOAA-EMC · Oct 8, 2020 · bf27d0b · bf27d0b
2 parents 561e195 + 959dac2
commit bf27d0b
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 12 deletions.
diff --git a/parm/config/config.wave b/parm/config/config.wave
@@ -38,7 +38,7 @@ export WAVEWND_FID=
 
 # Grids for output fields (used in all steps)
 export waveuoutpGRD=points
-export waveinterpGRD='glo_15mxt' # Grids that need to be interpolated from native
+export waveinterpGRD='glo_15mxt at_10m ep_10m wc_10m ak_10m glo_30m' # Grids that need to be interpolated from native
                              # in POST will generate grib unless gribOK not set
 export wavesbsGRD=''  # side-by-side grids generated as wave model runs, writes to com
 export wavepostGRD='gnh_10m aoc_9km gsh_15m' # Native grids that will be post-processed (grib2)
@@ -64,7 +64,7 @@ export DTPNT_WAV=3600
 export FHINCP_WAV=`expr $DTPNT_WAV / 3600`
 
 # Selected output parameters (gridded)
-export OUTPARS_WAV="WND CUR ICE HS T01 T02 DIR FP DP PHS PTP PDIR CHA"
+export OUTPARS_WAV="WND HS FP DP PHS PTP PDIR"
 
 # Restart file config
 if [ "$CDUMP" = "gdas" ]; then

diff --git a/parm/config/config.wavepostsbs b/parm/config/config.wavepostsbs
@@ -10,11 +10,13 @@ echo "BEGIN: config.wavepostsbs"
 
 
 # Subgrid info for grib2 encoding
-export WAV_SUBGRBSRC="gnh_10m"
-export WAV_SUBGRB="WAV_ATLO_GRB WAV_EPAC_GRB WAV_WCST_GRB"
-export WAV_ATLO_GRB="0 6 0 0 0 0 0 0 301 331 0 0 55000000 260000000 48 0 310000000 166667 166667 0 atlocn 0p16"
-export WAV_EPAC_GRB="0 6 0 0 0 0 0 0 511 301 0 0 30000002 130000000 48 -20000000 215000000 166667 166667 0 epacif 0p16"
-export WAV_WCST_GRB="0 6 0 0 0 0 0 0 241 151 0 0 50000000 210000000 48 25000000 250000000 166667 166667 0 wcoast 0p16"
+export WAV_SUBGRBSRC=""
+export WAV_SUBGRB=""
+#export WAV_SUBGRBSRC="gnh_10m"
+#export WAV_SUBGRB="WAV_ATLO_GRB WAV_EPAC_GRB WAV_WCST_GRB"
+#export WAV_ATLO_GRB="0 6 0 0 0 0 0 0 301 331 0 0 55000000 260000000 48 0 310000000 166667 166667 0 atlocn 0p16"
+#export WAV_EPAC_GRB="0 6 0 0 0 0 0 0 511 301 0 0 30000002 130000000 48 -20000000 215000000 166667 166667 0 epacif 0p16"
+#export WAV_WCST_GRB="0 6 0 0 0 0 0 0 241 151 0 0 50000000 210000000 48 25000000 250000000 166667 166667 0 wcoast 0p16"
 
 # Options for point output (switch on/off boundary point output)
 export DOIBP_WAV='NO' # Input boundary points

diff --git a/scripts/exgfs_wave_post_gridded_sbs.sh b/scripts/exgfs_wave_post_gridded_sbs.sh
@@ -305,21 +305,23 @@
         nigrd=1
         for grdID in $waveinterpGRD
         do
-          case $grdID in
-            glo_15mxt) ymdh_int=`$NDATE -${WAVHINDH} $ymdh`; dt_int=3600.; n_int=9999 ;;
-            glo_30mxt) ymdh_int=`$NDATE -${WAVHINDH} $ymdh`; dt_int=3600.; n_int=9999 ;;
-          esac
+            ymdh_int=`$NDATE -${WAVHINDH} $ymdh`; dt_int=3600.; n_int=9999 ;
             echo "$USHwave/wave_grid_interp_sbs.sh $grdID $ymdh_int $dt_int $n_int > grint_$grdID.out 2>&1" >> ${fcmdigrd}.${nigrd}
           if [ "$DOGRB_WAV" = 'YES' ]
           then
           gribFL=\'`echo ${OUTPARS_WAV}`\'
             case $grdID in
               glo_15mxt) GRDNAME='global' ; GRDRES=0p25 ; GRIDNR=255  ; MODNR=11 ;;
               glo_30mxt) GRDNAME='global' ; GRDRES=0p50 ; GRIDNR=255  ; MODNR=11 ;;
+              glo_30m) GRDNAME='global' ; GRDRES=0p50 ; GRIDNR=255  ; MODNR=11 ;;
+              at_10m) GRDNAME='atlocn' ; GRDRES=0p16 ; GRIDNR=255  ; MODNR=11   ;;
+              ep_10m) GRDNAME='epacif' ; GRDRES=0p16 ; GRIDNR=255  ; MODNR=11   ;;
+              wc_10m) GRDNAME='wcoast' ; GRDRES=0p16 ; GRIDNR=255  ; MODNR=11   ;;
+              ak_10m) GRDNAME='alaska' ; GRDRES=0p16 ; GRIDNR=255  ; MODNR=11   ;;
             esac
               echo "$USHwave/wave_grib2_sbs.sh $grdID $GRIDNR $MODNR $ymdh $fhr $GRDNAME $GRDRES $gribFL > grib_$grdID.out 2>&1" >> ${fcmdigrd}.${nigrd}
           fi
-          echo "pwd" >> ${fcmdnow}
+          #echo "pwd" >> ${fcmdnow}
           echo "${GRIBDATA}/${fcmdigrd}.${nigrd}" >> ${fcmdnow}
           chmod 744 ${fcmdigrd}.${nigrd}
           nigrd=$((nigrd+1))