From 6438626828a39725be62a35c48e3db472d3ef2ed Mon Sep 17 00:00:00 2001
From: ClaraDraper-NOAA <Clara.Draper@noaa.gov>
Date: Tue, 16 Jan 2024 17:42:11 +0000
Subject: [PATCH 01/13] First pass at adding the GSI-based soil analysis to the
 workflow. Relies on GSI PR being merged:
 https://github.com/NOAA-EMC/GSI/pull/675 Also needs a small change to
 UFS_UTILS (no PR yet)

To date: will cycle, and add the soil increments to the ensemble member restart at the beginning of each cycle.
Outstanding: add the increment to the deterministic member.
---
 parm/config/gfs/config.anal         |  9 ++++++++-
 parm/config/gfs/config.base.emc.dyn |  9 +++++++--
 parm/config/gfs/config.esfc         |  4 ++++
 scripts/exgdas_enkf_sfc.sh          | 21 ++++++++++++++++++---
 scripts/exgdas_enkf_update.sh       |  9 +++++++++
 scripts/exglobal_atmos_analysis.sh  |  6 +++++-
 scripts/exglobal_atmos_sfcanl.sh    | 15 +++++++++------
 ush/forecast_postdet.sh             |  6 ++++--
 8 files changed, 64 insertions(+), 15 deletions(-)

diff --git a/parm/config/gfs/config.anal b/parm/config/gfs/config.anal
index e3a17f9c6a3..088f2982685 100644
--- a/parm/config/gfs/config.anal
+++ b/parm/config/gfs/config.anal
@@ -45,11 +45,18 @@ export AMSR2BF=${AMSR2BF:-/dev/null}
 
 # Set default values for info files and observation error
 #  NOTE:  Remember to set PRVT in config.prep as OBERROR is set below
-export CONVINFO=${FIXgsi}/global_convinfo.txt
+#export CONVINFO=${FIXgsi}/global_convinfo.txt
+export CONVINFO=/scratch2/BMC/gsienkf/Clara.Draper/2mDAfiles_gworkflow/global_convinfo.txt_2mObs_newQC
+export ANAVINFO=/scratch2/BMC/gsienkf/Clara.Draper/2mDAfiles_gworkflow/global_anavinfo.l127.txt_2mObs_enkfSMCSTC
 export OZINFO=${FIXgsi}/global_ozinfo.txt
 export SATINFO=${FIXgsi}/global_satinfo.txt
 export OBERROR=${FIXgsi}/prepobs_errtable.global
 
+if [[ $DO_LNDINC == ".true." ]]; then
+    export hofx_2m_sfcfile=".true."
+    export paranc=".false." # temporary until coded.
+    export reducedgrid=".false."
+fi
 
 # Use experimental dumps in EMC GFS v16 parallels
 if [[ ${RUN_ENVIR} == "emc" ]]; then
diff --git a/parm/config/gfs/config.base.emc.dyn b/parm/config/gfs/config.base.emc.dyn
index 467cc8bbfe8..efe26aaa97b 100644
--- a/parm/config/gfs/config.base.emc.dyn
+++ b/parm/config/gfs/config.base.emc.dyn
@@ -360,9 +360,14 @@ fi
 
 if [[ "${DOIAU_ENKF}" = "NO" ]]; then export IAUFHRS_ENKF="6"; fi
 
+export DO_SFCCYCLE=".false." 
+export DO_LNDINC=".true."
+
 # turned on nsst in anal and/or fcst steps, and turn off rtgsst
-export DONST="YES"
-if [[ ${DONST} = "YES" ]]; then export FNTSFA="        "; fi
+export DONST="NO" # CSD until gcycle fixed
+#if [[ ${DONST} = "YES" ]]; then export FNTSFA="        "; fi
+# needs to be defined later, regardless of DONST
+export FNTSFA="        " 
 
 # The switch to apply SST elevation correction or not
 export nst_anl=.true.
diff --git a/parm/config/gfs/config.esfc b/parm/config/gfs/config.esfc
index 2bb3d48bb49..af840ad0638 100644
--- a/parm/config/gfs/config.esfc
+++ b/parm/config/gfs/config.esfc
@@ -16,4 +16,8 @@ if [ $DOIAU_ENKF = "YES" ]; then
    export DOSFCANL_ENKF="NO"
 fi
 
+if [ $DO_LNDINC = ".true." ]; then
+    export LND_SOI_FILE="lnd_incr"
+fi
+
 echo "END: config.esfc"
diff --git a/scripts/exgdas_enkf_sfc.sh b/scripts/exgdas_enkf_sfc.sh
index 81d68fb9fe0..615a883a32b 100755
--- a/scripts/exgdas_enkf_sfc.sh
+++ b/scripts/exgdas_enkf_sfc.sh
@@ -24,6 +24,7 @@ pwd=$(pwd)
 
 # Base variables
 DONST=${DONST:-"NO"}
+DO_LNDINC=${DO_LNDINC:-".true."}
 DOSFCANL_ENKF=${DOSFCANL_ENKF:-"YES"}
 export CASE=${CASE:-384}
 ntiles=${ntiles:-6}
@@ -144,8 +145,12 @@ if [ $DOIAU = "YES" ]; then
             MEMDIR=${memchar} RUN="enkfgdas" YMD=${gPDY} HH=${gcyc} generate_com \
                 COM_ATMOS_RESTART_MEM_PREV:COM_ATMOS_RESTART_TMPL
 
-            [[ ${TILE_NUM} -eq 1 ]] && mkdir -p "${COM_ATMOS_RESTART_MEM}"
+            MEMDIR=${memchar} YMD=${PDY} HH=${cyc} generate_com \
+                COM_ATMOS_ANALYSIS_MEM:COM_ATMOS_ANALYSIS_TMPL
 
+            [[ ${TILE_NUM} -eq 1 ]] && mkdir -p "${COM_ATMOS_RESTART_MEM}"
+            
+            # would it be more intuitive to put these into the analysis (not model_data) directory? 
             ${NCP} "${COM_ATMOS_RESTART_MEM_PREV}/${bPDY}.${bcyc}0000.sfc_data.tile${n}.nc" \
                 "${COM_ATMOS_RESTART_MEM}/${bPDY}.${bcyc}0000.sfcanl_data.tile${n}.nc"
             ${NLN} "${COM_ATMOS_RESTART_MEM_PREV}/${bPDY}.${bcyc}0000.sfc_data.tile${n}.nc" \
@@ -155,8 +160,17 @@ if [ $DOIAU = "YES" ]; then
             ${NLN} "${FIXorog}/${CASE}/${CASE}_grid.tile${n}.nc"     "${DATA}/fngrid.${cmem}"
             ${NLN} "${FIXorog}/${CASE}/${CASE}.mx${OCNRES}_oro_data.tile${n}.nc" "${DATA}/fnorog.${cmem}"
 
