Merge branch 'NOAA-EMC:develop' into c1152_cyc

ci/cases/yamls/gefs_defaults_ci.yaml

@@ -4,7 +4,6 @@ base:
   ACCOUNT: {{ 'HPC_ACCOUNT' | getenv }}
   SFS_POST: "NO"
   FHOUT_GFS: 6
-stage_ic:
   USE_OCN_ENS_PERTURB_FILES: "NO"
   USE_ATM_ENS_PERTURB_FILES: "NO"
 ocn:

ci/cases/yamls/sfs_defaults.yaml

@@ -7,7 +7,7 @@ base:
   DO_BUFRSND: "NO"
   DO_GEMPAK: "NO"
   DO_AWIPS: "NO"
-  KEEPDATA: "YES"
+  KEEPDATA: "NO"
   DO_EXTRACTVARS: "NO"
   FHMAX_GFS: 2976
   FHMAX_HF_GFS: 0
@@ -17,6 +17,8 @@ base:
   FHOUT_ICE_GFS: 24
   FCST_BREAKPOINTS: ""
   REPLAY_ICS: "NO"
+  USE_OCN_ENS_PERTURB_FILES: "YES"
+  USE_ATM_ENS_PERTURB_FILES: "YES"
   HPSSARCH: "NO"
   LOCALARCH: "NO"
   SFS_POST: "YES"
@@ -26,8 +28,5 @@ fcst:
   MONO: "mono"
   reforecast: "YES"
   FHZER: 24
-stage_ic:
-  USE_OCN_ENS_PERTURB_FILES: "YES"
-  USE_ATM_ENS_PERTURB_FILES: "YES"
 ocn:
   MOM6_INTERP_ICS: "YES"

env/WCOSS2.env

@@ -123,7 +123,7 @@ elif [[ "${step}" = "marineanlchkpt" ]]; then
 elif [[ "${step}" = "ocnanalecen" ]]; then
 
     export NTHREADS_OCNANALECEN=${NTHREADSmax}
-    export APRUN_OCNANALECEN="${APRUN_default} --cpus-per-task=${NTHREADS_OCNANALECEN}"
+    export APRUN_OCNANALECEN="${APRUN_default}"
 
 elif [[ "${step}" = "marineanlletkf" ]]; then
 

parm/config/gefs/config.base

@@ -227,8 +227,13 @@ export SDATE_GFS=@SDATE_GFS@
 export REPLAY_ICS=@REPLAY_ICS@
 if [[ "${REPLAY_ICS:-NO}" == "YES" ]]; then
     export OFFSET_START_HOUR=$(( assim_freq / 2 ))
+    echo "WARNING: Replay ICs require perturbation files, ignoring any previous settings"
+    export USE_OCN_ENS_PERTURB_FILES="YES"
+    export USE_ATM_ENS_PERTURB_FILES="YES"
 else
     export OFFSET_START_HOUR=0
+    export USE_OCN_ENS_PERTURB_FILES=@USE_OCN_ENS_PERTURB_FILES@
+    export USE_ATM_ENS_PERTURB_FILES=@USE_ATM_ENS_PERTURB_FILES@
 fi
 
 # GFS output and frequency

parm/config/gefs/config.efcs

@@ -57,7 +57,7 @@ if (( OCNRES <= 100 )); then
     export EPBL_LSCALE="500.E3,1000.E3,2000.E3,2000.E3,2000.E3"
 fi
 
-if [[ "${REPLAY_ICS:-NO}" == "YES" ]]; then
+if [[ "${USE_OCN_ENS_PERTURB_FILES:-NO}" == "YES" ]]; then
     export ODA_INCUPD="True"
     export ODA_TEMPINC_VAR='t_pert'
     export ODA_SALTINC_VAR='s_pert'

parm/config/gefs/config.fcst

@@ -192,14 +192,14 @@ case ${imp_physics} in
 
         export hord_mt_nh_nonmono=5
         export hord_xx_nh_nonmono=5
+        export hord_dp_nh_nonmono=-5
         export vtdm4_nh_nonmono=0.02
         export nord=2
         if [[ "${TYPE}" == "nh"* ]]; then
             export dddmp=0.1
         else
             export dddmp=0.
 	    fi
-        export dddmp=0.1
         export d4_bg=0.12
         ;;
     11) # GFDL
@@ -216,6 +216,7 @@ case ${imp_physics} in
 
         export hord_mt_nh_nonmono=5
         export hord_xx_nh_nonmono=5
