Fix the currently-broken state of master #71
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Update cmake documentation, remove old build scripts (ufs-community#45) The new cmake build requires the user to set up the environment specific to their platform. These requirements are now documented in a series of README_* files that the user can follow along with for setting their environment. In addition, this removes the old build system scripts to avoid confusion.
… update CCPP suites etc (ufs-community#50) * Remove all but the two supported CCPP suites (FV3_GFS_v15p2,FV3_RRFS_v1beta) for the release. Also, rather than hard-coding the list, allow for the "CCPP_SUITES" variable to be set to overwrite the default * CMakeLists.txt: cmake 3.15 is required by the submodules * src/CMakeLists.txt: allow CCPP suites to be specified on the command-line * Update documentation for cheyenne.intel and cheyenne.gnu
…-model develop branch; update CMakeLists.txt for new ufs-weather-model executable name
mkavulich
requested review from
gsketefian,
JeffBeck-NOAA and
JulieSchramm
as code owners
mkavulich
added a commit
to ufs-community/regional_workflow
that referenced
this pull request
Dec 11, 2020
## DESCRIPTION OF CHANGES: Part of the effort described in ufs-community/ufs-srweather-app#71 to update the master branch of ufs-srweather-app to a functioning state. Updates include: - Cherry-picking 5a4b90e from release branch in order to include the RRFS_v1alpha CCPP suite, as well as fixing some updated namelist settings in the ufs-weather-model - Fixing other namelist options that have been updated in ufs-weather-model This PR must be merged prior to ufs-community/ufs-srweather-app#71, then that PR updated to point to this PR's hash. ## TESTS CONDUCTED: The following end-to-end tests are now all successful on Hera: - DOT_OR_USCORE - GST_release_public_v1 - get_extrn_files_from_hpss_FV3GFS_FV3GFS - get_extrn_files_from_hpss_GSMGFS_GSMGFS - get_extrn_files_from_hpss_HRRR_RAP - get_extrn_files_from_hpss_RAP_RAP - grid_GSD_HRRR_AK_50km - grid_GSD_RAP13km - grid_RRFS_AK_13km_FV3GFS_FV3GFS - grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2 - grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16beta - grid_RRFS_CONUS_13km_ics_HRRR_lbcs_RAP_suite_GSD_SAR - grid_RRFS_CONUS_13km_ics_HRRR_lbcs_RAP_suite_RRFS_v1beta - grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2 - grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16beta - grid_RRFS_CONUS_25km_ics_HRRR_lbcs_RAP_suite_GSD_SAR - grid_RRFS_CONUS_25km_ics_HRRR_lbcs_RAP_suite_RRFS_v1beta - new_ESGgrid - new_GFDLgrid - new_GFDLgrid__GFDLgrid_USE_GFDLgrid_RES_IN_FILENAMES_eq_FALSE - new_GFDLgrid__GFDLgrid_USE_GFDLgrid_RES_IN_FILENAMES_eq_TRUE - regional_001 - regional_002 - suite_FV3_GFS_v15p2 - suite_FV3_GFS_v16beta - suite_FV3_GSD_SAR - suite_FV3_GSD_v0 - suite_FV3_RRFS_v1beta The following end-to-end tests were successful on Jet: - DOT_OR_USCORE - get_extrn_files_from_hpss_FV3GFS_FV3GFS - get_extrn_files_from_hpss_GSMGFS_GSMGFS - get_extrn_files_from_hpss_HRRR_RAP - get_extrn_files_from_hpss_RAP_RAP - grid_RRFS_AK_13km_FV3GFS_FV3GFS - grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2 - grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16beta - grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2 - grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16beta - new_ESGgrid - new_GFDLgrid - new_GFDLgrid__GFDLgrid_USE_GFDLgrid_RES_IN_FILENAMES_eq_FALSE - regional_001 - regional_002 - suite_FV3_GFS_v16beta A few tests on Hera and Jet are still failing, but they are known errors and will be fixed at a later date. Cheyenne tests are failing but this is fixed by #378 ## ISSUE (optional): In conjunction with #378 and ufs-community/ufs-srweather-app#71, will solve ufs-community/ufs-srweather-app#57, fixing the master branch of ufs-srweather-app so everyone will be happy and nothing will be broken and we will all live happily ever after.
mkavulich
added
bug
gsketefian
reviewed
Dec 11, 2020
|
|
||
| set(CCPP_SUITES "FV3_CPT_v0,FV3_GFS_2017_gfdlmp,FV3_GFS_2017_gfdlmp_regional,FV3_GSD_SAR,FV3_GSD_v0,FV3_GFS_v15p2,FV3_GFS_v16beta,FV3_RRFS_v1beta") | ||
| if(NOT CCPP_SUITES) | ||
| set(CCPP_SUITES "FV3_CPT_v0,FV3_GFS_2017_gfdlmp,FV3_GFS_2017_gfdlmp_regional,FV3_GSD_SAR,FV3_GSD_v0,FV3_GFS_v15p2,FV3_GFS_v16beta,FV3_RRFS_v1beta") |
There was a problem hiding this comment.
Should we add RRFS_v1alpha here, or is that not in the relevant hash of ufs-weather-model yet?
There was a problem hiding this comment.
Good catch, I didn't think about that change here...the change I made bringing over RRFS_v1alpha to develop was in regional_workflow, but as it turns out the necessary suite definition file is not yet in ufs-weather-model's develop, so it will not work anyway. So I would say we don't need to include it for now, and should add it when/if the SDF gets added to develop.
gsketefian
reviewed
Dec 11, 2020
| @@ -0,0 +1,23 @@ | |||
| #Setup instructions for macOS Mojave or Catalina using gcc-10.2.0 + gfortran-10.2.0 | |||
There was a problem hiding this comment.
Would it be better to add this macos file in a separate PR at the same time that you merge the upcoming macos PR into regional_workflow?
There was a problem hiding this comment.
The macos build additions were added to the release branch a while ago (#62), so this just brings the READMEs up-to-date with the release branch. I don't think it's worth omitting.
|
@mkavulich If it's not too much work, it would be nice to know which tests failed on each machine and, if you know, what needs to be done to fix them (e.g. creating symlinks on jet). Then we can work on the fixes. |
christinaholtNOAA
approved these changes
Dec 11, 2020
|
@gsketefian I can do that, I think it's a good idea to do an inventory of our tests on a regular basis anyway. I'll send out an email to the ufs-cam group so we have a full inventory of working and non-working tests as of this PR. |
|
@mkavulich And I/we need to go through all the tests and remove outdated and unnecessary ones, and maybe decide on a consistent naming convention. |
gsketefian
approved these changes
Dec 11, 2020
|
Final Hera sanity checks passed. Merging now. |
christinaholtNOAA
added a commit
to christinaholtNOAA/ufs-srweather-app
that referenced
this pull request
Dec 14, 2020
christinaholtNOAA
pushed a commit
to christinaholtNOAA/ufs-srweather-app
that referenced
this pull request
Dec 14, 2020
## DESCRIPTION OF CHANGES: Currently master is broken and will not build and/or run on any platform due to incompatible hashes and outdated changes. Several fixes are needed to get master back in working order, most of which will be included in this PR. The direct changes made in ufs-srweather-app for this PR are: - Partially cherry-picking release-branch changes to update build system and documentation - Updating static hashes to the latest versions of `develop` branches for ufs-weather-model, EMC_post, UFS_UTILS, and regional_workflow Some changes that were needed prior to this PR being merged are: - [x] EMC_post needs to be updated to include an updated executable name and flat config files - NOAA-EMC/UPP#237 - [x] regional_workflow needs to be updated for the new ufs-weather-model executable name - https://github.com/NOAA-EMC/regional_workflow/pull/374 - [x] regional_workflow also needs to be updated for changed namelist options in the latest ufs-weather-model develop branch - https://github.com/NOAA-EMC/regional_workflow/pull/377 - [x] regional_workflow also needs to be updated with the commit in https://github.com/NOAA-EMC/regional_workflow/pull/343 in order for the workflow and automated tests to work on Cheyenne - https://github.com/NOAA-EMC/regional_workflow/pull/378 These PRs have been merged and this PR updated with the latest hashes. ## TESTS CONDUCTED: Compiles and workflow is successfully generated on Cheyenne, Hera, and Jet; ran many tests that all passed; reference PR on Github for full list. ## ISSUE: Resolves ufs-community#57
christinaholtNOAA
added a commit
to christinaholtNOAA/ufs-srweather-app
that referenced
this pull request
Dec 14, 2020
christinaholtNOAA
pushed a commit
to christinaholtNOAA/ufs-srweather-app
that referenced
this pull request
Dec 14, 2020
## DESCRIPTION OF CHANGES: Currently master is broken and will not build and/or run on any platform due to incompatible hashes and outdated changes. Several fixes are needed to get master back in working order, most of which will be included in this PR. The direct changes made in ufs-srweather-app for this PR are: - Partially cherry-picking release-branch changes to update build system and documentation - Updating static hashes to the latest versions of `develop` branches for ufs-weather-model, EMC_post, UFS_UTILS, and regional_workflow Some changes that were needed prior to this PR being merged are: - [x] EMC_post needs to be updated to include an updated executable name and flat config files - NOAA-EMC/UPP#237 - [x] regional_workflow needs to be updated for the new ufs-weather-model executable name - https://github.com/NOAA-EMC/regional_workflow/pull/374 - [x] regional_workflow also needs to be updated for changed namelist options in the latest ufs-weather-model develop branch - https://github.com/NOAA-EMC/regional_workflow/pull/377 - [x] regional_workflow also needs to be updated with the commit in https://github.com/NOAA-EMC/regional_workflow/pull/343 in order for the workflow and automated tests to work on Cheyenne - https://github.com/NOAA-EMC/regional_workflow/pull/378 These PRs have been merged and this PR updated with the latest hashes. ## TESTS CONDUCTED: Compiles and workflow is successfully generated on Cheyenne, Hera, and Jet; ran many tests that all passed; reference PR on Github for full list. ## ISSUE: Resolves ufs-community#57
christinaholtNOAA
added a commit
to christinaholtNOAA/ufs-srweather-app
that referenced
this pull request
Dec 14, 2020
christinaholtNOAA
added a commit
to christinaholtNOAA/ufs-srweather-app
that referenced
this pull request
Nov 19, 2021
rrfs_ci: Merge develop
mkavulich
added a commit
to mkavulich/ufs-srweather-app
that referenced
this pull request
Aug 26, 2022
## DESCRIPTION OF CHANGES: Part of the effort described in ufs-community#71 to update the master branch of ufs-srweather-app to a functioning state. Updates include: - Cherry-picking 5a4b90e7 from release branch in order to include the RRFS_v1alpha CCPP suite, as well as fixing some updated namelist settings in the ufs-weather-model - Fixing other namelist options that have been updated in ufs-weather-model This PR must be merged prior to ufs-community#71, then that PR updated to point to this PR's hash. ## TESTS CONDUCTED: The following end-to-end tests are now all successful on Hera: - DOT_OR_USCORE - GST_release_public_v1 - get_extrn_files_from_hpss_FV3GFS_FV3GFS - get_extrn_files_from_hpss_GSMGFS_GSMGFS - get_extrn_files_from_hpss_HRRR_RAP - get_extrn_files_from_hpss_RAP_RAP - grid_GSD_HRRR_AK_50km - grid_GSD_RAP13km - grid_RRFS_AK_13km_FV3GFS_FV3GFS - grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2 - grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16beta - grid_RRFS_CONUS_13km_ics_HRRR_lbcs_RAP_suite_GSD_SAR - grid_RRFS_CONUS_13km_ics_HRRR_lbcs_RAP_suite_RRFS_v1beta - grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2 - grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16beta - grid_RRFS_CONUS_25km_ics_HRRR_lbcs_RAP_suite_GSD_SAR - grid_RRFS_CONUS_25km_ics_HRRR_lbcs_RAP_suite_RRFS_v1beta - new_ESGgrid - new_GFDLgrid - new_GFDLgrid__GFDLgrid_USE_GFDLgrid_RES_IN_FILENAMES_eq_FALSE - new_GFDLgrid__GFDLgrid_USE_GFDLgrid_RES_IN_FILENAMES_eq_TRUE - regional_001 - regional_002 - suite_FV3_GFS_v15p2 - suite_FV3_GFS_v16beta - suite_FV3_GSD_SAR - suite_FV3_GSD_v0 - suite_FV3_RRFS_v1beta The following end-to-end tests were successful on Jet: - DOT_OR_USCORE - get_extrn_files_from_hpss_FV3GFS_FV3GFS - get_extrn_files_from_hpss_GSMGFS_GSMGFS - get_extrn_files_from_hpss_HRRR_RAP - get_extrn_files_from_hpss_RAP_RAP - grid_RRFS_AK_13km_FV3GFS_FV3GFS - grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2 - grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16beta - grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2 - grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16beta - new_ESGgrid - new_GFDLgrid - new_GFDLgrid__GFDLgrid_USE_GFDLgrid_RES_IN_FILENAMES_eq_FALSE - regional_001 - regional_002 - suite_FV3_GFS_v16beta A few tests on Hera and Jet are still failing, but they are known errors and will be fixed at a later date. Cheyenne tests are failing but this is fixed by ufs-community#378 ## ISSUE (optional): In conjunction with ufs-community#378 and ufs-community#71, will solve ufs-community#57, fixing the master branch of ufs-srweather-app so everyone will be happy and nothing will be broken and we will all live happily ever after.
mkavulich
added a commit
that referenced
this pull request
Sep 8, 2022
## DESCRIPTION OF CHANGES: Part of the effort described in #71 to update the master branch of ufs-srweather-app to a functioning state. Updates include: - Cherry-picking 10911bcb from release branch in order to include the RRFS_v1alpha CCPP suite, as well as fixing some updated namelist settings in the ufs-weather-model - Fixing other namelist options that have been updated in ufs-weather-model This PR must be merged prior to #71, then that PR updated to point to this PR's hash. ## TESTS CONDUCTED: The following end-to-end tests are now all successful on Hera: - DOT_OR_USCORE - GST_release_public_v1 - get_extrn_files_from_hpss_FV3GFS_FV3GFS - get_extrn_files_from_hpss_GSMGFS_GSMGFS - get_extrn_files_from_hpss_HRRR_RAP - get_extrn_files_from_hpss_RAP_RAP - grid_GSD_HRRR_AK_50km - grid_GSD_RAP13km - grid_RRFS_AK_13km_FV3GFS_FV3GFS - grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2 - grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16beta - grid_RRFS_CONUS_13km_ics_HRRR_lbcs_RAP_suite_GSD_SAR - grid_RRFS_CONUS_13km_ics_HRRR_lbcs_RAP_suite_RRFS_v1beta - grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2 - grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16beta - grid_RRFS_CONUS_25km_ics_HRRR_lbcs_RAP_suite_GSD_SAR - grid_RRFS_CONUS_25km_ics_HRRR_lbcs_RAP_suite_RRFS_v1beta - new_ESGgrid - new_GFDLgrid - new_GFDLgrid__GFDLgrid_USE_GFDLgrid_RES_IN_FILENAMES_eq_FALSE - new_GFDLgrid__GFDLgrid_USE_GFDLgrid_RES_IN_FILENAMES_eq_TRUE - regional_001 - regional_002 - suite_FV3_GFS_v15p2 - suite_FV3_GFS_v16beta - suite_FV3_GSD_SAR - suite_FV3_GSD_v0 - suite_FV3_RRFS_v1beta The following end-to-end tests were successful on Jet: - DOT_OR_USCORE - get_extrn_files_from_hpss_FV3GFS_FV3GFS - get_extrn_files_from_hpss_GSMGFS_GSMGFS - get_extrn_files_from_hpss_HRRR_RAP - get_extrn_files_from_hpss_RAP_RAP - grid_RRFS_AK_13km_FV3GFS_FV3GFS - grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2 - grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16beta - grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2 - grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16beta - new_ESGgrid - new_GFDLgrid - new_GFDLgrid__GFDLgrid_USE_GFDLgrid_RES_IN_FILENAMES_eq_FALSE - regional_001 - regional_002 - suite_FV3_GFS_v16beta A few tests on Hera and Jet are still failing, but they are known errors and will be fixed at a later date. Cheyenne tests are failing but this is fixed by #378 ## ISSUE (optional): In conjunction with #378 and #71, will solve #57, fixing the master branch of ufs-srweather-app so everyone will be happy and nothing will be broken and we will all live happily ever after.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
DESCRIPTION OF CHANGES:
Currently master is broken and will not build and/or run on any platform due to incompatible hashes and outdated changes. Several fixes are needed to get master back in working order, most of which will be included in this PR.
The direct changes made in ufs-srweather-app for this PR are:
developbranches for ufs-weather-model, EMC_post, UFS_UTILS, and regional_workflowSome changes that are needed prior to this PR being merged are:
Once these PRs are accepted and merged, this PR will be updated to point to the corresponding hashes
TESTS CONDUCTED:
Compiles and workflow is successfully generated on Cheyenne, Hera, and Jet. The following tests have been run on each machine:
Hera (/scratch2/BMC/det/kavulich/workdir/update_app_master/expt_dirs/):
Cheyenne (/glade/scratch/kavulich/UFS_CAM/testing/SRW_PR_71/expt_dirs):
Jet (/mnt/lfs4/HFIP/dtc-hurr/kavulich/workdir/UFS_SRW_PR_71/expt_dirs):
ISSUE:
When complete, this PR will resolve issue #57