-        done
-
+            if [ $DO_LNDINC = ".true." ]; then
+                echo 'CSD fetching sfc increment'
+                FHR=6 # CSD - is this right?
+                echo "CSD will use: ${COM_ATMOS_ANALYSIS_MEM}/${APREFIX_ENS}sfci00${FHR}.nc"
+                ${NLN} "${COM_ATMOS_ANALYSIS_MEM}/${APREFIX_ENS}sfci00${FHR}.nc" \
+                   "${DATA}/lnd_incr.${cmem}"
+            fi
+        done # ensembles
+
+        echo 'CSD Calling global_cycle'
+        export DONST="NO" # turn off for now,not sure this works with fractional grids
         CDATE="${PDY}${cyc}" ${CYCLESH}
         export err=$?; err_chk
 
@@ -164,6 +178,7 @@ if [ $DOIAU = "YES" ]; then
 
 fi
 
+# CSD - should probably code this too.
 if [ $DOSFCANL_ENKF = "YES" ]; then
     for n in $(seq 1 $ntiles); do
 
diff --git a/scripts/exgdas_enkf_update.sh b/scripts/exgdas_enkf_update.sh
index 1f11026ac4d..719e4d41b5c 100755
--- a/scripts/exgdas_enkf_update.sh
+++ b/scripts/exgdas_enkf_update.sh
@@ -87,6 +87,7 @@ else
    DO_CALC_INCREMENT=${DO_CALC_INCREMENT:-"NO"}
 fi
 INCREMENTS_TO_ZERO=${INCREMENTS_TO_ZERO:-"'NONE'"}
+DO_LNDINC=${DO_LNDINC:-".false."}
 
 ################################################################################
 
@@ -203,6 +204,10 @@ for imem in $(seq 1 $NMEM_ENS); do
    for FHR in $nfhrs; do
       ${NLN} "${COM_ATMOS_HISTORY_MEM_PREV}/${GPREFIX}atmf00${FHR}${ENKF_SUFFIX}.nc" \
          "sfg_${PDY}${cyc}_fhr0${FHR}_${memchar}"
+      if [ $DO_LNDINC = ".true." ]; then
+      ${NLN} "${COM_ATMOS_HISTORY_MEM_PREV}/${GPREFIX}sfcf00${FHR}${ENKF_SUFFIX}.nc" \
+         "bfg_${PDY}${cyc}_fhr0${FHR}_${memchar}"
+      fi
       if [ $cnvw_option = ".true." ]; then
          ${NLN} "${COM_ATMOS_HISTORY_MEM_PREV}/${GPREFIX}sfcf00${FHR}.nc" \
             "sfgsfc_${PDY}${cyc}_fhr0${FHR}_${memchar}"
@@ -224,6 +229,10 @@ for imem in $(seq 1 $NMEM_ENS); do
                "incr_${PDY}${cyc}_fhr0${FHR}_${memchar}"
          fi
       fi
+      if [ $DO_LNDINC = ".true." ]; then
+          ${NLN} "${COM_ATMOS_ANALYSIS_MEM}/${APREFIX}sfci00${FHR}.nc" \
+           "sfcincr_${PDY}${cyc}_fhr0${FHR}_${memchar}"
+      fi
    done
 done
 
diff --git a/scripts/exglobal_atmos_analysis.sh b/scripts/exglobal_atmos_analysis.sh
index cb3c6467a11..7096e896935 100755
--- a/scripts/exglobal_atmos_analysis.sh
+++ b/scripts/exglobal_atmos_analysis.sh
@@ -89,6 +89,9 @@ SENDDBN=${SENDDBN:-"NO"}
 RUN_GETGES=${RUN_GETGES:-"NO"}
 GETGESSH=${GETGESSH:-"getges.sh"}
 export gesenvir=${gesenvir:-${envir}}
+ 
+# Assim of 2m obs: 
+export hofx_2m_sfcfile=${hofx_2m_sfcfile:-".false."}
 
 # Observations
 OPREFIX=${OPREFIX:-""}
@@ -296,6 +299,7 @@ RADCLOUDINFO=${RADCLOUDINFO:-${FIXgsi}/cloudy_radiance_info.txt}
 ATMSFILTER=${ATMSFILTER:-${FIXgsi}/atms_beamwidth.txt}
 ANAVINFO=${ANAVINFO:-${FIXgsi}/global_anavinfo.l${LEVS}.txt}
 CONVINFO=${CONVINFO:-${FIXgsi}/global_convinfo.txt}
+
 vqcdat=${vqcdat:-${FIXgsi}/vqctp001.dat}
 INSITUINFO=${INSITUINFO:-${FIXgsi}/global_insituinfo.txt}
 OZINFO=${OZINFO:-${FIXgsi}/global_ozinfo.txt}
@@ -748,6 +752,7 @@ cat > gsiparm.anl << EOF
 /
 &OBS_INPUT
   dmesh(1)=145.0,dmesh(2)=150.0,dmesh(3)=100.0,dmesh(4)=50.0,time_window_max=3.0,
+  hofx_2m_sfcfile=${hofx_2m_sfcfile}, 
   ${OBSINPUT}
 /
 OBS_INPUT::
@@ -909,7 +914,6 @@ ${NCP} ${GSIEXEC} ${DATA}
 ${APRUN_GSI} ${DATA}/$(basename ${GSIEXEC}) 1>&1 2>&2
 export err=$?; err_chk
 
-
 ##############################################################
 # If full analysis field written, calculate analysis increment
 # here before releasing FV3 forecast
diff --git a/scripts/exglobal_atmos_sfcanl.sh b/scripts/exglobal_atmos_sfcanl.sh
index 2997ac0d25a..28ed862a9d4 100755
--- a/scripts/exglobal_atmos_sfcanl.sh
+++ b/scripts/exglobal_atmos_sfcanl.sh
@@ -180,13 +180,16 @@ if [[ ${DOIAU} = "YES" ]]; then
         ${NLN} "${FIXorog}/${CASE}/${CASE}.mx${OCNRES}_oro_data.tile${n}.nc"                     "${DATA}/fnorog.00${n}"
     done
 
-    export APRUNCY=${APRUN_CYCLE}
-    export OMP_NUM_THREADS_CY=${NTHREADS_CYCLE}
-    export MAX_TASKS_CY=${ntiles}
-
-    CDATE="${PDY}${cyc}" ${CYCLESH}
-    export err=$?; err_chk
+    SKIP_GCYCLE="YES" # CSD - turn off for now.
+    if [ $SKIP_GCYCLE = "NO" ]; then
+        export APRUNCY=${APRUN_CYCLE}
+        export OMP_NUM_THREADS_CY=${NTHREADS_CYCLE}
+        export MAX_TASKS_CY=${ntiles}
+        CDATE="${PDY}${cyc}" ${CYCLESH}
+        export err=$?; err_chk
+    fi
 fi
+# CSD should above be an else statement?
 
 # Update surface restarts at middle of window
 for n in $(seq 1 ${ntiles}); do
