From 97255037ee05ef132e3bbd0eb3857bd81b441e75 Mon Sep 17 00:00:00 2001
From: Walter Kolczynski - NOAA <Walter.Kolczynski@noaa.gov>
Date: Fri, 13 Jan 2023 14:57:38 -0500
Subject: [PATCH] Revert "Use fracoro data for all new UFS applications
 (#1182)"

This reverts commit 1f258e43ae04acc9d16953793b67769bb53abc27.
---
 parm/config/config.init       |  2 +-
 scripts/exgdas_atmos_gldas.sh |  8 ++++++--
 ush/forecast_postdet.sh       | 24 ++++++++++++++++++------
 3 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/parm/config/config.init b/parm/config/config.init
index d83bb5ecfe..2301b1cdc1 100755
--- a/parm/config/config.init
+++ b/parm/config/config.init
@@ -17,7 +17,7 @@ export GDASINIT_DIR=${UFS_DIR}/util/gdas_init
 export CRES_HIRES=$CASE
 export CRES_ENKF=$CASE_ENKF
 
-export RUNICSH=${GDASINIT_DIR}/run_v17.chgres.sh
+export RUNICSH=${GDASINIT_DIR}/run_v16.chgres.sh
 if [ "${RETRO:-"NO"}" = "YES" ] || [ "$CDUMP" = "gdas" ]; then
   export RUNICSH=${GDASINIT_DIR}/run_v16retro.chgres.sh
 fi
diff --git a/scripts/exgdas_atmos_gldas.sh b/scripts/exgdas_atmos_gldas.sh
index ba56e323aa..596e049c3a 100755
--- a/scripts/exgdas_atmos_gldas.sh
+++ b/scripts/exgdas_atmos_gldas.sh
@@ -85,8 +85,12 @@ mkdir -p "${RUNDIR}/input"
 ln -fs "${GDAS}" "${RUNDIR}/input/GDAS"
 ln -fs "${EXECgldas:?}/gldas_model" "${RUNDIR}/LIS"
 
-# Set FIXgldas subfolder
-ln -fs "${FIXgldas}/frac_grid/FIX_T${JCAP}" "${RUNDIR}/FIX"
+# Set FIXgldas subfolder based on FRAC_GRID value
+if [[ "${FRAC_GRID:-".true."}" = ".true." ]] ; then
+  ln -fs "${FIXgldas}/frac_grid/FIX_T${JCAP}" "${RUNDIR}/FIX"
+else
+  ln -fs "${FIXgldas}/nonfrac_grid/FIX_T${JCAP}" "${RUNDIR}/FIX"
+fi
 
 #---------------------------------------------------------------
 ### 1) Get gdas 6-tile netcdf restart file and gdas forcing data
diff --git a/ush/forecast_postdet.sh b/ush/forecast_postdet.sh
index a3c4030917..e74fcac105 100755
--- a/ush/forecast_postdet.sh
+++ b/ush/forecast_postdet.sh
@@ -164,6 +164,10 @@ EOF
 
   #--------------------------------------------------------------------------
   # Grid and orography data
+  for n in $(seq 1 $ntiles); do
+    $NLN $FIXfv3/$CASE/${CASE}_grid.tile${n}.nc     $DATA/INPUT/${CASE}_grid.tile${n}.nc
+    $NLN $FIXfv3/$CASE/${CASE}_oro_data.tile${n}.nc $DATA/INPUT/oro_data.tile${n}.nc
+  done
 
   if [ $cplflx = ".false." ] ; then
     $NLN $FIXfv3/$CASE/${CASE}_mosaic.nc $DATA/INPUT/grid_spec.nc
@@ -171,12 +175,20 @@ EOF
     $NLN $FIXfv3/$CASE/${CASE}_mosaic.nc $DATA/INPUT/${CASE}_mosaic.nc
   fi
 
-  OROFIX=${OROFIX:-"${FIX_DIR}/orog/${CASE}.mx${OCNRES}_frac"}
-  FIX_SFC=${FIX_SFC:-"${OROFIX}/fix_sfc"}
-  for n in $(seq 1 $ntiles); do
-    $NLN ${OROFIX}/oro_${CASE}.mx${OCNRES}.tile${n}.nc $DATA/INPUT/oro_data.tile${n}.nc
-    $NLN ${OROFIX}/${CASE}_grid.tile${n}.nc     $DATA/INPUT/${CASE}_grid.tile${n}.nc
-  done
+  # Fractional grid related
+  if [ $FRAC_GRID = ".true." ]; then
+    OROFIX=${OROFIX:-"${FIX_DIR}/orog/${CASE}.mx${OCNRES}_frac"}
+    FIX_SFC=${FIX_SFC:-"${OROFIX}/fix_sfc"}
+    for n in $(seq 1 $ntiles); do
+      $NLN ${OROFIX}/oro_${CASE}.mx${OCNRES}.tile${n}.nc $DATA/INPUT/oro_data.tile${n}.nc
+    done
+  else
+    OROFIX=${OROFIX:-"${FIXfv3}/${CASE}"}
+    FIX_SFC=${FIX_SFC:-"${OROFIX}/fix_sfc"}
+    for n in $(seq 1 $ntiles); do
+      $NLN ${OROFIX}/${CASE}_oro_data.tile${n}.nc $DATA/INPUT/oro_data.tile${n}.nc
+    done
+  fi
 
   export CCPP_SUITE=${CCPP_SUITE:-"FV3_GFS_v16"}
   _suite_file=$HOMEgfs/sorc/ufs_model.fd/FV3/ccpp/suites/suite_${CCPP_SUITE}.xml