Bring up-to-date with latest hash

dpsarmie · Jan 6, 2025 · 6a16970 · 6a16970
1 parent 76471dc
commit 6a16970
Show file tree

Hide file tree

Showing 25 changed files with 69 additions and 34 deletions.
diff --git a/tests/default_vars.sh b/tests/default_vars.sh
@@ -795,6 +795,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 +1191,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/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/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_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

diff --git a/tests/tests/cpld_control_gfsv17_iau b/tests/tests/cpld_control_gfsv17_iau
@@ -129,9 +129,8 @@ export IAU_INC_FILES="'fv_increment3.nc','fv_increment6.nc','fv_increment9.nc'"
 export ODA_INCUPD="True"
 export ODA_INCUPD_UV="True"
 
-if [[ $MACHINE_ID = hera ]] && [[ $RT_COMPILER = gnu ]]; then
-  WLCLK=40
-fi
+export K_SPLIT=4
+export N_SPLIT=5
 
 # HR4 GFSv17 GWD update
 export DO_GWD_OPT_PSL=.true.

diff --git a/tests/tests/cpld_debug_gfsv17 b/tests/tests/cpld_debug_gfsv17
@@ -56,7 +56,6 @@ export LIST_FILES="sfcf003.tile1.nc \
                    ufs.cpld.ww3.r.2021-03-22-32400.nc \
                    20210322.090000.out_pnt.ww3 \
                    20210322.090000.out_grd.ww3 "
-export DT_ATMOS=360
 export_fv3
 export_ugwpv1
 export_cpl
@@ -106,21 +105,15 @@ export WW3_RSTFLDS="ice"
 
 export FV3_RUN=cpld_control_run.IN
 
-export K_SPLIT=2
+export K_SPLIT=4
 export N_SPLIT=5
 
-if [[ $MACHINE_ID = hera ]] && [[ $RT_COMPILER = gnu ]]; then
-  WLCLK=40
-fi
 if [[ $MACHINE_ID = gaeac5 ]] && [[ $RT_COMPILER = intelllvm ]]; then
   WLCLK=40
 fi
 if [[ $MACHINE_ID = gaeac6 ]] && [[ $RT_COMPILER = intelllvm ]]; then
   WLCLK=40
 fi
-if [[ $MACHINE_ID = orion ]]; then
-  WLCLK=40
-fi
 
 # HR4 GFSv17 GWD update
 export DO_GWD_OPT_PSL=.true.

diff --git a/tests/tests/cpld_debug_pdlib_p8 b/tests/tests/cpld_debug_pdlib_p8
@@ -57,7 +57,6 @@ export LIST_FILES="sfcf003.tile1.nc \
                    20210322.090000.out_pnt.ww3 \
                    20210322.090000.out_grd.ww3 "
 
-export DT_ATMOS=720
 export_fv3
 export_ugwpv1
 export_cpl
@@ -100,15 +99,12 @@ export UFS_CONFIGURE=ufs.configure.s2sw_fast.IN
 
 export FV3_RUN=cpld_control_run.IN
 
-if [[ $MACHINE_ID = hera ]] || [[ $MACHINE_ID = jet ]]; then
+if [[ $MACHINE_ID = jet ]]; then
   WLCLK=50
 fi
 if [[ $MACHINE_ID = hercules && $RT_COMPILER = intelllvm ]]; then
   WLCLK=50
 fi
-if [[ $MACHINE_ID = orion ]]; then
-  WLCLK=50
-fi
 if [[ $MACHINE_ID = gaeac5 ]]; then
   WLCLK=50
 fi
@@ -121,7 +117,7 @@ fi
 
 # set component and coupling timesteps due to long
 # runtime
-export K_SPLIT=2
+export K_SPLIT=4
 export N_SPLIT=5
 
 # HR4 GFSv17 GWD update

diff --git a/tests/tests/cpld_mpi_gfsv17 b/tests/tests/cpld_mpi_gfsv17
@@ -123,10 +123,9 @@ export WW3_RSTFLDS="ice"
 export PROGSIGMA=.true.
 export IOPT_DIAG=2
 
-export K_SPLIT=2
+export K_SPLIT=4
 export N_SPLIT=5
 
-
 # HR4 GFSv17 GWD update
 export DO_GWD_OPT_PSL=.true.
 export DO_GSL_DRAG_SS=.false.
diff --git a/tests/tests/cpld_restart_gfsv17 b/tests/tests/cpld_restart_gfsv17
@@ -122,7 +122,7 @@ export WW3_RSTFLDS="ice"
 export PROGSIGMA=.true.
 export IOPT_DIAG=2
 
-export K_SPLIT=2
+export K_SPLIT=4
 export N_SPLIT=5
 
 # HR4 GFSv17 GWD update

diff --git a/tests/tests/cpld_s2sa_p8 b/tests/tests/cpld_s2sa_p8
@@ -79,6 +79,9 @@ export UFS_CONFIGURE=ufs.configure.s2sa.IN
 
 export FV3_RUN=cpld_control_run.IN
 
+export K_SPLIT=4
+export N_SPLIT=5
+
 # HR4 GFSv17 GWD update
 export DO_UGWP_V0=.false.
 export DO_UGWP_V1=.true.