From ffd138d6235f18ba5c1e1ea9e29d4570b555109e Mon Sep 17 00:00:00 2001 From: Michael Kavulich Date: Fri, 11 Dec 2020 14:06:10 -0700 Subject: [PATCH 1/2] Fix the currently-broken state of master (#71) ## 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 - https://github.com/NOAA-EMC/EMC_post/pull/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 #57 --- Externals.cfg | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Externals.cfg b/Externals.cfg index 4009bb6f09..be6d7af228 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -1,9 +1,8 @@ [regional_workflow] protocol = git -repo_url = https://github.com/NOAA-GSD/regional_workflow +repo_url = https://github.com/NOAA-GSL/regional_workflow # Specify either a branch name or a hash but not both. branch = feature/RRFS_dev3 -#hash = b2b7e959 local_path = regional_workflow required = True @@ -17,9 +16,9 @@ required = True [ufs_weather_model] protocol = git -repo_url = https://github.com/NOAA-GSD/ufs-weather-model +repo_url = https://github.com/NOAA-GSL/ufs-weather-model # Specify either a branch name or a hash but not both. -#branch = gsd/develop +#branch = gsl/develop hash = 05a5f1f local_path = src/ufs_weather_model required = True From f29b4c63f0ae0b04fefb4f876fc10f1590ca275e Mon Sep 17 00:00:00 2001 From: Christina Holt Date: Mon, 14 Dec 2020 16:15:39 +0000 Subject: [PATCH 2/2] Updating to community #71 --- Externals.cfg | 2 +- src/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Externals.cfg b/Externals.cfg index be6d7af228..3378d7930a 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -19,7 +19,7 @@ protocol = git repo_url = https://github.com/NOAA-GSL/ufs-weather-model # Specify either a branch name or a hash but not both. #branch = gsl/develop -hash = 05a5f1f +hash = 7a249f2 local_path = src/ufs_weather_model required = True diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a192c821aa..fdb74d3d1a 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -8,7 +8,7 @@ ExternalProject_Add(UFS_UTILS ) 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") + set(CCPP_SUITES "FV3_GSD_SAR,FV3_HRRR") endif() ExternalProject_Add(ufs_weather_model