diff --git a/modulefiles/gaea.lua b/modulefiles/gaea_intel.lua
similarity index 100%
rename from modulefiles/gaea.lua
rename to modulefiles/gaea_intel.lua
diff --git a/modulefiles/hera.lua b/modulefiles/hera_intel.lua
similarity index 100%
rename from modulefiles/hera.lua
rename to modulefiles/hera_intel.lua
diff --git a/modulefiles/hera_external_ifi.lua b/modulefiles/hera_intel_external_ifi.lua
similarity index 100%
rename from modulefiles/hera_external_ifi.lua
rename to modulefiles/hera_intel_external_ifi.lua
diff --git a/modulefiles/hera_ifi_test_prereqs.lua b/modulefiles/hera_intel_ifi_test_prereqs.lua
similarity index 100%
rename from modulefiles/hera_ifi_test_prereqs.lua
rename to modulefiles/hera_intel_ifi_test_prereqs.lua
diff --git a/modulefiles/hercules.lua b/modulefiles/hercules_intel.lua
similarity index 100%
rename from modulefiles/hercules.lua
rename to modulefiles/hercules_intel.lua
diff --git a/modulefiles/jet.lua b/modulefiles/jet_intel.lua
similarity index 100%
rename from modulefiles/jet.lua
rename to modulefiles/jet_intel.lua
diff --git a/modulefiles/jet_external_ifi.lua b/modulefiles/jet_intel_external_ifi.lua
similarity index 100%
rename from modulefiles/jet_external_ifi.lua
rename to modulefiles/jet_intel_external_ifi.lua
diff --git a/modulefiles/jet_ifi_test_prereqs.lua b/modulefiles/jet_intel_ifi_test_prereqs.lua
similarity index 100%
rename from modulefiles/jet_ifi_test_prereqs.lua
rename to modulefiles/jet_intel_ifi_test_prereqs.lua
diff --git a/modulefiles/noaacloud.lua b/modulefiles/noaacloud_intel.lua
similarity index 100%
rename from modulefiles/noaacloud.lua
rename to modulefiles/noaacloud_intel.lua
diff --git a/modulefiles/orion.lua b/modulefiles/orion_intel.lua
similarity index 100%
rename from modulefiles/orion.lua
rename to modulefiles/orion_intel.lua
diff --git a/modulefiles/s4.lua b/modulefiles/s4_intel.lua
similarity index 100%
rename from modulefiles/s4.lua
rename to modulefiles/s4_intel.lua
diff --git a/modulefiles/ursa_intel.lua b/modulefiles/ursa_intel.lua
new file mode 100644
index 000000000..c9820807b
--- /dev/null
+++ b/modulefiles/ursa_intel.lua
@@ -0,0 +1,51 @@
+help([[
+Load environment to build UPP on ursa
+]])
+
+prepend_path("MODULEPATH", "/contrib/spack-stack/spack-stack-1.9.1/envs/ue-oneapi-2024.2.1/install/modulefiles/Core")
+prepend_path("MODULEPATH", "/scratch4/NAGAPE/epic/role-epic/modulefiles")
+
+stack_oneapi_ver=os.getenv("stack_oneapi_ver") or "2024.2.1"
+load(pathJoin("stack-oneapi", stack_oneapi_ver))
+
+stack_impi_ver=os.getenv("stack_impi_ver") or "2021.13"
+load(pathJoin("stack-intel-oneapi-mpi", stack_impi_ver))
+
+cmake_ver=os.getenv("cmake_ver") or "3.27.9"
+load(pathJoin("cmake", cmake_ver))
+
+local ufs_modules = {
+  {["jasper"]          = "2.0.32" },
+  {["zlib"]            = "1.2.13" },
+  {["libpng"]          = "1.6.37" },
+  {["hdf5"]            = "1.14.3" },
+  {["netcdf-c"]        = "4.9.2"  },
+  {["netcdf-fortran"]  = "4.6.1"  },
+  {["bacio"]           = "2.4.1"  },
+  {["crtm"]            = "2.4.0.1"},
+  {["g2"]              = "3.5.1"  },
+  {["g2tmpl"]          = "1.13.0" },
+  {["ip"]              = "5.1.0"  },
+  {["w3emc"]           = "2.10.0" },
+  {["nemsio"]          = "2.5.4"  },
+  {["sigio"]           = "2.3.3"  },
+  {["wrf-io"]          = "1.2.0"  },
+}
+
+for i = 1, #ufs_modules do
+  for name, default_version in pairs(ufs_modules[i]) do
+    local env_version_name = string.gsub(name, "-", "_") .. "_ver"
+    load(pathJoin(name, os.getenv(env_version_name) or default_version))
+  end
+end
+
+setenv("CC", "mpiicx")
+setenv("CXX", "mpiicpx")
+setenv("FC", "mpiifort")
+setenv("I_MPI_CC", "icx")
+setenv("I_MPI_CXX", "icpx")
+setenv("I_MPI_FC", "ifort")
+setenv("I_MPI_F77", "ifort")
+setenv("I_MPI_F90", "ifort")
+
+whatis("Description: UFS build environment")
diff --git a/modulefiles/ursa_intelllvm.lua b/modulefiles/ursa_intelllvm.lua
new file mode 100644
index 000000000..842f35672
--- /dev/null
+++ b/modulefiles/ursa_intelllvm.lua
@@ -0,0 +1,50 @@
+help([[
+Load environment to build UPP on ursa
+]])
+
+prepend_path("MODULEPATH", "/contrib/spack-stack/spack-stack-1.9.1/envs/ue-oneapi-2024.2.1/install/modulefiles/Core")
+
+stack_oneapi_ver=os.getenv("stack_oneapi_ver") or "2024.2.1"
+load(pathJoin("stack-oneapi", stack_oneapi_ver))
+
+stack_impi_ver=os.getenv("stack_impi_ver") or "2021.13"
+load(pathJoin("stack-intel-oneapi-mpi", stack_impi_ver))
+
+cmake_ver=os.getenv("cmake_ver") or "3.27.9"
+load(pathJoin("cmake", cmake_ver))
+
+local ufs_modules = {
+  {["jasper"]          = "2.0.32" },
+  {["zlib"]            = "1.2.13" },
+  {["libpng"]          = "1.6.37" },
+  {["hdf5"]            = "1.14.3" },
+  {["netcdf-c"]        = "4.9.2"  },
+  {["netcdf-fortran"]  = "4.6.1"  },
+  {["bacio"]           = "2.4.1"  },
+  {["crtm"]            = "2.4.0.1"},
+  {["g2"]              = "3.5.1"  },
+  {["g2tmpl"]          = "1.13.0" },
+  {["ip"]              = "5.1.0"  },
+  {["w3emc"]           = "2.10.0" },
+  {["nemsio"]          = "2.5.4"  },
+  {["sigio"]           = "2.3.3"  },
+  {["wrf-io"]          = "1.2.0"  },
+}
+
+for i = 1, #ufs_modules do
+  for name, default_version in pairs(ufs_modules[i]) do
+    local env_version_name = string.gsub(name, "-", "_") .. "_ver"
+    load(pathJoin(name, os.getenv(env_version_name) or default_version))
+  end
+end
+
+setenv("CC", "mpiicx")
+setenv("CXX", "mpiicpx")
+setenv("FC", "mpiifx")
+setenv("I_MPI_CC", "icx")
+setenv("I_MPI_CXX", "icpx")
+setenv("I_MPI_FC", "ifx")
+setenv("I_MPI_F90", "ifx")
+setenv("I_MPI_F77", "ifx")
+
+whatis("Description: UPP build environment")
diff --git a/modulefiles/wcoss2_a.lua b/modulefiles/wcoss2_a_intel.lua
similarity index 100%
rename from modulefiles/wcoss2_a.lua
rename to modulefiles/wcoss2_a_intel.lua
diff --git a/modulefiles/wcoss2.lua b/modulefiles/wcoss2_intel.lua
similarity index 100%
rename from modulefiles/wcoss2.lua
rename to modulefiles/wcoss2_intel.lua
diff --git a/tests/compile_upp.sh b/tests/compile_upp.sh
index 2a9925e10..24e5fd37a 100755
--- a/tests/compile_upp.sh
+++ b/tests/compile_upp.sh
@@ -6,20 +6,46 @@
 
 set -eu
 