+        export hord_dp_nh_nonmono=-5
         export vtdm4_nh_nonmono=0.02
         export nord=2
         export d4_bg=0.12

parm/config/gefs/config.nsst

@@ -12,10 +12,6 @@ export NST_MODEL=2
 
 # nstf_name(2) : NST_SPINUP : 0 = OFF, 1 = ON,
 export NST_SPINUP=0
-cdate="${PDY}${cyc}"
-if (( cdate < 2017072000 )); then
-    export NST_SPINUP=1
-fi
 
 # nstf_name(3) : NST_RESV (Reserved, NSST Analysis) : 0 = OFF, 1 = ON
 export NST_RESV=0

parm/config/gefs/config.resources

@@ -219,7 +219,7 @@ case ${step} in
 
     case "${CASE}" in
       "C48" | "C96" | "C192")
-        declare -x "walltime"="03:00:00"
+        declare -x "walltime"="04:00:00"
         ;;
       "C384" | "C768" | "C1152")
         declare -x "walltime"="06:00:00"

parm/config/gefs/config.stage_ic

@@ -32,8 +32,4 @@ if [[ -z "${ICSDIR}" ]] ; then
 
 fi
 
-#use of perturbations files for ensembles
-export USE_OCN_ENS_PERTURB_FILES=@USE_OCN_ENS_PERTURB_FILES@
-export USE_ATM_ENS_PERTURB_FILES=@USE_ATM_ENS_PERTURB_FILES@
-
 echo "END: config.stage_ic"

parm/config/gefs/config.ufs

@@ -99,8 +99,8 @@ case "${fv3_res}" in
         export DELTIM=600
         export layout_x=2
         export layout_y=2
-        export layout_x_gfs=4
-        export layout_y_gfs=4
+        export layout_x_gfs=6
+        export layout_y_gfs=8
         export nthreads_fv3=1
         export nthreads_fv3_gfs=1
         export nthreads_ufs=1

parm/config/gefs/config.wave

@@ -16,28 +16,10 @@ export RUNwave="${RUN}wave"
 export RUNRSTwave="gdas"
 
 #grid dependent variable defaults
-export waveGRDN='1'                   # grid number for ww3_multi
-export waveGRDG='10'                  # grid group for ww3_multi
-export USE_WAV_RMP='NO'               # YES/NO rmp grid remapping pre-processed coefficients
-export waveMULTIGRID='.false.'        # .true./.false. for multi or shel
 export MESH_WAV="mesh.${waveGRD}.nc"  # Mesh grid for wave model for CMEPS
-export waveesmfGRD=' '                # input grid for multigrid
 
 #Grid dependent variables for various grids
 case "${waveGRD}" in
-  "gnh_10m;aoc_9km;gsh_15m")
-    #GFSv16 settings:
-    export waveGRDN='1 2 3'
-    export waveGRDG='10 20 30'
-    export USE_WAV_RMP='YES'
-    export waveMULTIGRID='.true.'
-    export IOSRV='3'
-    export MESH_WAV=' '
-    export waveesmfGRD='glox_10m'
-    export waveuoutpGRD='points'
-    export waveinterpGRD='glo_15mxt at_10m ep_10m wc_10m glo_30m'
-    export wavepostGRD='gnh_10m aoc_9km gsh_15m'
-    ;;
   "gwes_30m")
     #Grid used for P8
     export waveinterpGRD=''
@@ -157,7 +139,7 @@ export WW3CURIENS='F'
 export GOFILETYPE=1     # GOFILETYPE=1 one gridded file per output step
 export POFILETYPE=1     # POFILETYPE=1 one point file per output step
 
-# Parameters for ww3_multi/shel.inp
+# Parameters for ww3_shel.inp
 # Unified output T or F
 export FUNIPNT='T'
 # Output server type (see ww3_shel/multi.inp in WW3 repo)

parm/config/gefs/yaml/defaults.yaml

@@ -14,22 +14,20 @@ base:
   FHOUT_HF_GFS: 1
   FCST_BREAKPOINTS: "48"
   REPLAY_ICS: "NO"
-  USE_OCN_PERTURB_FILES: "false"
   FHOUT_GFS: 6
   FHOUT_OCN_GFS: 6
   FHOUT_ICE_GFS: 6
   HPSSARCH: "NO"
   LOCALARCH: "NO"
   SFS_POST: "NO"
