From 35e127788a704df9ffe1863e0c21deec34296087 Mon Sep 17 00:00:00 2001 From: JulieSchramm Date: Mon, 23 Aug 2021 08:49:10 -0600 Subject: [PATCH 1/2] Fix typo. (#165) --- docs/UsersGuide/source/ConfigWorkflow.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/UsersGuide/source/ConfigWorkflow.rst b/docs/UsersGuide/source/ConfigWorkflow.rst index 9c85d7be1d..36f06dbe68 100644 --- a/docs/UsersGuide/source/ConfigWorkflow.rst +++ b/docs/UsersGuide/source/ConfigWorkflow.rst @@ -188,8 +188,8 @@ File Name Parameters ``WFLOW_LAUNCH_LOG_FN``: (Default: “log.launch_FV3LAM_wflow”) Name of the log file that contains the output from successive calls to the workflow launch script (``WFLOW_LAUNCH_SCRIPT_FN``). -Foreast Parameters -================== +Forecast Parameters +=================== ``DATE_FIRST_CYCL``: (Default: “YYYYMMDD”) Starting date of the first forecast in the set of forecasts to run. Format is "YYYYMMDD". Note that this does not include the hour-of-day. From d7de2fe2afaeb3d43dbe7df68965ff93f9927535 Mon Sep 17 00:00:00 2001 From: "Christina.Holt" Date: Tue, 31 Aug 2021 13:18:20 +0000 Subject: [PATCH 2/2] DESCRIPTION OF CHANGES EMC_post builds are currently failing on Hera due to an update to NCEPLIBS. While that is annoying, we also discovered that the App's EMC_post hash is from December 2020...way out of date! Updating to the latest hash fixes the build issue. In addition, regional_workflow must be updated and an additional PR must be applied (NOAA-EMC/regional_workflow#581) in order to accommodate the new executable and filenames for the newer EMC_post hash. In addition, some long-overdue quality-of-life improvements are added: Including the "BUILD_ALWAYS" flag in CMakelists.txt; this will cause code to be properly rebuilt by cmake after making changes Adding "module load rocoto" to the Hera workflow environment file. Rocoto is not loaded by default and can be unloaded by the build environment, so adding this here (as it already exists for Cheyenne and Orion) makes sense. TESTS CONDUCTED: Cheyenne grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_2017_gfdlmp grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_2017_gfdlmp_regional grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2 grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16 grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GSD_SAR grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_RAP_suite_HRRR grid_RRFS_CONUS_25km_ics_GSMGFS_lbcs_GSMGFS_suite_GFS_2017_gfdlmp grid_RRFS_CONUS_25km_ics_GSMGFS_lbcs_GSMGFS_suite_GFS_v15p2 grid_RRFS_CONUS_25km_ics_HRRR_lbcs_HRRR_suite_GSD_SAR grid_RRFS_CONUS_25km_ics_HRRR_lbcs_HRRR_suite_HRRR grid_RRFS_CONUS_25km_ics_HRRR_lbcs_HRRR_suite_RRFS_v1beta grid_RRFS_CONUS_25km_ics_HRRR_lbcs_RAP_suite_GSD_SAR grid_RRFS_CONUS_25km_ics_HRRR_lbcs_RAP_suite_GSD_v0 grid_RRFS_CONUS_25km_ics_HRRR_lbcs_RAP_suite_HRRR grid_RRFS_CONUS_25km_ics_HRRR_lbcs_RAP_suite_RRFS_v1alpha grid_RRFS_CONUS_25km_ics_HRRR_lbcs_RAP_suite_RRFS_v1beta Hera grid_CONUS_25km_GFDLgrid_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16 grid_RRFS_AK_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16 grid_RRFS_AK_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16 grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2 grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16 grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_2017_gfdlmp grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_2017_gfdlmp_regional grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2 grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16 grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GSD_SAR grid_RRFS_NA_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GSD_v0 grid_RRFS_SUBCONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16 DEPENDENCIES: Modify post files names to match what is used in latest EMC_post NOAA-EMC/regional_workflow#581 --- Externals.cfg | 2 +- env/wflow_hera.env | 2 ++ src/CMakeLists.txt | 3 +++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Externals.cfg b/Externals.cfg index 5ec11768f5..9a5f546aca 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -29,7 +29,7 @@ protocol = git repo_url = https://github.com/NOAA-EMC/EMC_post # Specify either a branch name or a hash but not both. #branch = develop -hash = 9fa1e088 +hash = a49af05 local_path = src/EMC_post required = True diff --git a/env/wflow_hera.env b/env/wflow_hera.env index 5699c9c696..f526c434f5 100644 --- a/env/wflow_hera.env +++ b/env/wflow_hera.env @@ -1,5 +1,7 @@ # Python environment for workflow on Hera +module load rocoto + module use -a /contrib/miniconda3/modulefiles module load miniconda3 conda activate regional_workflow diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 1adffe5eed..84ed6499fa 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -5,6 +5,7 @@ ExternalProject_Add(UFS_UTILS SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/UFS_UTILS INSTALL_DIR ${CMAKE_INSTALL_PREFIX} CMAKE_ARGS "-DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}" + BUILD_ALWAYS TRUE ) if(NOT CCPP_SUITES) @@ -57,6 +58,7 @@ ExternalProject_Add(ufs-weather-model INSTALL_DIR ${CMAKE_INSTALL_PREFIX} CMAKE_ARGS ${UFS_WEATHER_MODEL_ARGS} INSTALL_COMMAND mkdir -p ${CMAKE_INSTALL_PREFIX}/bin && cp ${CMAKE_CURRENT_BINARY_DIR}/ufs-weather-model/src/ufs-weather-model-build/ufs_model ${CMAKE_INSTALL_PREFIX}/bin/ + BUILD_ALWAYS TRUE ) ExternalProject_Add(EMC_post @@ -64,4 +66,5 @@ ExternalProject_Add(EMC_post SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/EMC_post INSTALL_DIR ${CMAKE_INSTALL_PREFIX} CMAKE_ARGS "-DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}" + BUILD_ALWAYS TRUE )