Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add omega calculation and change LSM diag option to RTs #2373

Merged
merged 17 commits into from
Aug 1, 2024
Merged

Add omega calculation and change LSM diag option to RTs #2373

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
fca459c
Add new omega calculation to select regression tests
dpsarmie Jul 23, 2024
d70ce2d
Reset test_changes.list
dpsarmie Jul 24, 2024
3094b3d
Merge branch 'ufs-community:develop' into feature/update_omega_calc
dpsarmie Jul 24, 2024
6d6e2bb
Add IOPT_DIAG=2 to test cases
dpsarmie Jul 24, 2024
b92b547
Merge branch 'ufs-community:develop' into feature/update_omega_calc
dpsarmie Jul 30, 2024
94cc0d6
Add final test_changes.list
dpsarmie Jul 30, 2024
806077b
fix crlf test_changes.list
FernandoAndrade-NOAA Jul 30, 2024
619de9c
Update bl_date.conf
FernandoAndrade-NOAA Jul 30, 2024
b43e24c
WCOSS2 RT Log: Passed
BrianCurtis-NOAA Jul 31, 2024
b8efef1
ORT Jobs Completed.
epic-cicd-jenkins Jul 31, 2024
aadf183
Acorn RT Log: Passed
BrianCurtis-NOAA Jul 31, 2024
cacd62d
add gaea RT log passed
FernandoAndrade-NOAA Jul 31, 2024
4062b88
add hera RT log passed
FernandoAndrade-NOAA Jul 31, 2024
d5d1b64
add hercules RT logs: passed
zach1221 Jul 31, 2024
a53bba9
add orion RT logs: passed
zach1221 Jul 31, 2024
e9cd309
add jet RT log passed
FernandoAndrade-NOAA Aug 1, 2024
5eb4a5f
add derecho RT logs: passed
zach1221 Aug 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions tests/default_vars.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -764,6 +764,7 @@ export LDIAG3D=.false.
export QDIAG3D=.false.
export PRINT_DIFF_PGR=.false.
export MAX_OUTPUT_FIELDS=310
export UPDATE_FULL_OMEGA=.false.

# Stochastic physics
export STOCHINI=.false.
Expand Down Expand Up @@ -1101,6 +1102,12 @@ export NY_GLB=320
export NPZ=127
export NPZP=128

# Use updated omega calculations if
# hydrostatic is set to false
if [[ "${HYDROSTATIC}" == .false. ]]; then
export UPDATE_FULL_OMEGA=.true.
fi

# default resources
export DOMAINS_STACK_SIZE=8000000
export INPES=${INPES_cpl_dflt}
Expand Down
1 change: 1 addition & 0 deletions tests/parm/diag_table/diag_table_cpld.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@
"gfs_dyn", "delp", "dpres", "fv3_history", "all", .false., "none", 2
"gfs_dyn", "delz", "delz", "fv3_history", "all", .false., "none", 2
"gfs_dyn", "w", "dzdt", "fv3_history", "all", .false., "none", 2
"gfs_dyn", "omga", "omga", "fv3_history", "all", .false., "none", 2
"gfs_dyn", "ice_wat", "icmr", "fv3_history", "all", .false., "none", 2
"gfs_dyn", "rainwat", "rwmr", "fv3_history", "all", .false., "none", 2
"gfs_dyn", "snowwat", "snmr", "fv3_history", "all", .false., "none", 2
Expand Down
1 change: 1 addition & 0 deletions tests/parm/diag_table/diag_table_template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@
"gfs_dyn", "delp", "dpres", "fv3_history", "all", .false., "none", 2
"gfs_dyn", "delz", "delz", "fv3_history", "all", .false., "none", 2
"gfs_dyn", "w", "dzdt", "fv3_history", "all", .false., "none", 2
"gfs_dyn", "omga", "omga", "fv3_history", "all", .false., "none", 2
"gfs_dyn", "ice_wat", "icmr", "fv3_history", "all", .false., "none", 2
"gfs_dyn", "rainwat", "rwmr", "fv3_history", "all", .false., "none", 2
"gfs_dyn", "snowwat", "snmr", "fv3_history", "all", .false., "none", 2
Expand Down
1 change: 1 addition & 0 deletions tests/parm/diag_table/diag_table_thompson
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@
"gfs_dyn", "delp", "dpres", "fv3_history", "all", .false., "none", 2
"gfs_dyn", "delz", "delz", "fv3_history", "all", .false., "none", 2
"gfs_dyn", "w", "dzdt", "fv3_history", "all", .false., "none", 2
"gfs_dyn", "omga", "omga", "fv3_history", "all", .false., "none", 2
"gfs_dyn", "ice_wat", "icmr", "fv3_history", "all", .false., "none", 2
"gfs_dyn", "rainwat", "rwmr", "fv3_history", "all", .false., "none", 2
"gfs_dyn", "snowwat", "snmr", "fv3_history", "all", .false., "none", 2
Expand Down
5 changes: 3 additions & 2 deletions tests/parm/diag_table/diag_table_wam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,12 @@
"gfs_dyn", "snowwat", "snmr", "fv3_history", "all", .false., "none", 2
"gfs_dyn", "graupel", "grle", "fv3_history", "all", .false., "none", 2
"gfs_dyn", "spo3", "o3mr", "fv3_history", "all", .false., "none", 2
"gfs_dyn", "spo2", "spfo2", "fv3_history", "all", .false., "none", 2
"gfs_dyn", "spo", "spfo", "fv3_history", "all", .false., "none", 2
"gfs_dyn", "spo2", "spfo2", "fv3_history", "all", .false., "none", 2
"gfs_dyn", "spo", "spfo", "fv3_history", "all", .false., "none", 2
"gfs_dyn", "delp", "dpres", "fv3_history", "all", .false., "none", 2
"gfs_dyn", "delz", "delz", "fv3_history", "all", .false., "none", 2
"gfs_dyn", "w", "dzdt", "fv3_history", "all", .false., "none", 2
"gfs_dyn", "omga", "omga", "fv3_history", "all", .false., "none", 2
"gfs_dyn", "ps", "pressfc", "fv3_history", "all", .false., "none", 2
"gfs_dyn", "hs", "hgtsfc", "fv3_history", "all", .false., "none", 2

