Fixes for SKEB in hydrostatic model

.gitmodules

@@ -1,7 +1,7 @@
 [submodule "UFSATM"]
   path = UFSATM
-  url = https://github.com/NOAA-EMC/ufsatm
-  branch = develop
+	url = https://github.com/pjpegion/fv3atm
+  branch = skeb_hydro
 [submodule "WW3"]
   path = WW3
   url = https://github.com/NOAA-EMC/WW3

tests/logs/RegressionTests_ursa.log

@@ -1,15 +1,23 @@
 ====START OF URSA REGRESSION TESTING LOG====
 
 UFSWM hash used in testing:
+<<<<<<< HEAD
+db4e2d0f2d0be639ae935ff109df8b8236ea0a6e
+=======
 12aa48e9af7404cdd2131e5d829ea055a0c130b0
+>>>>>>> upstream/develop
 
 Submodule hashes used in testing:
  14c01eb83812d5deca9d95f950d770a1ab056c5d AQM (remotes/origin/feature/guassian_fire_plume)
  642e81395472d5887b54f601b60ee607ed39bf09 AQM/src/model/CMAQ (CMAQv5.2.1_07Feb2018-6194-g642e81395)
  9f53664ef2e607ad25d6b6c939f2eac9ec818ee6 CDEPS-interface/CDEPS (cdeps0.4.17-432-g9f53664)
  90ed2522ba8dd04d75237a77aae6b49e7acca523 CICE-interface/CICE (CICE6.0.0-432-g90ed252)
  6a5c51e9e6c643da0760a315e452755661d7d745 CICE-interface/CICE/icepack (Icepack1.1.0-220-g6a5c51e)
+<<<<<<< HEAD
+ 2c1f924ccc57d3c19bf788da1dbe9006d94dfc4f CMEPS-interface/CMEPS (cmeps_v0.4.1-2323-g2c1f924)
+=======
  607a0bddcef8b8c4f0c80886be68db88fe52429f CMEPS-interface/CMEPS (cmeps_v0.4.1-2325-g607a0bd)
+>>>>>>> upstream/develop
  9b7652c75b40d9cbb40e52b824f8c0a423922757 CMakeModules (v1.0.0-33-g9b7652c)
  9ff3df9545dd582f415f682d3297e8c6c841e5cb GOCART (sdr_v2.1.2.6-291-g9ff3df9)
  bcf7777bb037ae2feb2a8a8ac51aacb3511b52d9 HYCOM-interface/HYCOM (2.3.00-122-gbcf7777)
@@ -18,6 +26,17 @@ Submodule hashes used in testing:
  9c8b26c2d870636f359f2ef62ef775639132b3ba MOM6-interface/MOM6 (dev/master/repository_split_2014.10.10-10723-g9c8b26c2d)
  65ef5c73bc7f5663d5688f75c3855d431da4baea MOM6-interface/MOM6/pkg/CVMix-src (65ef5c7)
  29e64d652786e1d076a05128c920f394202bfe10 MOM6-interface/MOM6/pkg/GSW-Fortran (29e64d6)
+<<<<<<< HEAD
+ 8fe108a4c522da15474c9f954266782b4cb56951 NOAHMP-interface/noahmp (v3.7.1-460-g8fe108a)
+ 0e381d5004c605f9da145254d18c5c3a8e4007e4 UFSATM (heads/develop)
+ 11359cb04a420fc87e4cf0f035f4d1215ab24488 UFSATM/ccpp/framework (2025-01-06-dev-5-g11359cb)
+ bca8f11d44f65a7fac83065a8d9ae23bd09c8b25 UFSATM/ccpp/physics (EP4-1856-gbca8f11d)
+ c62efd27caa26f660edf24232f33f154e608b77a UFSATM/ccpp/physics/physics/MP/TEMPO/TEMPO (c62efd2)
+ 74a0e098b2163425e4b5466c2dfcf8ae26d560a5 UFSATM/ccpp/physics/physics/Radiation/RRTMGP/rte-rrtmgp (v1.6)
+ 7e24e739182281717607b341a1c2ffdba473616f UFSATM/fv3/atmos_cubed_sphere (201912_public_release-424-g7e24e73)
+ 38d2177aef842a5c6abe26ffe876804b95fd9e0a UFSATM/mpas/MPAS-Model (remotes/origin/feature/mpas-in-ufs)
+ 8f6caa9d04f1caf2ca8ce1b362aedcebf9b14c8c UFSATM/upp (upp_v10.2.0-297-g8f6caa9d)
+=======
  2c7b3bc2a8096f6232020c47507593058795102e NOAHMP-interface/noahmp (v3.7.1-471-g2c7b3bc)
  f6dc2070945042f89c7ab87aaaf3a6a02922b6c4 UFSATM (heads/develop)
  3256121dc4972d5c78f43f1a16ea1cb118ec6daf UFSATM/ccpp/framework (2025-06-03-dev-12-g3256121)
