Merge branch 'NOAA-EMC:develop' into feature/issue_2475

KateFriedman-NOAA · Jun 5, 2024 · 03d8e20 · 03d8e20
2 parents 3f08f03 + 67b833e
commit 03d8e20
Show file tree

Hide file tree

Showing 222 changed files with 1,050 additions and 1,075 deletions.
diff --git a/ci/cases/yamls/atmaerosnowDA_defaults_ci.yaml b/ci/cases/yamls/atmaerosnowDA_defaults_ci.yaml
@@ -1,6 +1,5 @@
 defaults:
   !INC {{ HOMEgfs }}/parm/config/gfs/yaml/defaults.yaml
 base:
-  DOIAU: "NO"
   DO_JEDISNOWDA: "YES"
   ACCOUNT: {{ 'HPC_ACCOUNT' | getenv }}
diff --git a/jobs/JGLOBAL_ATMOS_SFCANL b/jobs/JGLOBAL_ATMOS_SFCANL
@@ -4,40 +4,35 @@ source "${HOMEgfs}/ush/preamble.sh"
 source "${HOMEgfs}/ush/jjob_header.sh" -e "sfcanl" -c "base sfcanl"
 
 
-##############################################
-# Set variables used in the script
-##############################################
-export CDUMP="${RUN/enkf}"
-
-
 ##############################################
 # Begin JOB SPECIFIC work
 ##############################################
 # Ignore possible spelling error (nothing is misspelled)
 # shellcheck disable=SC2153
-GDATE=$(${NDATE} -"${assim_freq}" "${PDY}${cyc}")
-# shellcheck disable=
-gPDY=${GDATE:0:8}
-gcyc=${GDATE:8:2}
-export GDUMP="gdas"
+GDATE=$(date --utc -d "${PDY} ${cyc} - ${assim_freq} hours" +%Y%m%d%H)
+export GDATE
+
+RUN="gdas" YMD=${GDATE:0:8} HH=${GDATE:8:2} declare_from_tmpl -rx \
+  COMIN_OBS_PREV:COM_OBS_TMPL \
+  COMIN_ATMOS_RESTART_PREV:COM_ATMOS_RESTART_TMPL
+
+YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
+  COMIN_OBS:COM_OBS_TMPL \
+  COMIN_ATMOS_ANALYSIS:COM_ATMOS_ANALYSIS_TMPL \
+  COMIN_SNOW_ANALYSIS:COM_SNOW_ANALYSIS_TMPL
 
-export OPREFIX="${CDUMP}.t${cyc}z."
-export GPREFIX="${GDUMP}.t${gcyc}z."
-export APREFIX="${CDUMP}.t${cyc}z."
+YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
+  COMOUT_ATMOS_RESTART:COM_ATMOS_RESTART_TMPL
 
-YMD=${PDY} HH=${cyc} declare_from_tmpl -rx COM_OBS COM_ATMOS_ANALYSIS COM_ATMOS_RESTART \
-    COM_SNOW_ANALYSIS
+mkdir -p "${COMOUT_ATMOS_RESTART}"
 
-RUN=${GDUMP} YMD=${gPDY} HH=${gcyc} declare_from_tmpl -rx \
-    COM_OBS_PREV:COM_OBS_TMPL \
-    COM_ATMOS_RESTART_PREV:COM_ATMOS_RESTART_TMPL
 
 ###############################################################
 # Run relevant script
 
 ${SFCANALSH:-${SCRgfs}/exglobal_atmos_sfcanl.sh}
 status=$?
-[[ ${status} -ne 0 ]] && exit ${status}
+(( status != 0 )) && exit "${status}"
 
 
 ##############################################
@@ -48,14 +43,14 @@ status=$?
 # Final processing
 ##############################################
 if [[ -e "${pgmout}" ]] ; then
-  cat ${pgmout}
+  cat "${pgmout}"
 fi
 
 ##########################################
 # Remove the Temporary working directory
 ##########################################
-cd ${DATAROOT}
-[[ ${KEEPDATA} = "NO" ]] && rm -rf ${DATA}
+cd "${DATAROOT}"
+[[ "${KEEPDATA}" == "NO" ]] && rm -rf "${DATA}"
 
 
 exit 0
diff --git a/parm/wmo/grib2_awpgfs_20km_akf003 b/parm/wmo/grib2_awpgfs_20km_akf003
@@ -251,7 +251,7 @@
 &GRIBIDS DESC=' MSLET    Mean Sea Level ',WMOHEAD='ZPBB89 KWBC',PDTN= 0 ,PDT=  3 192 2 0 96 0 0 1 3 101 0 0 255 0 0 /
 &GRIBIDS DESC=' TMIN     2 m above ground ',WMOHEAD='ZTBB98 KWBC',PDTN= 8 ,PDT=  0 5 2 0 96 0 0 1 0 103 0 2 255 0 0 /
 &GRIBIDS DESC=' TMAX     2 m above ground ',WMOHEAD='ZTBB98 KWBC',PDTN= 8 ,PDT=  0 4 2 0 96 0 0 1 0 103 0 2 255 0 0 /
