From eb2c7b1a9cb5d8dc464fb4946917f74442794c2a Mon Sep 17 00:00:00 2001
From: Wei Huang <Wei.Huang@noaa.gov>
Date: Fri, 8 Nov 2024 16:31:09 +0000
Subject: [PATCH] manualle merge #3023 code int

---
 sorc/build_all.sh | 3 +++
 sorc/build_ufs.sh | 8 ++++++++
 2 files changed, 11 insertions(+)

diff --git a/sorc/build_all.sh b/sorc/build_all.sh
index b2f4e6ce0e..33b440f242 100755
--- a/sorc/build_all.sh
+++ b/sorc/build_all.sh
@@ -108,6 +108,9 @@ fi
 #------------------------------------
 # TODO: Commented out until components aligned for build
 #source ../versions/build.ver
+if [[ "${MACHINE_ID}" == "noaacloud" ]] ; then
+   source "../versions/build.${MACHINE_ID}.ver"
+fi
 
 #------------------------------------
 # Exception Handling Init
diff --git a/sorc/build_ufs.sh b/sorc/build_ufs.sh
index 44c8c7a2ad..bacbf9fd85 100755
--- a/sorc/build_ufs.sh
+++ b/sorc/build_ufs.sh
@@ -41,6 +41,14 @@ COMPILE_NR=0
 CLEAN_BEFORE=YES
 CLEAN_AFTER=NO
 
+#TODO temp patch for build update for noaacload in advance of updating ufs_module.fd repo for global-workflow building
+if [[ "${MACHINE_ID}" == "noaacloud" ]] ; then
+    patched=$(grep upp-addon-env modulefiles/ufs_noaacloud.intel.lua; echo $?)
+    if [[ ${patched} == "1" ]] ; then
+       patch -R modulefiles/ufs_noaacloud.intel.lua ../ufs_noaacloud.intel.diff
+    fi   
+fi
+
 BUILD_JOBS=${BUILD_JOBS:-8} ./tests/compile.sh "${MACHINE_ID}" "${MAKE_OPT}" "${COMPILE_NR}" "intel" "${CLEAN_BEFORE}" "${CLEAN_AFTER}"
 mv "./tests/fv3_${COMPILE_NR}.exe" ./tests/ufs_model.x
 mv "./tests/modules.fv3_${COMPILE_NR}.lua" ./tests/modules.ufs_model.lua