+if [[ $(uname -s) == Darwin ]]; then
+  readonly MYDIR=$(cd "$(dirname "$(greadlink -f -n "${BASH_SOURCE[0]}" )" )" && pwd -P)
+else
+  readonly MYDIR=$(cd "$(dirname "$(readlink -f -n "${BASH_SOURCE[0]}" )" )" && pwd -P)
+fi
+PATHTR=${PATHTR:-$( cd ${MYDIR}/.. && pwd )}
+source ${PATHTR}/tests/detect_machine.sh
+
+set_defaults() {
+    delete_exec=YES
+    upp_name="upp.x"
+    load_ifi_module=NO
+    prefix="../install"
+    ifi_opt=" -DBUILD_WITH_IFI=OFF"
+    build_ifi_executables_opt=" "
+    build_ifi_executables=NO
+    gtg_opt=" -DBUILD_WITH_GTG=OFF"
+    nemsio_opt=" -DBUILD_WITH_NEMSIO=ON"
+    wrfio_opt=" -DBUILD_WITH_WRFIO=ON"
+    more=" "
+    verbose_opt=""
+    debug_opt=""
+    compiler="intel"
+}
+
 usage() {
+  set_defaults # restore defaults so usage is correct
   echo
   echo "Usage: $0 [options]"
   echo
-  echo "  -o  exe_name.x   Name of built UPP executable in exec. Default: upp.x"
-  echo "  -p  installation prefix <prefix>    DEFAULT: ../install"
-  echo "  -g  build with GTG(users with gtg repos. access only)     DEFAULT: OFF"
+  echo "  -o  exe_name.x   Name of built UPP executable in exec. Default: $upp_name"
+  echo "  -p  installation prefix <prefix>    DEFAULT: $prefix"
+  echo "  -g  build with GTG(users with gtg repos. access only)     DEFAULT: ${gtg_opt#*=}"
   echo "  -i  build with libIFI(users with ifi install access only) DEFAULT: OFF"
   echo "  -I  build with libIFI (users with ifi repos. access only) DEFAULT: OFF"
   echo "  -B  build libIFI test programs (only valid with -I)       DEFAULT: OFF"
-  echo "  -n  build without nemsio            DEFAULT: ON"
-  echo "  -w  build without WRF-IO            DEFAULT: ON"
+  echo "  -n  build with nemsio               DEFAULT: ${nemsio_opt#*=}"
+  echo "  -w  build with WRF-IO               DEFAULT: ${wrfio_opt#*=}"
   echo "  -v  build with cmake verbose        DEFAULT: OFF"
-  echo "  -c  Compiler to use for build       DEFAULT: intel"
+  echo "  -c  Compiler to use for build       DEFAULT: $compiler"
   echo "  -d  Debug mode of CMAKE_BUILD_TYPE  DEFAULT: Release"
   echo "  -a  Skip deletion of exec. Add new executables. DEFAULT: OFF"
   echo "  -Doption=value   Passes this option to cmake (can use more than once)"
@@ -28,20 +54,8 @@ usage() {
   exit 1
 }
 
-delete_exec=YES
-upp_name="upp.x"
-load_ifi_module=NO
-prefix="../install"
-ifi_opt=" -DBUILD_WITH_IFI=OFF"
-build_ifi_executables_opt=" "
-build_ifi_executables=NO
-gtg_opt=" -DBUILD_WITH_GTG=OFF"
-nemsio_opt=" -DBUILD_WITH_NEMSIO=ON"
-wrfio_opt=" -DBUILD_WITH_WRFIO=ON"
-more=" "
-compiler="intel"
-verbose_opt=""
-debug_opt=""
+set_defaults
+
 while getopts ":p:gnwc:vhiIdBD:o:a" opt; do
   case $opt in
     a)