@@ -27,6 +46,7 @@ Submodule hashes used in testing:
  b0a1b0957d3b79d642f3c01e5cd9441936c7c832 UFSATM/fv3/atmos_cubed_sphere (201912_public_release-429-gb0a1b09)
  38d2177aef842a5c6abe26ffe876804b95fd9e0a UFSATM/mpas/MPAS-Model (remotes/origin/develop-226-g38d2177a)
  1a16f94d20898ff2ffcc3c8b6e036a9a16ed19a4 UFSATM/upp (upp_v10.2.0-327-g1a16f94d)
+>>>>>>> upstream/develop
 -179cae1dd84401cf25d250bd9102e66560a9d328 UFSATM/upp/sorc/libIFI.fd
 -3d35332fe66e3e63a285cc8d96facdf255a33481 UFSATM/upp/sorc/ncep_post.fd/post_gtg.fd
  560cb9c0f9fdc8ec96f746576dcac6503ed14eef WW3 (6.07.1-495-g560cb9c0)
@@ -40,13 +60,97 @@ 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-20250915
+COMPARISON DIRECTORY: /scratch4/BMC/gsienkf/Philip.Pegion/stmp/RT_RUNDIRS/Philip.Pegion/FV3_RT/rt_753990
+=======
 BASELINE DIRECTORY: /scratch4/NAGAPE/epic/role-epic/UFS-WM_RT/NEMSfv3gfs/develop-20251117
 COMPARISON DIRECTORY: /scratch3/NAGAPE/epic/Fernando.Andrade-maldonado/stmp/ursa/RT_RUNDIRS/Fernando.Andrade-maldonado/FV3_RT/rt_3261007
+>>>>>>> upstream/develop
 
 RT.SH OPTIONS USED:
-* (-a) - HPC PROJECT ACCOUNT: epic
-* (-e) - USE ECFLOW
+* (-a) - HPC PROJECT ACCOUNT: gsienkf
+* (-l) - USE CONFIG FILE: rt.conf-phil
+* (-k) - KEEP RUN DIRECTORY
+
+<<<<<<< HEAD
+PASS -- COMPILE 's2swa_32bit_intel' [10:11, 08:30] ( 1043 remarks )
+PASS -- TEST 'cpld_control_p8_mixedmode_intel' [09:04, 06:51](2216 MB)
+PASS -- TEST 'cpld_control_gefs_intel' [27:46, 19:09](3231 MB)
+
+PASS -- COMPILE 's2swa_32bit_pdlib_sfs_intel' [14:12, 13:06] ( 1041 remarks )
+PASS -- TEST 'cpld_control_sfs_intel' [14:46, 12:35](1995 MB)
+
+PASS -- COMPILE 's2swa_intel' [10:11, 08:22] ( 1043 remarks )
+PASS -- TEST 'cpld_control_p8_intel' [10:12, 07:28](2476 MB)
+PASS -- TEST 'cpld_control_p8.v2.sfc_intel' [11:02, 07:19](2527 MB)
+PASS -- TEST 'cpld_control_c192_p8_intel' [23:45, 19:40](3611 MB)
+PASS -- TEST 'cpld_restart_c192_p8_intel' [16:26, 12:31](3474 MB)
+
+PASS -- COMPILE 's2swal_intel' [11:11, 09:20] ( 1064 remarks )
+PASS -- TEST 'cpld_control_p8_lnd_intel' [11:11, 07:58](2495 MB)
+PASS -- TEST 'cpld_s2sa_p8_intel' [07:57, 05:34](3155 MB)
+
+PASS -- COMPILE 's2sw_intel' [10:13, 08:12] ( 1011 remarks )
+PASS -- TEST 'cpld_control_noaero_p8_intel' [08:50, 06:40](2083 MB)
+PASS -- TEST 'cpld_control_nowave_noaero_p8_intel' [06:58, 04:55](2974 MB)
+
+PASS -- COMPILE 's2swa_debug_intel' [05:12, 03:06] ( 1444 warnings 2182 remarks )
+PASS -- TEST 'cpld_debug_p8_intel' [11:01, 09:06](2395 MB)
+
+PASS -- COMPILE 's2sw_debug_intel' [05:11, 03:22] ( 1444 warnings 2164 remarks )
+PASS -- TEST 'cpld_debug_noaero_p8_intel' [06:59, 04:31](2107 MB)
+
+PASS -- COMPILE 's2s_aoflux_intel' [08:12, 06:27] ( 947 remarks )
+PASS -- TEST 'cpld_control_noaero_p8_agrid_intel' [06:00, 03:22](2170 MB)
+
+PASS -- COMPILE 's2swa_faster_intel' [10:11, 09:08] ( 1029 remarks )
+PASS -- TEST 'cpld_control_p8_faster_intel' [09:07, 06:41](2475 MB)
+
+PASS -- COMPILE 'atm_dyn32_intel' [08:12, 06:34] ( 502 remarks )
+PASS -- TEST 'control_stochy_intel' [03:20, 01:13](1306 MB)
+PASS -- TEST 'regional_wofs_intel' [06:30, 04:30](2636 MB)
 
