From 76e7979375d2670ad5232f063b5b996eebd9473f Mon Sep 17 00:00:00 2001
From: dpsarmie <Daniel.Sarmiento@noaa.gov>
Date: Wed, 11 Sep 2024 13:47:02 +0000
Subject: [PATCH] Modify tests for reproducibility errors

---
 tests/tests/cpld_control_pdlib_p8 |  4 +++-
 tests/tests/cpld_restart_bmark_p8 | 13 +++++--------
 tests/tests/cpld_restart_gfsv17   |  3 +++
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/tests/tests/cpld_control_pdlib_p8 b/tests/tests/cpld_control_pdlib_p8
index 2d4be1e695..7f87778cf7 100644
--- a/tests/tests/cpld_control_pdlib_p8
+++ b/tests/tests/cpld_control_pdlib_p8
@@ -108,7 +108,9 @@ if [[ $MACHINE_ID = hera ]] && [[ $RT_COMPILER = gnu ]]; then
   WLCLK=40
 fi
 
-export K_SPLIT=2
+export DT_INNER=720
+export DT_ATMOS=720
+export K_SPLIT=4
 export N_SPLIT=5
 
 # HR4 GFSv17 GWD update
diff --git a/tests/tests/cpld_restart_bmark_p8 b/tests/tests/cpld_restart_bmark_p8
index d6a3b39d2d..ca3dc70ffc 100644
--- a/tests/tests/cpld_restart_bmark_p8
+++ b/tests/tests/cpld_restart_bmark_p8
@@ -53,6 +53,8 @@ export LIST_FILES="sfcf006.nc \
 
 export_fv3
 export_cpl
+export_ugwpv1
+export CCPP_SUITE=FV3_GFS_v17_coupled_p8_ugwpv1
 
 export SYEAR=2013
 export SMONTH=04
@@ -111,8 +113,6 @@ export MESH_WAV=mesh.${WW3_DOMAIN}.nc
 export WW3_MODDEF=mod_def.${WW3_DOMAIN}
 
 # set component and coupling timesteps
-export DT_ATMOS=300
-export DT_INNER=${DT_ATMOS}
 export DT_CICE=${DT_ATMOS}
 export DT_DYNAM_MOM6=900
 export DT_THERM_MOM6=1800
@@ -145,8 +145,6 @@ export FNVMXC="'C384.vegetation_greenness.tileX.nc'"
 export FNSLPC="'C384.slope_type.tileX.nc'"
 export FNABSC="'C384.maximum_snow_albedo.tileX.nc'"
 
-export CDMBWD=${CDMBWD_c384}
-
 # ATM warm start
 export WARM_START=.true.
 export MAKE_NH=.false.
@@ -165,10 +163,9 @@ export MOM6_RESTART_SETTING=r
 
 export FV3_RUN=cpld_control_run.IN
 
+export K_SPLIT=2
+export N_SPLIT=5
+
 # HR4 GFSv17 GWD update
-export DO_UGWP_V0=.false.
-export DO_UGWP_V1=.true.
-export DO_GSL_DRAG_LS_BL=.true.
 export DO_GWD_OPT_PSL=.true.
 export DO_GSL_DRAG_SS=.false.
-export DO_GSL_DRAG_TOFD=.true.
diff --git a/tests/tests/cpld_restart_gfsv17 b/tests/tests/cpld_restart_gfsv17
index 48ec4be972..484c29da74 100644
--- a/tests/tests/cpld_restart_gfsv17
+++ b/tests/tests/cpld_restart_gfsv17
@@ -119,6 +119,9 @@ export UFS_CONFIGURE=ufs.configure.s2sw.IN
 export PROGSIGMA=.true.
 export IOPT_DIAG=2
 
+export K_SPLIT=2
+export N_SPLIT=5
+
 # HR4 GFSv17 GWD update
 export DO_GWD_OPT_PSL=.true.
 export DO_GSL_DRAG_SS=.false.