-&GRIBIDS DESC=' CRAIN    Surface ',WMOHEAD='ZMBB98 KWBC',PDTN= 8 ,PDT=  1 192 2 0 96 0 0 1 0 1 0 0 255 0 0 /
-&GRIBIDS DESC=' CFRZR    Surface ',WMOHEAD='ZMBB98 KWBC',PDTN= 8 ,PDT=  1 193 2 0 96 0 0 1 0 1 0 0 255 0 0 /
-&GRIBIDS DESC=' CICEP    Surface ',WMOHEAD='ZMBB98 KWBC',PDTN= 8 ,PDT=  1 194 2 0 96 0 0 1 0 1 0 0 255 0 0 /
-&GRIBIDS DESC=' CSNOW    Surface ',WMOHEAD='ZMBB98 KWBC',PDTN= 8 ,PDT=  1 195 2 0 96 0 0 1 0 1 0 0 255 0 0 /
+&GRIBIDS DESC=' CRAIN    Surface ',WMOHEAD='ZMBB98 KWBC',PDTN= 0 ,PDT=  1 192 2 0 96 0 0 1 3 1 0 0 255 0 0 /
+&GRIBIDS DESC=' CFRZR    Surface ',WMOHEAD='ZMBB98 KWBC',PDTN= 0 ,PDT=  1 193 2 0 96 0 0 1 3 1 0 0 255 0 0 /
+&GRIBIDS DESC=' CICEP    Surface ',WMOHEAD='ZMBB98 KWBC',PDTN= 0 ,PDT=  1 194 2 0 96 0 0 1 3 1 0 0 255 0 0 /
+&GRIBIDS DESC=' CSNOW    Surface ',WMOHEAD='ZMBB98 KWBC',PDTN= 0 ,PDT=  1 195 2 0 96 0 0 1 3 1 0 0 255 0 0 /
diff --git a/parm/wmo/grib2_awpgfs_20km_akf006 b/parm/wmo/grib2_awpgfs_20km_akf006
@@ -251,7 +251,7 @@
 &GRIBIDS DESC=' MSLET    Mean Sea Level ',WMOHEAD='YPBB89 KWBC',PDTN= 0 ,PDT=  3 192 2 0 96 0 0 1 6 101 0 0 255 0 0 /
 &GRIBIDS DESC=' TMIN     2 m above ground ',WMOHEAD='YTBB98 KWBC',PDTN= 8 ,PDT=  0 5 2 0 96 0 0 1 0 103 0 2 255 0 0 /
 &GRIBIDS DESC=' TMAX     2 m above ground ',WMOHEAD='YTBB98 KWBC',PDTN= 8 ,PDT=  0 4 2 0 96 0 0 1 0 103 0 2 255 0 0 /
-&GRIBIDS DESC=' CRAIN    Surface ',WMOHEAD='YMBB98 KWBC',PDTN= 8 ,PDT=  1 192 2 0 96 0 0 1 0 1 0 0 255 0 0 /
-&GRIBIDS DESC=' CFRZR    Surface ',WMOHEAD='YMBB98 KWBC',PDTN= 8 ,PDT=  1 193 2 0 96 0 0 1 0 1 0 0 255 0 0 /
-&GRIBIDS DESC=' CICEP    Surface ',WMOHEAD='YMBB98 KWBC',PDTN= 8 ,PDT=  1 194 2 0 96 0 0 1 0 1 0 0 255 0 0 /
-&GRIBIDS DESC=' CSNOW    Surface ',WMOHEAD='YMBB98 KWBC',PDTN= 8 ,PDT=  1 195 2 0 96 0 0 1 0 1 0 0 255 0 0 /
+&GRIBIDS DESC=' CRAIN    Surface ',WMOHEAD='YMBB98 KWBC',PDTN= 0 ,PDT=  1 192 2 0 96 0 0 1 6 1 0 0 255 0 0 /
+&GRIBIDS DESC=' CFRZR    Surface ',WMOHEAD='YMBB98 KWBC',PDTN= 0 ,PDT=  1 193 2 0 96 0 0 1 6 1 0 0 255 0 0 /
+&GRIBIDS DESC=' CICEP    Surface ',WMOHEAD='YMBB98 KWBC',PDTN= 0 ,PDT=  1 194 2 0 96 0 0 1 6 1 0 0 255 0 0 /
+&GRIBIDS DESC=' CSNOW    Surface ',WMOHEAD='YMBB98 KWBC',PDTN= 0 ,PDT=  1 195 2 0 96 0 0 1 6 1 0 0 255 0 0 /
diff --git a/parm/wmo/grib2_awpgfs_20km_akf009 b/parm/wmo/grib2_awpgfs_20km_akf009
@@ -251,7 +251,7 @@
 &GRIBIDS DESC=' MSLET    Mean Sea Level ',WMOHEAD='ZPBE89 KWBC',PDTN= 0 ,PDT=  3 192 2 0 96 0 0 1 9 101 0 0 255 0 0 /
 &GRIBIDS DESC=' TMIN     2 m above ground ',WMOHEAD='ZTBE98 KWBC',PDTN= 8 ,PDT=  0 5 2 0 96 0 0 1 6 103 0 2 255 0 0 /
 &GRIBIDS DESC=' TMAX     2 m above ground ',WMOHEAD='ZTBE98 KWBC',PDTN= 8 ,PDT=  0 4 2 0 96 0 0 1 6 103 0 2 255 0 0 /
