Fix/cpld sfs rt + Pull in units updates from FV3 ufs-community#2467 (u…

…fs-community#2475) * UFSWM - Updates cpld_control_sfs to use the most up-to-date configuration specs * UFSWM - Update units attributes in netCDF output to be machine-readable * FV3 - Update units attributes in netCDF output to be machine-readable * atmos_cubed_sphere - Update units attributes in netCDF output to be machine-readable
LarissaReames-NOAA · Dec 5, 2024 · f314432 · f314432
1 parent fb97fdb
commit f314432
Show file tree

Hide file tree

Showing 12 changed files with 1,863 additions and 2,513 deletions.
diff --git a/FV3 b/FV3
diff --git a/tests/bl_date.conf b/tests/bl_date.conf
@@ -1 +1 @@
-export BL_DATE=20241028
+export BL_DATE=20241031
diff --git a/tests/logs/RegressionTests_gaea.log b/tests/logs/RegressionTests_gaea.log
diff --git a/tests/logs/RegressionTests_hera.log b/tests/logs/RegressionTests_hera.log
diff --git a/tests/logs/RegressionTests_hercules.log b/tests/logs/RegressionTests_hercules.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/logs/RegressionTests_wcoss2.log b/tests/logs/RegressionTests_wcoss2.log
diff --git a/tests/test_changes.list b/tests/test_changes.list
@@ -0,0 +1,53 @@
+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_control_c192_p8 intel
+cpld_restart_c192_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
+datm_cdeps_control_cfsr intel
+datm_cdeps_restart_cfsr intel
+datm_cdeps_control_gefs intel
+datm_cdeps_iau_gefs intel
+datm_cdeps_stochy_gefs intel
+datm_cdeps_ciceC_cfsr intel
+datm_cdeps_bulk_cfsr intel
+datm_cdeps_bulk_gefs intel
+datm_cdeps_mx025_cfsr intel
+datm_cdeps_mx025_gefs intel
+datm_cdeps_multiple_files_cfsr intel
+datm_cdeps_3072x1536_cfsr intel
+datm_cdeps_gfs intel
+datm_cdeps_debug_cfsr intel
+datm_cdeps_control_cfsr_faster intel
+atm_ds2s_docn_dice intel
+cpld_control_nowave_noaero_p8 gnu
+cpld_control_pdlib_p8 gnu
+datm_cdeps_control_cfsr gnu
diff --git a/tests/tests/cpld_control_pdlib_p8 b/tests/tests/cpld_control_pdlib_p8
@@ -109,6 +109,10 @@ if [[ $MACHINE_ID = orion ]] || [[ $RT_COMPILER = gnu ]]; then
   WLCLK=50
 fi
 
+if [[ $MACHINE_ID = jet ]]; then
+  WLCLK=50
+fi
+
 export K_SPLIT=4
 export N_SPLIT=5
 

diff --git a/tests/tests/cpld_control_sfs b/tests/tests/cpld_control_sfs
@@ -88,6 +88,9 @@ fi
 export K_SPLIT=2
 export N_SPLIT=5
 
+export NUDGE_QV=.false.
+export VTDM4=0.05
+
 # HR4 GFSv17 GWD update
 export DO_GWD_OPT_PSL=.true.
 export DO_GSL_DRAG_SS=.false.
diff --git a/tests/tests/cpld_mpi_pdlib_p8 b/tests/tests/cpld_mpi_pdlib_p8
@@ -114,7 +114,7 @@ export N_SPLIT=5
 export DO_GWD_OPT_PSL=.true.
 export DO_GSL_DRAG_SS=.false.
 
-if [[ $MACHINE_ID = hera ]] || [[ $MACHINE_ID = orion ]]; then
+if [[ $MACHINE_ID = hera ]] || [[ $MACHINE_ID = orion ]] || [[ $MACHINE_ID = jet ]]; then
   WLCLK=50
 fi
 if [[ $MACHINE_ID = wcoss2 ]]; then
+1 −1		atmos_cubed_sphere
+16 −16		ccpp/driver/GFS_diagnostics.F90