ufs-community · FernandoAndrade-NOAA · Jan 13, 2025 · Jan 6, 2025 · Jan 6, 2025 · Jan 7, 2025
diff --git a/tests/bl_date.conf b/tests/bl_date.conf
@@ -1 +1 @@
-export BL_DATE=20241230
+export BL_DATE=20250107
diff --git a/tests/default_vars.sh b/tests/default_vars.sh
@@ -501,7 +501,6 @@ export FNABSC="'global_mxsnoalb.uariz.t126.384.190.rg.grb'"
 export RF_CUTOFF=30.0
 export FAST_TAU_W_SEC=0.0
 
-export ATMRES=C96
 export TILEDFIX=.false.
 export DO_CA=.false.
 export CA_SGS=.false.
@@ -795,6 +794,7 @@ export HWRF_SAMFDEEP=.false.
 export RAS=.false.
 export RANDOM_CLDS=.false.
 export CNVCLD=.true.
+export XR_CNVCLD=.false.
 export PROGSIGMA=.false.
 export BETASCU=8.0
 export BETAMCU=1.0
@@ -1190,8 +1190,11 @@ export_ugwpv1() {
   esac
 
   if [[ ${DO_GSL_DRAG_SS} = .true. ]]; then export CDMBGWD=${CDMBGWD_GSL}; fi
-  if [[ ${SEDI_SEMI} = .true. ]]; then export DT_ATMOS=$((DT_ATMOS/2)); fi
-  export DT_INNER=${DT_ATMOS}
+  if [[ ${SEDI_SEMI} = .false. ]]; then 
+    export DT_INNER=$((DT_ATMOS/2))
+  else 
+    export DT_INNER=${DT_ATMOS}
+  fi
   export default_dt_atmos=0
 }
 

diff --git a/tests/logs/RegressionTests_derecho.log b/tests/logs/RegressionTests_derecho.log
diff --git a/tests/logs/RegressionTests_gaeac5.log b/tests/logs/RegressionTests_gaeac5.log
diff --git a/tests/logs/RegressionTests_gaeac6.log b/tests/logs/RegressionTests_gaeac6.log
diff --git a/tests/logs/RegressionTests_hera.log b/tests/logs/RegressionTests_hera.log
diff --git a/tests/logs/RegressionTests_jet.log b/tests/logs/RegressionTests_jet.log
diff --git a/tests/logs/RegressionTests_orion.log b/tests/logs/RegressionTests_orion.log
diff --git a/tests/parm/fd_ufs.yaml b/tests/parm/fd_ufs.yaml
@@ -1081,11 +1081,11 @@ field_dictionary:
     #
     - standard_name: ps
       canonical_units: Pa
-      alias: surface_pressure
+      alias: air_pressure_at_surface
     #
     - standard_name: sphum
       canonical_units: kg kg-1
-      alias: specific_humidity
+      alias: water_vapor_mixing_ratio_wrt_moist_air
     #
     - standard_name: ice_wat
       canonical_units: kg kg-1
@@ -1113,20 +1113,19 @@ field_dictionary:
     #
     - standard_name: phis
       canonical_units: m2 s-2
-      alias: sfc_geopotential_height_times_grav
+      alias: geopotential_height_times_gravity_at_surface
     #
     - standard_name: u_srf
       canonical_units: m s-1
-      alias: surface_eastward_wind
+      alias: eastward_wind_at_surface
     #
     - standard_name: v_srf
       canonical_units: m s-1
-      alias: surface_northward_wind
-    #
+      alias: northward_wind_at_surface
     #
     - standard_name: t2m
       canonical_units: K
-      alias: surface_temperature
+      alias: air_temperature_at_2m
     #
     - standard_name: slmsk
       canonical_units: flag
@@ -1138,6 +1137,7 @@ field_dictionary:
       alias: sheleg
     #
     - standard_name: tsea
+      alias: skin_temperature_at_surface
       canonical_units: K
       description: surface skin temperature
     #

diff --git a/tests/parm/global_control.nml.IN b/tests/parm/global_control.nml.IN
@@ -173,6 +173,7 @@
   random_clds  = @[RANDOM_CLDS]
   trans_trac   = @[TRANS_TRAC]
   cnvcld       = @[CNVCLD]
+  xr_cnvcld    = @[XR_CNVCLD]
   imfshalcnv   = @[IMFSHALCNV]
   imfdeepcnv   = @[IMFDEEPCNV]
   progsigma    = @[PROGSIGMA]

