diff --git a/.gitmodules b/.gitmodules
index b881f89393..686b1627ed 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,7 +1,7 @@
 [submodule "UFSATM"]
   path = UFSATM
-  url = https://github.com/NOAA-EMC/ufsatm
-  branch = develop
+  url = https://github.com/ClaraDraper-NOAA/ufsatm.git
+  branch = update-ccpp-physics-sfcsub-cleanup
 [submodule "WW3"]
   path = WW3
   url = https://github.com/NOAA-EMC/WW3
diff --git a/UFSATM b/UFSATM
index c20b46c256..caff07a0e7 160000
--- a/UFSATM
+++ b/UFSATM
@@ -1 +1 @@
-Subproject commit c20b46c256ca08788d54d7991bc336a410913f39
+Subproject commit caff07a0e717ab502faec0f4dc929aa8a8389248
diff --git a/tests/logs/RegressionTests_ursa.log b/tests/logs/RegressionTests_ursa.log
index 93b4a8c324..666a3d7594 100644
--- a/tests/logs/RegressionTests_ursa.log
+++ b/tests/logs/RegressionTests_ursa.log
@@ -1,7 +1,11 @@
 ====START OF URSA REGRESSION TESTING LOG====
 
 UFSWM hash used in testing:
+<<<<<<< HEAD
 eaac99d57e7f19ddcf5dc77b21ebd92f9af5e3e8
+=======
+a4a87e080dbf3850b7e9c9888805473665f1263f
+>>>>>>> cdf5dfa88af1a160bb02f77032f3c9413fe75d96
 
 Submodule hashes used in testing:
  2c1cec7dd4d7a477abd2ae204db4a78295c24f16 AQM (v0.2.0-63-g2c1cec7)
@@ -19,9 +23,15 @@ Submodule hashes used in testing:
  65ef5c73bc7f5663d5688f75c3855d431da4baea MOM6-interface/MOM6/pkg/CVMix-src (65ef5c7)
  29e64d652786e1d076a05128c920f394202bfe10 MOM6-interface/MOM6/pkg/GSW-Fortran (29e64d6)
  2c7b3bc2a8096f6232020c47507593058795102e NOAHMP-interface/noahmp (v3.7.1-471-g2c7b3bc)
+<<<<<<< HEAD
  033b733818b44600a18ab144bf40f6b61749799f UFSATM (remotes/origin/dev_alt_dfac)
  22bc1a5de8a19996310aedc3482931616cd74a1b UFSATM/ccpp/framework (2025-10-15-dev-5-g22bc1a5)
  71303ead4f4347fbb55f02ea180175b00a93fffb UFSATM/ccpp/physics (ccpp_transition_to_vlab_master_20190705-5643-g71303ead)
+=======
+ fd0f1a68253459906fc6ede253e7dee5ed45d86f UFSATM (remotes/origin/production/HREF.v3beta-428-gfd0f1a6)
+ 22bc1a5de8a19996310aedc3482931616cd74a1b UFSATM/ccpp/framework (2025-10-15-dev-5-g22bc1a5)
+ 3dcd800d2adb0ea5032a2d130576a3944e068729 UFSATM/ccpp/physics (EP4-2158-g3dcd800d)
+>>>>>>> cdf5dfa88af1a160bb02f77032f3c9413fe75d96
  c62efd27caa26f660edf24232f33f154e608b77a UFSATM/ccpp/physics/physics/MP/TEMPO/TEMPO (v2.1.3~3)
  41c5fcd950fed09b8afe186dede266824eca7fd3 UFSATM/ccpp/physics/physics/Radiation/RRTMGP/rte-rrtmgp (41c5fcd)
  87936f8b0d57b541ebade64a33a926b583c70c6d UFSATM/fv3/atmos_cubed_sphere (201912_public_release-450-g87936f8)
@@ -40,13 +50,19 @@ The first time is for the full script (prep+run+finalize).
 The second time is specifically for the run phase.
 Times/Memory will be empty for failed tests.
 
+<<<<<<< HEAD
 BASELINE DIRECTORY: /scratch4/NAGAPE/epic/role-epic/UFS-WM_RT/NEMSfv3gfs/develop-20260202
 COMPARISON DIRECTORY: /scratch3/NAGAPE/epic/Fernando.Andrade-maldonado/stmp/RT_RUNDIRS/Fernando.Andrade-maldonado/FV3_RT/rt_3730985
+=======
+BASELINE DIRECTORY: /scratch4/NAGAPE/epic/role-epic/UFS-WM_RT/NEMSfv3gfs/develop-20260126
+COMPARISON DIRECTORY: /scratch4/NAGAPE/epic/Gillian.Petro/stmp/RT_RUNDIRS/Gillian.Petro/FV3_RT/rt_1715814
+>>>>>>> cdf5dfa88af1a160bb02f77032f3c9413fe75d96
 
 RT.SH OPTIONS USED:
 * (-a) - HPC PROJECT ACCOUNT: epic
 * (-e) - USE ECFLOW
 
+<<<<<<< HEAD
 PASS -- COMPILE 's2swa_32bit_intel' [16:11, 14:43] ( 1 warnings 1048 remarks )
 PASS -- TEST 'cpld_control_p8_mixedmode_intel' [08:46, 06:37](2178 MB)
 PASS -- TEST 'cpld_control_gefs_intel' [28:41, 21:06](3242 MB)
@@ -448,6 +464,494 @@ Ending Date/Time: 20260203 09:18:07
 Total Time: 01h:26m:55s
 Compiles Completed: 64/64
 Tests Completed: 267/267