-&GRIBIDS DESC=' CRAIN    Surface ',WMOHEAD='ZMBE98 KWBC',PDTN= 8 ,PDT=  1 192 2 0 96 0 0 1 6 1 0 0 255 0 0 /
-&GRIBIDS DESC=' CFRZR    Surface ',WMOHEAD='ZMBE98 KWBC',PDTN= 8 ,PDT=  1 193 2 0 96 0 0 1 6 1 0 0 255 0 0 /
-&GRIBIDS DESC=' CICEP    Surface ',WMOHEAD='ZMBE98 KWBC',PDTN= 8 ,PDT=  1 194 2 0 96 0 0 1 6 1 0 0 255 0 0 /
-&GRIBIDS DESC=' CSNOW    Surface ',WMOHEAD='ZMBE98 KWBC',PDTN= 8 ,PDT=  1 195 2 0 96 0 0 1 6 1 0 0 255 0 0 /
+&GRIBIDS DESC=' CRAIN    Surface ',WMOHEAD='ZMBE98 KWBC',PDTN= 0 ,PDT=  1 192 2 0 96 0 0 1 9 1 0 0 255 0 0 /
+&GRIBIDS DESC=' CFRZR    Surface ',WMOHEAD='ZMBE98 KWBC',PDTN= 0 ,PDT=  1 193 2 0 96 0 0 1 9 1 0 0 255 0 0 /
+&GRIBIDS DESC=' CICEP    Surface ',WMOHEAD='ZMBE98 KWBC',PDTN= 0 ,PDT=  1 194 2 0 96 0 0 1 9 1 0 0 255 0 0 /
+&GRIBIDS DESC=' CSNOW    Surface ',WMOHEAD='ZMBE98 KWBC',PDTN= 0 ,PDT=  1 195 2 0 96 0 0 1 9 1 0 0 255 0 0 /
diff --git a/parm/wmo/grib2_awpgfs_20km_akf012 b/parm/wmo/grib2_awpgfs_20km_akf012
@@ -251,7 +251,7 @@
 &GRIBIDS DESC=' MSLET    Mean Sea Level ',WMOHEAD='YPBC89 KWBC',PDTN= 0 ,PDT=  3 192 2 0 96 0 0 1 12 101 0 0 255 0 0 /
 &GRIBIDS DESC=' TMIN     2 m above ground ',WMOHEAD='YTBC98 KWBC',PDTN= 8 ,PDT=  0 5 2 0 96 0 0 1 6 103 0 2 255 0 0 /
 &GRIBIDS DESC=' TMAX     2 m above ground ',WMOHEAD='YTBC98 KWBC',PDTN= 8 ,PDT=  0 4 2 0 96 0 0 1 6 103 0 2 255 0 0 /
-&GRIBIDS DESC=' CRAIN    Surface ',WMOHEAD='YMBC98 KWBC',PDTN= 8 ,PDT=  1 192 2 0 96 0 0 1 6 1 0 0 255 0 0 /
-&GRIBIDS DESC=' CFRZR    Surface ',WMOHEAD='YMBC98 KWBC',PDTN= 8 ,PDT=  1 193 2 0 96 0 0 1 6 1 0 0 255 0 0 /
-&GRIBIDS DESC=' CICEP    Surface ',WMOHEAD='YMBC98 KWBC',PDTN= 8 ,PDT=  1 194 2 0 96 0 0 1 6 1 0 0 255 0 0 /
-&GRIBIDS DESC=' CSNOW    Surface ',WMOHEAD='YMBC98 KWBC',PDTN= 8 ,PDT=  1 195 2 0 96 0 0 1 6 1 0 0 255 0 0 /
+&GRIBIDS DESC=' CRAIN    Surface ',WMOHEAD='YMBC98 KWBC',PDTN= 0 ,PDT=  1 192 2 0 96 0 0 1 12 1 0 0 255 0 0 /
+&GRIBIDS DESC=' CFRZR    Surface ',WMOHEAD='YMBC98 KWBC',PDTN= 0 ,PDT=  1 193 2 0 96 0 0 1 12 1 0 0 255 0 0 /
+&GRIBIDS DESC=' CICEP    Surface ',WMOHEAD='YMBC98 KWBC',PDTN= 0 ,PDT=  1 194 2 0 96 0 0 1 12 1 0 0 255 0 0 /
+&GRIBIDS DESC=' CSNOW    Surface ',WMOHEAD='YMBC98 KWBC',PDTN= 0 ,PDT=  1 195 2 0 96 0 0 1 12 1 0 0 255 0 0 /
diff --git a/parm/wmo/grib2_awpgfs_20km_akf015 b/parm/wmo/grib2_awpgfs_20km_akf015
@@ -251,7 +251,7 @@
 &GRIBIDS DESC=' MSLET    Mean Sea Level ',WMOHEAD='ZPBH89 KWBC',PDTN= 0 ,PDT=  3 192 2 0 96 0 0 1 15 101 0 0 255 0 0 /
 &GRIBIDS DESC=' TMIN     2 m above ground ',WMOHEAD='ZTBH98 KWBC',PDTN= 8 ,PDT=  0 5 2 0 96 0 0 1 12 103 0 2 255 0 0 /
 &GRIBIDS DESC=' TMAX     2 m above ground ',WMOHEAD='ZTBH98 KWBC',PDTN= 8 ,PDT=  0 4 2 0 96 0 0 1 12 103 0 2 255 0 0 /