+  USE_OCN_ENS_PERTURB_FILES: "NO"
+  USE_ATM_ENS_PERTURB_FILES: "NO"
   DO_TEST_MODE: "NO"
 fcst:
   reforecast: "NO"
   FHZER: 6
   TYPE: "nh"
   MONO: "non-mono"
-stage_ic:
-  USE_OCN_ENS_PERTURB_FILES: "NO"
-  USE_ATM_ENS_PERTURB_FILES: "NO"
 ocn:
   MOM6_INTERP_ICS: "NO"
 # config.aero has just a system-specific path to add.

parm/config/gfs/config.fcst

@@ -203,6 +203,7 @@ case ${imp_physics} in
 
         export hord_mt_nh_nonmono=5
         export hord_xx_nh_nonmono=5
+        export hord_dp_nh_nonmono=-5
         export vtdm4_nh_nonmono=0.02
         export nord=2
         export dddmp=0.1
@@ -236,6 +237,7 @@ case ${imp_physics} in
 
         export hord_mt_nh_nonmono=5
         export hord_xx_nh_nonmono=5
+        export hord_dp_nh_nonmono=-5
         export vtdm4_nh_nonmono=0.02
         export nord=2
         export d4_bg=0.12

parm/config/gfs/config.wave

@@ -16,28 +16,10 @@ export RUNwave="${RUN}wave"
 export RUNRSTwave="gdas"
 
 #grid dependent variable defaults
-export waveGRDN='1'                   # grid number for ww3_multi
-export waveGRDG='10'                  # grid group for ww3_multi
-export USE_WAV_RMP='NO'               # YES/NO rmp grid remapping pre-processed coefficients
-export waveMULTIGRID='.false.'        # .true./.false. for multi or shel
 export MESH_WAV="mesh.${waveGRD}.nc"  # Mesh grid for wave model for CMEPS
-export waveesmfGRD=' '                # input grid for multigrid
 
 #Grid dependent variables for various grids
 case "${waveGRD}" in
-  "gnh_10m;aoc_9km;gsh_15m")
-    #GFSv16 settings:
-    export waveGRDN='1 2 3'
-    export waveGRDG='10 20 30'
-    export USE_WAV_RMP='YES'
-    export waveMULTIGRID='.true.'
-    export IOSRV='3'
-    export MESH_WAV=' '
-    export waveesmfGRD='glox_10m'
-    export waveuoutpGRD='points'
-    export waveinterpGRD='glo_15mxt at_10m ep_10m wc_10m glo_30m'
-    export wavepostGRD='gnh_10m aoc_9km gsh_15m'
-    ;;
   "gwes_30m")
     #Grid used for P8
     export waveinterpGRD=''
@@ -187,7 +169,7 @@ export WW3CURIENS='F'
 export GOFILETYPE=1     # GOFILETYPE=1 one gridded file per output step
 export POFILETYPE=1     # POFILETYPE=1 one point file per output step
 
-# Parameters for ww3_multi/shel.inp
+# Parameters for ww3_shel.inp
 # Unified output T or F
 export FUNIPNT='T'
 # Output server type (see ww3_shel/multi.inp in WW3 repo)

parm/wmo/grib2_awpgfs000.003

@@ -104,4 +104,3 @@
 &GRIBIDS DESC=' R H      925 mb ',WMOHEAD='YRPA92 KWBC',PDTN= 0 ,PDT=  1 1 2 0 81 0 0 1 0 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' U GRD    925 mb ',WMOHEAD='YUPA92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 2 2 0 81 0 0 1 0 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' V GRD    925 mb ',WMOHEAD='YVPA92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 3 2 0 81 0 0 1 0 100 0 92500 255 0 0 /
-&GRIBIDS DESC=' 5WAVH    500 mb ',WMOHEAD='YHPA50 KWBC',PDTN= 0 ,PDT=  3 193 2 0 81 0 0 1 0 100 0 50000 255 0 0 /

parm/wmo/grib2_awpgfs006.003

@@ -106,4 +106,3 @@
 &GRIBIDS DESC=' R H      925 mb ',WMOHEAD='YRPB92 KWBC',PDTN= 0 ,PDT=  1 1 2 0 96 0 0 1 6 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' U GRD    925 mb ',WMOHEAD='YUPB92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 2 2 0 96 0 0 1 6 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' V GRD    925 mb ',WMOHEAD='YVPB92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 3 2 0 96 0 0 1 6 100 0 92500 255 0 0 /