+PASS -- COMPILE 'rrfs_intel' [07:10, 05:43] ( 3 warnings 447 remarks )
+PASS -- TEST 'rap_control_intel' [04:32, 02:48](1794 MB)
+PASS -- TEST 'regional_spp_sppt_shum_skeb_intel' [04:48, 02:50](1619 MB)
+FAILED: RUN DID NOT COMPLETE -- TEST 'rap_sfcdiff_restart_intel' [, ]( MB)
+PASS -- TEST 'hrrr_control_intel' [12:33, 10:37](1863 MB)
+PASS -- TEST 'rrfs_v1beta_intel' [06:35, 04:58](1920 MB)
+PASS -- TEST 'rrfs_v1nssl_intel' [08:19, 06:23](2681 MB)
+
+PASS -- COMPILE 'wam_intel' [07:12, 05:28] ( 394 remarks )
+PASS -- TEST 'control_wam_intel' [09:36, 08:04](2433 MB)
+
+PASS -- COMPILE 'hafsw_intel' [10:11, 08:47] ( 694 remarks )
+PASS -- TEST 'hafs_regional_atm_ocn_wav_intel' [24:59, 23:04](1368 MB)
+PASS -- TEST 'gnv1_nested_intel' [05:04, 02:43](1725 MB)
+
+PASS -- COMPILE 'hafsw_debug_intel' [04:10, 02:23] ( 1499 warnings 2056 remarks )
+PASS -- TEST 'hafs_regional_storm_following_1nest_atm_ocn_debug_intel' [10:47, 08:18](723 MB)
+
+PASS -- COMPILE 'hafsw_faster_intel' [09:10, 07:42] ( 659 remarks )
+PASS -- TEST 'hafs_regional_storm_following_1nest_atm_ocn_wav_intel' [30:41, 29:03](875 MB)
+PASS -- TEST 'hafs_regional_storm_following_1nest_atm_ocn_wav_inline_intel' [28:50, 26:52](1080 MB)
+
+PASS -- COMPILE 'hafs_mom6w_intel' [09:11, 08:08] ( 927 remarks )
+PASS -- TEST 'hafs_regional_storm_following_1nest_atm_ocn_wav_mom6_intel' [20:14, 18:04](1084 MB)
+
+PASS -- COMPILE 'hafs_all_intel' [09:10, 07:50] ( 636 remarks )
+PASS -- TEST 'hafs_regional_docn_intel' [06:44, 04:27](1315 MB)
+PASS -- TEST 'hafs_regional_docn_oisst_intel' [06:45, 04:27](1292 MB)
+PASS -- TEST 'hafs_regional_datm_cdeps_intel' [13:43, 11:37](1812 MB)
+
+SYNOPSIS:
+Starting Date/Time: 20250922 18:31:54
+Ending Date/Time: 20250923 03:26:12
+Total Time: 08h:54m:24s
+Compiles Completed: 17/17
+Tests Completed: 32/33
+Failed Tests:
+* TEST rap_sfcdiff_restart_intel: FAILED: RUN DID NOT COMPLETE
+-- LOG: /scratch4/BMC/gsienkf/Philip.Pegion/ufs-weather-model.skeb_fix/tests/logs/log_ursa/run_rap_sfcdiff_restart_intel.log
+=======
 PASS -- COMPILE 's2swa_32bit_intel' [15:10, 13:14] ( 1 warnings 1044 remarks )
 PASS -- TEST 'cpld_control_p8_mixedmode_intel' [08:45, 06:25](2184 MB)
 PASS -- TEST 'cpld_control_gefs_intel' [30:00, 20:15](3274 MB)
@@ -539,11 +643,13 @@ Ending Date/Time: 20251118 08:14:39
 Total Time: 00h:53m:55s
 Compiles Completed: 2/2
 Tests Completed: 2/2
+>>>>>>> upstream/develop
 
 NOTES:
-A file 'test_changes.list' was generated but is empty.
+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: SUCCESS
+Result: FAILURE
 
 ====END OF URSA REGRESSION TESTING LOG====

tests/rt.sh

@@ -811,7 +811,7 @@ case ${MACHINE_ID} in
     COMPILE_QUEUE="batch"
 
     PARTITION="u1-compute"
-    dprefix="/scratch4/NCEPDEV/stmp/${USER}"
+    dprefix="/scratch4/BMC/gsienkf/${USER}/stmp"
     if [[ "${ACCNR}" == 'epic' ]] ; then
       dprefix="/scratch4/NAGAPE/epic/${USER}/stmp"
     fi

tests/test_changes.list

@@ -1,3 +1,7 @@
+<<<<<<< HEAD
+rap_sfcdiff_restart intel
+=======
 regional_atmaq intel
 regional_atmaq_canopy intel
 regional_atmaq_debug intel
+>>>>>>> upstream/develop