+=======
+PASS -- COMPILE 's2swa_32bit_intel' [15:11, 13:40] ( 1 warnings 1048 remarks )
+PASS -- TEST 'cpld_control_p8_mixedmode_intel' [13:49, 06:26](2178 MB)
+PASS -- TEST 'cpld_control_gefs_intel' [48:52, 20:56](3256 MB)
+PASS -- TEST 'cpld_restart_gefs_intel' [39:46, 06:56](2961 MB)
+PASS -- TEST 'cpld_dcp_gefs_intel' [33:16, 57:12](3464 MB)
+
+PASS -- COMPILE 's2swa_32bit_pdlib_intel' [17:11, 16:01] ( 1 warnings 1047 remarks )
+PASS -- TEST 'cpld_control_gfsv17_intel' [30:45, 09:32](2059 MB)
+PASS -- TEST 'cpld_control_gfsv17_iau_intel' [44:02, 10:08](2587 MB)
+PASS -- TEST 'cpld_restart_gfsv17_intel' [37:55, 03:46](1502 MB)
+PASS -- TEST 'cpld_restart_gfsv17_iau_intel' [07:55, 04:34](2344 MB)
+PASS -- TEST 'cpld_mpi_gfsv17_intel' [37:41, 17:17](1996 MB)
+
+PASS -- COMPILE 's2s_32bit_sfs_intel' [17:11, 15:24] ( 1 warnings 943 remarks )
+PASS -- TEST 'cpld_control_sfs_intel' [30:27, 08:24](2385 MB)
+PASS -- TEST 'cpld_restart_sfs_intel' [39:17, 05:09](1904 MB)
+
+PASS -- COMPILE 's2s_32bit_sfs_debug_intel' [05:10, 03:48] ( 332 warnings 943 remarks )
+PASS -- TEST 'cpld_debug_sfs_intel' [13:26, 08:10](2403 MB)
+
+PASS -- COMPILE 's2swa_32bit_pdlib_debug_intel' [05:10, 03:59] ( 332 warnings 2775 remarks )
+PASS -- TEST 'cpld_debug_gfsv17_intel' [20:54, 17:24](2093 MB)
+
+PASS -- COMPILE 's2swa_intel' [16:11, 14:21] ( 1 warnings 1048 remarks )
+PASS -- TEST 'cpld_control_p8_intel' [27:03, 07:37](2500 MB)
+PASS -- TEST 'cpld_control_p8.v2.sfc_intel' [29:09, 07:05](2491 MB)
+PASS -- TEST 'cpld_restart_p8_intel' [35:04, 03:52](2273 MB)
+PASS -- TEST 'cpld_control_qr_p8_intel' [26:06, 06:54](2350 MB)
+PASS -- TEST 'cpld_restart_qr_p8_intel' [38:16, 03:44](1996 MB)
+PASS -- TEST 'cpld_2threads_p8_intel' [40:50, 12:53](2978 MB)
+PASS -- TEST 'cpld_decomp_p8_intel' [35:12, 07:21](2451 MB)
+PASS -- TEST 'cpld_mpi_p8_intel' [41:12, 11:11](2313 MB)
+PASS -- TEST 'cpld_control_ciceC_p8_intel' [34:10, 06:43](2502 MB)
+PASS -- TEST 'cpld_control_c192_p8_intel' [34:41, 22:32](3564 MB)
+PASS -- TEST 'cpld_restart_c192_p8_intel' [37:13, 12:00](3434 MB)
+
+PASS -- COMPILE 's2swal_intel' [16:11, 15:04] ( 1 warnings 1069 remarks )
+PASS -- TEST 'cpld_control_p8_lnd_intel' [35:56, 07:25](2463 MB)
+PASS -- TEST 'cpld_restart_p8_lnd_intel' [25:07, 03:43](2306 MB)
+PASS -- TEST 'cpld_s2sa_p8_intel' [15:50, 05:56](3121 MB)
+
+PASS -- COMPILE 's2sw_intel' [16:11, 14:14] ( 1 warnings 1016 remarks )
+PASS -- TEST 'cpld_control_noaero_p8_intel' [34:44, 06:52](2080 MB)
+PASS -- TEST 'cpld_control_nowave_noaero_p8_intel' [23:57, 08:48](3000 MB)
+
+PASS -- COMPILE 's2swa_debug_intel' [05:10, 03:37] ( 332 warnings 2025 remarks )
+PASS -- TEST 'cpld_debug_p8_intel' [13:00, 08:57](2363 MB)
+
+PASS -- COMPILE 's2sw_debug_intel' [05:10, 03:40] ( 332 warnings 2007 remarks )
+PASS -- TEST 'cpld_debug_noaero_p8_intel' [07:48, 04:26](2109 MB)
+
+PASS -- COMPILE 's2s_aoflux_intel' [15:11, 12:58] ( 1 warnings 954 remarks )
+PASS -- TEST 'cpld_control_noaero_p8_agrid_intel' [58:56, 27:10](2186 MB)
+
+PASS -- COMPILE 's2sw_pdlib_intel' [17:11, 14:49] ( 1 warnings 1039 remarks )
+PASS -- TEST 'cpld_control_pdlib_p8_intel' [39:46, 08:05](2156 MB)
+PASS -- TEST 'cpld_restart_pdlib_p8_intel' [20:00, 04:02](1671 MB)
+PASS -- TEST 'cpld_mpi_pdlib_p8_intel' [42:48, 11:39](2107 MB)
+PASS -- TEST 'cpld_control_c48_5deg_intel' [10:31, 07:58](3031 MB)
+FAILED: TEST TIMED OUT -- TEST 'cpld_warmstart_c48_5deg_intel' [, ]( MB)
+FAILED: UNABLE TO START TEST -- TEST 'cpld_restart_c48_5deg_intel' [, ]( MB)
+PASS -- TEST 'cpld_control_c24_5deg_intel' [21:28, 19:27](2215 MB)
+PASS -- TEST 'cpld_warmstart_c24_5deg_intel' [03:26, 00:31](2210 MB)
+PASS -- TEST 'cpld_restart_c24_5deg_intel' [02:26, 00:26](1533 MB)
+PASS -- TEST 'cpld_control_c24_9deg_intel' [14:26, 11:31](2214 MB)
+PASS -- TEST 'cpld_warmstart_c24_9deg_intel' [03:26, 00:31](2210 MB)
+PASS -- TEST 'cpld_restart_c24_9deg_intel' [02:26, 00:28](1531 MB)
+PASS -- TEST 'cpld_control_c12_9deg_intel' [20:29, 17:40](2138 MB)
+PASS -- TEST 'cpld_warmstart_c12_9deg_intel' [02:25, 00:29](2137 MB)
+PASS -- TEST 'cpld_restart_c12_9deg_intel' [04:26, 01:57](1491 MB)
+
+PASS -- COMPILE 's2sw_pdlib_debug_intel' [06:10, 03:57] ( 332 warnings 2757 remarks )
+PASS -- TEST 'cpld_debug_pdlib_p8_intel' [21:43, 19:34](2184 MB)
+
+PASS -- COMPILE 'atm_dyn32_intel' [10:10, 07:38] ( 1 warnings 501 remarks )
+PASS -- TEST 'control_flake_intel' [11:20, 02:29](1348 MB)
+PASS -- TEST 'control_CubedSphereGrid_intel' [13:22, 01:33](2210 MB)
+PASS -- TEST 'control_CubedSphereGrid_parallel_intel' [10:23, 01:49](2231 MB)
+PASS -- TEST 'control_latlon_intel' [13:22, 01:37](2214 MB)
+PASS -- TEST 'control_wrtGauss_netcdf_parallel_intel' [13:23, 01:39](2214 MB)
+PASS -- TEST 'control_c48_intel' [14:22, 11:55](1669 MB)
+PASS -- TEST 'control_c48.v2.sfc_intel' [06:20, 04:02](805 MB)
+PASS -- TEST 'control_c48_lnd_iau_intel' [06:21, 04:30](1670 MB)
+PASS -- TEST 'control_c192_intel' [12:35, 04:49](1809 MB)
+PASS -- TEST 'control_c384_intel' [08:19, 05:36](2084 MB)
+PASS -- TEST 'control_c384gdas_intel' [25:08, 06:15](1864 MB)
+PASS -- TEST 'control_stochy_intel' [09:19, 01:09](1301 MB)
+PASS -- TEST 'control_stochy_restart_intel' [15:18, 05:41](1225 MB)
+PASS -- TEST 'control_lndp_intel' [03:19, 01:04](1289 MB)
+PASS -- TEST 'control_iovr4_intel' [10:20, 01:58](1298 MB)
+PASS -- TEST 'control_iovr4_gfdlmpv3_intel' [18:38, 02:06](1590 MB)
+PASS -- TEST 'control_iovr5_intel' [06:20, 01:41](1287 MB)
+PASS -- TEST 'control_p8_intel' [28:48, 11:24](2513 MB)
+PASS -- TEST 'control_p8.v2.sfc_intel' [21:52, 02:10](2517 MB)
+PASS -- TEST 'control_p8_ugwpv1_intel' [29:45, 11:26](2537 MB)
+PASS -- TEST 'control_p8_ugwpv1_tempo_intel' [20:47, 02:22](2521 MB)
+PASS -- TEST 'control_p8_ugwpv1_tempo_aerosol_intel' [20:48, 02:04](2545 MB)
+PASS -- TEST 'control_p8_ugwpv1_tempo_aerosol_hail_intel' [40:40, 01:45](2406 MB)
+PASS -- TEST 'control_restart_p8_intel' [33:35, 01:30](1864 MB)
+PASS -- TEST 'control_noqr_p8_intel' [18:46, 02:00](2498 MB)
+PASS -- TEST 'control_restart_noqr_p8_intel' [26:37, 07:49](1901 MB)
+PASS -- TEST 'control_decomp_p8_intel' [27:34, 02:05](2498 MB)
+PASS -- TEST 'control_2threads_p8_intel' [38:42, 01:42](2009 MB)
+PASS -- TEST 'control_p8_lndp_intel' [34:31, 03:36](2528 MB)
+PASS -- TEST 'control_p8_rrtmgp_intel' [40:37, 10:02](2587 MB)
+PASS -- TEST 'control_p8_mynn_intel' [29:40, 02:19](2518 MB)
+PASS -- TEST 'merra2_thompson_intel' [29:38, 02:22](2529 MB)
+PASS -- TEST 'merra2_hf_thompson_intel' [30:32, 03:28](2527 MB)
+PASS -- TEST 'regional_control_intel' [15:28, 03:26](1720 MB)
+PASS -- TEST 'regional_restart_intel' [04:29, 01:57](1697 MB)
+PASS -- TEST 'regional_decomp_intel' [15:28, 03:35](1721 MB)
+PASS -- TEST 'regional_2threads_intel' [25:28, 02:03](1572 MB)
+PASS -- TEST 'regional_noquilt_intel' [13:29, 03:22](1989 MB)
+PASS -- TEST 'regional_netcdf_parallel_intel' [14:29, 03:22](1718 MB)
+PASS -- TEST 'regional_2dwrtdecomp_intel' [11:28, 03:23](1728 MB)
+PASS -- TEST 'regional_wofs_intel' [11:27, 04:18](2620 MB)
+
+PASS -- COMPILE 'atm_dyn32_rad32_intel' [09:10, 07:00] ( 1 warnings 481 remarks )
+PASS -- TEST 'control_p8_rrtmgp_rad32_intel' [20:35, 02:42](2539 MB)
+
+PASS -- COMPILE 'rrfs_intel' [09:11, 06:13] ( 4 warnings 448 remarks )
+PASS -- TEST 'rap_control_intel' [20:24, 02:32](1783 MB)
+PASS -- TEST 'regional_spp_sppt_shum_skeb_intel' [16:45, 02:37](1605 MB)
+PASS -- TEST 'rap_decomp_intel' [15:27, 02:29](1732 MB)
+PASS -- TEST 'rap_2threads_intel' [20:25, 01:57](1167 MB)
+PASS -- TEST 'rap_restart_intel' [05:27, 01:23](1754 MB)
+PASS -- TEST 'rap_sfcdiff_intel' [19:28, 02:46](1792 MB)
+PASS -- TEST 'rap_sfcdiff_decomp_intel' [20:29, 02:32](1726 MB)
+PASS -- TEST 'rap_sfcdiff_restart_intel' [06:29, 01:19](1744 MB)
+PASS -- TEST 'hrrr_control_intel' [19:24, 02:20](1767 MB)
+PASS -- TEST 'hrrr_control_decomp_intel' [18:23, 02:30](1707 MB)
+PASS -- TEST 'hrrr_control_2threads_intel' [16:26, 01:52](1161 MB)
+PASS -- TEST 'hrrr_control_restart_intel' [06:19, 01:16](1704 MB)
+PASS -- TEST 'rrfs_v1beta_intel' [18:34, 04:20](1908 MB)
+PASS -- TEST 'rrfs_v1nssl_intel' [17:18, 05:41](2640 MB)
+PASS -- TEST 'rrfs_v1nssl_nohailnoccn_intel' [16:18, 05:25](2909 MB)
+
+PASS -- COMPILE 'csawmg_intel' [08:11, 05:58] ( 1 warnings 417 remarks )
+PASS -- TEST 'control_csawmg_intel' [15:27, 04:21](1750 MB)
+PASS -- TEST 'control_ras_intel' [12:16, 02:14](1598 MB)
+
+PASS -- COMPILE 'wam_intel' [08:11, 05:46] ( 1 warnings 395 remarks )
+PASS -- TEST 'control_wam_intel' [17:36, 08:02](2415 MB)
+
+PASS -- COMPILE 'atm_debug_dyn32_intel' [06:11, 03:53] ( 411 warnings 589 remarks )
+PASS -- TEST 'control_CubedSphereGrid_debug_intel' [10:19, 01:40](2237 MB)
+PASS -- TEST 'control_wrtGauss_netcdf_parallel_debug_intel' [10:19, 01:39](2260 MB)
+PASS -- TEST 'control_stochy_debug_intel' [10:17, 02:11](1477 MB)
+PASS -- TEST 'control_lndp_debug_intel' [10:17, 01:57](1477 MB)
+PASS -- TEST 'control_csawmg_debug_intel' [10:28, 03:02](1782 MB)
+PASS -- TEST 'control_ras_debug_intel' [08:17, 01:58](1482 MB)
+PASS -- TEST 'control_diag_debug_intel' [06:24, 01:59](2309 MB)
+PASS -- TEST 'control_debug_p8_intel' [06:30, 02:03](2543 MB)
+PASS -- TEST 'regional_debug_intel' [16:29, 12:02](1633 MB)
+PASS -- TEST 'rap_control_debug_intel' [07:18, 03:49](1863 MB)
+PASS -- TEST 'hrrr_control_debug_intel' [05:17, 03:28](1869 MB)
+PASS -- TEST 'hrrr_gf_debug_intel' [12:18, 09:54](1875 MB)
+PASS -- TEST 'hrrr_c3_debug_intel' [11:17, 07:46](1879 MB)
+PASS -- TEST 'rap_unified_drag_suite_debug_intel' [08:17, 04:03](1866 MB)
+PASS -- TEST 'rap_diag_debug_intel' [09:25, 03:44](1951 MB)
+PASS -- TEST 'rap_cires_ugwp_debug_intel' [08:18, 03:34](1867 MB)
+PASS -- TEST 'rap_unified_ugwp_debug_intel' [09:18, 03:43](1869 MB)
+PASS -- TEST 'rap_lndp_debug_intel' [09:18, 03:36](1873 MB)
+PASS -- TEST 'rap_progcld_thompson_debug_intel' [08:18, 03:35](1857 MB)
+PASS -- TEST 'rap_noah_debug_intel' [08:18, 03:27](1866 MB)
+PASS -- TEST 'rap_sfcdiff_debug_intel' [08:18, 03:29](1879 MB)
+PASS -- TEST 'rap_noah_sfcdiff_cires_ugwp_debug_intel' [10:18, 05:41](1864 MB)
+PASS -- TEST 'rap_clm_lake_debug_intel' [08:18, 03:34](1865 MB)
+PASS -- TEST 'rap_flake_debug_intel' [10:18, 03:41](1867 MB)
+PASS -- TEST 'gnv1_c96_no_nest_debug_intel' [13:28, 06:01](1875 MB)
+
+PASS -- COMPILE 'wam_debug_intel' [05:11, 02:28] ( 374 warnings 395 remarks )
+PASS -- TEST 'control_wam_debug_intel' [16:32, 09:07](2285 MB)
+
+PASS -- COMPILE 'rrfs_dyn32_phy32_intel' [08:11, 05:47] ( 4 warnings 415 remarks )
+PASS -- TEST 'regional_spp_sppt_shum_skeb_dyn32_phy32_intel' [05:45, 02:28](1476 MB)
+PASS -- TEST 'rap_control_dyn32_phy32_intel' [08:26, 02:06](1748 MB)
+PASS -- TEST 'hrrr_control_dyn32_phy32_intel' [08:22, 02:05](1729 MB)
+PASS -- TEST 'rap_2threads_dyn32_phy32_intel' [07:23, 01:42](1067 MB)
+PASS -- TEST 'hrrr_control_2threads_dyn32_phy32_intel' [07:25, 01:37](1048 MB)
+PASS -- TEST 'hrrr_control_decomp_dyn32_phy32_intel' [07:22, 02:07](1663 MB)
+PASS -- TEST 'rap_restart_dyn32_phy32_intel' [03:24, 01:19](1648 MB)
+PASS -- TEST 'hrrr_control_restart_dyn32_phy32_intel' [05:18, 01:09](1610 MB)
+PASS -- TEST 'conus13km_control_intel' [07:41, 01:56](1776 MB)
+PASS -- TEST 'conus13km_2threads_intel' [03:38, 00:50](1783 MB)
+PASS -- TEST 'conus13km_decomp_intel' [04:38, 01:57](1806 MB)
+PASS -- TEST 'conus13km_restart_intel' [33:39, 01:07](1546 MB)
+
+PASS -- COMPILE 'rrfs_dyn32_phy32_faster_cdeps_intel' [08:11, 05:47] ( 4 warnings 445 remarks )
+PASS -- TEST 'conus13km_gl_inline_intel' [03:39, 01:18](1332 MB)
+
+PASS -- COMPILE 'rrfs_dyn64_phy32_intel' [08:10, 05:56] ( 4 warnings 415 remarks )
+PASS -- TEST 'rap_control_dyn64_phy32_intel' [04:29, 02:39](1801 MB)
+
+PASS -- COMPILE 'rrfs_dyn32_phy32_debug_intel' [04:11, 02:13] ( 305 warnings 421 remarks )
+PASS -- TEST 'rap_control_debug_dyn32_phy32_intel' [05:18, 03:25](1750 MB)
+PASS -- TEST 'hrrr_control_debug_dyn32_phy32_intel' [05:18, 03:16](1749 MB)
+PASS -- TEST 'conus13km_debug_intel' [16:39, 14:47](1809 MB)
+PASS -- TEST 'conus13km_debug_qr_intel' [30:43, 14:54](1425 MB)
+PASS -- TEST 'conus13km_debug_2threads_intel' [14:35, 08:14](1822 MB)
+PASS -- TEST 'conus13km_debug_decomp_intel' [31:36, 15:09](1834 MB)
+PASS -- TEST 'conus13km_radar_tten_debug_intel' [33:36, 14:45](1880 MB)
+
+PASS -- COMPILE 'rrfs_dyn64_phy32_debug_intel' [04:11, 02:11] ( 305 warnings 415 remarks )
+PASS -- TEST 'rap_control_dyn64_phy32_debug_intel' [12:19, 09:56](1874 MB)
+
+PASS -- COMPILE 'hafsw_intel' [11:11, 08:45] ( 1 warnings 694 remarks )
+PASS -- TEST 'hafs_regional_atm_intel' [33:33, 02:45](1146 MB)
+PASS -- TEST 'hafs_regional_atm_gfdlmpv3_intel' [34:52, 03:55](1366 MB)
+PASS -- TEST 'hafs_regional_atm_thompson_gfdlsf_intel' [33:24, 02:27](1464 MB)
+PASS -- TEST 'hafs_regional_atm_wav_intel' [10:47, 39:34](1335 MB)
+PASS -- TEST 'hafs_regional_1nest_atm_intel' [35:29, 03:19](823 MB)
+PASS -- TEST 'hafs_regional_telescopic_2nests_atm_intel' [36:33, 03:56](822 MB)
+PASS -- TEST 'hafs_global_1nest_atm_intel' [34:27, 01:34](533 MB)
+PASS -- TEST 'hafs_global_multiple_4nests_atm_intel' [36:53, 04:37](607 MB)
+PASS -- TEST 'hafs_regional_specified_moving_1nest_atm_intel' [35:23, 02:31](754 MB)
+PASS -- TEST 'hafs_regional_storm_following_1nest_atm_intel' [35:28, 02:07](751 MB)
+PASS -- TEST 'hafs_global_storm_following_1nest_atm_intel' [33:17, 00:44](528 MB)
+PASS -- TEST 'gnv1_nested_intel' [35:49, 02:23](1716 MB)
+
+PASS -- COMPILE 'hafs_mom6w_intel' [10:10, 08:13] ( 1 warnings 933 remarks )
+PASS -- TEST 'hafs_regional_storm_following_1nest_atm_ocn_wav_mom6_intel' [56:16, 22:37](1083 MB)
+
+PASS -- COMPILE 'hafs_all_intel' [10:10, 08:07] ( 1 warnings 636 remarks )
+PASS -- TEST 'hafs_regional_docn_intel' [37:34, 04:26](1324 MB)
+PASS -- TEST 'hafs_regional_docn_oisst_intel' [36:34, 04:19](1271 MB)
+
+PASS -- COMPILE 'datm_cdeps_intel' [15:10, 12:22] ( 567 remarks )
+PASS -- TEST 'datm_cdeps_control_cfsr_intel' [04:14, 02:01](1915 MB)
+PASS -- TEST 'datm_cdeps_restart_cfsr_intel' [04:16, 01:16](1870 MB)
+PASS -- TEST 'datm_cdeps_control_gefs_intel' [04:14, 01:53](1173 MB)
+PASS -- TEST 'datm_cdeps_iau_gefs_intel' [04:15, 01:56](1178 MB)
+PASS -- TEST 'datm_cdeps_stochy_gefs_intel' [04:14, 01:51](1166 MB)
+PASS -- TEST 'datm_cdeps_ciceC_cfsr_intel' [03:14, 01:58](1914 MB)
+PASS -- TEST 'datm_cdeps_bulk_cfsr_intel' [04:15, 01:57](1909 MB)
+PASS -- TEST 'datm_cdeps_bulk_gefs_intel' [03:14, 01:50](1165 MB)
+PASS -- TEST 'datm_cdeps_mx025_cfsr_intel' [32:55, 05:17](1818 MB)
+PASS -- TEST 'datm_cdeps_mx025_gefs_intel' [30:54, 05:12](1324 MB)
+PASS -- TEST 'datm_cdeps_multiple_files_cfsr_intel' [18:14, 16:08](1911 MB)
+PASS -- TEST 'datm_cdeps_3072x1536_cfsr_intel' [06:15, 03:19](4788 MB)
+PASS -- TEST 'datm_cdeps_gfs_intel' [05:15, 03:17](4790 MB)
+
+PASS -- COMPILE 'datm_cdeps_debug_intel' [05:10, 02:39] ( 2 warnings 567 remarks )
+PASS -- TEST 'datm_cdeps_debug_cfsr_intel' [06:15, 03:59](1831 MB)
+
+PASS -- COMPILE 'datm_cdeps_land_intel' [02:10, 00:41] ( 127 remarks )
+PASS -- TEST 'datm_cdeps_lnd_gswp3_intel' [24:25, 00:47](367 MB)
+PASS -- TEST 'datm_cdeps_lnd_era5_intel' [23:20, 00:32](622 MB)
+PASS -- TEST 'datm_cdeps_lnd_era5_rst_intel' [04:20, 00:24](619 MB)
+
+PASS -- COMPILE 'atm_ds2s_docn_pcice_intel' [14:10, 11:32] ( 1 warnings 612 remarks )
+PASS -- TEST 'atm_ds2s_docn_pcice_intel' [23:45, 02:30](2826 MB)
+
+PASS -- COMPILE 'atm_ds2s_docn_dice_intel' [08:10, 06:03] ( 1 warnings 500 remarks )
+PASS -- TEST 'atm_ds2s_docn_dice_intel' [23:40, 03:20](2866 MB)
+
+PASS -- COMPILE 'atml_intel' [09:10, 07:00] ( 9 warnings 553 remarks )
+PASS -- TEST 'control_p8_atmlnd_intel' [21:37, 02:22](1908 MB)
+PASS -- TEST 'control_restart_p8_atmlnd_intel' [03:31, 01:24](1313 MB)
+
+PASS -- COMPILE 'atml_debug_intel' [05:10, 03:28] ( 418 warnings 553 remarks )
+PASS -- TEST 'control_p8_atmlnd_debug_intel' [22:38, 03:33](1955 MB)
+
+PASS -- COMPILE 'atmw_intel' [10:10, 07:35] ( 1 warnings 519 remarks )
+PASS -- TEST 'atmwav_control_noaero_p8_intel' [10:35, 01:49](2695 MB)
+
+PASS -- COMPILE 'atmaero_intel' [11:10, 09:13] ( 1 warnings 413 remarks )
+PASS -- TEST 'atmaero_control_p8_intel' [10:42, 03:09](2004 MB)
+PASS -- TEST 'atmaero_control_p8_rad_intel' [09:31, 03:16](2389 MB)
+PASS -- TEST 'atmaero_control_p8_rad_micro_intel' [07:32, 03:21](2415 MB)
+
+PASS -- COMPILE 'atmaq_intel' [08:12, 06:35] ( 1 warnings 598 remarks )
+PASS -- TEST 'regional_atmaq_intel' [15:29, 10:35](2879 MB)
+PASS -- TEST 'regional_atmaq_canopy_intel' [16:18, 12:13](2878 MB)
+
+PASS -- COMPILE 'atmaq_debug_intel' [04:10, 02:26] ( 391 warnings 598 remarks )
+PASS -- TEST 'regional_atmaq_debug_intel' [31:35, 27:40](2892 MB)
+
+PASS -- COMPILE 'atm_fbh_intel' [08:10, 05:32] ( 4 warnings 422 remarks )
+FAILED: TEST TIMED OUT -- TEST 'cpld_regional_atm_fbh_intel' [, ]( MB)
+
+PASS -- COMPILE 's2swa_32bit_pdlib_intelllvm' [16:10, 14:25]
+PASS -- TEST 'cpld_control_gfsv17_intelllvm' [11:44, 09:28](2053 MB)
+
+PASS -- COMPILE 's2swa_32bit_pdlib_debug_intelllvm' [05:10, 03:27]
+PASS -- TEST 'cpld_debug_gfsv17_intelllvm' [15:43, 13:23](2093 MB)
+
+PASS -- COMPILE 's2s_32bit_sfs_intelllvm' [14:10, 12:17]
+PASS -- TEST 'cpld_control_sfs_intelllvm' [12:17, 08:18](2403 MB)
+
+PASS -- COMPILE 's2swa_intelllvm' [15:10, 12:46]
+PASS -- TEST 'cpld_control_p8_intelllvm' [10:00, 07:20](2459 MB)
+
+PASS -- COMPILE 'rrfs_dyn32_phy32_intelllvm' [08:10, 05:42]
+PASS -- TEST 'rap_control_dyn32_phy32_intelllvm' [03:26, 02:07](1727 MB)
+
+PASS -- COMPILE 'rrfs_dyn64_phy32_intelllvm' [07:10, 05:37]
+PASS -- TEST 'rap_control_dyn64_phy32_intelllvm' [04:28, 02:42](1797 MB)
+
+PASS -- COMPILE 'datm_cdeps_intelllvm' [13:10, 11:09]
+PASS -- TEST 'datm_cdeps_control_cfsr_intelllvm' [20:17, 19:03](1917 MB)
+
+PASS -- COMPILE 'datm_cdeps_debug_intelllvm' [05:10, 02:32]
+PASS -- TEST 'datm_cdeps_debug_cfsr_intelllvm' [05:15, 03:56](1834 MB)
+
+PASS -- COMPILE 'atm_gnu' [05:10, 02:49]
+PASS -- TEST 'control_c48_gnu' [08:18, 05:47](1509 MB)
+PASS -- TEST 'control_stochy_gnu' [04:16, 02:00](509 MB)
+PASS -- TEST 'control_ras_gnu' [05:16, 03:12](514 MB)
+PASS -- TEST 'control_p8_gnu' [05:38, 03:05](1450 MB)
+PASS -- TEST 'control_p8_ugwpv1_gnu' [05:37, 03:00](1459 MB)
+PASS -- TEST 'control_flake_gnu' [06:18, 04:03](554 MB)
+
+PASS -- COMPILE 'rrfs_gnu' [05:10, 02:50]
+PASS -- TEST 'rap_control_gnu' [05:27, 03:30](872 MB)
+PASS -- TEST 'rap_decomp_gnu' [05:24, 03:29](848 MB)
+PASS -- TEST 'rap_2threads_gnu' [05:24, 02:38](897 MB)
+PASS -- TEST 'rap_restart_gnu' [03:30, 01:50](581 MB)
+PASS -- TEST 'rap_sfcdiff_gnu' [05:28, 03:29](845 MB)
+PASS -- TEST 'rap_sfcdiff_decomp_gnu' [05:26, 03:26](847 MB)
+PASS -- TEST 'rap_sfcdiff_restart_gnu' [03:30, 01:51](581 MB)
+PASS -- TEST 'hrrr_control_gnu' [05:26, 03:23](848 MB)
+PASS -- TEST 'hrrr_control_noqr_gnu' [05:23, 03:20](836 MB)
+PASS -- TEST 'hrrr_control_2threads_gnu' [05:23, 02:38](890 MB)
+PASS -- TEST 'hrrr_control_decomp_gnu' [05:23, 03:20](849 MB)
+PASS -- TEST 'hrrr_control_restart_gnu' [03:20, 01:45](577 MB)
+PASS -- TEST 'hrrr_control_restart_noqr_gnu' [04:19, 01:46](656 MB)
+PASS -- TEST 'rrfs_v1beta_gnu' [08:27, 06:21](845 MB)
+
+PASS -- COMPILE 'csawmg_gnu' [04:10, 02:30]
+PASS -- TEST 'control_csawmg_gnu' [09:30, 05:42](752 MB)
+
+PASS -- COMPILE 'atm_dyn32_debug_gnu' [07:10, 05:28]
+PASS -- TEST 'control_diag_debug_gnu' [03:25, 01:20](1280 MB)
+PASS -- TEST 'regional_debug_gnu' [09:27, 05:35](772 MB)
+PASS -- TEST 'rap_control_debug_gnu' [03:18, 01:47](854 MB)
+PASS -- TEST 'hrrr_control_debug_gnu' [03:17, 01:46](856 MB)
+PASS -- TEST 'hrrr_gf_debug_gnu' [03:17, 01:47](860 MB)
+PASS -- TEST 'hrrr_c3_debug_gnu' [03:18, 01:47](860 MB)
+PASS -- TEST 'rap_diag_debug_gnu' [03:26, 02:06](940 MB)
+PASS -- TEST 'rap_noah_sfcdiff_cires_ugwp_debug_gnu' [04:18, 02:48](852 MB)
+PASS -- TEST 'rap_progcld_thompson_debug_gnu' [03:19, 01:49](856 MB)
+PASS -- TEST 'control_ras_debug_gnu' [03:17, 01:05](500 MB)
+PASS -- TEST 'control_stochy_debug_gnu' [04:17, 01:12](490 MB)
+PASS -- TEST 'control_debug_p8_gnu' [03:31, 01:17](1453 MB)
+PASS -- TEST 'rap_flake_debug_gnu' [04:18, 01:50](855 MB)
+PASS -- TEST 'rap_clm_lake_debug_gnu' [04:18, 01:47](856 MB)
+PASS -- TEST 'gnv1_c96_no_nest_debug_gnu' [05:29, 02:55](867 MB)
+
+PASS -- COMPILE 'wam_debug_gnu' [04:10, 01:22]
+PASS -- TEST 'control_wam_debug_gnu' [06:32, 04:34](1304 MB)
+
+PASS -- COMPILE 'atm_debug_dyn32_gnu' [04:11, 02:31]
+PASS -- TEST 'control_csawmg_debug_gnu' [03:31, 01:43](735 MB)
+
+PASS -- COMPILE 'rrfs_dyn32_phy32_gnu' [04:10, 02:40]
+PASS -- TEST 'rap_control_dyn32_phy32_gnu' [05:26, 03:12](706 MB)
+PASS -- TEST 'hrrr_control_dyn32_phy32_gnu' [11:22, 09:29](709 MB)
+PASS -- TEST 'rap_2threads_dyn32_phy32_gnu' [09:22, 02:28](732 MB)
+PASS -- TEST 'hrrr_control_2threads_dyn32_phy32_gnu' [09:24, 02:21](727 MB)
+PASS -- TEST 'hrrr_control_decomp_dyn32_phy32_gnu' [10:21, 03:07](710 MB)
+PASS -- TEST 'rap_restart_dyn32_phy32_gnu' [15:25, 01:42](549 MB)
+PASS -- TEST 'hrrr_control_restart_dyn32_phy32_gnu' [10:18, 01:40](556 MB)
+PASS -- TEST 'conus13km_control_gnu' [14:43, 02:56](903 MB)
+PASS -- TEST 'conus13km_2threads_gnu' [13:36, 01:08](907 MB)
+PASS -- TEST 'conus13km_decomp_gnu' [15:37, 02:58](908 MB)
+PASS -- TEST 'conus13km_restart_gnu' [11:37, 01:39](581 MB)
+
+PASS -- COMPILE 'atm_dyn64_phy32_gnu' [08:11, 06:06]
+PASS -- TEST 'rap_control_dyn64_phy32_gnu' [13:28, 03:36](733 MB)
+
+PASS -- COMPILE 'atm_dyn32_phy32_debug_gnu' [07:11, 05:24]
+PASS -- TEST 'rap_control_debug_dyn32_phy32_gnu' [14:18, 03:51](712 MB)
+PASS -- TEST 'hrrr_control_debug_dyn32_phy32_gnu' [33:22, 01:44](716 MB)
+PASS -- TEST 'conus13km_debug_gnu' [21:38, 07:01](922 MB)
+PASS -- TEST 'conus13km_debug_qr_gnu' [21:36, 07:03](650 MB)
+PASS -- TEST 'conus13km_debug_2threads_gnu' [18:34, 04:03](923 MB)
+PASS -- TEST 'conus13km_debug_decomp_gnu' [23:36, 07:18](926 MB)
+PASS -- TEST 'conus13km_radar_tten_debug_gnu' [22:34, 07:04](989 MB)
+
+PASS -- COMPILE 'atm_dyn64_phy32_debug_gnu' [07:11, 05:06]
+PASS -- TEST 'rap_control_dyn64_phy32_debug_gnu' [14:18, 01:48](741 MB)
+
+PASS -- COMPILE 's2swa_gnu' [13:11, 10:52]
+PASS -- TEST 'cpld_control_p8_gnu' [22:59, 07:35](1596 MB)
+
+PASS -- COMPILE 's2s_gnu' [12:11, 10:25]
+PASS -- TEST 'cpld_control_nowave_noaero_p8_gnu' [20:54, 06:54](1556 MB)
+
+PASS -- COMPILE 's2swa_debug_gnu' [04:11, 01:54]
+PASS -- TEST 'cpld_debug_p8_gnu' [20:50, 04:41](1605 MB)
+
+PASS -- COMPILE 's2sw_pdlib_gnu' [12:11, 10:40]
+PASS -- TEST 'cpld_control_pdlib_p8_gnu' [31:43, 08:59](1551 MB)
+
+PASS -- COMPILE 's2sw_pdlib_debug_gnu' [04:11, 01:51]
+PASS -- TEST 'cpld_debug_pdlib_p8_gnu' [21:41, 06:35](1559 MB)
+
+PASS -- COMPILE 'datm_cdeps_gnu' [12:11, 10:38]
+PASS -- TEST 'datm_cdeps_control_cfsr_gnu' [04:14, 02:11](1513 MB)
+
+SYNOPSIS:
+Starting Date/Time: 20260205 02:09:37
+Ending Date/Time: 20260205 06:01:40
+Total Time: 03h:52m:49s
+Compiles Completed: 64/64
+Tests Completed: 270/273
+Failed Tests:
+* TEST cpld_warmstart_c48_5deg_intel: FAILED: TEST TIMED OUT
+-- LOG: /scratch4/NAGAPE/epic/Gillian.Petro/stmp/RT_RUNDIRS/Gillian.Petro/FV3_RT/rt_1715814/cpld_warmstart_c48_5deg_intel/err
+* TEST cpld_restart_c48_5deg_intel: FAILED: UNABLE TO START TEST
+-- LOG: N/A
+* TEST cpld_regional_atm_fbh_intel: FAILED: TEST TIMED OUT
+-- LOG: /scratch4/NAGAPE/epic/Gillian.Petro/stmp/RT_RUNDIRS/Gillian.Petro/FV3_RT/rt_1715814/cpld_regional_atm_fbh_intel/err
+
+NOTES:
+A file 'test_changes.list' was generated with list of all failed tests.
+You can use './rt.sh -c -b test_changes.list' to create baselines for the failed tests.
+If you are using this log as a pull request verification, please commit 'test_changes.list'.
+
+Result: FAILURE
+
+====END OF URSA REGRESSION TESTING LOG====
+====START OF URSA REGRESSION TESTING LOG====
+
+UFSWM hash used in testing:
+a4a87e080dbf3850b7e9c9888805473665f1263f
+
+Submodule hashes used in testing:
+ 2c1cec7dd4d7a477abd2ae204db4a78295c24f16 AQM (v0.2.0-63-g2c1cec7)
+ 642e81395472d5887b54f601b60ee607ed39bf09 AQM/src/model/CMAQ (CMAQv5.2.1_07Feb2018-6194-g642e81395)
+ 9f53664ef2e607ad25d6b6c939f2eac9ec818ee6 CDEPS-interface/CDEPS (cdeps0.4.17-432-g9f53664)
+ def9c53b17d6722cc9991ba72ddae8ad2d5d25d9 CICE-interface/CICE (CICE6.0.0-445-gdef9c53)
+ 4954a6f9033f78e5c32bf33780384cbf2d0843e6 CICE-interface/CICE/icepack (Icepack1.1.0-225-g4954a6f)
+ 27e3961d9bb323fc5ff16a532947caddb515eb95 CMEPS-interface/CMEPS (cmeps_v0.4.1-2331-g27e3961)
+ 69049ec0c26b3160c3dbe1980b2feb78470a37a6 CMakeModules (v1.0.0-36-g69049ec)
+ 9ff3df9545dd582f415f682d3297e8c6c841e5cb GOCART (sdr_v2.1.2.6-291-g9ff3df9)
+ bcf7777bb037ae2feb2a8a8ac51aacb3511b52d9 HYCOM-interface/HYCOM (2.3.00-122-gbcf7777)
+ 05a3f7ae291b59a2ab7611a042f2fc99be31dc61 LM4-driver (baseline_change_240904-7-g05a3f7a)
+ c03c4f68816030f726785daf0db6150aa1e9cc6f LM4-driver/LM4 (land_lad2_2021.02)
+ b4d9a232181b3057587f30362876a9626abf7f98 MOM6-interface/MOM6 (dev/master/repository_split_2014.10.10-10784-gb4d9a2321)
+ 65ef5c73bc7f5663d5688f75c3855d431da4baea MOM6-interface/MOM6/pkg/CVMix-src (65ef5c7)
+ 29e64d652786e1d076a05128c920f394202bfe10 MOM6-interface/MOM6/pkg/GSW-Fortran (29e64d6)
+ 2c7b3bc2a8096f6232020c47507593058795102e NOAHMP-interface/noahmp (v3.7.1-471-g2c7b3bc)
+ fd0f1a68253459906fc6ede253e7dee5ed45d86f UFSATM (remotes/origin/production/HREF.v3beta-428-gfd0f1a6)
+ 22bc1a5de8a19996310aedc3482931616cd74a1b UFSATM/ccpp/framework (2025-10-15-dev-5-g22bc1a5)
+ 3dcd800d2adb0ea5032a2d130576a3944e068729 UFSATM/ccpp/physics (EP4-2158-g3dcd800d)
+ c62efd27caa26f660edf24232f33f154e608b77a UFSATM/ccpp/physics/physics/MP/TEMPO/TEMPO (v2.1.3~3)
+ 41c5fcd950fed09b8afe186dede266824eca7fd3 UFSATM/ccpp/physics/physics/Radiation/RRTMGP/rte-rrtmgp (41c5fcd)
+ 87936f8b0d57b541ebade64a33a926b583c70c6d UFSATM/fv3/atmos_cubed_sphere (201912_public_release-450-g87936f8)
+ 38d2177aef842a5c6abe26ffe876804b95fd9e0a UFSATM/mpas/MPAS-Model (remotes/origin/master-60-g38d2177a)
+ 8d41f98e66ea858c163a387aaa0c6179851a1466 UFSATM/upp (upp_v10.2.0-331-g8d41f98e)
+-179cae1dd84401cf25d250bd9102e66560a9d328 UFSATM/upp/sorc/libIFI.fd
+-3d35332fe66e3e63a285cc8d96facdf255a33481 UFSATM/upp/sorc/ncep_post.fd/post_gtg.fd
+ ae7faa596280e80e24dff9d2ed72671221e2a1c8 WW3 (6.07.1-515-gae7faa59)
+ 3be9c444ace991b4235e4e978449cc3d3fd0d2d1 fire_behavior (v0.2.0-3-g3be9c44)
+ ae192f119b8614b4476a1b04ba55f6fb93e2953d stochastic_physics (ufs-v2.0.0-298-gae192f1)
+
+
+NOTES:
+[Times](Memory) are at the end of each compile/test in format [MM:SS](Size).
+The first time is for the full script (prep+run+finalize).
+The second time is specifically for the run phase.
+Times/Memory will be empty for failed tests.
+
+BASELINE DIRECTORY: /scratch4/NAGAPE/epic/role-epic/UFS-WM_RT/NEMSfv3gfs/develop-20260126
+COMPARISON DIRECTORY: /scratch4/NAGAPE/epic/Gillian.Petro/stmp/RT_RUNDIRS/Gillian.Petro/FV3_RT/rt_2304299
+
+RT.SH OPTIONS USED:
+* (-a) - HPC PROJECT ACCOUNT: epic
+* (-l) - USE CONFIG FILE: rerun.conf
+* (-e) - USE ECFLOW
+
+PASS -- COMPILE 's2sw_pdlib_intel' [16:11, 14:07] ( 1 warnings 1039 remarks )
+PASS -- TEST 'cpld_warmstart_c48_5deg_intel' [03:33, 01:22](3021 MB)
+PASS -- TEST 'cpld_restart_c48_5deg_intel' [23:32, 21:16](2456 MB)
+
+PASS -- COMPILE 'atm_fbh_intel' [08:11, 05:50] ( 4 warnings 422 remarks )
+PASS -- TEST 'cpld_regional_atm_fbh_intel' [21:22, 19:09](1131 MB)
+
+SYNOPSIS:
+Starting Date/Time: 20260205 13:53:06
+Ending Date/Time: 20260205 14:37:34
+Total Time: 00h:44m:31s
+Compiles Completed: 2/2
+Tests Completed: 3/3
+>>>>>>> cdf5dfa88af1a160bb02f77032f3c9413fe75d96
 
 NOTES:
 A file 'test_changes.list' was generated but is empty.
diff --git a/tests/test_changes.list b/tests/test_changes.list
index 9aa3189682..5d108abc3a 100644
--- a/tests/test_changes.list
+++ b/tests/test_changes.list
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 cpld_control_p8_mixedmode intel
 cpld_control_gfsv17 intel
 cpld_control_gfsv17_iau intel
@@ -45,3 +46,5 @@ cpld_control_nowave_noaero_p8 gnu
 cpld_debug_p8 gnu
 cpld_control_pdlib_p8 gnu
 cpld_debug_pdlib_p8 gnu
+=======
+>>>>>>> cdf5dfa88af1a160bb02f77032f3c9413fe75d96