-&GRIBIDS DESC=' 5WAVH    500 mb ',WMOHEAD='YHPB50 KWBC',PDTN= 0 ,PDT=  3 193 2 0 96 0 0 1 6 100 0 50000 255 0 0 /

parm/wmo/grib2_awpgfs012.003

@@ -106,4 +106,3 @@
 &GRIBIDS DESC=' R H      925 mb ',WMOHEAD='YRPC92 KWBC',PDTN= 0 ,PDT=  1 1 2 0 96 0 0 1 12 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' U GRD    925 mb ',WMOHEAD='YUPC92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 2 2 0 96 0 0 1 12 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' V GRD    925 mb ',WMOHEAD='YVPC92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 3 2 0 96 0 0 1 12 100 0 92500 255 0 0 /
-&GRIBIDS DESC=' 5WAVH    500 mb ',WMOHEAD='YHPC50 KWBC',PDTN= 0 ,PDT=  3 193 2 0 96 0 0 1 12 100 0 50000 255 0 0 /

parm/wmo/grib2_awpgfs018.003

@@ -106,4 +106,3 @@
 &GRIBIDS DESC=' R H      925 mb ',WMOHEAD='YRPD92 KWBC',PDTN= 0 ,PDT=  1 1 2 0 96 0 0 1 18 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' U GRD    925 mb ',WMOHEAD='YUPD92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 2 2 0 96 0 0 1 18 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' V GRD    925 mb ',WMOHEAD='YVPD92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 3 2 0 96 0 0 1 18 100 0 92500 255 0 0 /
-&GRIBIDS DESC=' 5WAVH    500 mb ',WMOHEAD='YHPD50 KWBC',PDTN= 0 ,PDT=  3 193 2 0 96 0 0 1 18 100 0 50000 255 0 0 /

parm/wmo/grib2_awpgfs024.003

@@ -106,4 +106,3 @@
 &GRIBIDS DESC=' R H      925 mb ',WMOHEAD='YRPE92 KWBC',PDTN= 0 ,PDT=  1 1 2 0 96 0 0 1 24 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' U GRD    925 mb ',WMOHEAD='YUPE92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 2 2 0 96 0 0 1 24 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' V GRD    925 mb ',WMOHEAD='YVPE92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 3 2 0 96 0 0 1 24 100 0 92500 255 0 0 /
-&GRIBIDS DESC=' 5WAVH    500 mb ',WMOHEAD='YHPE50 KWBC',PDTN= 0 ,PDT=  3 193 2 0 96 0 0 1 24 100 0 50000 255 0 0 /

parm/wmo/grib2_awpgfs030.003

@@ -106,4 +106,3 @@
 &GRIBIDS DESC=' R H      925 mb ',WMOHEAD='YRPF92 KWBC',PDTN= 0 ,PDT=  1 1 2 0 96 0 0 1 30 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' U GRD    925 mb ',WMOHEAD='YUPF92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 2 2 0 96 0 0 1 30 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' V GRD    925 mb ',WMOHEAD='YVPF92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 3 2 0 96 0 0 1 30 100 0 92500 255 0 0 /
-&GRIBIDS DESC=' 5WAVH    500 mb ',WMOHEAD='YHPF50 KWBC',PDTN= 0 ,PDT=  3 193 2 0 96 0 0 1 30 100 0 50000 255 0 0 /

parm/wmo/grib2_awpgfs036.003

@@ -106,4 +106,3 @@
 &GRIBIDS DESC=' R H      925 mb ',WMOHEAD='YRPG92 KWBC',PDTN= 0 ,PDT=  1 1 2 0 96 0 0 1 36 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' U GRD    925 mb ',WMOHEAD='YUPG92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 2 2 0 96 0 0 1 36 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' V GRD    925 mb ',WMOHEAD='YVPG92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 3 2 0 96 0 0 1 36 100 0 92500 255 0 0 /
-&GRIBIDS DESC=' 5WAVH    500 mb ',WMOHEAD='YHPG50 KWBC',PDTN= 0 ,PDT=  3 193 2 0 96 0 0 1 36 100 0 50000 255 0 0 /

parm/wmo/grib2_awpgfs042.003