@@ -100,14 +114,6 @@ fi
 
 cmake_opts=" -DCMAKE_INSTALL_PREFIX=$prefix"${nemsio_opt}${wrfio_opt}${gtg_opt}${ifi_opt}${debug_opt}${build_ifi_executables_opt}${more}
 
-if [[ $(uname -s) == Darwin ]]; then
-  readonly MYDIR=$(cd "$(dirname "$(greadlink -f -n "${BASH_SOURCE[0]}" )" )" && pwd -P)
-else
-  readonly MYDIR=$(cd "$(dirname "$(readlink -f -n "${BASH_SOURCE[0]}" )" )" && pwd -P)
-fi
-PATHTR=${PATHTR:-$( cd ${MYDIR}/.. && pwd )}
-source ${PATHTR}/tests/detect_machine.sh
-
 #Load required modulefiles
 if [[ $MACHINE_ID != "unknown" ]]; then
    if [ $MACHINE_ID == "wcoss2"  -o $MACHINE_ID == "wcoss2_a" ]; then
@@ -122,11 +128,7 @@ if [[ $MACHINE_ID != "unknown" ]]; then
       module purge
    fi
    module use $PATHTR/modulefiles
-   if [[ $compiler == "intel" ]]; then
-      modulefile=${MACHINE_ID}
-   else
-      modulefile=${MACHINE_ID}_${compiler}
-   fi
+   modulefile=${MACHINE_ID}_${compiler}
    if [ -f "${PATHTR}/modulefiles/${modulefile}" -o -f "${PATHTR}/modulefiles/${modulefile}.lua" ]; then
       echo "Building for machine ${MACHINE_ID}, compiler ${compiler}"
    else
diff --git a/tests/detect_machine.sh b/tests/detect_machine.sh
index eb7237f82..96c182276 100755
--- a/tests/detect_machine.sh
+++ b/tests/detect_machine.sh
@@ -31,6 +31,9 @@ case $(hostname -f) in
   hfe1[01]) MACHINE_ID=hera ;;   ### hera10-11
   hecflow01) MACHINE_ID=hera ;;   ### heraecflow01
 
+  ufe[0-9][0-9]) MACHINE_ID=ursa ;;
+  uecflow*) MACHINE_ID=ursa ;;
+
   s4-submit.ssec.wisc.edu) MACHINE_ID=s4 ;; ### s4
 
   fe[1-8]) MACHINE_ID=jet ;; ### jet1-8
diff --git a/tests/logs/rt.log.HERA b/tests/logs/rt.log.HERA
index 7e89197c1..034cfcb97 100644
--- a/tests/logs/rt.log.HERA
+++ b/tests/logs/rt.log.HERA
@@ -1,45 +1,45 @@
 ===== Start of UPP Regression Testing Log =====
 UPP Hash Tested:
-4a125c31c60714c7747002e3f1c27976aa678a7d
+20fc8813bbb2cd4f45ea61451d849a92ef05ea30
 
 Submodule hashes:
 -179cae1dd84401cf25d250bd9102e66560a9d328 sorc/libIFI.fd
 -3d35332fe66e3e63a285cc8d96facdf255a33481 sorc/ncep_post.fd/post_gtg.fd
 
-Run directory: /scratch2/NAGAPE/epic/Gillian.Petro/RTs/upp-rts/1208b/ci/rundir/upp-HERA
+Run directory: /scratch2/NAGAPE/epic/Gillian.Petro/RTs/upp-rts/1231/ci/rundir/upp-HERA
 Baseline directory: /scratch2/NAGAPE/epic/UPP/test_suite
 
-Total runtime: 00h:10m:08s
-Test Date: 20250605 17:47:22
+Total runtime: 00h:09m:42s
+Test Date: 20250610 03:09:53
 Summary Results:
 