-&GRIBIDS DESC=' CRAIN    Surface ',WMOHEAD='ZMBH98 KWBC',PDTN= 8 ,PDT=  1 192 2 0 96 0 0 1 12 1 0 0 255 0 0 /
-&GRIBIDS DESC=' CFRZR    Surface ',WMOHEAD='ZMBH98 KWBC',PDTN= 8 ,PDT=  1 193 2 0 96 0 0 1 12 1 0 0 255 0 0 /
-&GRIBIDS DESC=' CICEP    Surface ',WMOHEAD='ZMBH98 KWBC',PDTN= 8 ,PDT=  1 194 2 0 96 0 0 1 12 1 0 0 255 0 0 /
-&GRIBIDS DESC=' CSNOW    Surface ',WMOHEAD='ZMBH98 KWBC',PDTN= 8 ,PDT=  1 195 2 0 96 0 0 1 12 1 0 0 255 0 0 /
+&GRIBIDS DESC=' CRAIN    Surface ',WMOHEAD='ZMBH98 KWBC',PDTN= 0 ,PDT=  1 192 2 0 96 0 0 1 15 1 0 0 255 0 0 /
+&GRIBIDS DESC=' CFRZR    Surface ',WMOHEAD='ZMBH98 KWBC',PDTN= 0 ,PDT=  1 193 2 0 96 0 0 1 15 1 0 0 255 0 0 /
+&GRIBIDS DESC=' CICEP    Surface ',WMOHEAD='ZMBH98 KWBC',PDTN= 0 ,PDT=  1 194 2 0 96 0 0 1 15 1 0 0 255 0 0 /
+&GRIBIDS DESC=' CSNOW    Surface ',WMOHEAD='ZMBH98 KWBC',PDTN= 0 ,PDT=  1 195 2 0 96 0 0 1 15 1 0 0 255 0 0 /
diff --git a/parm/wmo/grib2_awpgfs_20km_akf018 b/parm/wmo/grib2_awpgfs_20km_akf018
@@ -251,7 +251,7 @@
 &GRIBIDS DESC=' MSLET    Mean Sea Level ',WMOHEAD='YPBD89 KWBC',PDTN= 0 ,PDT=  3 192 2 0 96 0 0 1 18 101 0 0 255 0 0 /
 &GRIBIDS DESC=' TMIN     2 m above ground ',WMOHEAD='YTBD98 KWBC',PDTN= 8 ,PDT=  0 5 2 0 96 0 0 1 12 103 0 2 255 0 0 /
 &GRIBIDS DESC=' TMAX     2 m above ground ',WMOHEAD='YTBD98 KWBC',PDTN= 8 ,PDT=  0 4 2 0 96 0 0 1 12 103 0 2 255 0 0 /
-&GRIBIDS DESC=' CRAIN    Surface ',WMOHEAD='YMBD98 KWBC',PDTN= 8 ,PDT=  1 192 2 0 96 0 0 1 12 1 0 0 255 0 0 /
-&GRIBIDS DESC=' CFRZR    Surface ',WMOHEAD='YMBD98 KWBC',PDTN= 8 ,PDT=  1 193 2 0 96 0 0 1 12 1 0 0 255 0 0 /
-&GRIBIDS DESC=' CICEP    Surface ',WMOHEAD='YMBD98 KWBC',PDTN= 8 ,PDT=  1 194 2 0 96 0 0 1 12 1 0 0 255 0 0 /
-&GRIBIDS DESC=' CSNOW    Surface ',WMOHEAD='YMBD98 KWBC',PDTN= 8 ,PDT=  1 195 2 0 96 0 0 1 12 1 0 0 255 0 0 /
+&GRIBIDS DESC=' CRAIN    Surface ',WMOHEAD='YMBD98 KWBC',PDTN= 0 ,PDT=  1 192 2 0 96 0 0 1 18 1 0 0 255 0 0 /
+&GRIBIDS DESC=' CFRZR    Surface ',WMOHEAD='YMBD98 KWBC',PDTN= 0 ,PDT=  1 193 2 0 96 0 0 1 18 1 0 0 255 0 0 /
+&GRIBIDS DESC=' CICEP    Surface ',WMOHEAD='YMBD98 KWBC',PDTN= 0 ,PDT=  1 194 2 0 96 0 0 1 18 1 0 0 255 0 0 /
+&GRIBIDS DESC=' CSNOW    Surface ',WMOHEAD='YMBD98 KWBC',PDTN= 0 ,PDT=  1 195 2 0 96 0 0 1 18 1 0 0 255 0 0 /
diff --git a/parm/wmo/grib2_awpgfs_20km_akf021 b/parm/wmo/grib2_awpgfs_20km_akf021
@@ -251,7 +251,7 @@
 &GRIBIDS DESC=' MSLET    Mean Sea Level ',WMOHEAD='ZPBK89 KWBC',PDTN= 0 ,PDT=  3 192 2 0 96 0 0 1 21 101 0 0 255 0 0 /
 &GRIBIDS DESC=' TMIN     2 m above ground ',WMOHEAD='ZTBK98 KWBC',PDTN= 8 ,PDT=  0 5 2 0 96 0 0 1 18 103 0 2 255 0 0 /
 &GRIBIDS DESC=' TMAX     2 m above ground ',WMOHEAD='ZTBK98 KWBC',PDTN= 8 ,PDT=  0 4 2 0 96 0 0 1 18 103 0 2 255 0 0 /
