Link both global-nest fix files and non-nest ones at the same time

.gitignore

@@ -39,6 +39,7 @@ fix/sfc_climo
 fix/ugwd
 fix/verif
 fix/wave
+fix/nest
 
 # Ignore parm file symlinks
 #--------------------------

parm/config/gfs/config.base

@@ -188,6 +188,7 @@ export DO_NEST="NO" # Whether to run a global-nested domain
 if [[ "${DO_NEST:-NO}" == "YES" ]] ; then
   export ntiles=7
   export NEST_OUTPUT_GRID="regional_latlon"
+  export FIXgfs="${HOMEgfs}/fix/nest"
 else
   export ntiles=6
 fi

sorc/link_workflow.sh

@@ -10,7 +10,7 @@ function usage() {
 Builds all of the global-workflow components by calling the individual build
   scripts in sequence.
 
-Usage: ${BASH_SOURCE[0]} [-h][-o][--nest]
+Usage: ${BASH_SOURCE[0]} [-h][-o]
   -h:
     Print this help message and exit
   -o:
@@ -23,17 +23,12 @@ RUN_ENVIR="emc"
 
 # Reset option counter in case this script is sourced
 OPTIND=1
-while getopts ":ho-:" option; do
+while getopts ":ho" option; do
   case "${option}" in
     h) usage ;;
     o)
       echo "-o option received, configuring for NCO"
       RUN_ENVIR="nco";;
-    -)
-      if [[ "${OPTARG}" == "nest" ]]; then
-        LINK_NEST=ON
-      fi
-      ;;
     :)
       echo "[${BASH_SOURCE[0]}]: ${option} requires an argument"
       usage
@@ -83,10 +78,6 @@ esac
 
 # Source fix version file
 source "${HOMEgfs}/versions/fix.ver"
-# global-nest uses different versions of orog and ugwd
-if [[ "${LINK_NEST:-OFF}" == "ON" ]] ; then
-  source "${HOMEgfs}/versions/fix.nest.ver"
-fi
 
 # Link python pacakges in ush/python
 # TODO: This will be unnecessary when these are part of the virtualenv
@@ -109,6 +100,7 @@ ${LINK} "${HOMEgfs}/sorc/wxflow/src/wxflow" .
 # Link fix directories
 if [[ -n "${FIX_DIR}" ]]; then
   if [[ ! -d "${HOMEgfs}/fix" ]]; then mkdir "${HOMEgfs}/fix" || exit 1; fi
+  if [[ ! -d "${HOMEgfs}/fix/nest" ]]; then mkdir "${HOMEgfs}/fix/nest" || exit 1; fi
 fi
 cd "${HOMEgfs}/fix" || exit 1
 for dir in aer \
@@ -133,6 +125,38 @@ do
   fix_ver="${dir}_ver"
   ${LINK_OR_COPY} "${FIX_DIR}/${dir}/${!fix_ver}" "${dir}"
 done
+cd "${HOMEgfs}/fix/nest" || exit 1
+for dir in aer \
+            am \
+            chem \
+            cice \
+            cpl \
+            datm \
+            gsi \
+            lut \
+            mom6 \
+            sfc_climo \
+            verif \
+            wave \
+            product \
+            gdas
+do
+  if [[ -d "${dir}" ]]; then
+    [[ "${RUN_ENVIR}" == "nco" ]] && chmod -R 755 "${dir}"
+    rm -rf "${dir}"
+  fi
+  ln -snf ../${dir} .
+done
+for dir in orog \
+           ugwd
+do
+  if [[ -d "${dir}" ]]; then
+    [[ "${RUN_ENVIR}" == "nco" ]] && chmod -R 755 "${dir}"
+    rm -rf "${dir}"
+  fi
+  fix_ver="${dir}_nest_ver"
+  ${LINK_OR_COPY} "${FIX_DIR}/${dir}/${!fix_ver}" "${dir}"
+done
 
 
 #---------------------------------------

versions/fix.ver

@@ -21,3 +21,5 @@ export sfc_climo_ver=20220805
 export ugwd_ver=20231027
 export verif_ver=20220805
 export wave_ver=20240105
+export orog_nest_ver=global-nest.20240419
+export ugwd_nest_ver=global-nest.20240419