-06/05 17:40:36Z -fv3gefs test: your new post executable generates bit-identical geaer.t00z.master.grb2f060 as the develop branch
-06/05 17:40:36Z -fv3r_ifi_missing test: your new post executable generates bit-identical IFIFIP10.tm00 as the develop branch
-06/05 17:40:59Z -fv3hafs test: your new post executable generates bit-identical HURPRS09.tm00 as the develop branch
-06/05 17:41:13Z -rap test: your new post executable generates bit-identical WRFPRS.GrbF16 as the develop branch
-06/05 17:41:14Z -rap test: your new post executable generates bit-identical WRFNAT.GrbF16 as the develop branch
-06/05 17:41:32Z -nmmb test: your new post executable generates bit-identical BGDAWP03.tm00.Grib2 as the develop branch
-06/05 17:41:33Z -nmmb test: your new post executable generates bit-identical BGRD3D03.tm00.Grib2 as the develop branch
-06/05 17:41:34Z -nmmb test: your new post executable generates bit-identical BGRDSF03.tm00.Grib2 as the develop branch
-06/05 17:41:45Z -fv3r test: your new post executable generates bit-identical PRSLEV10.tm00 as the develop branch
-06/05 17:41:51Z -fv3r test: your new post executable generates bit-identical NATLEV10.tm00 as the develop branch
-06/05 17:42:02Z -3drtma test: your new post executable generates bit-identical NATLEV00.tm00 as the develop branch
-06/05 17:42:05Z -3drtma test: your new post executable generates bit-identical PRSLEV00.tm00 as the develop branch
-06/05 17:42:40Z -hrrr test: your new post executable generates bit-identical WRFTWO.GrbF04 as the develop branch
-06/05 17:42:41Z -hrrr test: your new post executable generates bit-identical WRFPRS.GrbF04 as the develop branch
-06/05 17:42:43Z -hrrr test: your new post executable generates bit-identical WRFNAT.GrbF04 as the develop branch
-06/05 17:47:04Z -fv3gfs test: your new post executable generates bit-identical gfs.t00z.master.grb2f006 as the develop branch
-06/05 17:47:07Z -fv3gfs test: your new post executable generates bit-identical gfs.t00z.sfluxgrbf006.grib2 as the develop branch
-06/05 17:47:08Z -fv3gfs test: your new post executable generates bit-identical gfs.t00z.special.grb2f006 as the develop branch
-06/05 17:41:44Z -Runtime: nmmb_test 00:01:34 -- baseline 00:02:00
-06/05 17:41:44Z -Runtime: fv3gefs_test 00:00:36 -- baseline 00:01:00
-06/05 17:41:59Z -Runtime: fv3r_test 00:01:51 -- baseline 00:03:00
-06/05 17:41:59Z -Runtime: fv3r_ifi_mis 00:00:36 -- baseline 00:01:00
-06/05 17:42:45Z -Runtime: hrrr_test 00:02:43 -- baseline 00:03:00
-06/05 17:42:45Z -Runtime: rap_test 00:01:14 -- baseline 00:02:00
-06/05 17:42:45Z -Runtime: fv3hafs_test 00:00:59 -- baseline 00:01:00
-06/05 17:42:45Z -Runtime: 3drtma_test 00:02:05 -- baseline 00:03:00
-06/05 17:47:22Z -Runtime: fv3gfs_test 00:07:08 -- baseline 00:10:00
+06/10 03:03:15Z -fv3r_ifi_missing test: your new post executable generates bit-identical IFIFIP10.tm00 as the develop branch
+06/10 03:03:17Z -fv3gefs test: your new post executable generates bit-identical geaer.t00z.master.grb2f060 as the develop branch
+06/10 03:03:23Z -fv3hafs test: your new post executable generates bit-identical HURPRS09.tm00 as the develop branch
+06/10 03:03:56Z -rap test: your new post executable generates bit-identical WRFPRS.GrbF16 as the develop branch
+06/10 03:03:57Z -rap test: your new post executable generates bit-identical WRFNAT.GrbF16 as the develop branch
+06/10 03:04:15Z -nmmb test: your new post executable generates bit-identical BGDAWP03.tm00.Grib2 as the develop branch
+06/10 03:04:17Z -nmmb test: your new post executable generates bit-identical BGRD3D03.tm00.Grib2 as the develop branch
+06/10 03:04:17Z -nmmb test: your new post executable generates bit-identical BGRDSF03.tm00.Grib2 as the develop branch
+06/10 03:04:25Z -fv3r test: your new post executable generates bit-identical PRSLEV10.tm00 as the develop branch
+06/10 03:04:31Z -fv3r test: your new post executable generates bit-identical NATLEV10.tm00 as the develop branch
+06/10 03:04:36Z -3drtma test: your new post executable generates bit-identical NATLEV00.tm00 as the develop branch
+06/10 03:04:40Z -3drtma test: your new post executable generates bit-identical PRSLEV00.tm00 as the develop branch
+06/10 03:05:15Z -hrrr test: your new post executable generates bit-identical WRFTWO.GrbF04 as the develop branch
+06/10 03:05:16Z -hrrr test: your new post executable generates bit-identical WRFPRS.GrbF04 as the develop branch
+06/10 03:05:18Z -hrrr test: your new post executable generates bit-identical WRFNAT.GrbF04 as the develop branch
+06/10 03:09:42Z -fv3gfs test: your new post executable generates bit-identical gfs.t00z.master.grb2f006 as the develop branch
+06/10 03:09:45Z -fv3gfs test: your new post executable generates bit-identical gfs.t00z.sfluxgrbf006.grib2 as the develop branch
+06/10 03:09:45Z -fv3gfs test: your new post executable generates bit-identical gfs.t00z.special.grb2f006 as the develop branch
+06/10 03:04:20Z -Runtime: nmmb_test 00:01:27 -- baseline 00:02:00
+06/10 03:04:20Z -Runtime: fv3gefs_test 00:00:29 -- baseline 00:01:00
+06/10 03:04:35Z -Runtime: fv3r_test 00:01:43 -- baseline 00:03:00
+06/10 03:04:35Z -Runtime: fv3r_ifi_mis 00:00:27 -- baseline 00:01:00
+06/10 03:05:21Z -Runtime: hrrr_test 00:02:30 -- baseline 00:03:00
+06/10 03:05:21Z -Runtime: rap_test 00:01:09 -- baseline 00:02:00
+06/10 03:05:21Z -Runtime: fv3hafs_test 00:00:35 -- baseline 00:01:00
+06/10 03:05:21Z -Runtime: 3drtma_test 00:01:52 -- baseline 00:03:00
+06/10 03:09:53Z -Runtime: fv3gfs_test 00:06:57 -- baseline 00:10:00
 Check tests:
 nmmb fv3gefs fv3r fv3r_ifi_missing hrrr rap fv3hafs 3drtma fv3gfs
 No changes in test results detected.
diff --git a/tests/logs/rt.log.HERCULES b/tests/logs/rt.log.HERCULES
index 37645760b..3129f272a 100644
--- a/tests/logs/rt.log.HERCULES
+++ b/tests/logs/rt.log.HERCULES
@@ -1,45 +1,45 @@
 ===== Start of UPP Regression Testing Log =====
 UPP Hash Tested:
-4a125c31c60714c7747002e3f1c27976aa678a7d
+20fc8813bbb2cd4f45ea61451d849a92ef05ea30
 
 Submodule hashes:
 -179cae1dd84401cf25d250bd9102e66560a9d328 sorc/libIFI.fd
 -3d35332fe66e3e63a285cc8d96facdf255a33481 sorc/ncep_post.fd/post_gtg.fd
 
-Run directory: /work/noaa/epic/gpetro/hercules/RTs/upp-rts/1208b/ci/rundir/upp-HERCULES
+Run directory: /work/noaa/epic/gpetro/hercules/RTs/upp-rts/1231/ci/rundir/upp-HERCULES
 Baseline directory: /work/noaa/epic/UPP
 
-Total runtime: 00h:20m:23s
-Test Date: 20250605 12:57:40
+Total runtime: 00h:11m:06s
+Test Date: 20250609 22:11:07
 Summary Results:
 