-&GRIBIDS DESC=' CRAIN    Surface ',WMOHEAD='ZMBK98 KWBC',PDTN= 8 ,PDT=  1 192 2 0 96 0 0 1 18 1 0 0 255 0 0 /
-&GRIBIDS DESC=' CFRZR    Surface ',WMOHEAD='ZMBK98 KWBC',PDTN= 8 ,PDT=  1 193 2 0 96 0 0 1 18 1 0 0 255 0 0 /
-&GRIBIDS DESC=' CICEP    Surface ',WMOHEAD='ZMBK98 KWBC',PDTN= 8 ,PDT=  1 194 2 0 96 0 0 1 18 1 0 0 255 0 0 /
-&GRIBIDS DESC=' CSNOW    Surface ',WMOHEAD='ZMBK98 KWBC',PDTN= 8 ,PDT=  1 195 2 0 96 0 0 1 18 1 0 0 255 0 0 /
+&GRIBIDS DESC=' CRAIN    Surface ',WMOHEAD='ZMBK98 KWBC',PDTN= 0 ,PDT=  1 192 2 0 96 0 0 1 21 1 0 0 255 0 0 /
+&GRIBIDS DESC=' CFRZR    Surface ',WMOHEAD='ZMBK98 KWBC',PDTN= 0 ,PDT=  1 193 2 0 96 0 0 1 21 1 0 0 255 0 0 /
+&GRIBIDS DESC=' CICEP    Surface ',WMOHEAD='ZMBK98 KWBC',PDTN= 0 ,PDT=  1 194 2 0 96 0 0 1 21 1 0 0 255 0 0 /
+&GRIBIDS DESC=' CSNOW    Surface ',WMOHEAD='ZMBK98 KWBC',PDTN= 0 ,PDT=  1 195 2 0 96 0 0 1 21 1 0 0 255 0 0 /
diff --git a/parm/wmo/grib2_awpgfs_20km_akf024 b/parm/wmo/grib2_awpgfs_20km_akf024
@@ -251,7 +251,7 @@
 &GRIBIDS DESC=' MSLET    Mean Sea Level ',WMOHEAD='YPBE89 KWBC',PDTN= 0 ,PDT=  3 192 2 0 96 0 0 1 24 101 0 0 255 0 0 /
 &GRIBIDS DESC=' TMIN     2 m above ground ',WMOHEAD='YTBE98 KWBC',PDTN= 8 ,PDT=  0 5 2 0 96 0 0 1 18 103 0 2 255 0 0 /
 &GRIBIDS DESC=' TMAX     2 m above ground ',WMOHEAD='YTBE98 KWBC',PDTN= 8 ,PDT=  0 4 2 0 96 0 0 1 18 103 0 2 255 0 0 /
-&GRIBIDS DESC=' CRAIN    Surface ',WMOHEAD='YMBE98 KWBC',PDTN= 8 ,PDT=  1 192 2 0 96 0 0 1 18 1 0 0 255 0 0 /
-&GRIBIDS DESC=' CFRZR    Surface ',WMOHEAD='YMBE98 KWBC',PDTN= 8 ,PDT=  1 193 2 0 96 0 0 1 18 1 0 0 255 0 0 /
-&GRIBIDS DESC=' CICEP    Surface ',WMOHEAD='YMBE98 KWBC',PDTN= 8 ,PDT=  1 194 2 0 96 0 0 1 18 1 0 0 255 0 0 /
-&GRIBIDS DESC=' CSNOW    Surface ',WMOHEAD='YMBE98 KWBC',PDTN= 8 ,PDT=  1 195 2 0 96 0 0 1 18 1 0 0 255 0 0 /
+&GRIBIDS DESC=' CRAIN    Surface ',WMOHEAD='YMBE98 KWBC',PDTN= 0 ,PDT=  1 192 2 0 96 0 0 1 24 1 0 0 255 0 0 /
+&GRIBIDS DESC=' CFRZR    Surface ',WMOHEAD='YMBE98 KWBC',PDTN= 0 ,PDT=  1 193 2 0 96 0 0 1 24 1 0 0 255 0 0 /
+&GRIBIDS DESC=' CICEP    Surface ',WMOHEAD='YMBE98 KWBC',PDTN= 0 ,PDT=  1 194 2 0 96 0 0 1 24 1 0 0 255 0 0 /
+&GRIBIDS DESC=' CSNOW    Surface ',WMOHEAD='YMBE98 KWBC',PDTN= 0 ,PDT=  1 195 2 0 96 0 0 1 24 1 0 0 255 0 0 /
diff --git a/parm/wmo/grib2_awpgfs_20km_akf027 b/parm/wmo/grib2_awpgfs_20km_akf027
@@ -251,7 +251,7 @@
 &GRIBIDS DESC=' MSLET    Mean Sea Level ',WMOHEAD='ZPBL89 KWBC',PDTN= 0 ,PDT=  3 192 2 0 96 0 0 1 27 101 0 0 255 0 0 /
 &GRIBIDS DESC=' TMIN     2 m above ground ',WMOHEAD='ZTBL98 KWBC',PDTN= 8 ,PDT=  0 5 2 0 96 0 0 1 24 103 0 2 255 0 0 /
 &GRIBIDS DESC=' TMAX     2 m above ground ',WMOHEAD='ZTBL98 KWBC',PDTN= 8 ,PDT=  0 4 2 0 96 0 0 1 24 103 0 2 255 0 0 /