Expand Down
1 change: 1 addition & 0 deletions tests/parm/global_control.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
hydrostatic = @[HYDROSTATIC]
phys_hydrostatic = .false.
use_hydro_pressure = .false.
pass_full_omega_to_physics_in_non_hydrostatic_mode = @[UPDATE_FULL_OMEGA]
beta = 0.
a_imp = 1.
p_fac = 0.1
Expand Down
45 changes: 1 addition & 44 deletions tests/test_changes.list
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ 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
Expand Down Expand Up @@ -32,21 +31,13 @@ cpld_control_pdlib_p8 intel
cpld_restart_pdlib_p8 intel
cpld_mpi_pdlib_p8 intel
cpld_debug_pdlib_p8 intel
control_flake intel
control_CubedSphereGrid intel
control_CubedSphereGrid_parallel intel
control_latlon intel
control_wrtGauss_netcdf_parallel intel
control_c48 intel
control_c48.v2.sfc intel
control_c192 intel
control_c384 intel
control_c384gdas intel
control_stochy intel
control_stochy_restart intel
control_lndp intel
control_iovr4 intel
control_iovr5 intel
control_p8 intel
control_p8.v2.sfc intel
control_p8_ugwpv1 intel
Expand All @@ -58,39 +49,12 @@ control_2threads_p8 intel
control_p8_lndp intel
control_p8_rrtmgp intel
control_p8_mynn intel
merra2_thompson intel
control_csawmg intel
control_ras intel
control_wam intel
control_p8_faster intel
control_CubedSphereGrid_debug intel
control_wrtGauss_netcdf_parallel_debug intel
control_stochy_debug intel
control_lndp_debug intel
control_ras_debug intel
control_diag_debug intel
control_debug_p8 intel
control_wam_debug intel
conus13km_debug_2threads intel
hafs_regional_atm intel
hafs_regional_atm_thompson_gfdlsf intel
hafs_regional_atm_ocn intel
hafs_regional_atm_wav intel
hafs_regional_atm_ocn_wav intel
hafs_regional_1nest_atm intel
hafs_regional_telescopic_2nests_atm intel
hafs_global_1nest_atm intel
hafs_global_multiple_4nests_atm intel
hafs_regional_specified_moving_1nest_atm intel
hafs_regional_storm_following_1nest_atm intel
hafs_regional_storm_following_1nest_atm_ocn intel
hafs_global_storm_following_1nest_atm intel
hafs_regional_storm_following_1nest_atm_ocn_debug intel
hafs_regional_storm_following_1nest_atm_ocn_wav intel
hafs_regional_storm_following_1nest_atm_ocn_wav_inline intel
hafs_regional_storm_following_1nest_atm_ocn_wav_mom6 intel
hafs_regional_docn intel
hafs_regional_docn_oisst intel
atm_ds2s_docn_pcice intel
atm_ds2s_docn_dice intel
control_p8_atmlnd_sbs intel
Expand All @@ -100,19 +64,12 @@ 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
regional_atmaq_debug intel
control_c48 gnu
control_stochy gnu
control_ras gnu
control_p8 gnu
control_p8_ugwpv1 gnu
control_flake gnu
control_diag_debug gnu
control_ras_debug gnu
control_stochy_debug gnu
control_debug_p8 gnu
control_wam_debug gnu
cpld_control_nowave_noaero_p8 gnu
cpld_control_pdlib_p8 gnu
cpld_debug_pdlib_p8 gnu

Loading