Merge branch 'NOAA-EMC:develop' into ci_unit-tests

NOAA-EMC · Jun 11, 2024 · d30d11f · d30d11f
2 parents 494690d + e7909af
commit d30d11f
Show file tree

Hide file tree

Showing 238 changed files with 1,097 additions and 1,099 deletions.
diff --git a/ci/cases/pr/C96C48_ufs_hybatmDA.yaml b/ci/cases/pr/C96C48_ufs_hybatmDA.yaml
@@ -21,5 +21,4 @@ skip_ci_on_hosts:
   - hera
   - orion
   - hercules
-  - wcoss2
 
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: {{ 'ACCOUNT' | getenv }}
diff --git a/ci/scripts/clone-build_ci.sh b/ci/scripts/clone-build_ci.sh
@@ -74,7 +74,7 @@ set +e
 source "${HOMEgfs}/ush/module-setup.sh"
 export BUILD_JOBS=8
 rm -rf log.build
-./build_all.sh -gk  >> log.build 2>&1
+./build_all.sh -guk  >> log.build 2>&1
 build_status=$?
 
 DATE=$(date +'%D %r')

diff --git a/docs/source/hpc.rst b/docs/source/hpc.rst
@@ -22,7 +22,7 @@ HPC helpdesks
 * Hercules:  [email protected]
 * HPSS: [email protected]
 * Gaea: [email protected]
-* S4: david.huber@noaa.gov
+* S4: innocent.souopgui@noaa.gov
 * Jet: [email protected]
 * Cloud: [email protected]
 
@@ -48,7 +48,7 @@ https://aim.rdhpcs.noaa.gov/
 Optimizing the global workflow on S4
 ====================================
 
-The S4 cluster is relatively small and so optimizations are recommended to improve cycled runtimes. Please contact David Huber (david.huber@noaa.gov) if you are planning on running a cycled experiment on this system to obtain optimized configuration files.
+The S4 cluster is relatively small and so optimizations are recommended to improve cycled runtimes. Please contact Innocent Souopgui (innocent.souopgui@noaa.gov) if you are planning on running a cycled experiment on this system to obtain optimized configuration files.
 
 ============
 Git settings

diff --git a/docs/source/init.rst b/docs/source/init.rst
@@ -315,7 +315,7 @@ Manual Generation
 *****************
 
 .. note::
-   Initial conditions cannot be generated on S4. These must be generated on another supported platform then pushed to S4. If you do not have access to a supported system or need assistance, please contact David Huber (david.huber@noaa.gov).
+   Initial conditions cannot be generated on S4. These must be generated on another supported platform then pushed to S4. If you do not have access to a supported system or need assistance, please contact Innocent Souopgui (innocent.souopgui@noaa.gov).
 
 .. _coldstarts:
 

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/config/gfs/config.atmanl b/parm/config/gfs/config.atmanl
@@ -6,9 +6,9 @@
 echo "BEGIN: config.atmanl"
 
 export JCB_BASE_YAML="${PARMgfs}/gdas/atm/jcb-base.yaml.j2"
-export JCB_ALGO_YAML="${PARMgfs}/gdas/atm/jcb-prototype_3dvar.yaml.j2"
+export JCB_ALGO_YAML=@JCB_ALGO_YAML@
 
-export STATICB_TYPE="gsibec"
+export STATICB_TYPE=@STATICB_TYPE@
 export LOCALIZATION_TYPE="bump"
 export INTERP_METHOD='barycentric'
 

diff --git a/parm/config/gfs/config.atmensanl b/parm/config/gfs/config.atmensanl
@@ -6,7 +6,7 @@
 echo "BEGIN: config.atmensanl"
 
 export JCB_BASE_YAML="${PARMgfs}/gdas/atm/jcb-base.yaml.j2"
-export JCB_ALGO_YAML="${PARMgfs}/gdas/atm/jcb-prototype_lgetkf.yaml.j2"
+export JCB_ALGO_YAML=@JCB_ALGO_YAML@
 
 export INTERP_METHOD='barycentric'
 

diff --git a/parm/config/gfs/config.resources b/parm/config/gfs/config.resources
@@ -1049,9 +1049,11 @@ case ${step} in
         if [[ "${machine}" == "WCOSS2" ]]; then
           export npe_eupd=315
           export nth_eupd=14
-        elif [[ ${machine} == "S4" ]]; then
+        elif [[ "${machine}" == "S4" ]]; then
            export npe_eupd=160
            export nth_eupd=2
+        elif [[ "${machine}" == "HERA" ]]; then
+          export npe_eupd=80
         fi
         ;;
       "C192" | "C96" | "C48")

diff --git a/parm/config/gfs/yaml/defaults.yaml b/parm/config/gfs/yaml/defaults.yaml
@@ -20,12 +20,15 @@ base:
   FHMAX_ENKF_GFS: 12
 
 atmanl:
+  JCB_ALGO_YAML: "${PARMgfs}/gdas/atm/jcb-prototype_3dvar.yaml.j2" 
+  STATICB_TYPE: "gsibec"  
   LAYOUT_X_ATMANL: 8
   LAYOUT_Y_ATMANL: 8
   IO_LAYOUT_X: 1
   IO_LAYOUT_Y: 1
 
 atmensanl:
+  JCB_ALGO_YAML: "${PARMgfs}/gdas/atm/jcb-prototype_lgetkf.yaml.j2"
   LAYOUT_X_ATMENSANL: 8
   LAYOUT_Y_ATMENSANL: 8
   IO_LAYOUT_X: 1

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 /