From c80ad79248e51ee250e87cebf669e8aa3f83c009 Mon Sep 17 00:00:00 2001
From: "Walter.Kolczynski" <Walter.Kolczynski@noaa.gov>
Date: Tue, 27 Sep 2022 22:12:02 +0000
Subject: [PATCH] Move root fixdir setting higher in link script

Moved the setting of FIXDIR higher so it errors on an unknown machine
sooner. Also removed redundant version file load.

Refs: #966
---
 sorc/link_workflow.sh | 29 +++++++++++++----------------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/sorc/link_workflow.sh b/sorc/link_workflow.sh
index 4ed7c4d7bb..183796d4f7 100755
--- a/sorc/link_workflow.sh
+++ b/sorc/link_workflow.sh
@@ -47,26 +47,10 @@ cd ${script_dir}
 source gfs_utils.fd/ush/machine-setup.sh > /dev/null 2>&1
 # shellcheck disable=
 machine="${target:?}"
-# Source fix version file
-source "${top_dir}/versions/fix.ver"
-
-LINK="ln -fs"
-SLINK="ln -fs"
-if [[ "${RUN_ENVIR}" == "nco" ]]; then
-  LINK="cp -rp"
-fi
-
-# Link post
-[[ -d upp.fd ]] && rm -rf upp.fd
-${LINK} ufs_model.fd/FV3/upp upp.fd
 
 #------------------------------
 #--model fix fields
 #------------------------------
-
-# Source fix version file
-source "${top_dir}/versions/fix.ver"
-
 case "${machine}" in
   "wcoss2")   FIX_DIR="/lfs/h2/emc/global/noscrub/emc.global/FIX/fix" ;;
   "hera")     FIX_DIR="/scratch1/NCEPDEV/global/glopara/fix" ;;
@@ -78,6 +62,19 @@ case "${machine}" in
     ;;
 esac
 
+# Source fix version file
+source "${top_dir}/versions/fix.ver"
+
+LINK="ln -fs"
+SLINK="ln -fs"
+if [[ "${RUN_ENVIR}" == "nco" ]]; then
+  LINK="cp -rp"
+fi
+
+# Link post
+[[ -d upp.fd ]] && rm -rf upp.fd
+${LINK} ufs_model.fd/FV3/upp upp.fd
+
 if [ ! -z "${FIX_DIR}" ]; then
   if [ ! -d "${top_dir}/fix" ]; then mkdir "${top_dir}/fix" || exit 1; fi
 fi