diff --git a/tests/test_changes.list b/tests/test_changes.list
@@ -1,86 +1,70 @@
-rap_control intel
-regional_spp_sppt_shum_skeb intel
-rap_decomp intel
-rap_2threads intel
-rap_restart intel
-rap_sfcdiff intel
-rap_sfcdiff_decomp intel
-rap_sfcdiff_restart intel
-hrrr_control intel
-hrrr_control_decomp intel
-hrrr_control_2threads intel
-hrrr_control_restart intel
-rap_control_debug intel
-hrrr_control_debug intel
-hrrr_gf_debug intel
-hrrr_c3_debug intel
-rap_unified_drag_suite_debug intel
-rap_diag_debug intel
-rap_cires_ugwp_debug intel
-rap_unified_ugwp_debug intel
-rap_lndp_debug intel
-rap_progcld_thompson_debug intel
-rap_sfcdiff_debug intel
-rap_clm_lake_debug intel
-rap_flake_debug intel
-regional_spp_sppt_shum_skeb_dyn32_phy32 intel
-rap_control_dyn32_phy32 intel
-hrrr_control_dyn32_phy32 intel
-rap_2threads_dyn32_phy32 intel
-hrrr_control_2threads_dyn32_phy32 intel
-hrrr_control_decomp_dyn32_phy32 intel
-rap_restart_dyn32_phy32 intel
-hrrr_control_restart_dyn32_phy32 intel
-conus13km_control intel
-conus13km_2threads intel
-conus13km_restart_mismatch intel
-rap_control_dyn64_phy32 intel
-rap_control_debug_dyn32_phy32 intel
-hrrr_control_debug_dyn32_phy32 intel
-conus13km_debug intel
-conus13km_debug_qr intel
-conus13km_debug_2threads intel
-conus13km_radar_tten_debug intel
-rap_control_dyn64_phy32_debug intel
-cpld_regional_atm_fbh intel
-rap_control_dyn32_phy32 intelllvm
-rap_control_dyn64_phy32 intelllvm
-rap_control gnu
-rap_decomp gnu
-rap_2threads gnu
-rap_restart gnu
-rap_sfcdiff gnu
-rap_sfcdiff_decomp gnu
-rap_sfcdiff_restart gnu
-hrrr_control gnu
-hrrr_control_noqr gnu
-hrrr_control_2threads gnu
-hrrr_control_decomp gnu
-hrrr_control_restart gnu
-hrrr_control_restart_noqr gnu
-rap_control_debug gnu
-hrrr_control_debug gnu
-hrrr_gf_debug gnu
-hrrr_c3_debug gnu
-rap_diag_debug gnu
-rap_progcld_thompson_debug gnu
-rap_flake_debug gnu
-rap_clm_lake_debug gnu
-rap_control_dyn32_phy32 gnu
-hrrr_control_dyn32_phy32 gnu
-rap_2threads_dyn32_phy32 gnu
-hrrr_control_2threads_dyn32_phy32 gnu
-hrrr_control_decomp_dyn32_phy32 gnu
-rap_restart_dyn32_phy32 gnu
-hrrr_control_restart_dyn32_phy32 gnu
-conus13km_control gnu
-conus13km_2threads gnu
-conus13km_restart_mismatch gnu
-rap_control_dyn64_phy32 gnu
-rap_control_debug_dyn32_phy32 gnu
-hrrr_control_debug_dyn32_phy32 gnu
-conus13km_debug gnu
-conus13km_debug_qr gnu
-conus13km_debug_2threads gnu
-conus13km_radar_tten_debug gnu
-rap_control_dyn64_phy32_debug gnu
+cpld_control_p8_mixedmode intel
+cpld_control_gfsv17 intel
+cpld_control_gfsv17_iau intel
+cpld_restart_gfsv17 intel
+cpld_mpi_gfsv17 intel
+cpld_control_sfs intel
+cpld_debug_gfsv17 intel
+cpld_control_p8 intel
+cpld_control_p8.v2.sfc intel
+cpld_restart_p8 intel
+cpld_control_qr_p8 intel
+cpld_restart_qr_p8 intel
+cpld_2threads_p8 intel
+cpld_decomp_p8 intel
+cpld_mpi_p8 intel
+cpld_control_ciceC_p8 intel
+cpld_bmark_p8 intel
+cpld_restart_bmark_p8 intel
+cpld_s2sa_p8 intel
+cpld_control_noaero_p8 intel
+cpld_control_nowave_noaero_p8 intel
+cpld_debug_p8 intel
+cpld_debug_noaero_p8 intel
+cpld_control_noaero_p8_agrid intel
+cpld_control_c48 intel
+cpld_warmstart_c48 intel
+cpld_restart_c48 intel
+cpld_control_p8_faster intel
+cpld_control_pdlib_p8 intel
+cpld_restart_pdlib_p8 intel
+cpld_mpi_pdlib_p8 intel
+cpld_debug_pdlib_p8 intel
+control_CubedSphereGrid intel
+control_CubedSphereGrid_parallel intel
+control_latlon intel
+control_wrtGauss_netcdf_parallel intel
+control_c48 intel
+control_c48_lnd_iau intel
+control_c192 intel
+control_c384 intel
+control_p8 intel
+control_p8.v2.sfc intel
+control_p8_ugwpv1 intel
+control_restart_p8 intel
+control_noqr_p8 intel
+control_restart_noqr_p8 intel
+control_decomp_p8 intel
+control_2threads_p8 intel
+control_p8_lndp intel
+merra2_thompson intel
+control_p8_faster intel
+control_CubedSphereGrid_debug intel
+control_wrtGauss_netcdf_parallel_debug intel
+control_debug_p8 intel
+atm_ds2s_docn_pcice intel
+atm_ds2s_docn_dice intel
+control_p8_atmlnd_sbs intel
+control_p8_atmlnd intel
+control_restart_p8_atmlnd intel
+control_p8_atmlnd_debug intel
+atmwav_control_noaero_p8 intel
+atmaero_control_p8 intel
+atmaero_control_p8_rad intel
+atmaero_control_p8_rad_micro intel
+control_c48 gnu
+control_p8 gnu
+control_p8_ugwpv1 gnu
+control_debug_p8 gnu
+cpld_control_nowave_noaero_p8 gnu
+cpld_control_pdlib_p8 gnu
diff --git a/tests/tests/control_2threads_p8 b/tests/tests/control_2threads_p8
@@ -153,6 +153,9 @@ export DOGP_CLDOPTICS_LUT=.true.
 export DOGP_LWSCAT=.true.
 export DOGP_SGS_CNV=.true.
 
