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

Jump to bottom

[develop] Update WM and UPP hashes and minor rearrangement of WE2E coverage tests that fail on certain platforms #799

Merged
merged 15 commits into from
Jun 9, 2023
Merged

[develop] Update WM and UPP hashes and minor rearrangement of WE2E coverage tests that fail on certain platforms #799

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
bbab116
[develop] Update ufs-weather-model, UPP, and UFS_UTILS hashes. Commen…
MichaelLueken May 15, 2023
cecd808
Merge branch 'ufs-community:develop' into feature/WM-hash-update
MichaelLueken May 15, 2023
4d3482d
[develop] Update modulefiles/build_gaea_intel.lua to allow SRW to bui…
MichaelLueken May 15, 2023
d6dce50
Update WM hash to yesterday's update to address a failure in the Gaea…
MichaelLueken May 16, 2023
b5776c4
Merge branch 'ufs-community:develop' into feature/WM-hash-update
MichaelLueken May 16, 2023
829bf33
Merge remote-tracking branch 'upstream/develop' into feature/WM-hash-…
MichaelLueken May 17, 2023
0a4cc3e
[develop] Move nco_grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_G…
MichaelLueken May 17, 2023
b53db6b
[develop] Move the grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_…
MichaelLueken May 19, 2023
9649937
[develop] Set DT_ATMOS for RRFS_CONUS_25km to 150 to allow WE2E tests…
MichaelLueken May 26, 2023
87f4998
[develop] Update test_calculate_cost.py to use 150 rather than 180 to…
MichaelLueken May 26, 2023
2fe7493
[develop] Update RRFS_AK_3km grid's DT_ATMOS value from 10 to 30 to a…
MichaelLueken Jun 2, 2023
3301672
Merge branch 'feature/WM-hash-update' of github.com:MichaelLueken/ufs…
MichaelLueken Jun 2, 2023
fabed48
Merge branch 'ufs-community:develop' into feature/WM-hash-update
MichaelLueken Jun 6, 2023
977c467
[develop] Set DT_ATMOS=180 for grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_F…
MichaelLueken Jun 8, 2023
6059e47
Merge branch 'ufs-community:develop' into feature/WM-hash-update
MichaelLueken Jun 8, 2023
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
10 changes: 7 additions & 3 deletions .cicd/Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@ pipeline {
// choice(name: 'SRW_PLATFORM_FILTER', choices: ['all', 'cheyenne', 'gaea', 'hera', 'jet', 'orion', 'pclusternoaav2use1', 'azclusternoaav2eus1', 'gclusternoaav2usc1'], description: 'Specify the platform(s) to use')
// Use the line below to enable the PW AWS cluster
// choice(name: 'SRW_PLATFORM_FILTER', choices: ['all', 'cheyenne', 'gaea', 'hera', 'jet', 'orion', 'pclusternoaav2use1'], description: 'Specify the platform(s) to use')
choice(name: 'SRW_PLATFORM_FILTER', choices: ['all', 'cheyenne', 'gaea', 'hera', 'jet', 'orion'], description: 'Specify the platform(s) to use')
// Use the line below to re-enable Gaea
// choice(name: 'SRW_PLATFORM_FILTER', choices: ['all', 'cheyenne', 'gaea', 'hera', 'jet', 'orion'], description: 'Specify the platform(s) to use')
choice(name: 'SRW_PLATFORM_FILTER', choices: ['all', 'cheyenne', 'hera', 'jet', 'orion'], description: 'Specify the platform(s) to use')
// Allow job runner to filter based on compiler
choice(name: 'SRW_COMPILER_FILTER', choices: ['all', 'gnu', 'intel'], description: 'Specify the compiler(s) to use to build')
// Uncomment the following line to re-enable comprehensive tests
Expand Down Expand Up @@ -76,7 +78,8 @@ pipeline {
axes {
axis {
name 'SRW_PLATFORM'
values 'cheyenne', 'gaea', 'hera', 'jet', 'orion' //, 'pclusternoaav2use1', 'azclusternoaav2eus1', 'gclusternoaav2usc1'
// values 'cheyenne', 'gaea', 'hera', 'jet', 'orion' //, 'pclusternoaav2use1', 'azclusternoaav2eus1', 'gclusternoaav2usc1'
values 'cheyenne', 'hera', 'jet', 'orion' //, 'pclusternoaav2use1', 'azclusternoaav2eus1', 'gclusternoaav2usc1'
}

axis {
Expand All @@ -90,7 +93,8 @@ pipeline {
exclude {
axis {
name 'SRW_PLATFORM'
values 'gaea', 'jet', 'orion' //, 'pclusternoaav2use1' , 'azclusternoaav2eus1', 'gclusternoaav2usc1'
// values 'gaea', 'jet', 'orion' //, 'pclusternoaav2use1' , 'azclusternoaav2eus1', 'gclusternoaav2usc1'
values 'jet', 'orion' //, 'pclusternoaav2use1' , 'azclusternoaav2eus1', 'gclusternoaav2usc1'
}

axis {
Expand Down
4 changes: 2 additions & 2 deletions Externals.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ protocol = git
repo_url = https://github.com/ufs-community/ufs-weather-model
# Specify either a branch name or a hash but not both.
#branch = develop
hash = 36d6e16
hash = e403bb4
local_path = sorc/ufs-weather-model
required = True

Expand All @@ -21,7 +21,7 @@ protocol = git
repo_url = https://github.com/NOAA-EMC/UPP
# Specify either a branch name or a hash but not both.
#branch = develop
hash = 22cfb88
hash = dccb321
mkavulich marked this conversation as resolved.
Show resolved Hide resolved
local_path = sorc/UPP
required = True

Expand Down
2 changes: 1 addition & 1 deletion tests/WE2E/machine_suites/coverage.cheyenne.gnu
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
grid_CONUS_25km_GFDLgrid_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16
grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_RRFS_v1beta
grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_2017_gfdlmp
grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v17_p8_plot
grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_HRRR
grid_RRFS_CONUScompact_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16
grid_RRFS_NA_13km_ics_FV3GFS_lbcs_FV3GFS_suite_RRFS_v1beta
grid_SUBCONUS_Ind_3km_ics_NAM_lbcs_NAM_suite_GFS_v16
nco_grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15_thompson_mynn_lam3km
specify_EXTRN_MDL_SYSBASEDIR_ICS_LBCS
1 change: 1 addition & 0 deletions tests/WE2E/machine_suites/coverage.gaea
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ grid_RRFS_CONUScompact_25km_ics_HRRR_lbcs_HRRR_suite_HRRR
grid_RRFS_CONUScompact_3km_ics_HRRR_lbcs_RAP_suite_RRFS_v1beta
grid_SUBCONUS_Ind_3km_ics_RAP_lbcs_RAP_suite_RRFS_v1beta_plot
nco_ensemble
nco_grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15_thompson_mynn_lam3km
1 change: 0 additions & 1 deletion tests/WE2E/machine_suites/coverage.hera.intel.nco
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
get_from_HPSS_ics_FV3GFS_lbcs_FV3GFS_fmt_grib2_2019061200
get_from_HPSS_ics_GDAS_lbcs_GDAS_fmt_netcdf_2022040400_ensemble_2mems
get_from_HPSS_ics_HRRR_lbcs_RAP
grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_RRFS_v1beta
grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_2017_gfdlmp_regional_plot
grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2
grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16
Expand Down
2 changes: 1 addition & 1 deletion tests/test_python/test_calculate_cost.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ def test_calculate_cost(self):
test_dir = os.path.dirname(os.path.abspath(__file__))
USHdir = os.path.join(test_dir, "..", "..", "ush")
params = calculate_cost(os.path.join(USHdir, 'config.community.yaml'))
self.assertCountEqual(params, [180, 28689, 180, 28689])
self.assertCountEqual(params, [150, 28689, 150, 28689])
2 changes: 1 addition & 1 deletion ush/predef_grid_params.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
ESGgrid_NY: 131
ESGgrid_PAZI: 0.0
ESGgrid_WIDE_HALO_WIDTH: 6
DT_ATMOS: 180
DT_ATMOS: 150
LAYOUT_X: 5
LAYOUT_Y: 2
BLOCKSIZE: 40
Expand Down