@@ -106,4 +106,3 @@
 &GRIBIDS DESC=' R H      925 mb ',WMOHEAD='YRPH92 KWBC',PDTN= 0 ,PDT=  1 1 2 0 96 0 0 1 42 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' U GRD    925 mb ',WMOHEAD='YUPH92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 2 2 0 96 0 0 1 42 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' V GRD    925 mb ',WMOHEAD='YVPH92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 3 2 0 96 0 0 1 42 100 0 92500 255 0 0 /
-&GRIBIDS DESC=' 5WAVH    500 mb ',WMOHEAD='YHPH50 KWBC',PDTN= 0 ,PDT=  3 193 2 0 96 0 0 1 42 100 0 50000 255 0 0 /

parm/wmo/grib2_awpgfs048.003

@@ -106,4 +106,3 @@
 &GRIBIDS DESC=' R H      925 mb ',WMOHEAD='YRPI92 KWBC',PDTN= 0 ,PDT=  1 1 2 0 96 0 0 1 48 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' U GRD    925 mb ',WMOHEAD='YUPI92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 2 2 0 96 0 0 1 48 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' V GRD    925 mb ',WMOHEAD='YVPI92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 3 2 0 96 0 0 1 48 100 0 92500 255 0 0 /
-&GRIBIDS DESC=' 5WAVH    500 mb ',WMOHEAD='YHPI50 KWBC',PDTN= 0 ,PDT=  3 193 2 0 96 0 0 1 48 100 0 50000 255 0 0 /

parm/wmo/grib2_awpgfs054.003

@@ -106,4 +106,3 @@
 &GRIBIDS DESC=' R H      925 mb ',WMOHEAD='ZRPM92 KWBC',PDTN= 0 ,PDT=  1 1 2 0 96 0 0 1 54 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' U GRD    925 mb ',WMOHEAD='ZUPM92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 2 2 0 96 0 0 1 54 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' V GRD    925 mb ',WMOHEAD='ZVPM92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 3 2 0 96 0 0 1 54 100 0 92500 255 0 0 /
-&GRIBIDS DESC=' 5WAVH    500 mb ',WMOHEAD='ZHPM50 KWBC',PDTN= 0 ,PDT=  3 193 2 0 96 0 0 1 54 100 0 50000 255 0 0 /

parm/wmo/grib2_awpgfs060.003

@@ -106,4 +106,3 @@
 &GRIBIDS DESC=' R H      925 mb ',WMOHEAD='YRPJ92 KWBC',PDTN= 0 ,PDT=  1 1 2 0 96 0 0 1 60 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' U GRD    925 mb ',WMOHEAD='YUPJ92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 2 2 0 96 0 0 1 60 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' V GRD    925 mb ',WMOHEAD='YVPJ92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 3 2 0 96 0 0 1 60 100 0 92500 255 0 0 /
-&GRIBIDS DESC=' 5WAVH    500 mb ',WMOHEAD='YHPJ50 KWBC',PDTN= 0 ,PDT=  3 193 2 0 96 0 0 1 60 100 0 50000 255 0 0 /

parm/wmo/grib2_awpgfs066.003

@@ -106,4 +106,3 @@
 &GRIBIDS DESC=' R H      925 mb ',WMOHEAD='ZRPN92 KWBC',PDTN= 0 ,PDT=  1 1 2 0 96 0 0 1 66 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' U GRD    925 mb ',WMOHEAD='ZUPN92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 2 2 0 96 0 0 1 66 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' V GRD    925 mb ',WMOHEAD='ZVPN92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 3 2 0 96 0 0 1 66 100 0 92500 255 0 0 /
-&GRIBIDS DESC=' 5WAVH    500 mb ',WMOHEAD='ZHPN50 KWBC',PDTN= 0 ,PDT=  3 193 2 0 96 0 0 1 66 100 0 50000 255 0 0 /

parm/wmo/grib2_awpgfs072.003

@@ -106,4 +106,3 @@
 &GRIBIDS DESC=' R H      925 mb ',WMOHEAD='YRPK92 KWBC',PDTN= 0 ,PDT=  1 1 2 0 96 0 0 1 72 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' U GRD    925 mb ',WMOHEAD='YUPK92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 2 2 0 96 0 0 1 72 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' V GRD    925 mb ',WMOHEAD='YVPK92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 3 2 0 96 0 0 1 72 100 0 92500 255 0 0 /
-&GRIBIDS DESC=' 5WAVH    500 mb ',WMOHEAD='YHPK50 KWBC',PDTN= 0 ,PDT=  3 193 2 0 96 0 0 1 72 100 0 50000 255 0 0 /