+export K_SPLIT=2
+export N_SPLIT=4
+
 export SATMEDMF=.true.
 
 ESMF_THREADING=false

diff --git a/tests/tests/control_CubedSphereGrid b/tests/tests/control_CubedSphereGrid
@@ -51,5 +51,8 @@ export IOVR=3
 
 export WRITE_DOPOST=.false.
 
+export K_SPLIT=2
+export N_SPLIT=4
+
 export FV3_RUN=control_run.IN
 export INPUT_NML=global_control.nml.IN
diff --git a/tests/tests/control_CubedSphereGrid_debug b/tests/tests/control_CubedSphereGrid_debug
@@ -51,5 +51,8 @@ export IAER=5111
 export IOVR=3
 export OUTPUT_FH="0 1"
 
+export K_SPLIT=2
+export N_SPLIT=4
+
 export FV3_RUN=control_run.IN
 export INPUT_NML=global_control.nml.IN
diff --git a/tests/tests/control_CubedSphereGrid_parallel b/tests/tests/control_CubedSphereGrid_parallel
@@ -42,5 +42,8 @@ export IOVR=3
 export HISTORY_FILE_ON_NATIVE_GRID=.true.
 export WRITE_DOPOST=.true.
 
+export K_SPLIT=2
+export N_SPLIT=4
+
 export FV3_RUN=control_run.IN
 export INPUT_NML=global_control.nml.IN
diff --git a/tests/tests/control_debug_p8 b/tests/tests/control_debug_p8
@@ -97,6 +97,9 @@ export DOGP_SGS_CNV=.true.
 
 export SATMEDMF=.true.
 
+export K_SPLIT=2
+export N_SPLIT=4
+
 if [[ " hera orion hercules jet " =~ " ${MACHINE_ID} " ]] ; then
   ZSTANDARD_LEVEL=5
 fi
diff --git a/tests/tests/control_decomp_p8 b/tests/tests/control_decomp_p8
@@ -139,4 +139,7 @@ export DOGP_CLDOPTICS_LUT=.true.
 export DOGP_LWSCAT=.true.
 export DOGP_SGS_CNV=.true.
 
+export K_SPLIT=2
+export N_SPLIT=4
+
 export SATMEDMF=.true.
diff --git a/tests/tests/control_latlon b/tests/tests/control_latlon
@@ -37,6 +37,8 @@ export IAER=5111
 export IOVR=3
 export OUTPUT_FH='0 24'
 