-06/05 17:41:30Z -nmmb test: your new post executable generates bit-identical BGDAWP03.tm00.Grib2 as the develop branch
-06/05 17:41:32Z -nmmb test: your new post executable generates bit-identical BGRD3D03.tm00.Grib2 as the develop branch
-06/05 17:41:32Z -nmmb test: your new post executable generates bit-identical BGRDSF03.tm00.Grib2 as the develop branch
-06/05 17:44:14Z -fv3r test: your new post executable generates bit-identical IFIFIP10.tm00 as the develop branch
-06/05 17:44:19Z -fv3gefs test: your new post executable generates bit-identical geaer.t00z.master.grb2f060 as the develop branch
-06/05 17:44:52Z -rap test: your new post executable generates bit-identical WRFPRS.GrbF16 as the develop branch
-06/05 17:44:53Z -rap test: your new post executable generates bit-identical WRFNAT.GrbF16 as the develop branch
-06/05 17:45:43Z -fv3r test: your new post executable generates bit-identical PRSLEV10.tm00 as the develop branch
-06/05 17:45:47Z -fv3r test: your new post executable generates bit-identical NATLEV10.tm00 as the develop branch
-06/05 17:46:13Z -3drtma test: your new post executable generates bit-identical NATLEV00.tm00 as the develop branch
-06/05 17:46:17Z -3drtma test: your new post executable generates bit-identical PRSLEV00.tm00 as the develop branch
-06/05 17:48:40Z -hrrr test: your new post executable generates bit-identical WRFTWO.GrbF04 as the develop branch
-06/05 17:48:41Z -hrrr test: your new post executable generates bit-identical WRFPRS.GrbF04 as the develop branch
-06/05 17:48:44Z -hrrr test: your new post executable generates bit-identical WRFNAT.GrbF04 as the develop branch
-06/05 17:53:31Z -fv3gfs test: your new post executable generates bit-identical gfs.t00z.master.grb2f006 as the develop branch
-06/05 17:53:32Z -fv3gfs test: your new post executable generates bit-identical gfs.t00z.sfluxgrbf006.grib2 as the develop branch
-06/05 17:53:32Z -fv3gfs test: your new post executable generates bit-identical gfs.t00z.special.grb2f006 as the develop branch
-06/05 17:57:37Z -fv3hafs test: your new post executable generates bit-identical HURPRS09.tm00 as the develop branch
-06/05 17:41:38Z -Runtime: nmmb_test 00:02:09 -- baseline 00:03:00
-06/05 17:44:23Z -Runtime: fv3gefs_test 00:00:22 -- baseline 00:01:00
-06/05 17:45:53Z -Runtime: fv3r_test 00:01:50 -- baseline 00:03:00
-06/05 17:45:53Z -Runtime: fv3r_ifi_mis 00:00:17 -- baseline 00:01:00
-06/05 17:48:53Z -Runtime: hrrr_test 00:04:47 -- baseline 00:05:00
-06/05 17:48:53Z -Runtime: rap_test 00:00:56 -- baseline 00:02:00
-06/05 17:57:39Z -Runtime: fv3hafs_test 00:00:29 -- baseline 00:01:00
-06/05 17:57:39Z -Runtime: 3drtma_test 00:02:20 -- baseline 00:03:00
-06/05 17:57:39Z -Runtime: fv3gfs_test 00:09:35 -- baseline 00:11:00
+06/10 03:02:21Z -fv3r test: your new post executable generates bit-identical IFIFIP10.tm00 as the develop branch
+06/10 03:02:24Z -fv3gefs test: your new post executable generates bit-identical geaer.t00z.master.grb2f060 as the develop branch
+06/10 03:02:37Z -fv3hafs test: your new post executable generates bit-identical HURPRS09.tm00 as the develop branch
+06/10 03:03:02Z -rap test: your new post executable generates bit-identical WRFPRS.GrbF16 as the develop branch
+06/10 03:03:03Z -rap test: your new post executable generates bit-identical WRFNAT.GrbF16 as the develop branch
+06/10 03:03:50Z -nmmb test: your new post executable generates bit-identical BGDAWP03.tm00.Grib2 as the develop branch
+06/10 03:03:50Z -fv3r test: your new post executable generates bit-identical PRSLEV10.tm00 as the develop branch
+06/10 03:03:51Z -nmmb test: your new post executable generates bit-identical BGRD3D03.tm00.Grib2 as the develop branch
+06/10 03:03:51Z -nmmb test: your new post executable generates bit-identical BGRDSF03.tm00.Grib2 as the develop branch
+06/10 03:03:53Z -fv3r test: your new post executable generates bit-identical NATLEV10.tm00 as the develop branch
+06/10 03:04:19Z -3drtma test: your new post executable generates bit-identical NATLEV00.tm00 as the develop branch
+06/10 03:04:22Z -3drtma test: your new post executable generates bit-identical PRSLEV00.tm00 as the develop branch
+06/10 03:06:33Z -hrrr test: your new post executable generates bit-identical WRFTWO.GrbF04 as the develop branch
+06/10 03:06:34Z -hrrr test: your new post executable generates bit-identical WRFPRS.GrbF04 as the develop branch
+06/10 03:06:36Z -hrrr test: your new post executable generates bit-identical WRFNAT.GrbF04 as the develop branch
+06/10 03:11:00Z -fv3gfs test: your new post executable generates bit-identical gfs.t00z.master.grb2f006 as the develop branch
+06/10 03:11:02Z -fv3gfs test: your new post executable generates bit-identical gfs.t00z.sfluxgrbf006.grib2 as the develop branch
+06/10 03:11:03Z -fv3gfs test: your new post executable generates bit-identical gfs.t00z.special.grb2f006 as the develop branch
+06/10 03:03:51Z -Runtime: nmmb_test 00:01:45 -- baseline 00:03:00
+06/10 03:03:51Z -Runtime: fv3gefs_test 00:00:17 -- baseline 00:01:00
+06/10 03:04:06Z -Runtime: fv3r_test 00:01:46 -- baseline 00:03:00
+06/10 03:04:06Z -Runtime: fv3r_ifi_mis 00:00:14 -- baseline 00:01:00
+06/10 03:06:36Z -Runtime: hrrr_test 00:04:29 -- baseline 00:05:00
+06/10 03:06:36Z -Runtime: rap_test 00:00:56 -- baseline 00:02:00
+06/10 03:06:36Z -Runtime: fv3hafs_test 00:00:30 -- baseline 00:01:00
+06/10 03:06:36Z -Runtime: 3drtma_test 00:02:15 -- baseline 00:03:00
+06/10 03:11:07Z -Runtime: fv3gfs_test 00:08:56 -- baseline 00:11:00
 Check tests:
 nmmb fv3gefs fv3r fv3r_ifi_missing hrrr rap fv3hafs 3drtma fv3gfs
 No changes in test results detected.
