From 89bb1e1c1bb2dfcaf0a530a768a92ac56bd41922 Mon Sep 17 00:00:00 2001
From: George Gayno <George.Gayno@noaa.gov>
Date: Fri, 16 Feb 2024 14:32:29 +0000
Subject: [PATCH] Update FIX variables in the snow and ice blend scripts.

Fixes #897.
---
 scripts/exemcsfc_global_sfc_prep.sh | 19 +++++++++----------
 ush/emcsfc_ice_blend.sh             |  4 ++--
 ush/emcsfc_snow.sh                  |  4 ++--
 3 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/scripts/exemcsfc_global_sfc_prep.sh b/scripts/exemcsfc_global_sfc_prep.sh
index bea65decb..4188dbf38 100755
--- a/scripts/exemcsfc_global_sfc_prep.sh
+++ b/scripts/exemcsfc_global_sfc_prep.sh
@@ -72,7 +72,6 @@ RUN=${RUN:-"gfs"}
 export HOMEgfs=${HOMEgfs:-$NWROOT/gfs.${gfs_ver:?}}
 export USHgfs=${USHgfs:-$HOMEgfs/ush}
 export FIXgfs=${FIXgfs:-$HOMEgfs/fix}
-FIXgfs_am=${FIXgfs_am:-$HOMEgfs/fix/am}
 export EXECgfs=${EXECgfs:-$HOMEgfs/exec}
 
 # output com directory.
@@ -116,7 +115,7 @@ export IMS_FILE=${IMS_FILE:-"ims.grib2"}
 export FIVE_MIN_ICE_FILE=${FIVE_MIN_ICE_FILE:-"seaice.5min.grib2"}
 
 # landmask file for global 5-minute data (grib 2)
-export FIVE_MIN_ICE_MASK_FILE=${FIVE_MIN_ICE_MASK_FILE:-${FIXgfs_am}/emcsfc_gland5min.grib2}
+export FIVE_MIN_ICE_MASK_FILE=${FIVE_MIN_ICE_MASK_FILE:-${FIXgfs}/am/emcsfc_gland5min.grib2}
 
 # the output ice blend data (grib)
 export BLENDED_ICE_FILE=${BLENDED_ICE_FILE:-seaice.5min.blend}
@@ -182,10 +181,10 @@ LATB=${LATB:-"1536"}
 
 resolution="${JCAP}.${LONB}.${LATB}"
 
-export MODEL_SLMASK_FILE=${SLMASK:-$FIXgfs_am/global_slmask.t${resolution}.grb}
-export MODEL_LATITUDE_FILE=${MDL_LATS:-$FIXgfs_am/global_latitudes.t${resolution}.grb}
-export MODEL_LONGITUDE_FILE=${MDL_LONS:-$FIXgfs_am/global_longitudes.t${resolution}.grb}
-export GFS_LONSPERLAT_FILE=${LONSPERLAT:-$FIXgfs_am/global_lonsperlat.t${resolution}.txt}
+export MODEL_SLMASK_FILE=${SLMASK:-${FIXgfs}/am/global_slmask.t${resolution}.grb}
+export MODEL_LATITUDE_FILE=${MDL_LATS:-${FIXgfs}/am/global_latitudes.t${resolution}.grb}
+export MODEL_LONGITUDE_FILE=${MDL_LONS:-${FIXgfs}/am/global_longitudes.t${resolution}.grb}
+export GFS_LONSPERLAT_FILE=${LONSPERLAT:-${FIXgfs}/am/global_lonsperlat.t${resolution}.txt}
 export MODEL_SNOW_FILE=${FNSNOAJCAP:-${RUN}.${cycle}.snogrb_t${resolution}}
 export MODEL_SNOW_FILE_m6hrs=${FNSNOGJCAP:-${COMINgfs_m6hrs}/${RUN}.${cycle_m6hrs}.snogrb_t${resolution}}
 
@@ -240,10 +239,10 @@ LATB_ENKF=${LATB_ENKF:-"576"}
 
 resolution="${JCAP_ENKF}.${LONB_ENKF}.${LATB_ENKF}"
 
