Skip to content

Commit

Permalink
Update post and regional_workflow hashes, QOL improvements (#167)
Browse files Browse the repository at this point in the history
* Update EMC_post hash to top of develop; way overdue!

* Use BUILD_ALWAYS flags in CMakeLists.txt so that code changes result in a rebuild

* Load rocoto in wflow_hera.env, since it may have been unloaded at the build step

* Point to required regional_workflow branch for testing; will update to proper hash once PR is merged

* Point to latest regional_workflow hash
  • Loading branch information
mkavulich committed Aug 31, 2021
1 parent 35e1277 commit 8db444d
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Externals.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ protocol = git
repo_url = https://github.com/NOAA-EMC/regional_workflow
# Specify either a branch name or a hash but not both.
#branch = develop
hash = de1220b
hash = efa026f
local_path = regional_workflow
required = True

Expand All @@ -30,7 +30,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

Expand Down
2 changes: 2 additions & 0 deletions env/wflow_hera.env
Original file line number Diff line number Diff line change
@@ -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
3 changes: 3 additions & 0 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -57,11 +58,13 @@ 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
PREFIX ${CMAKE_CURRENT_BINARY_DIR}/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
)

0 comments on commit 8db444d

Please sign in to comment.