diff --git a/tests/logs/rt.log.ORION b/tests/logs/rt.log.ORION
index 9fdef6e7f..c92d5e0e9 100644
--- a/tests/logs/rt.log.ORION
+++ b/tests/logs/rt.log.ORION
@@ -1,45 +1,45 @@
 ===== Start of UPP Regression Testing Log =====
 UPP Hash Tested:
-e334f741672873da3c269ef8f96596b0c0c1a5bd
+3b1620ef9ea6681069bafc65553e253e7d78034b
 
 Submodule hashes:
 -179cae1dd84401cf25d250bd9102e66560a9d328 sorc/libIFI.fd
 -3d35332fe66e3e63a285cc8d96facdf255a33481 sorc/ncep_post.fd/post_gtg.fd
 
-Run directory: /work/noaa/epic/gpetro/orion/RTs/upp-rts/1208b/ci/rundir/upp-ORION
+Run directory: /work/noaa/epic/gpetro/orion/RTs/upp-rts/1231a/ci/rundir/upp-ORION
 Baseline directory: /work/noaa/epic/UPP
 
-Total runtime: 00h:14m:16s
-Test Date: 20250605 15:17:20
+Total runtime: 00h:15m:21s
+Test Date: 20250609 22:34:51
 Summary Results:
 
-06/05 20:07:18Z -fv3r test: your new post executable generates bit-identical IFIFIP10.tm00 as the develop branch
-06/05 20:07:24Z -fv3gefs test: your new post executable generates bit-identical geaer.t00z.master.grb2f060 as the develop branch
-06/05 20:07:43Z -fv3hafs test: your new post executable generates bit-identical HURPRS09.tm00 as the develop branch
-06/05 20:08:31Z -rap test: your new post executable generates bit-identical WRFPRS.GrbF16 as the develop branch
-06/05 20:08:32Z -rap test: your new post executable generates bit-identical WRFNAT.GrbF16 as the develop branch
-06/05 20:08:43Z -nmmb test: your new post executable generates bit-identical BGDAWP03.tm00.Grib2 as the develop branch
-06/05 20:08:45Z -nmmb test: your new post executable generates bit-identical BGRD3D03.tm00.Grib2 as the develop branch
-06/05 20:08:46Z -nmmb test: your new post executable generates bit-identical BGRDSF03.tm00.Grib2 as the develop branch
-06/05 20:09:03Z -fv3r test: your new post executable generates bit-identical PRSLEV10.tm00 as the develop branch
-06/05 20:09:09Z -fv3r test: your new post executable generates bit-identical NATLEV10.tm00 as the develop branch
-06/05 20:09:35Z -3drtma test: your new post executable generates bit-identical NATLEV00.tm00 as the develop branch
-06/05 20:09:40Z -3drtma test: your new post executable generates bit-identical PRSLEV00.tm00 as the develop branch
-06/05 20:14:38Z -hrrr test: your new post executable generates bit-identical WRFTWO.GrbF04 as the develop branch
-06/05 20:14:39Z -hrrr test: your new post executable generates bit-identical WRFPRS.GrbF04 as the develop branch
-06/05 20:14:41Z -hrrr test: your new post executable generates bit-identical WRFNAT.GrbF04 as the develop branch
-06/05 20:17:18Z -fv3gfs test: your new post executable generates bit-identical gfs.t00z.master.grb2f006 as the develop branch
-06/05 20:17:19Z -fv3gfs test: your new post executable generates bit-identical gfs.t00z.sfluxgrbf006.grib2 as the develop branch
-06/05 20:17:19Z -fv3gfs test: your new post executable generates bit-identical gfs.t00z.special.grb2f006 as the develop branch
-06/05 20:08:48Z -Runtime: nmmb_test 00:02:27 -- baseline 00:03:00
-06/05 20:08:48Z -Runtime: fv3gefs_test 00:00:27 -- baseline 00:01:00
-06/05 20:09:18Z -Runtime: fv3r_test 00:02:12 -- baseline 00:03:00
-06/05 20:09:18Z -Runtime: fv3r_ifi_mis 00:00:21 -- baseline 00:01:00
-06/05 20:14:49Z -Runtime: hrrr_test 00:07:44 -- baseline 00:08:00
-06/05 20:14:49Z -Runtime: rap_test 00:01:35 -- baseline 00:02:00
-06/05 20:14:49Z -Runtime: fv3hafs_test 00:00:46 -- baseline 00:01:00
-06/05 20:14:49Z -Runtime: 3drtma_test 00:02:43 -- baseline 00:03:00
-06/05 20:17:19Z -Runtime: fv3gfs_test 00:10:22 -- baseline 00:11:00
+06/10 03:23:36Z -nmmb test: your new post executable generates bit-identical BGDAWP03.tm00.Grib2 as the develop branch
+06/10 03:23:37Z -nmmb test: your new post executable generates bit-identical BGRD3D03.tm00.Grib2 as the develop branch
+06/10 03:23:37Z -nmmb test: your new post executable generates bit-identical BGRDSF03.tm00.Grib2 as the develop branch
+06/10 03:23:41Z -fv3r test: your new post executable generates bit-identical IFIFIP10.tm00 as the develop branch
+06/10 03:24:01Z -fv3gefs test: your new post executable generates bit-identical geaer.t00z.master.grb2f060 as the develop branch
+06/10 03:24:18Z -fv3hafs test: your new post executable generates bit-identical HURPRS09.tm00 as the develop branch
+06/10 03:25:17Z -rap test: your new post executable generates bit-identical WRFPRS.GrbF16 as the develop branch
+06/10 03:25:18Z -rap test: your new post executable generates bit-identical WRFNAT.GrbF16 as the develop branch
+06/10 03:25:32Z -fv3r test: your new post executable generates bit-identical PRSLEV10.tm00 as the develop branch
+06/10 03:26:01Z -fv3r test: your new post executable generates bit-identical NATLEV10.tm00 as the develop branch
+06/10 03:26:09Z -3drtma test: your new post executable generates bit-identical NATLEV00.tm00 as the develop branch
+06/10 03:26:13Z -3drtma test: your new post executable generates bit-identical PRSLEV00.tm00 as the develop branch
+06/10 03:31:08Z -hrrr test: your new post executable generates bit-identical WRFTWO.GrbF04 as the develop branch
+06/10 03:31:09Z -hrrr test: your new post executable generates bit-identical WRFPRS.GrbF04 as the develop branch
+06/10 03:31:11Z -hrrr test: your new post executable generates bit-identical WRFNAT.GrbF04 as the develop branch
+06/10 03:34:42Z -fv3gfs test: your new post executable generates bit-identical gfs.t00z.master.grb2f006 as the develop branch
+06/10 03:34:43Z -fv3gfs test: your new post executable generates bit-identical gfs.t00z.sfluxgrbf006.grib2 as the develop branch
+06/10 03:34:43Z -fv3gfs test: your new post executable generates bit-identical gfs.t00z.special.grb2f006 as the develop branch
+06/10 03:23:49Z -Runtime: nmmb_test 00:00:48 -- baseline 00:03:00
+06/10 03:24:04Z -Runtime: fv3gefs_test 00:00:19 -- baseline 00:01:00
+06/10 03:26:04Z -Runtime: fv3r_test 00:02:38 -- baseline 00:03:00
+06/10 03:26:04Z -Runtime: fv3r_ifi_mis 00:00:18 -- baseline 00:01:00
+06/10 03:31:20Z -Runtime: hrrr_test 00:07:29 -- baseline 00:08:00
+06/10 03:31:20Z -Runtime: rap_test 00:01:36 -- baseline 00:02:00
+06/10 03:31:20Z -Runtime: fv3hafs_test 00:00:36 -- baseline 00:01:00
+06/10 03:31:20Z -Runtime: 3drtma_test 00:02:50 -- baseline 00:03:00
+06/10 03:34:51Z -Runtime: fv3gfs_test 00:11:20 -- baseline 00:11:00
 Check tests:
 nmmb fv3gefs fv3r fv3r_ifi_missing hrrr rap fv3hafs 3drtma fv3gfs
 No changes in test results detected.