-&GRIBIDS DESC=' CRAIN    Surface ',WMOHEAD='ZMBL98 KWBC',PDTN= 8 ,PDT=  1 192 2 0 96 0 0 1 24 1 0 0 255 0 0 /
-&GRIBIDS DESC=' CFRZR    Surface ',WMOHEAD='ZMBL98 KWBC',PDTN= 8 ,PDT=  1 193 2 0 96 0 0 1 24 1 0 0 255 0 0 /
-&GRIBIDS DESC=' CICEP    Surface ',WMOHEAD='ZMBL98 KWBC',PDTN= 8 ,PDT=  1 194 2 0 96 0 0 1 24 1 0 0 255 0 0 /
-&GRIBIDS DESC=' CSNOW    Surface ',WMOHEAD='ZMBL98 KWBC',PDTN= 8 ,PDT=  1 195 2 0 96 0 0 1 24 1 0 0 255 0 0 /
+&GRIBIDS DESC=' CRAIN    Surface ',WMOHEAD='ZMBL98 KWBC',PDTN= 0 ,PDT=  1 192 2 0 96 0 0 1 27 1 0 0 255 0 0 /
+&GRIBIDS DESC=' CFRZR    Surface ',WMOHEAD='ZMBL98 KWBC',PDTN= 0 ,PDT=  1 193 2 0 96 0 0 1 27 1 0 0 255 0 0 /
+&GRIBIDS DESC=' CICEP    Surface ',WMOHEAD='ZMBL98 KWBC',PDTN= 0 ,PDT=  1 194 2 0 96 0 0 1 27 1 0 0 255 0 0 /
+&GRIBIDS DESC=' CSNOW    Surface ',WMOHEAD='ZMBL98 KWBC',PDTN= 0 ,PDT=  1 195 2 0 96 0 0 1 27 1 0 0 255 0 0 /
diff --git a/parm/wmo/grib2_awpgfs_20km_akf030 b/parm/wmo/grib2_awpgfs_20km_akf030
@@ -251,7 +251,7 @@
 &GRIBIDS DESC=' MSLET    Mean Sea Level ',WMOHEAD='YPBF89 KWBC',PDTN= 0 ,PDT=  3 192 2 0 96 0 0 1 30 101 0 0 255 0 0 /
 &GRIBIDS DESC=' TMIN     2 m above ground ',WMOHEAD='YTBF98 KWBC',PDTN= 8 ,PDT=  0 5 2 0 96 0 0 1 24 103 0 2 255 0 0 /
 &GRIBIDS DESC=' TMAX     2 m above ground ',WMOHEAD='YTBF98 KWBC',PDTN= 8 ,PDT=  0 4 2 0 96 0 0 1 24 103 0 2 255 0 0 /
-&GRIBIDS DESC=' CRAIN    Surface ',WMOHEAD='YMBF98 KWBC',PDTN= 8 ,PDT=  1 192 2 0 96 0 0 1 24 1 0 0 255 0 0 /
-&GRIBIDS DESC=' CFRZR    Surface ',WMOHEAD='YMBF98 KWBC',PDTN= 8 ,PDT=  1 193 2 0 96 0 0 1 24 1 0 0 255 0 0 /
-&GRIBIDS DESC=' CICEP    Surface ',WMOHEAD='YMBF98 KWBC',PDTN= 8 ,PDT=  1 194 2 0 96 0 0 1 24 1 0 0 255 0 0 /
-&GRIBIDS DESC=' CSNOW    Surface ',WMOHEAD='YMBF98 KWBC',PDTN= 8 ,PDT=  1 195 2 0 96 0 0 1 24 1 0 0 255 0 0 /
+&GRIBIDS DESC=' CRAIN    Surface ',WMOHEAD='YMBF98 KWBC',PDTN= 0 ,PDT=  1 192 2 0 96 0 0 1 30 1 0 0 255 0 0 /
+&GRIBIDS DESC=' CFRZR    Surface ',WMOHEAD='YMBF98 KWBC',PDTN= 0 ,PDT=  1 193 2 0 96 0 0 1 30 1 0 0 255 0 0 /
+&GRIBIDS DESC=' CICEP    Surface ',WMOHEAD='YMBF98 KWBC',PDTN= 0 ,PDT=  1 194 2 0 96 0 0 1 30 1 0 0 255 0 0 /
+&GRIBIDS DESC=' CSNOW    Surface ',WMOHEAD='YMBF98 KWBC',PDTN= 0 ,PDT=  1 195 2 0 96 0 0 1 30 1 0 0 255 0 0 /
diff --git a/parm/wmo/grib2_awpgfs_20km_akf033 b/parm/wmo/grib2_awpgfs_20km_akf033
@@ -251,7 +251,7 @@
 &GRIBIDS DESC=' MSLET    Mean Sea Level ',WMOHEAD='ZPBO89 KWBC',PDTN= 0 ,PDT=  3 192 2 0 96 0 0 1 33 101 0 0 255 0 0 /
 &GRIBIDS DESC=' TMIN     2 m above ground ',WMOHEAD='ZTBO98 KWBC',PDTN= 8 ,PDT=  0 5 2 0 96 0 0 1 30 103 0 2 255 0 0 /
 &GRIBIDS DESC=' TMAX     2 m above ground ',WMOHEAD='ZTBO98 KWBC',PDTN= 8 ,PDT=  0 4 2 0 96 0 0 1 30 103 0 2 255 0 0 /