parm/wmo/grib2_awpgfs078.003

@@ -106,4 +106,3 @@
 &GRIBIDS DESC=' R H      925 mb ',WMOHEAD='ZRPT92 KWBC',PDTN= 0 ,PDT=  1 1 2 0 96 0 0 1 78 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' U GRD    925 mb ',WMOHEAD='ZUPT92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 2 2 0 96 0 0 1 78 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' V GRD    925 mb ',WMOHEAD='ZVPT92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 3 2 0 96 0 0 1 78 100 0 92500 255 0 0 /
-&GRIBIDS DESC=' 5WAVH    500 mb ',WMOHEAD='ZHPT50 KWBC',PDTN= 0 ,PDT=  3 193 2 0 96 0 0 1 78 100 0 50000 255 0 0 /

parm/wmo/grib2_awpgfs084.003

@@ -106,4 +106,3 @@
 &GRIBIDS DESC=' R H      925 mb ',WMOHEAD='YRPL92 KWBC',PDTN= 0 ,PDT=  1 1 2 0 96 0 0 1 84 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' U GRD    925 mb ',WMOHEAD='YUPL92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 2 2 0 96 0 0 1 84 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' V GRD    925 mb ',WMOHEAD='YVPL92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 3 2 0 96 0 0 1 84 100 0 92500 255 0 0 /
-&GRIBIDS DESC=' 5WAVH    500 mb ',WMOHEAD='YHPL50 KWBC',PDTN= 0 ,PDT=  3 193 2 0 96 0 0 1 84 100 0 50000 255 0 0 /

parm/wmo/grib2_awpgfs090.003

@@ -106,4 +106,3 @@
 &GRIBIDS DESC=' R H      925 mb ',WMOHEAD='ZRPU92 KWBC',PDTN= 0 ,PDT=  1 1 2 0 96 0 0 1 90 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' U GRD    925 mb ',WMOHEAD='ZUPU92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 2 2 0 96 0 0 1 90 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' V GRD    925 mb ',WMOHEAD='ZVPU92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 3 2 0 96 0 0 1 90 100 0 92500 255 0 0 /
-&GRIBIDS DESC=' 5WAVH    500 mb ',WMOHEAD='ZHPU50 KWBC',PDTN= 0 ,PDT=  3 193 2 0 96 0 0 1 90 100 0 50000 255 0 0 /

parm/wmo/grib2_awpgfs096.003

@@ -106,4 +106,3 @@
 &GRIBIDS DESC=' R H      925 mb ',WMOHEAD='YRPM92 KWBC',PDTN= 0 ,PDT=  1 1 2 0 96 0 0 1 96 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' U GRD    925 mb ',WMOHEAD='YUPM92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 2 2 0 96 0 0 1 96 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' V GRD    925 mb ',WMOHEAD='YVPM92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 3 2 0 96 0 0 1 96 100 0 92500 255 0 0 /
-&GRIBIDS DESC=' 5WAVH    500 mb ',WMOHEAD='YHPM50 KWBC',PDTN= 0 ,PDT=  3 193 2 0 96 0 0 1 96 100 0 50000 255 0 0 /

parm/wmo/grib2_awpgfs102.003

@@ -106,4 +106,3 @@
 &GRIBIDS DESC=' R H      925 mb ',WMOHEAD='ZRPV92 KWBC',PDTN= 0 ,PDT=  1 1 2 0 96 0 0 1 102 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' U GRD    925 mb ',WMOHEAD='ZUPV92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 2 2 0 96 0 0 1 102 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' V GRD    925 mb ',WMOHEAD='ZVPV92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 3 2 0 96 0 0 1 102 100 0 92500 255 0 0 /
-&GRIBIDS DESC=' 5WAVH    500 mb ',WMOHEAD='ZHPV50 KWBC',PDTN= 0 ,PDT=  3 193 2 0 96 0 0 1 102 100 0 50000 255 0 0 /

parm/wmo/grib2_awpgfs108.003

@@ -106,4 +106,3 @@
 &GRIBIDS DESC=' R H      925 mb ',WMOHEAD='YRPN92 KWBC',PDTN= 0 ,PDT=  1 1 2 0 96 0 0 1 108 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' U GRD    925 mb ',WMOHEAD='YUPN92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 2 2 0 96 0 0 1 108 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' V GRD    925 mb ',WMOHEAD='YVPN92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 3 2 0 96 0 0 1 108 100 0 92500 255 0 0 /