diff --git a/tests/logs/rt.log.WCOSS2 b/tests/logs/rt.log.WCOSS2
index c3b9cd018..5271f984b 100644
--- a/tests/logs/rt.log.WCOSS2
+++ b/tests/logs/rt.log.WCOSS2
@@ -1,49 +1,49 @@
 ===== Start of UPP Regression Testing Log =====
 UPP Hash Tested:
-d48a547d2ad59a144486ea194b5c95f332be2342
+ac06aba06f4db0ab77b67418dca52c1e1273dadc
 
 Submodule hashes:
  179cae1dd84401cf25d250bd9102e66560a9d328 sorc/libIFI.fd (before-3km-fixes-45-g179cae1)
 -3d35332fe66e3e63a285cc8d96facdf255a33481 sorc/ncep_post.fd/post_gtg.fd
 
-Run directory: /lfs/h2/emc/ptmp/benjamin.blake/upp-WCOSS2
+Run directory: /lfs/h2/emc/ptmp/wen.meng/upp-WCOSS2
 Baseline directory: /u/wen.meng/noscrub/ncep_post/post_regression_test_new
 
-Total runtime: 00h:17m:09s
-Test Date: 20250605 17:49:06
+Total runtime: 00h:15m:47s
+Test Date: 20250610 12:04:15
 Summary Results:
 
