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

[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 3 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
6 changes: 3 additions & 3 deletions Externals.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ protocol = git
repo_url = https://github.com/ufs-community/UFS_UTILS
# Specify either a branch name or a hash but not both.
#branch = develop
hash = ca9bed8
hash = 4d2768c
local_path = sorc/UFS_UTILS
required = True

Expand All @@ -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 = ee35891
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
7 changes: 3 additions & 4 deletions modulefiles/build_gaea_intel.lua
View file
Open in desktop
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All the regression tests pass on Gaea with the following updated stack:
/lustre/f2/dev/role.epic/contrib/hpc-stack/intel-classic-2022.0.2/modulefiles/stack/

Please see comments and logs for the WM regression tests:
ufs-community/ufs-weather-model#1755 (comment)
ufs-community/ufs-weather-model#1755 (comment)

Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,11 @@ whatis([===[Loads libraries needed for building the UFS SRW App on Gaea ]===])

load(pathJoin("cmake", os.getenv("cmake_ver") or "3.20.1"))

prepend_path("MODULEPATH","/lustre/f2/dev/role.epic/contrib/hpc-stack/intel-2021.3.0_noarch/modulefiles/stack")
prepend_path("MODULEPATH","/lustre/f2/dev/role.epic/contrib/hpc-stack/intel-2022.0.2/modulefiles/stack")
natalie-perlin marked this conversation as resolved.
Show resolved Hide resolved
load(pathJoin("hpc", os.getenv("hpc_ver") or "1.2.0"))
load(pathJoin("intel", os.getenv("intel_ver") or "2021.3.0"))
load(pathJoin("hpc-intel", os.getenv("hpc_intel_ver") or "2021.3.0"))
load(pathJoin("intel-classic", os.getenv("intel_ver") or "2022.0.2"))
load(pathJoin("hpc-intel", os.getenv("hpc_intel_ver") or "2022.0.2"))
load(pathJoin("hpc-cray-mpich", os.getenv("hpc_cray_mpich_ver") or "7.7.11"))
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggesting changes following the recent updates for Gaea C3, C4, hpc-stack, and WM regression tests:
load(pathJoin("hpc-intel-classic", os.getenv("hpc_intel_classic_ver") or "2022.0.2"))
load(pathJoin("hpc-cray-mpich", os.getenv("hpc_cray_mpich_ver") or "7.7.20"))

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@natalie-perlin I have reverted my modifications to modulefiles/build_gaea_intel.lua for now. Once your PR has been merged in the UFS-WM, we can open a PR in the SRW App to update the modulefile here too.

load(pathJoin("gcc", os.getenv("gcc_ver") or "8.3.0"))
load(pathJoin("libpng", os.getenv("libpng_ver") or "1.6.37"))

load("srw_common")
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
Expand Up @@ -5,5 +5,5 @@ 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
#nco_grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15_thompson_mynn_lam3km
specify_EXTRN_MDL_SYSBASEDIR_ICS_LBCS
2 changes: 1 addition & 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,7 @@
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_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