-&GRIBIDS DESC=' 5WAVH    500 mb ',WMOHEAD='YHPN50 KWBC',PDTN= 0 ,PDT=  3 193 2 0 96 0 0 1 108 100 0 50000 255 0 0 /

parm/wmo/grib2_awpgfs114.003

@@ -106,4 +106,3 @@
 &GRIBIDS DESC=' R H      925 mb ',WMOHEAD='ZRPW92 KWBC',PDTN= 0 ,PDT=  1 1 2 0 96 0 0 1 114 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' U GRD    925 mb ',WMOHEAD='ZUPW92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 2 2 0 96 0 0 1 114 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' V GRD    925 mb ',WMOHEAD='ZVPW92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 3 2 0 96 0 0 1 114 100 0 92500 255 0 0 /
-&GRIBIDS DESC=' 5WAVH    500 mb ',WMOHEAD='ZHPW50 KWBC',PDTN= 0 ,PDT=  3 193 2 0 96 0 0 1 114 100 0 50000 255 0 0 /

parm/wmo/grib2_awpgfs120.003

@@ -106,4 +106,3 @@
 &GRIBIDS DESC=' R H      925 mb ',WMOHEAD='YRPO92 KWBC',PDTN= 0 ,PDT=  1 1 2 0 96 0 0 1 120 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' U GRD    925 mb ',WMOHEAD='YUPO92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 2 2 0 96 0 0 1 120 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' V GRD    925 mb ',WMOHEAD='YVPO92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 3 2 0 96 0 0 1 120 100 0 92500 255 0 0 /
-&GRIBIDS DESC=' 5WAVH    500 mb ',WMOHEAD='YHPO50 KWBC',PDTN= 0 ,PDT=  3 193 2 0 96 0 0 1 120 100 0 50000 255 0 0 /

parm/wmo/grib2_awpgfs126.003

@@ -106,4 +106,3 @@
 &GRIBIDS DESC=' R H      925 mb ',WMOHEAD='ZRPZ92 KWBC',PDTN= 0 ,PDT=  1 1 2 0 96 0 0 1 126 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' U GRD    925 mb ',WMOHEAD='ZUPZ92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 2 2 0 96 0 0 1 126 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' V GRD    925 mb ',WMOHEAD='ZVPZ92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 3 2 0 96 0 0 1 126 100 0 92500 255 0 0 /
-&GRIBIDS DESC=' 5WAVH    500 mb ',WMOHEAD='ZHPZ50 KWBC',PDTN= 0 ,PDT=  3 193 2 0 96 0 0 1 126 100 0 50000 255 0 0 /

parm/wmo/grib2_awpgfs132.003

@@ -106,4 +106,3 @@
 &GRIBIDS DESC=' R H      925 mb ',WMOHEAD='YRPP92 KWBC',PDTN= 0 ,PDT=  1 1 2 0 96 0 0 1 132 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' U GRD    925 mb ',WMOHEAD='YUPP92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 2 2 0 96 0 0 1 132 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' V GRD    925 mb ',WMOHEAD='YVPP92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 3 2 0 96 0 0 1 132 100 0 92500 255 0 0 /
-&GRIBIDS DESC=' 5WAVH    500 mb ',WMOHEAD='YHPP50 KWBC',PDTN= 0 ,PDT=  3 193 2 0 96 0 0 1 132 100 0 50000 255 0 0 /

parm/wmo/grib2_awpgfs138.003

@@ -106,4 +106,3 @@
 &GRIBIDS DESC=' R H      925 mb ',WMOHEAD='ZRPZ92 KWBC',PDTN= 0 ,PDT=  1 1 2 0 96 0 0 1 138 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' U GRD    925 mb ',WMOHEAD='ZUPZ92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 2 2 0 96 0 0 1 138 100 0 92500 255 0 0 /
 &GRIBIDS DESC=' V GRD    925 mb ',WMOHEAD='ZVPZ92 KWBC',EXTRACT=.true.,PDTN= 0 ,PDT=  2 3 2 0 96 0 0 1 138 100 0 92500 255 0 0 /
-&GRIBIDS DESC=' 5WAVH    500 mb ',WMOHEAD='ZHPZ50 KWBC',PDTN= 0 ,PDT=  3 193 2 0 96 0 0 1 138 100 0 50000 255 0 0 /