Update ufs-weather-model (#2663)

Updates ufs-weather-model, this updates RDHPCS to the newer spack-stack allowing some temporary fixes to be reverted. * removes upp submodule * uses upp from the ufs-weather-model * restores the build and link that were hacked during the Hera Rocky 8 transition to allow for UPP submodule * Removes forecast directories in clean-up Resolves #2617 Resolves #2437 --------- Co-authored-by: Rahul Mahajan <[email protected]>
NOAA-EMC · Jun 24, 2024 · c98474a · c98474a
1 parent 15eaf35
commit c98474a
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 18 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -26,10 +26,6 @@
 [submodule "sorc/gsi_monitor.fd"]
   path = sorc/gsi_monitor.fd
   url = https://github.com/NOAA-EMC/GSI-Monitor.git
-[submodule "sorc/upp.fd"]
-  path = sorc/upp.fd
-  url = https://github.com/NOAA-EMC/UPP.git
-  ignore = dirty
 [submodule "sorc/jcb"]
   path = sorc/jcb
   url = https://github.com/noaa-emc/jcb

diff --git a/scripts/exglobal_cleanup.sh b/scripts/exglobal_cleanup.sh
@@ -2,6 +2,13 @@
 
 source "${USHgfs}/preamble.sh"
 
+# Remove DATAoutput from the forecast model run
+# TODO: Handle this better
+DATAfcst="${DATAROOT}/${RUN}fcst.${PDY:-}${cyc}"
+if [[ -d "${DATAfcst}" ]]; then rm -rf "${DATAfcst}"; fi
+#DATAefcs="${DATAROOT}/${RUN}efcs???${PDY:-}${cyc}"
+rm -rf "${DATAROOT}/${RUN}efcs"*"${PDY:-}${cyc}"
+
 ###############################################################
 # Clean up previous cycles; various depths
 # PRIOR CYCLE: Leave the prior cycle alone

diff --git a/sorc/build_upp.sh b/sorc/build_upp.sh
@@ -26,6 +26,6 @@ if [[ ! -d "../exec" ]]; then
   mkdir -p ../exec
 fi
 
-cd upp.fd/tests
+cd ufs_model.fd/FV3/upp/tests
 # shellcheck disable=SC2086
 BUILD_JOBS=${BUILD_JOBS:-8} ./compile_upp.sh ${_opts}
diff --git a/sorc/link_workflow.sh b/sorc/link_workflow.sh
@@ -370,11 +370,10 @@ fi
 #--link source code directories
 #------------------------------
 cd "${HOMEgfs}/sorc" || exit 8
-# TODO: Commenting out until UPP is up-to-date with Rocky-8.
-#if [[ -d ufs_model.fd ]]; then
-#  [[ -d upp.fd ]] && rm -rf upp.fd
-#  ${LINK} ufs_model.fd/FV3/upp upp.fd
-#fi
+if [[ -d ufs_model.fd ]]; then
+  [[ -d upp.fd ]] && rm -rf upp.fd
+  ${LINK} ufs_model.fd/FV3/upp upp.fd
+fi
 
 if [[ -d gsi_enkf.fd ]]; then
   [[ -d gsi.fd ]] && rm -rf gsi.fd

diff --git a/sorc/ufs_model.fd b/sorc/ufs_model.fd
diff --git a/sorc/upp.fd b/sorc/upp.fd
diff --git a/ush/forecast_postdet.sh b/ush/forecast_postdet.sh
@@ -217,12 +217,11 @@ FV3_out() {
   echo "SUB ${FUNCNAME[0]}: copying output data for FV3"
 
   # Copy configuration files
-  if [[ "${RUN}" == "gfs" || "${RUN}" == "gefs" ]]; then
-    ${NCP} "${DATA}/input.nml" "${COMOUT_CONF}/ufs.input.nml"
-    ${NCP} "${DATA}/model_configure" "${COMOUT_CONF}/ufs.model_configure"
-    ${NCP} "${DATA}/ufs.configure" "${COMOUT_CONF}/ufs.ufs.configure"
-    ${NCP} "${DATA}/diag_table" "${COMOUT_CONF}/ufs.diag_table"
-  fi
+  ${NCP} "${DATA}/input.nml" "${COMOUT_CONF}/ufs.input.nml"
+  ${NCP} "${DATA}/model_configure" "${COMOUT_CONF}/ufs.model_configure"
+  ${NCP} "${DATA}/ufs.configure" "${COMOUT_CONF}/ufs.ufs.configure"
+  ${NCP} "${DATA}/diag_table" "${COMOUT_CONF}/ufs.diag_table"
+
 
   # Create an array of fv3 restart files
   local fv3_restart_files tile_files fv3_restart_file restart_file
+1 −1		modulefiles/ufs_acorn.intel.lua
+5 −5		modulefiles/ufs_common.lua
+2 −2		modulefiles/ufs_gaea.intel.lua
+8 −3		modulefiles/ufs_hera.gnu.lua
+1 −1		modulefiles/ufs_hera.intel.lua
+1 −1		modulefiles/ufs_hercules.gnu.lua
+1 −1		modulefiles/ufs_hercules.intel.lua
+1 −1		modulefiles/ufs_jet.intel.lua
+1 −2		modulefiles/ufs_noaacloud.intel.lua
+1 −1		modulefiles/ufs_orion.intel.lua
+1 −1		modulefiles/ufs_s4.intel.lua
+1 −1		tests/bl_date.conf
+31 −31		tests/logs/OpnReqTests_control_p8_hera.log
+15 −9		tests/logs/OpnReqTests_cpld_control_nowave_noaero_p8_hera.log
+15 −15		tests/logs/OpnReqTests_regional_control_hera.log
+256 −256		tests/logs/RegressionTests_acorn.log
+265 −265		tests/logs/RegressionTests_derecho.log
+266 −266		tests/logs/RegressionTests_gaea.log
+543 −359		tests/logs/RegressionTests_hera.log
+440 −343		tests/logs/RegressionTests_hercules.log
+235 −235		tests/logs/RegressionTests_jet.log
+266 −266		tests/logs/RegressionTests_orion.log
+226 −226		tests/logs/RegressionTests_wcoss2.log
+7 −7		tests/rt.conf
+37 −1		tests/test_changes.list