-export MODEL_SLMASK_FILE=${SLMASK_ENKF:-$FIXgfs_am/global_slmask.t${resolution}.grb}
-export MODEL_LATITUDE_FILE=${MDL_LATS_ENKF:-$FIXgfs_am/global_latitudes.t${resolution}.grb}
-export MODEL_LONGITUDE_FILE=${MDL_LONS_ENKF:-$FIXgfs_am/global_longitudes.t${resolution}.grb}
-export GFS_LONSPERLAT_FILE=${LONSPERLAT_ENKF:-$FIXgfs_am/global_lonsperlat.t${resolution}.txt}
+export MODEL_SLMASK_FILE=${SLMASK_ENKF:-${FIXgfs}/am/global_slmask.t${resolution}.grb}
+export MODEL_LATITUDE_FILE=${MDL_LATS_ENKF:-${FIXgfs}/am/global_latitudes.t${resolution}.grb}
+export MODEL_LONGITUDE_FILE=${MDL_LONS_ENKF:-${FIXgfs}/am/global_longitudes.t${resolution}.grb}
+export GFS_LONSPERLAT_FILE=${LONSPERLAT_ENKF:-${FIXgfs}/am/global_lonsperlat.t${resolution}.txt}
 export MODEL_SNOW_FILE=${FNSNOAJCAP_ENKF:-${RUN}.${cycle}.snogrb_t${resolution}}
 export MODEL_SNOW_FILE_m6hrs=${FNSNOGJCAP_ENKF:-${COMINgfs_m6hrs}/${RUN}.${cycle_m6hrs}.snogrb_t${resolution}}
 
diff --git a/ush/emcsfc_ice_blend.sh b/ush/emcsfc_ice_blend.sh
index f1b9421b1..e6d464256 100755
--- a/ush/emcsfc_ice_blend.sh
+++ b/ush/emcsfc_ice_blend.sh
@@ -82,8 +82,8 @@ envir=${envir:-"prod"}
 NWROOT=${NWROOT:-"/nw${envir}"}
 
 HOMEgfs=${HOMEgfs:-${NWPROD:-$NWROOT/gfs.${gfs_ver:?}}}
-FIXam=${FIXam:-$HOMEgfs/fix/am}
 EXECgfs=${EXECgfs:-$HOMEgfs/exec}
+FIXgfs=${FIXgfs:-$HOMEgfs/fix}
  
 # output com directory.
 COMOUT=${COMOUT:-$PWD}
@@ -91,7 +91,7 @@ COMOUT=${COMOUT:-$PWD}
 # the input data.  ims may be grib1 or grib2.  five_min files are grib 2.
 IMS_FILE=${IMS_FILE:-"ims.grib2"} 
 FIVE_MIN_ICE_FILE=${FIVE_MIN_ICE_FILE:-"seaice.5min.grib2"} 
-FIVE_MIN_ICE_MASK_FILE=${FIVE_MIN_ICE_MASK_FILE:-${FIXam}/emcsfc_gland5min.grib2}
+FIVE_MIN_ICE_MASK_FILE=${FIVE_MIN_ICE_MASK_FILE:-${FIXgfs}/am/emcsfc_gland5min.grib2}
 
 # the output ice blend data (grib)
 BLENDED_ICE_FILE=${BLENDED_ICE_FILE:-seaice.5min.blend}
diff --git a/ush/emcsfc_snow.sh b/ush/emcsfc_snow.sh
index 2db1ebdfb..6f049995e 100755
--- a/ush/emcsfc_snow.sh
+++ b/ush/emcsfc_snow.sh
@@ -77,7 +77,7 @@ envir=${envir:-"prod"}
 NWROOT=${NWROOT:-"/nw${envir}"}
 HOMEgfs=${HOMEgfs:-$NWROOT/gfs.${gfs_ver:?}}
 EXECgfs=${EXECgfs:-$HOMEgfs/exec}
-FIXam=${FIXam:-$HOMEgfs/fix/am}
+FIXgfs=${FIXgfs:-$HOMEgfs/fix}
 
 COMOUT=${COMOUT:-$PWD}
 
@@ -114,7 +114,7 @@ IMS_FILE=${IMS_FILE:-"imssnow96.grb.grib2"}
 # File of snow cover climo used to qc the input snow data
 #------------------------------------------------------------------------
 
-CLIMO_QC=${CLIMO_QC:-${FIXam}/emcsfc_snow_cover_climo.grib2}
+CLIMO_QC=${CLIMO_QC:-${FIXgfs}/am/emcsfc_snow_cover_climo.grib2}
 
 #------------------------------------------------------------------------
 # Output snow analysis on model grid