From b8075d0681da20c70d0a9734190c38b125d25b0e Mon Sep 17 00:00:00 2001
From: "kate.friedman" <kate.friedman@noaa.gov>
Date: Mon, 6 Nov 2023 19:47:03 +0000
Subject: [PATCH] Updates for orog reorg in forecast script

- Move OROFIX and FIX_SFC path settings earlier so OROFIX can be used
to define a path above where it was previously set.
- Replace "${FIX_DIR}/orog/${CASE}" with "${OROFIX}".
- Update filename for orog data tile files.

Refs #1981
---
 ush/forecast_postdet.sh | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/ush/forecast_postdet.sh b/ush/forecast_postdet.sh
index bafa61dd0e..f711eee022 100755
--- a/ush/forecast_postdet.sh
+++ b/ush/forecast_postdet.sh
@@ -133,16 +133,17 @@ EOF
   #--------------------------------------------------------------------------
   # Grid and orography data
 
+  OROFIX=${OROFIX:-"${FIX_DIR}/orog/${CASE}"}
+  FIX_SFC=${FIX_SFC:-"${OROFIX}/sfc"}
+
   if [[ ${cplflx} = ".false." ]] ; then
-    ${NLN} "${FIX_DIR}/orog/${CASE}/${CASE}_mosaic.nc" "${DATA}/INPUT/grid_spec.nc"
+    ${NLN} "${OROFIX}/${CASE}_mosaic.nc" "${DATA}/INPUT/grid_spec.nc"
   else
-    ${NLN} "${FIX_DIR}/orog/${CASE}/${CASE}_mosaic.nc" "${DATA}/INPUT/${CASE}_mosaic.nc"
+    ${NLN} "${OROFIX}/${CASE}_mosaic.nc" "${DATA}/INPUT/${CASE}_mosaic.nc"
   fi
 
-  OROFIX=${OROFIX:-"${FIX_DIR}/orog/${CASE}.mx${OCNRES}_frac"}
-  FIX_SFC=${FIX_SFC:-"${OROFIX}/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}.mx${OCNRES}_oro_data.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