-&GRIBIDS DESC=' CRAIN    Surface ',WMOHEAD='ZMBO98 KWBC',PDTN= 8 ,PDT=  1 192 2 0 96 0 0 1 30 1 0 0 255 0 0 /
-&GRIBIDS DESC=' CFRZR    Surface ',WMOHEAD='ZMBO98 KWBC',PDTN= 8 ,PDT=  1 193 2 0 96 0 0 1 30 1 0 0 255 0 0 /
-&GRIBIDS DESC=' CICEP    Surface ',WMOHEAD='ZMBO98 KWBC',PDTN= 8 ,PDT=  1 194 2 0 96 0 0 1 30 1 0 0 255 0 0 /
-&GRIBIDS DESC=' CSNOW    Surface ',WMOHEAD='ZMBO98 KWBC',PDTN= 8 ,PDT=  1 195 2 0 96 0 0 1 30 1 0 0 255 0 0 /
+&GRIBIDS DESC=' CRAIN    Surface ',WMOHEAD='ZMBO98 KWBC',PDTN= 0 ,PDT=  1 192 2 0 96 0 0 1 33 1 0 0 255 0 0 /
+&GRIBIDS DESC=' CFRZR    Surface ',WMOHEAD='ZMBO98 KWBC',PDTN= 0 ,PDT=  1 193 2 0 96 0 0 1 33 1 0 0 255 0 0 /
+&GRIBIDS DESC=' CICEP    Surface ',WMOHEAD='ZMBO98 KWBC',PDTN= 0 ,PDT=  1 194 2 0 96 0 0 1 33 1 0 0 255 0 0 /
+&GRIBIDS DESC=' CSNOW    Surface ',WMOHEAD='ZMBO98 KWBC',PDTN= 0 ,PDT=  1 195 2 0 96 0 0 1 33 1 0 0 255 0 0 /
diff --git a/parm/wmo/grib2_awpgfs_20km_akf036 b/parm/wmo/grib2_awpgfs_20km_akf036
@@ -251,7 +251,7 @@
 &GRIBIDS DESC=' MSLET    Mean Sea Level ',WMOHEAD='YPBG89 KWBC',PDTN= 0 ,PDT=  3 192 2 0 96 0 0 1 36 101 0 0 255 0 0 /
 &GRIBIDS DESC=' TMIN     2 m above ground ',WMOHEAD='YTBG98 KWBC',PDTN= 8 ,PDT=  0 5 2 0 96 0 0 1 30 103 0 2 255 0 0 /
 &GRIBIDS DESC=' TMAX     2 m above ground ',WMOHEAD='YTBG98 KWBC',PDTN= 8 ,PDT=  0 4 2 0 96 0 0 1 30 103 0 2 255 0 0 /
-&GRIBIDS DESC=' CRAIN    Surface ',WMOHEAD='YMBG98 KWBC',PDTN= 8 ,PDT=  1 192 2 0 96 0 0 1 30 1 0 0 255 0 0 /
-&GRIBIDS DESC=' CFRZR    Surface ',WMOHEAD='YMBG98 KWBC',PDTN= 8 ,PDT=  1 193 2 0 96 0 0 1 30 1 0 0 255 0 0 /
-&GRIBIDS DESC=' CICEP    Surface ',WMOHEAD='YMBG98 KWBC',PDTN= 8 ,PDT=  1 194 2 0 96 0 0 1 30 1 0 0 255 0 0 /
-&GRIBIDS DESC=' CSNOW    Surface ',WMOHEAD='YMBG98 KWBC',PDTN= 8 ,PDT=  1 195 2 0 96 0 0 1 30 1 0 0 255 0 0 /
+&GRIBIDS DESC=' CRAIN    Surface ',WMOHEAD='YMBG98 KWBC',PDTN= 0 ,PDT=  1 192 2 0 96 0 0 1 36 1 0 0 255 0 0 /
+&GRIBIDS DESC=' CFRZR    Surface ',WMOHEAD='YMBG98 KWBC',PDTN= 0 ,PDT=  1 193 2 0 96 0 0 1 36 1 0 0 255 0 0 /
+&GRIBIDS DESC=' CICEP    Surface ',WMOHEAD='YMBG98 KWBC',PDTN= 0 ,PDT=  1 194 2 0 96 0 0 1 36 1 0 0 255 0 0 /
+&GRIBIDS DESC=' CSNOW    Surface ',WMOHEAD='YMBG98 KWBC',PDTN= 0 ,PDT=  1 195 2 0 96 0 0 1 36 1 0 0 255 0 0 /
diff --git a/parm/wmo/grib2_awpgfs_20km_akf039 b/parm/wmo/grib2_awpgfs_20km_akf039
@@ -251,7 +251,7 @@
 &GRIBIDS DESC=' MSLET    Mean Sea Level ',WMOHEAD='ZPBP89 KWBC',PDTN= 0 ,PDT=  3 192 2 0 96 0 0 1 39 101 0 0 255 0 0 /
 &GRIBIDS DESC=' TMIN     2 m above ground ',WMOHEAD='ZTBP98 KWBC',PDTN= 8 ,PDT=  0 5 2 0 96 0 0 1 36 103 0 2 255 0 0 /
 &GRIBIDS DESC=' TMAX     2 m above ground ',WMOHEAD='ZTBP98 KWBC',PDTN= 8 ,PDT=  0 4 2 0 96 0 0 1 36 103 0 2 255 0 0 /