diff --git a/ush/forecast_postdet.sh b/ush/forecast_postdet.sh
index f47755f854e..3b7740a8d22 100755
--- a/ush/forecast_postdet.sh
+++ b/ush/forecast_postdet.sh
@@ -32,8 +32,10 @@ FV3_postdet(){
         ${NLN} "${file}" "${DATA}/INPUT/${file2}"
       done
 
-      # Replace sfc_data with sfcanl_data restart files from current cycle (if found)
-      if [[ "${MODE}" = "cycled" ]] && [[ "${CCPP_SUITE}" = "FV3_GFS_v16" ]]; then  # TODO: remove if statement when global_cycle can handle NOAHMP
+      # Replace sfc_data with sfcanl_data restart files from current cycle (if found)   
+      if [[ "${MODE}" = "cycled" ]]; then  # TODO: remove if statement when global_cycle can handle NOAHMP
+        #  CSD - replaced check on SUITE here by not calling global_cycle where it can't be used 
+        # (calling it for soil increments though) 
         for file in "${COM_ATMOS_RESTART}/${sPDY}.${scyc}0000."*.nc; do
           file2=$(basename "${file}")
           file2=$(echo "${file2}" | cut -d. -f3-) # remove the date from file

From f9d0442b7b7d3838cd13739ee333bfe8e2f15978 Mon Sep 17 00:00:00 2001
From: ClaraDraper-NOAA <Clara.Draper@noaa.gov>
Date: Tue, 16 Jan 2024 20:40:12 +0000
Subject: [PATCH 02/13] Cleaned up print statememts. Runs, adds increments to
 ensemble only.

---
 scripts/exgdas_enkf_sfc.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/scripts/exgdas_enkf_sfc.sh b/scripts/exgdas_enkf_sfc.sh
index 615a883a32b..265628cb940 100755
--- a/scripts/exgdas_enkf_sfc.sh
+++ b/scripts/exgdas_enkf_sfc.sh
@@ -161,9 +161,7 @@ if [ $DOIAU = "YES" ]; then
             ${NLN} "${FIXorog}/${CASE}/${CASE}.mx${OCNRES}_oro_data.tile${n}.nc" "${DATA}/fnorog.${cmem}"
 
             if [ $DO_LNDINC = ".true." ]; then
-                echo 'CSD fetching sfc increment'
                 FHR=6 # CSD - is this right?
-                echo "CSD will use: ${COM_ATMOS_ANALYSIS_MEM}/${APREFIX_ENS}sfci00${FHR}.nc"
                 ${NLN} "${COM_ATMOS_ANALYSIS_MEM}/${APREFIX_ENS}sfci00${FHR}.nc" \
                    "${DATA}/lnd_incr.${cmem}"
             fi

From d1434bb241df8e8e3965816975968b5db474fc79 Mon Sep 17 00:00:00 2001
From: ClaraDraper-NOAA <Clara.Draper@noaa.gov>
Date: Fri, 26 Jan 2024 16:44:32 +0000
Subject: [PATCH 03/13] Clean-up, ready for PR.

---
 parm/config/gfs/config.anal         | 13 +++++++------
 parm/config/gfs/config.base.emc.dyn |  9 +++------
 parm/config/gfs/config.esfc         |  3 ++-
 scripts/exgdas_enkf_sfc.sh          | 18 ++++++++----------
 scripts/exgdas_enkf_update.sh       | 10 +++++-----
 scripts/exglobal_atmos_analysis.sh  |  3 +--
 scripts/exglobal_atmos_sfcanl.sh    | 20 +++++++++++++-------
 ush/forecast_postdet.sh             |  6 ++----
 8 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/parm/config/gfs/config.anal b/parm/config/gfs/config.anal
index 088f2982685..04a4ccf0b41 100644
--- a/parm/config/gfs/config.anal
+++ b/parm/config/gfs/config.anal
@@ -45,17 +45,18 @@ export AMSR2BF=${AMSR2BF:-/dev/null}
 
 # Set default values for info files and observation error
 #  NOTE:  Remember to set PRVT in config.prep as OBERROR is set below
-#export CONVINFO=${FIXgsi}/global_convinfo.txt
-export CONVINFO=/scratch2/BMC/gsienkf/Clara.Draper/2mDAfiles_gworkflow/global_convinfo.txt_2mObs_newQC
-export ANAVINFO=/scratch2/BMC/gsienkf/Clara.Draper/2mDAfiles_gworkflow/global_anavinfo.l127.txt_2mObs_enkfSMCSTC
+export CONVINFO=${FIXgsi}/global_convinfo.txt
 export OZINFO=${FIXgsi}/global_ozinfo.txt
 export SATINFO=${FIXgsi}/global_satinfo.txt
 export OBERROR=${FIXgsi}/prepobs_errtable.global
 
-if [[ $DO_LNDINC == ".true." ]]; then
+if [[ $GSI_SOILANAL == ".true." ]]; then
     export hofx_2m_sfcfile=".true."
-    export paranc=".false." # temporary until coded.
-    export reducedgrid=".false."
+    export reducedgrid=".false." # not possible for sfc analysis, Jeff Whitaker says it's not useful anyway
+    export paranc=".false." # temporary until sfc io coded for parance (PR being prepared by T. Gichamo)
+    export DO_SFCCYCLE=".false."  # temporary, until sfccycle has handle fractional grids (PR very close)
+    export CONVINFO=/scratch2/BMC/gsienkf/Clara.Draper/2mDAfiles_gworkflow/global_convinfos.w2mobs.txt
+    export ANAVINFO=/scratch2/BMC/gsienkf/Clara.Draper/2mDAfiles_gworkflow/global_anavinfo.2mobs_soilupd.l127.txt
 fi
 
 # Use experimental dumps in EMC GFS v16 parallels
diff --git a/parm/config/gfs/config.base.emc.dyn b/parm/config/gfs/config.base.emc.dyn
index e778a19930b..136d80f8df7 100644
--- a/parm/config/gfs/config.base.emc.dyn
+++ b/parm/config/gfs/config.base.emc.dyn
@@ -352,14 +352,11 @@ fi
 
 if [[ "${DOIAU_ENKF}" = "NO" ]]; then export IAUFHRS_ENKF="6"; fi
 
-export DO_SFCCYCLE=".false." 
-export DO_LNDINC=".true."
+export GSI_SOILANAL="YES"
 
 # turned on nsst in anal and/or fcst steps, and turn off rtgsst
-export DONST="NO" # CSD until gcycle fixed
-#if [[ ${DONST} = "YES" ]]; then export FNTSFA="        "; fi
-# needs to be defined later, regardless of DONST
-export FNTSFA="        " 
+export DONST="YES"
+if [[ ${DONST} = "YES" ]]; then export FNTSFA="        "; fi
 
 # The switch to apply SST elevation correction or not
 export nst_anl=.true.
diff --git a/parm/config/gfs/config.esfc b/parm/config/gfs/config.esfc
index af840ad0638..32c7abf3a6f 100644
--- a/parm/config/gfs/config.esfc
+++ b/parm/config/gfs/config.esfc
@@ -16,7 +16,8 @@ if [ $DOIAU_ENKF = "YES" ]; then
    export DOSFCANL_ENKF="NO"
 fi
 
-if [ $DO_LNDINC = ".true." ]; then
+if [ $GSI_SOILANAL = "YES" ]; then
+    export DO_LNDINC=".true."
     export LND_SOI_FILE="lnd_incr"
 fi
 
diff --git a/scripts/exgdas_enkf_sfc.sh b/scripts/exgdas_enkf_sfc.sh
index 265628cb940..7add0b7bea8 100755
--- a/scripts/exgdas_enkf_sfc.sh
+++ b/scripts/exgdas_enkf_sfc.sh
@@ -24,7 +24,7 @@ pwd=$(pwd)
 
 # Base variables
 DONST=${DONST:-"NO"}
-DO_LNDINC=${DO_LNDINC:-".true."}
+GSI_SOILANAL=${GSI_SOILANAL:-"NO"}
 DOSFCANL_ENKF=${DOSFCANL_ENKF:-"YES"}
 export CASE=${CASE:-384}
 ntiles=${ntiles:-6}
@@ -149,8 +149,6 @@ if [ $DOIAU = "YES" ]; then
                 COM_ATMOS_ANALYSIS_MEM:COM_ATMOS_ANALYSIS_TMPL
 
             [[ ${TILE_NUM} -eq 1 ]] && mkdir -p "${COM_ATMOS_RESTART_MEM}"
-            
-            # would it be more intuitive to put these into the analysis (not model_data) directory? 
             ${NCP} "${COM_ATMOS_RESTART_MEM_PREV}/${bPDY}.${bcyc}0000.sfc_data.tile${n}.nc" \
                 "${COM_ATMOS_RESTART_MEM}/${bPDY}.${bcyc}0000.sfcanl_data.tile${n}.nc"
             ${NLN} "${COM_ATMOS_RESTART_MEM_PREV}/${bPDY}.${bcyc}0000.sfc_data.tile${n}.nc" \
@@ -160,23 +158,23 @@ if [ $DOIAU = "YES" ]; then
             ${NLN} "${FIXorog}/${CASE}/${CASE}_grid.tile${n}.nc"     "${DATA}/fngrid.${cmem}"
             ${NLN} "${FIXorog}/${CASE}/${CASE}.mx${OCNRES}_oro_data.tile${n}.nc" "${DATA}/fnorog.${cmem}"
 
-            if [ $DO_LNDINC = ".true." ]; then
-                FHR=6 # CSD - is this right?
+            if [ ${GSI_SOILANAL} = "YES" ]; then
+                FHR=6
                 ${NLN} "${COM_ATMOS_ANALYSIS_MEM}/${APREFIX_ENS}sfci00${FHR}.nc" \
                    "${DATA}/lnd_incr.${cmem}"
             fi
         done # ensembles
 
-        echo 'CSD Calling global_cycle'
-        export DONST="NO" # turn off for now,not sure this works with fractional grids
-        CDATE="${PDY}${cyc}" ${CYCLESH}
-        export err=$?; err_chk
+        if [ ${GSI_SOILANAL} = "YES" ]; then
+            export DONST="NO" #  temporary, until fractional grids solved
+            CDATE="${PDY}${cyc}" ${CYCLESH}
+            export err=$?; err_chk
+        fi
 
     done
 
 fi
 
-# CSD - should probably code this too.
 if [ $DOSFCANL_ENKF = "YES" ]; then
     for n in $(seq 1 $ntiles); do
 
diff --git a/scripts/exgdas_enkf_update.sh b/scripts/exgdas_enkf_update.sh
index 719e4d41b5c..0a93792fb7a 100755
--- a/scripts/exgdas_enkf_update.sh
+++ b/scripts/exgdas_enkf_update.sh
@@ -87,7 +87,7 @@ else
    DO_CALC_INCREMENT=${DO_CALC_INCREMENT:-"NO"}
 fi
 INCREMENTS_TO_ZERO=${INCREMENTS_TO_ZERO:-"'NONE'"}
-DO_LNDINC=${DO_LNDINC:-".false."}
+GSI_SOILINC=${GSI_SOILINC:-"NO"}
 
 ################################################################################
 
@@ -204,9 +204,9 @@ for imem in $(seq 1 $NMEM_ENS); do
    for FHR in $nfhrs; do
       ${NLN} "${COM_ATMOS_HISTORY_MEM_PREV}/${GPREFIX}atmf00${FHR}${ENKF_SUFFIX}.nc" \
          "sfg_${PDY}${cyc}_fhr0${FHR}_${memchar}"
-      if [ $DO_LNDINC = ".true." ]; then
-      ${NLN} "${COM_ATMOS_HISTORY_MEM_PREV}/${GPREFIX}sfcf00${FHR}${ENKF_SUFFIX}.nc" \
-         "bfg_${PDY}${cyc}_fhr0${FHR}_${memchar}"
+      if [ $GSI_SOILINC = "YES" ]; then
+         ${NLN} "${COM_ATMOS_HISTORY_MEM_PREV}/${GPREFIX}sfcf00${FHR}${ENKF_SUFFIX}.nc" \
+             "bfg_${PDY}${cyc}_fhr0${FHR}_${memchar}"
       fi
       if [ $cnvw_option = ".true." ]; then
          ${NLN} "${COM_ATMOS_HISTORY_MEM_PREV}/${GPREFIX}sfcf00${FHR}.nc" \
@@ -229,7 +229,7 @@ for imem in $(seq 1 $NMEM_ENS); do
                "incr_${PDY}${cyc}_fhr0${FHR}_${memchar}"
          fi
       fi
-      if [ $DO_LNDINC = ".true." ]; then
+      if [ $GSI_SOILANAL = "YES" ]; then
           ${NLN} "${COM_ATMOS_ANALYSIS_MEM}/${APREFIX}sfci00${FHR}.nc" \
            "sfcincr_${PDY}${cyc}_fhr0${FHR}_${memchar}"
       fi
diff --git a/scripts/exglobal_atmos_analysis.sh b/scripts/exglobal_atmos_analysis.sh
index 7096e896935..844792b4c58 100755
--- a/scripts/exglobal_atmos_analysis.sh
+++ b/scripts/exglobal_atmos_analysis.sh
@@ -90,7 +90,6 @@ RUN_GETGES=${RUN_GETGES:-"NO"}
 GETGESSH=${GETGESSH:-"getges.sh"}
 export gesenvir=${gesenvir:-${envir}}
  
-# Assim of 2m obs: 
 export hofx_2m_sfcfile=${hofx_2m_sfcfile:-".false."}
 
 # Observations
@@ -752,7 +751,7 @@ cat > gsiparm.anl << EOF
 /
 &OBS_INPUT
   dmesh(1)=145.0,dmesh(2)=150.0,dmesh(3)=100.0,dmesh(4)=50.0,time_window_max=3.0,
-  hofx_2m_sfcfile=${hofx_2m_sfcfile}, 
+  hofx_2m_sfcfile=${hofx_2m_sfcfile},
   ${OBSINPUT}
 /
 OBS_INPUT::
diff --git a/scripts/exglobal_atmos_sfcanl.sh b/scripts/exglobal_atmos_sfcanl.sh
index 28ed862a9d4..746af8ae9c3 100755
--- a/scripts/exglobal_atmos_sfcanl.sh
+++ b/scripts/exglobal_atmos_sfcanl.sh
@@ -58,6 +58,9 @@ export DELTSFC=${DELTSFC:-6}
 export FIXam=${FIXam:-${HOMEgfs}/fix/am}
 export FIXorog=${FIXorog:-${HOMEgfs}/fix/orog}
 
+# temporary - skip global_cycle, until can deal with fractional grids
+SKIP_GCYCLE="YES" 
+
 # FV3 specific info (required for global_cycle)
 export CASE=${CASE:-"C384"}
 ntiles=${ntiles:-6}
@@ -180,7 +183,7 @@ if [[ ${DOIAU} = "YES" ]]; then
         ${NLN} "${FIXorog}/${CASE}/${CASE}.mx${OCNRES}_oro_data.tile${n}.nc"                     "${DATA}/fnorog.00${n}"
     done
 
-    SKIP_GCYCLE="YES" # CSD - turn off for now.
+    # skip calling global_cycle, until fractional grids issues is resolved
     if [ $SKIP_GCYCLE = "NO" ]; then
         export APRUNCY=${APRUN_CYCLE}
         export OMP_NUM_THREADS_CY=${NTHREADS_CYCLE}
@@ -189,7 +192,7 @@ if [[ ${DOIAU} = "YES" ]]; then
         export err=$?; err_chk
     fi
 fi
-# CSD should above be an else statement?
+# CSD should above be an else statement? i.e, for IAU do we use the restarts in the middle of the window?
 
 # Update surface restarts at middle of window
 for n in $(seq 1 ${ntiles}); do
@@ -206,12 +209,15 @@ for n in $(seq 1 ${ntiles}); do
     ${NLN} "${FIXorog}/${CASE}/${CASE}.mx${OCNRES}_oro_data.tile${n}.nc"                   "${DATA}/fnorog.00${n}"
 done
 
-export APRUNCY=${APRUN_CYCLE}
-export OMP_NUM_THREADS_CY=${NTHREADS_CYCLE}
-export MAX_TASKS_CY=${ntiles}
+# skip calling global_cycle, until fractional grids issues is resolved
+if [ $SKIP_GCYCLE = "NO" ]; then
+    export APRUNCY=${APRUN_CYCLE}
+    export OMP_NUM_THREADS_CY=${NTHREADS_CYCLE}
+    export MAX_TASKS_CY=${ntiles}
 
-CDATE="${PDY}${cyc}" ${CYCLESH}
-export err=$?; err_chk
+    CDATE="${PDY}${cyc}" ${CYCLESH}
+    export err=$?; err_chk
+fi
 
 
 ################################################################################
diff --git a/ush/forecast_postdet.sh b/ush/forecast_postdet.sh
index 17a90457f39..e8ad16be4f7 100755
--- a/ush/forecast_postdet.sh
+++ b/ush/forecast_postdet.sh
@@ -32,10 +32,8 @@ FV3_postdet(){
         ${NLN} "${file}" "${DATA}/INPUT/${file2}"
       done
 
-      # Replace sfc_data with sfcanl_data restart files from current cycle (if found)   
-      if [[ "${MODE}" = "cycled" ]]; then  # TODO: remove if statement when global_cycle can handle NOAHMP
-        #  CSD - replaced check on SUITE here by not calling global_cycle where it can't be used 
-        # (calling it for soil increments though) 
+      # Replace sfc_data with sfcanl_data restart files from current cycle (if found)
+      if [[ "${MODE}" = "cycled" ]]; then
         for file in "${COM_ATMOS_RESTART}/${sPDY}.${scyc}0000."*.nc; do
           file2=$(basename "${file}")
           file2=$(echo "${file2}" | cut -d. -f3-) # remove the date from file

From 3f507c057604d3156defa9a6f4007ea68719fc3c Mon Sep 17 00:00:00 2001
From: ClaraDraper-NOAA <Clara.Draper@noaa.gov>
Date: Wed, 7 Feb 2024 17:52:14 +0000
Subject: [PATCH 04/13] minor updates for git's spell-check.

---
 parm/config/gfs/config.anal      | 2 +-
 parm/config/gfs/config.esfc      | 4 ++--
 scripts/exgdas_enkf_sfc.sh       | 4 ++--
 scripts/exglobal_atmos_sfcanl.sh | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/parm/config/gfs/config.anal b/parm/config/gfs/config.anal
index 04a4ccf0b41..200217934a3 100644
--- a/parm/config/gfs/config.anal
+++ b/parm/config/gfs/config.anal
@@ -50,7 +50,7 @@ export OZINFO=${FIXgsi}/global_ozinfo.txt
 export SATINFO=${FIXgsi}/global_satinfo.txt
 export OBERROR=${FIXgsi}/prepobs_errtable.global
 
-if [[ $GSI_SOILANAL == ".true." ]]; then
+if [[ ${GSI_SOILANAL} = ".true." ]]; then
     export hofx_2m_sfcfile=".true."
     export reducedgrid=".false." # not possible for sfc analysis, Jeff Whitaker says it's not useful anyway
     export paranc=".false." # temporary until sfc io coded for parance (PR being prepared by T. Gichamo)
diff --git a/parm/config/gfs/config.esfc b/parm/config/gfs/config.esfc
index 32c7abf3a6f..da91f02162b 100644
--- a/parm/config/gfs/config.esfc
+++ b/parm/config/gfs/config.esfc
@@ -12,11 +12,11 @@ echo "BEGIN: config.esfc"
 # Set DOSFCANL_ENKF=NO to prevent creation of sfcanl at 
 # center of analysis window.  
 
-if [ $DOIAU_ENKF = "YES" ]; then
+if [[ ${DOIAU_ENKF} = "YES" ]]; then
    export DOSFCANL_ENKF="NO"
 fi
 
-if [ $GSI_SOILANAL = "YES" ]; then
+if [[ ${GSI_SOILANAL} = "YES" ]]; then
     export DO_LNDINC=".true."
     export LND_SOI_FILE="lnd_incr"
 fi
diff --git a/scripts/exgdas_enkf_sfc.sh b/scripts/exgdas_enkf_sfc.sh
index 7add0b7bea8..87243ff8c4a 100755
--- a/scripts/exgdas_enkf_sfc.sh
+++ b/scripts/exgdas_enkf_sfc.sh
@@ -158,14 +158,14 @@ if [ $DOIAU = "YES" ]; then
             ${NLN} "${FIXorog}/${CASE}/${CASE}_grid.tile${n}.nc"     "${DATA}/fngrid.${cmem}"
             ${NLN} "${FIXorog}/${CASE}/${CASE}.mx${OCNRES}_oro_data.tile${n}.nc" "${DATA}/fnorog.${cmem}"
 
-            if [ ${GSI_SOILANAL} = "YES" ]; then
+            if [[ ${GSI_SOILANAL} = "YES" ]]; then
                 FHR=6
                 ${NLN} "${COM_ATMOS_ANALYSIS_MEM}/${APREFIX_ENS}sfci00${FHR}.nc" \
                    "${DATA}/lnd_incr.${cmem}"
             fi
         done # ensembles
 
-        if [ ${GSI_SOILANAL} = "YES" ]; then
+        if [[ ${GSI_SOILANAL} = "YES" ]]; then
             export DONST="NO" #  temporary, until fractional grids solved
             CDATE="${PDY}${cyc}" ${CYCLESH}
             export err=$?; err_chk
diff --git a/scripts/exglobal_atmos_sfcanl.sh b/scripts/exglobal_atmos_sfcanl.sh
index 746af8ae9c3..26ff0ce56d4 100755
--- a/scripts/exglobal_atmos_sfcanl.sh
+++ b/scripts/exglobal_atmos_sfcanl.sh
@@ -184,7 +184,7 @@ if [[ ${DOIAU} = "YES" ]]; then
     done
 
     # skip calling global_cycle, until fractional grids issues is resolved
-    if [ $SKIP_GCYCLE = "NO" ]; then
+    if [[ ${SKIP_GCYCLE} = "NO" ]]; then
         export APRUNCY=${APRUN_CYCLE}
         export OMP_NUM_THREADS_CY=${NTHREADS_CYCLE}
         export MAX_TASKS_CY=${ntiles}
@@ -210,7 +210,7 @@ for n in $(seq 1 ${ntiles}); do
 done
 
 # skip calling global_cycle, until fractional grids issues is resolved
-if [ $SKIP_GCYCLE = "NO" ]; then
+if [[ ${SKIP_GCYCLE} = "NO" ]]; then
     export APRUNCY=${APRUN_CYCLE}
     export OMP_NUM_THREADS_CY=${NTHREADS_CYCLE}
     export MAX_TASKS_CY=${ntiles}

From c767ca6887113e38c49dc9b5a7d612d0975ed20f Mon Sep 17 00:00:00 2001
From: ClaraDraper-NOAA <Clara.Draper@noaa.gov>
Date: Wed, 7 Feb 2024 20:11:41 +0000
Subject: [PATCH 05/13] removed work-arounds to avoid call to
 global_cycle/sfccycle with fractional grids, since this issues has been
 resolved in UFS_UTILS.

---
 parm/config/gfs/config.anal      |  5 ++---
 scripts/exgdas_enkf_sfc.sh       |  1 -
 scripts/exglobal_atmos_sfcanl.sh | 31 +++++++++++--------------------
 3 files changed, 13 insertions(+), 24 deletions(-)

diff --git a/parm/config/gfs/config.anal b/parm/config/gfs/config.anal
index 200217934a3..7abbf37c164 100644
--- a/parm/config/gfs/config.anal
+++ b/parm/config/gfs/config.anal
@@ -54,9 +54,8 @@ if [[ ${GSI_SOILANAL} = ".true." ]]; then
     export hofx_2m_sfcfile=".true."
     export reducedgrid=".false." # not possible for sfc analysis, Jeff Whitaker says it's not useful anyway
     export paranc=".false." # temporary until sfc io coded for parance (PR being prepared by T. Gichamo)
-    export DO_SFCCYCLE=".false."  # temporary, until sfccycle has handle fractional grids (PR very close)
-    export CONVINFO=/scratch2/BMC/gsienkf/Clara.Draper/2mDAfiles_gworkflow/global_convinfos.w2mobs.txt
-    export ANAVINFO=/scratch2/BMC/gsienkf/Clara.Draper/2mDAfiles_gworkflow/global_anavinfo.2mobs_soilupd.l127.txt
+    export CONVINFO=${FIXgsi}/global_convinfo_2mObs.txt
+    export ANAVINFO=${FIXgsi}/global_anavinfo_soilanal.l127.txt
 fi
 
 # Use experimental dumps in EMC GFS v16 parallels
diff --git a/scripts/exgdas_enkf_sfc.sh b/scripts/exgdas_enkf_sfc.sh
index 87243ff8c4a..6e600929ca9 100755
--- a/scripts/exgdas_enkf_sfc.sh
+++ b/scripts/exgdas_enkf_sfc.sh
@@ -166,7 +166,6 @@ if [ $DOIAU = "YES" ]; then
         done # ensembles
 
         if [[ ${GSI_SOILANAL} = "YES" ]]; then
-            export DONST="NO" #  temporary, until fractional grids solved
             CDATE="${PDY}${cyc}" ${CYCLESH}
             export err=$?; err_chk
         fi
diff --git a/scripts/exglobal_atmos_sfcanl.sh b/scripts/exglobal_atmos_sfcanl.sh
index 26ff0ce56d4..2997ac0d25a 100755
--- a/scripts/exglobal_atmos_sfcanl.sh
+++ b/scripts/exglobal_atmos_sfcanl.sh
@@ -58,9 +58,6 @@ export DELTSFC=${DELTSFC:-6}
 export FIXam=${FIXam:-${HOMEgfs}/fix/am}
 export FIXorog=${FIXorog:-${HOMEgfs}/fix/orog}
 
-# temporary - skip global_cycle, until can deal with fractional grids
-SKIP_GCYCLE="YES" 
-
 # FV3 specific info (required for global_cycle)
 export CASE=${CASE:-"C384"}
 ntiles=${ntiles:-6}
@@ -183,16 +180,13 @@ if [[ ${DOIAU} = "YES" ]]; then
         ${NLN} "${FIXorog}/${CASE}/${CASE}.mx${OCNRES}_oro_data.tile${n}.nc"                     "${DATA}/fnorog.00${n}"
     done
 
-    # skip calling global_cycle, until fractional grids issues is resolved
-    if [[ ${SKIP_GCYCLE} = "NO" ]]; then
-        export APRUNCY=${APRUN_CYCLE}
-        export OMP_NUM_THREADS_CY=${NTHREADS_CYCLE}
-        export MAX_TASKS_CY=${ntiles}
-        CDATE="${PDY}${cyc}" ${CYCLESH}
-        export err=$?; err_chk
-    fi
+    export APRUNCY=${APRUN_CYCLE}
+    export OMP_NUM_THREADS_CY=${NTHREADS_CYCLE}
+    export MAX_TASKS_CY=${ntiles}
+
+    CDATE="${PDY}${cyc}" ${CYCLESH}
+    export err=$?; err_chk
 fi
-# CSD should above be an else statement? i.e, for IAU do we use the restarts in the middle of the window?
 
 # Update surface restarts at middle of window
 for n in $(seq 1 ${ntiles}); do
@@ -209,15 +203,12 @@ for n in $(seq 1 ${ntiles}); do
     ${NLN} "${FIXorog}/${CASE}/${CASE}.mx${OCNRES}_oro_data.tile${n}.nc"                   "${DATA}/fnorog.00${n}"
 done
 
-# skip calling global_cycle, until fractional grids issues is resolved
-if [[ ${SKIP_GCYCLE} = "NO" ]]; then
-    export APRUNCY=${APRUN_CYCLE}
-    export OMP_NUM_THREADS_CY=${NTHREADS_CYCLE}
-    export MAX_TASKS_CY=${ntiles}
+export APRUNCY=${APRUN_CYCLE}
+export OMP_NUM_THREADS_CY=${NTHREADS_CYCLE}
+export MAX_TASKS_CY=${ntiles}
 
-    CDATE="${PDY}${cyc}" ${CYCLESH}
-    export err=$?; err_chk
-fi
+CDATE="${PDY}${cyc}" ${CYCLESH}
+export err=$?; err_chk
 
 
 ################################################################################

From 2815023ef26f1fc27e71684023a001feedaccad6 Mon Sep 17 00:00:00 2001
From: ClaraDraper-NOAA <Clara.Draper@noaa.gov>
Date: Wed, 7 Feb 2024 21:08:36 +0000
Subject: [PATCH 06/13] Updated gsi hash to catch soil analysis updates.

---
 sorc/gsi_enkf.fd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sorc/gsi_enkf.fd b/sorc/gsi_enkf.fd
index c94bc72ff41..94c6a7c2e91 160000
--- a/sorc/gsi_enkf.fd
+++ b/sorc/gsi_enkf.fd
@@ -1 +1 @@
-Subproject commit c94bc72ff410b48c325abbfe92c9fcb601d89aed
+Subproject commit 94c6a7c2e917f5edb08d899845711427258f9733

From fb4917a7af297736c2ec8a51acc4677c5a069516 Mon Sep 17 00:00:00 2001
From: ClaraDraper-NOAA <Clara.Draper@noaa.gov>
Date: Thu, 8 Feb 2024 21:13:26 +0000
Subject: [PATCH 07/13] Turn soil analysis off for default.

---
 parm/config/gfs/config.base.emc.dyn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/parm/config/gfs/config.base.emc.dyn b/parm/config/gfs/config.base.emc.dyn
index be8eedbccbc..d6185f70c34 100644
--- a/parm/config/gfs/config.base.emc.dyn
+++ b/parm/config/gfs/config.base.emc.dyn
@@ -346,7 +346,7 @@ fi
 
 if [[ "${DOIAU_ENKF}" = "NO" ]]; then export IAUFHRS_ENKF="6"; fi
 
-export GSI_SOILANAL="YES"
+export GSI_SOILANAL="NO"
 
 # turned on nsst in anal and/or fcst steps, and turn off rtgsst
 export DONST="YES"

From 13026e3cc03b0920faa2c346a0e11befba9c181b Mon Sep 17 00:00:00 2001
From: ClaraDraper-NOAA <Clara.Draper@noaa.gov>
Date: Tue, 13 Feb 2024 16:54:22 +0000
Subject: [PATCH 08/13] bug fixes.

---
 scripts/exgdas_enkf_sfc.sh    | 7 ++-----
 scripts/exgdas_enkf_update.sh | 4 ++--
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/scripts/exgdas_enkf_sfc.sh b/scripts/exgdas_enkf_sfc.sh
index 6e600929ca9..557a1343ea5 100755
--- a/scripts/exgdas_enkf_sfc.sh
+++ b/scripts/exgdas_enkf_sfc.sh
@@ -64,7 +64,6 @@ export DELTSFC=${DELTSFC:-6}
 APRUN_ESFC=${APRUN_ESFC:-${APRUN:-""}}
 NTHREADS_ESFC=${NTHREADS_ESFC:-${NTHREADS:-1}}
 
-
 ################################################################################
 # Preprocessing
 mkdata=NO
@@ -165,10 +164,8 @@ if [ $DOIAU = "YES" ]; then
             fi
         done # ensembles
 
-        if [[ ${GSI_SOILANAL} = "YES" ]]; then
-            CDATE="${PDY}${cyc}" ${CYCLESH}
-            export err=$?; err_chk
-        fi
+        CDATE="${PDY}${cyc}" ${CYCLESH}
+        export err=$?; err_chk
 
     done
 
diff --git a/scripts/exgdas_enkf_update.sh b/scripts/exgdas_enkf_update.sh
index 0a93792fb7a..352531ed9c7 100755
--- a/scripts/exgdas_enkf_update.sh
+++ b/scripts/exgdas_enkf_update.sh
@@ -87,7 +87,7 @@ else
    DO_CALC_INCREMENT=${DO_CALC_INCREMENT:-"NO"}
 fi
 INCREMENTS_TO_ZERO=${INCREMENTS_TO_ZERO:-"'NONE'"}
-GSI_SOILINC=${GSI_SOILINC:-"NO"}
+GSI_SOILANAL=${GSI_SOILANAL:-"NO"}
 
 ################################################################################
 
@@ -204,7 +204,7 @@ for imem in $(seq 1 $NMEM_ENS); do
    for FHR in $nfhrs; do
       ${NLN} "${COM_ATMOS_HISTORY_MEM_PREV}/${GPREFIX}atmf00${FHR}${ENKF_SUFFIX}.nc" \
          "sfg_${PDY}${cyc}_fhr0${FHR}_${memchar}"
-      if [ $GSI_SOILINC = "YES" ]; then
+      if [ $GSI_SOILANAL = "YES" ]; then
          ${NLN} "${COM_ATMOS_HISTORY_MEM_PREV}/${GPREFIX}sfcf00${FHR}${ENKF_SUFFIX}.nc" \
              "bfg_${PDY}${cyc}_fhr0${FHR}_${memchar}"
       fi

From f77d91f24a9d15edd390e71441b310d2357f857a Mon Sep 17 00:00:00 2001
From: ClaraDraper-NOAA <Clara.Draper@noaa.gov>
Date: Thu, 29 Feb 2024 20:16:33 +0000
Subject: [PATCH 09/13] Update UFS_UTILS hash.

---
 sorc/ufs_utils.fd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sorc/ufs_utils.fd b/sorc/ufs_utils.fd
index 47956a96a7d..1dac85544dd 160000
--- a/sorc/ufs_utils.fd
+++ b/sorc/ufs_utils.fd
@@ -1 +1 @@
-Subproject commit 47956a96a7dc14e33fbccbb7fe74422f9bf542bf
+Subproject commit 1dac85544dd4134de7cb899214c7db67bbe8c0b4

From 0dcc2c4ca537f41d16a08f61c3e357933e20bb79 Mon Sep 17 00:00:00 2001
From: ClaraDraper-NOAA <Clara.Draper@noaa.gov>
Date: Thu, 29 Feb 2024 21:36:54 +0000
Subject: [PATCH 10/13] bug fix.

---
 parm/config/gfs/config.anal | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/parm/config/gfs/config.anal b/parm/config/gfs/config.anal
index ab98fc979ac..b07516dae1d 100644
--- a/parm/config/gfs/config.anal
+++ b/parm/config/gfs/config.anal
@@ -50,7 +50,7 @@ export OZINFO=${FIXgfs}/gsi/global_ozinfo.txt
 export SATINFO=${FIXgfs}/gsi/global_satinfo.txt
 export OBERROR=${FIXgfs}/gsi/prepobs_errtable.global
 
-if [[ ${GSI_SOILANAL} = ".true." ]]; then
+if [[ ${GSI_SOILANAL} = "YES" ]]; then
     export hofx_2m_sfcfile=".true."
     export reducedgrid=".false." # not possible for sfc analysis, Jeff Whitaker says it's not useful anyway
     export paranc=".false." # temporary until sfc io coded for parance (PR being prepared by T. Gichamo)

From 2129fac3b5d39d9bf5cf64df457417ba8f314e01 Mon Sep 17 00:00:00 2001
From: ClaraDraper-NOAA <Clara.Draper@noaa.gov>
Date: Fri, 1 Mar 2024 00:24:19 +0000
Subject: [PATCH 11/13] Clean up merge, resolve spelling issues.

---
 parm/config/gfs/config.anal   |  4 ++--
 scripts/exgdas_enkf_update.sh | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/parm/config/gfs/config.anal b/parm/config/gfs/config.anal
index b07516dae1d..09aaa15a98e 100644
--- a/parm/config/gfs/config.anal
+++ b/parm/config/gfs/config.anal
@@ -54,8 +54,8 @@ if [[ ${GSI_SOILANAL} = "YES" ]]; then
     export hofx_2m_sfcfile=".true."
     export reducedgrid=".false." # not possible for sfc analysis, Jeff Whitaker says it's not useful anyway
     export paranc=".false." # temporary until sfc io coded for parance (PR being prepared by T. Gichamo)
-    export CONVINFO=${FIXgsi}/global_convinfo_2mObs.txt
-    export ANAVINFO=${FIXgsi}/global_anavinfo_soilanal.l127.txt
+    export CONVINFO=${FIXgfs}/gsi/global_convinfo_2mObs.txt
+    export ANAVINFO=${FIXgfs}/gsi/global_anavinfo_soilanal.l127.txt
 fi
 
 # Use experimental dumps in EMC GFS v16 parallels
diff --git a/scripts/exgdas_enkf_update.sh b/scripts/exgdas_enkf_update.sh
index fc4ac907691..95670d3b934 100755
--- a/scripts/exgdas_enkf_update.sh
+++ b/scripts/exgdas_enkf_update.sh
@@ -247,10 +247,10 @@ for FHR in $nfhrs; do
    fi
 done
 
-if [ $USE_CFP = "YES" ]; then
+if [[ $USE_CFP = "YES" ]]; then
    chmod 755 $DATA/mp_untar.sh
    ncmd=$(cat $DATA/mp_untar.sh | wc -l)
-   if [ $ncmd -gt 0 ]; then
+   if [[ $ncmd -gt 0 ]]; then
       ncmd_max=$((ncmd < npe_node_max ? ncmd : npe_node_max))
       APRUNCFP=$(eval echo $APRUNCFP)
       $APRUNCFP $DATA/mp_untar.sh
@@ -407,8 +407,8 @@ cat stdout stderr > "${COM_ATMOS_ANALYSIS_STAT}/${ENKFSTAT}"
 
 ################################################################################
 #  Postprocessing
-cd $pwd
-[[ $mkdata = "YES" ]] && rm -rf $DATA
+cd "$pwd"
+[[ $mkdata = "YES" ]] && rm -rf "${DATA}"
 
 
-exit $err
+exit ${err}

From 2b6694e891d88cf963328bc76075ead04ed58cab Mon Sep 17 00:00:00 2001
From: ClaraDraper-NOAA <Clara.Draper@noaa.gov>
Date: Fri, 1 Mar 2024 18:51:52 +0000
Subject: [PATCH 12/13] Updated the gsi fix version. Added GSI_SOILANAL to a
 template.

---
 parm/config/gfs/config.base.emc.dyn | 2 +-
 parm/config/gfs/yaml/defaults.yaml  | 1 +
 versions/fix.ver                    | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/parm/config/gfs/config.base.emc.dyn b/parm/config/gfs/config.base.emc.dyn
index 1ec68ca45f7..b94ee3e6505 100644
--- a/parm/config/gfs/config.base.emc.dyn
+++ b/parm/config/gfs/config.base.emc.dyn
@@ -337,7 +337,7 @@ fi
 
 if [[ "${DOIAU_ENKF}" = "NO" ]]; then export IAUFHRS_ENKF="6"; fi
 
-export GSI_SOILANAL="NO"
+export GSI_SOILANAL=@GSI_SOILANAL@
 
 # turned on nsst in anal and/or fcst steps, and turn off rtgsst
 export DONST="YES"
diff --git a/parm/config/gfs/yaml/defaults.yaml b/parm/config/gfs/yaml/defaults.yaml
index e6108fff29d..649b71b40e5 100644
--- a/parm/config/gfs/yaml/defaults.yaml
+++ b/parm/config/gfs/yaml/defaults.yaml
@@ -7,6 +7,7 @@ base:
   DO_MERGENSST: "NO"
   DO_GOES: "NO"
   FHMAX_GFS: 120
+  GSI_SOILANAL: "NO"
 
 atmanl:
   LAYOUT_X_ATMANL: 8
diff --git a/versions/fix.ver b/versions/fix.ver
index a2a9caf8e32..d2828518bcd 100644
--- a/versions/fix.ver
+++ b/versions/fix.ver
@@ -12,7 +12,7 @@ export gdas_fv3jedi_ver=20220805
 export gdas_gsibec_ver=20221031
 export gdas_obs_ver=20240213
 export glwu_ver=20220805
-export gsi_ver=20230911
+export gsi_ver=20240208
 export lut_ver=20220805
 export mom6_ver=20231219
 export orog_ver=20231027

From 7e785140f65d06fe6e6d1d29168d9b308a9a3d85 Mon Sep 17 00:00:00 2001
From: ClaraDraper-NOAA <Clara.Draper@noaa.gov>
Date: Fri, 15 Mar 2024 16:31:36 +0000
Subject: [PATCH 13/13] Fixed merge commit in defaults.yaml

---
 parm/config/gfs/yaml/defaults.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/parm/config/gfs/yaml/defaults.yaml b/parm/config/gfs/yaml/defaults.yaml
index 9c90255cdd7..e80cb4a6dc9 100644
--- a/parm/config/gfs/yaml/defaults.yaml
+++ b/parm/config/gfs/yaml/defaults.yaml
@@ -8,6 +8,7 @@ base:
   DO_GOES: "NO"
   FHMAX_GFS: 120
   DO_VRFY_OCEANDA: "NO"
+  GSI_SOILANAL: "NO"
 
 atmanl:
   LAYOUT_X_ATMANL: 8