+export K_SPLIT=2
+export N_SPLIT=4
 
 export FV3_RUN=control_run.IN
 export INPUT_NML=global_control.nml.IN
diff --git a/tests/tests/control_noqr_p8 b/tests/tests/control_noqr_p8
@@ -137,4 +137,7 @@ export DOGP_CLDOPTICS_LUT=.true.
 export DOGP_LWSCAT=.true.
 export DOGP_SGS_CNV=.true.
 
+export K_SPLIT=2
+export N_SPLIT=4
+
 export SATMEDMF=.true.
diff --git a/tests/tests/control_p8 b/tests/tests/control_p8
@@ -138,6 +138,9 @@ export DOGP_SGS_CNV=.true.
 
 export SATMEDMF=.true.
 
+export K_SPLIT=2
+export N_SPLIT=4
+
 if [[ " hera orion hercules jet " =~ " ${MACHINE_ID} " ]] ; then
   ZSTANDARD_LEVEL=5
 fi
diff --git a/tests/tests/control_p8_lndp b/tests/tests/control_p8_lndp
@@ -114,4 +114,7 @@ export DOGP_CLDOPTICS_LUT=.true.
 export DOGP_LWSCAT=.true.
 export DOGP_SGS_CNV=.true.
 
+export K_SPLIT=2
+export N_SPLIT=4
+
 export SATMEDMF=.true.
diff --git a/tests/tests/control_p8_ugwpv1 b/tests/tests/control_p8_ugwpv1
@@ -137,4 +137,7 @@ export DOGP_CLDOPTICS_LUT=.true.
 export DOGP_LWSCAT=.true.
 export DOGP_SGS_CNV=.true.
 
+export K_SPLIT=2
+export N_SPLIT=4
+
 export SATMEDMF=.true.
diff --git a/tests/tests/control_restart_noqr_p8 b/tests/tests/control_restart_noqr_p8
@@ -136,4 +136,7 @@ export DOGP_CLDOPTICS_LUT=.true.
 export DOGP_LWSCAT=.true.
 export DOGP_SGS_CNV=.true.
 
+export K_SPLIT=2
+export N_SPLIT=4
+
 export SATMEDMF=.true.
diff --git a/tests/tests/control_restart_p8 b/tests/tests/control_restart_p8
@@ -135,4 +135,7 @@ export DOGP_CLDOPTICS_LUT=.true.
 export DOGP_LWSCAT=.true.
 export DOGP_SGS_CNV=.true.
 
+export K_SPLIT=2
+export N_SPLIT=4
+
 export SATMEDMF=.true.
diff --git a/tests/tests/control_wam b/tests/tests/control_wam
@@ -109,3 +109,7 @@ export INPUT_NML=wam_v17.nml.IN
 if [[ " hera orion hercules gaeac5 gaeac6 jet " =~ " ${MACHINE_ID} " ]] ; then
   ZSTANDARD_LEVEL=5
 fi
+
+if [[ $MACHINE_ID = hera ]]; then
+  WLCLK=45
+fi
diff --git a/tests/tests/control_wrtGauss_netcdf_parallel b/tests/tests/control_wrtGauss_netcdf_parallel
@@ -37,5 +37,8 @@ export OUTPUT_FILE="'netcdf_parallel' 'netcdf_parallel'"
 export IDEFLATE=1
 export QUANTIZE_NSD=14
 
+export K_SPLIT=2
+export N_SPLIT=4
+
 export FV3_RUN=control_run.IN
 export INPUT_NML=global_control.nml.IN
diff --git a/tests/tests/control_wrtGauss_netcdf_parallel_debug b/tests/tests/control_wrtGauss_netcdf_parallel_debug
@@ -34,5 +34,8 @@ export IDEFLATE=1
 export QUANTIZE_NSD=14
 export OUTPUT_FH="0 1"
 
+export K_SPLIT=2
+export N_SPLIT=4
+
 export FV3_RUN=control_run.IN
 export INPUT_NML=global_control.nml.IN
diff --git a/tests/tests/cpld_control_gfsv17 b/tests/tests/cpld_control_gfsv17
@@ -117,11 +117,7 @@ export WW3_RSTFLDS="ice"
 export PROGSIGMA=.true.
 export IOPT_DIAG=2
 
-if [[ $MACHINE_ID = hera ]] && [[ $RT_COMPILER = gnu ]]; then
-  WLCLK=40
-fi
-
-export K_SPLIT=2
+export K_SPLIT=4
 export N_SPLIT=5
 
 # HR4 GFSv17 GWD update