-&GRIBIDS DESC=' CRAIN    Surface ',WMOHEAD='ZMBP98 KWBC',PDTN= 8 ,PDT=  1 192 2 0 96 0 0 1 36 1 0 0 255 0 0 /
-&GRIBIDS DESC=' CFRZR    Surface ',WMOHEAD='ZMBP98 KWBC',PDTN= 8 ,PDT=  1 193 2 0 96 0 0 1 36 1 0 0 255 0 0 /
-&GRIBIDS DESC=' CICEP    Surface ',WMOHEAD='ZMBP98 KWBC',PDTN= 8 ,PDT=  1 194 2 0 96 0 0 1 36 1 0 0 255 0 0 /
-&GRIBIDS DESC=' CSNOW    Surface ',WMOHEAD='ZMBP98 KWBC',PDTN= 8 ,PDT=  1 195 2 0 96 0 0 1 36 1 0 0 255 0 0 /
+&GRIBIDS DESC=' CRAIN    Surface ',WMOHEAD='ZMBP98 KWBC',PDTN= 0 ,PDT=  1 192 2 0 96 0 0 1 39 1 0 0 255 0 0 /
+&GRIBIDS DESC=' CFRZR    Surface ',WMOHEAD='ZMBP98 KWBC',PDTN= 0 ,PDT=  1 193 2 0 96 0 0 1 39 1 0 0 255 0 0 /
+&GRIBIDS DESC=' CICEP    Surface ',WMOHEAD='ZMBP98 KWBC',PDTN= 0 ,PDT=  1 194 2 0 96 0 0 1 39 1 0 0 255 0 0 /
+&GRIBIDS DESC=' CSNOW    Surface ',WMOHEAD='ZMBP98 KWBC',PDTN= 0 ,PDT=  1 195 2 0 96 0 0 1 39 1 0 0 255 0 0 /
diff --git a/parm/wmo/grib2_awpgfs_20km_akf042 b/parm/wmo/grib2_awpgfs_20km_akf042
@@ -251,7 +251,7 @@
 &GRIBIDS DESC=' MSLET    Mean Sea Level ',WMOHEAD='YPBH89 KWBC',PDTN= 0 ,PDT=  3 192 2 0 96 0 0 1 42 101 0 0 255 0 0 /
 &GRIBIDS DESC=' TMIN     2 m above ground ',WMOHEAD='YTBH98 KWBC',PDTN= 8 ,PDT=  0 5 2 0 96 0 0 1 36 103 0 2 255 0 0 /
 &GRIBIDS DESC=' TMAX     2 m above ground ',WMOHEAD='YTBH98 KWBC',PDTN= 8 ,PDT=  0 4 2 0 96 0 0 1 36 103 0 2 255 0 0 /
-&GRIBIDS DESC=' CRAIN    Surface ',WMOHEAD='YMBH98 KWBC',PDTN= 8 ,PDT=  1 192 2 0 96 0 0 1 36 1 0 0 255 0 0 /
-&GRIBIDS DESC=' CFRZR    Surface ',WMOHEAD='YMBH98 KWBC',PDTN= 8 ,PDT=  1 193 2 0 96 0 0 1 36 1 0 0 255 0 0 /
-&GRIBIDS DESC=' CICEP    Surface ',WMOHEAD='YMBH98 KWBC',PDTN= 8 ,PDT=  1 194 2 0 96 0 0 1 36 1 0 0 255 0 0 /
-&GRIBIDS DESC=' CSNOW    Surface ',WMOHEAD='YMBH98 KWBC',PDTN= 8 ,PDT=  1 195 2 0 96 0 0 1 36 1 0 0 255 0 0 /
+&GRIBIDS DESC=' CRAIN    Surface ',WMOHEAD='YMBH98 KWBC',PDTN= 0 ,PDT=  1 192 2 0 96 0 0 1 42 1 0 0 255 0 0 /
+&GRIBIDS DESC=' CFRZR    Surface ',WMOHEAD='YMBH98 KWBC',PDTN= 0 ,PDT=  1 193 2 0 96 0 0 1 42 1 0 0 255 0 0 /
+&GRIBIDS DESC=' CICEP    Surface ',WMOHEAD='YMBH98 KWBC',PDTN= 0 ,PDT=  1 194 2 0 96 0 0 1 42 1 0 0 255 0 0 /
+&GRIBIDS DESC=' CSNOW    Surface ',WMOHEAD='YMBH98 KWBC',PDTN= 0 ,PDT=  1 195 2 0 96 0 0 1 42 1 0 0 255 0 0 /