-06/05 17:38:42Z -fv3r test: your new post executable generates bit-identical IFIFIP10.tm00 as the develop branch
-06/05 17:38:49Z -fv3r_ifi_missing test: your new post executable generates bit-identical IFIFIP10.tm00 as the develop branch
-06/05 17:38:54Z -fv3gefs test: your new post executable generates bit-identical geaer.t00z.master.grb2f060 as the develop branch
-06/05 17:39:20Z -fv3hafs test: your new post executable generates bit-identical HURPRS09.tm00 as the develop branch
-06/05 17:39:25Z -hrrr_ifi test: your new post executable generates bit-identical IFIFIP.GrbF04 as the develop branch
-06/05 17:39:28Z -rap test: your new post executable generates bit-identical WRFPRS.GrbF16 as the develop branch
-06/05 17:39:30Z -rap test: your new post executable generates bit-identical WRFNAT.GrbF16 as the develop branch
-06/05 17:39:55Z -3drtma test: your new post executable generates bit-identical NATLEV00.tm00 as the develop branch
-06/05 17:40:00Z -3drtma test: your new post executable generates bit-identical PRSLEV00.tm00 as the develop branch
-06/05 17:40:11Z -fv3r test: your new post executable generates bit-identical PRSLEV10.tm00 as the develop branch
-06/05 17:40:16Z -fv3r test: your new post executable generates bit-identical NATLEV10.tm00 as the develop branch
-06/05 17:40:22Z -nmmb test: your new post executable generates bit-identical BGDAWP03.tm00.Grib2 as the develop branch
-06/05 17:40:24Z -nmmb test: your new post executable generates bit-identical BGRD3D03.tm00.Grib2 as the develop branch
-06/05 17:40:25Z -nmmb test: your new post executable generates bit-identical BGRDSF03.tm00.Grib2 as the develop branch
-06/05 17:41:08Z -hrrr test: your new post executable generates bit-identical WRFTWO.GrbF04 as the develop branch
-06/05 17:41:10Z -hrrr test: your new post executable generates bit-identical WRFPRS.GrbF04 as the develop branch
-06/05 17:41:15Z -hrrr test: your new post executable generates bit-identical WRFNAT.GrbF04 as the develop branch
-06/05 17:48:19Z -fv3gfs test: your new post executable generates bit-identical gfs.t00z.master.grb2f006 as the develop branch
-06/05 17:48:22Z -fv3gfs test: your new post executable generates bit-identical gfs.t00z.sfluxgrbf006.grib2 as the develop branch
-06/05 17:48:22Z -fv3gfs test: your new post executable generates bit-identical gfs.t00z.special.grb2f006 as the develop branch
-06/05 17:40:46Z -Runtime: nmmb.test 00:02:50 -- baseline 00:02:20
-06/05 17:40:51Z -Runtime: fv3gefs.test 00:01:18 -- baseline 00:01:20
-06/05 17:40:55Z -Runtime: fv3r.test 00:02:45 -- baseline 00:06:00
-06/05 17:40:59Z -Runtime: fv3r_ifi_mis 00:01:17 -- baseline 00:02:00
-06/05 17:41:36Z -Runtime: hrrr.test 00:03:40 -- baseline 00:03:40
-06/05 17:41:41Z -Runtime: rap.test 00:01:54 -- baseline 00:02:00
-06/05 17:41:45Z -Runtime: hafs.test 00:01:44 -- baseline 00:02:00
-06/05 17:41:49Z -Runtime: 3drtma.test 00:02:25 -- baseline 00:03:40
-06/05 17:48:56Z -Runtime: fv3gfs.test 00:10:51 -- baseline 00:12:00
-06/05 17:49:00Z -Runtime: hrrr_ifi_test 00:01:50 -- baseline 00:02:00
-06/05 17:49:04Z -Runtime: fv3r_ifi_test 00:01:08 -- baseline 00:02:00
+06/10 11:54:37Z -fv3r_ifi_missing test: your new post executable generates bit-identical IFIFIP10.tm00 as the develop branch
+06/10 11:54:42Z -fv3gefs test: your new post executable generates bit-identical geaer.t00z.master.grb2f060 as the develop branch
+06/10 11:54:44Z -fv3r test: your new post executable generates bit-identical IFIFIP10.tm00 as the develop branch
+06/10 11:55:09Z -fv3hafs test: your new post executable generates bit-identical HURPRS09.tm00 as the develop branch
+06/10 11:55:14Z -hrrr_ifi test: your new post executable generates bit-identical IFIFIP.GrbF04 as the develop branch
+06/10 11:55:19Z -rap test: your new post executable generates bit-identical WRFPRS.GrbF16 as the develop branch
+06/10 11:55:20Z -rap test: your new post executable generates bit-identical WRFNAT.GrbF16 as the develop branch
+06/10 11:55:23Z -nmmb test: your new post executable generates bit-identical BGDAWP03.tm00.Grib2 as the develop branch
+06/10 11:55:24Z -nmmb test: your new post executable generates bit-identical BGRD3D03.tm00.Grib2 as the develop branch
+06/10 11:55:25Z -nmmb test: your new post executable generates bit-identical BGRDSF03.tm00.Grib2 as the develop branch
+06/10 11:55:42Z -3drtma test: your new post executable generates bit-identical NATLEV00.tm00 as the develop branch
+06/10 11:55:46Z -3drtma test: your new post executable generates bit-identical PRSLEV00.tm00 as the develop branch
+06/10 11:55:56Z -fv3r test: your new post executable generates bit-identical PRSLEV10.tm00 as the develop branch
+06/10 11:56:03Z -fv3r test: your new post executable generates bit-identical NATLEV10.tm00 as the develop branch
+06/10 11:56:53Z -hrrr test: your new post executable generates bit-identical WRFTWO.GrbF04 as the develop branch
+06/10 11:56:54Z -hrrr test: your new post executable generates bit-identical WRFPRS.GrbF04 as the develop branch
+06/10 11:56:55Z -hrrr test: your new post executable generates bit-identical WRFNAT.GrbF04 as the develop branch
+06/10 12:03:29Z -fv3gfs test: your new post executable generates bit-identical gfs.t00z.master.grb2f006 as the develop branch
+06/10 12:03:31Z -fv3gfs test: your new post executable generates bit-identical gfs.t00z.sfluxgrbf006.grib2 as the develop branch
+06/10 12:03:31Z -fv3gfs test: your new post executable generates bit-identical gfs.t00z.special.grb2f006 as the develop branch
+06/10 11:55:46Z -Runtime: nmmb.test 00:01:52 -- baseline 00:02:20
+06/10 11:55:50Z -Runtime: fv3gefs.test 00:01:07 -- baseline 00:01:20
+06/10 11:56:26Z -Runtime: fv3r.test 00:02:31 -- baseline 00:06:00
+06/10 11:56:31Z -Runtime: fv3r_ifi_mis 00:01:04 -- baseline 00:02:00
+06/10 11:57:23Z -Runtime: hrrr.test 00:03:22 -- baseline 00:03:40
+06/10 11:57:27Z -Runtime: rap.test 00:01:48 -- baseline 00:02:00
+06/10 11:57:32Z -Runtime: hafs.test 00:01:38 -- baseline 00:02:00
+06/10 11:57:36Z -Runtime: 3drtma.test 00:02:11 -- baseline 00:03:40
+06/10 12:04:06Z -Runtime: fv3gfs.test 00:09:59 -- baseline 00:12:00
+06/10 12:04:10Z -Runtime: hrrr_ifi_test 00:01:42 -- baseline 00:02:00
+06/10 12:04:15Z -Runtime: fv3r_ifi_test 00:01:10 -- baseline 00:02:00
 Check tests:
 nmmb fv3gefs fv3r fv3r_ifi_missing hrrr rap fv3hafs 3drtma fv3gfs hrrr_ifi fv3r_ifi
 No changes in test results detected.