From c627054c5692fd140ccb8c1149f5cd4aeeaf3713 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Fri, 22 Sep 2023 12:02:22 -0600 Subject: [PATCH 1/8] Switch CI to spack-stack-1.5.0 --- .github/workflows/run_ec2_pcluster.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/run_ec2_pcluster.yaml b/.github/workflows/run_ec2_pcluster.yaml index 538fd63..2f94df5 100644 --- a/.github/workflows/run_ec2_pcluster.yaml +++ b/.github/workflows/run_ec2_pcluster.yaml @@ -74,7 +74,7 @@ jobs: cat < setup.sh #!/bin/bash - echo "Loading ufs-bundle environment using spack-stack-1.4.0" + echo "Loading ufs-bundle environment using spack-stack-1.5.0" ulimit -s unlimited ulimit -c unlimited @@ -84,13 +84,12 @@ jobs: source /opt/intel/oneapi/compiler/2022.1.0/env/vars.sh - module use /mnt/experiments-efs/skylab-v5/spack-stack-1.4.0/envs/unified-env-v2/install/modulefiles/Core + module use /mnt/experiments-efs/skylab-v6/spack-stack-1.5.0/envs/unified-env/install/modulefiles/Core module load stack-intel/2022.1.0 module load stack-intel-oneapi-mpi/2021.6.0 module load stack-python/3.10.8 module load jedi-ufs-env/unified-dev - module unload crtm module li From 6f04c4c5e5ee0e5f032d1448e6b6ee9ead028f32 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Fri, 22 Sep 2023 12:04:40 -0600 Subject: [PATCH 2/8] Fix jedi-ufs-env module name --- .github/workflows/run_ec2_pcluster.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run_ec2_pcluster.yaml b/.github/workflows/run_ec2_pcluster.yaml index 2f94df5..07af019 100644 --- a/.github/workflows/run_ec2_pcluster.yaml +++ b/.github/workflows/run_ec2_pcluster.yaml @@ -89,7 +89,7 @@ jobs: module load stack-intel-oneapi-mpi/2021.6.0 module load stack-python/3.10.8 - module load jedi-ufs-env/unified-dev + module load jedi-ufs-env/1.0.0 module li From 05867eabd2ffb356bcfada2249aaf7e5b40a1482 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Mon, 25 Sep 2023 08:31:42 -0600 Subject: [PATCH 3/8] Change ufs-weather-model branch temporarily for testing with spack-stack-1.5.0 --- CMakeLists.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7597fb5..c528199 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -99,7 +99,10 @@ ExternalProject_Add(ufs-weather-model PREFIX ${CMAKE_CURRENT_BINARY_DIR}/ufs-weather-model GIT_REPOSITORY https://github.com/climbfuji/ufs-weather-model GIT_SUBMODULES_RECURSE TRUE - GIT_TAG feature/consolidate_dom_update_20221114 # updated from develop on 2023/07/17 + # DH* 20230925 temporarily for testing + #GIT_TAG feature/consolidate_dom_update_20221114 # updated from develop on 2023/07/17 + GIT_TAG feature/consolidate_dom_update_20221114_tmp_gocart_workaround_spst150 + # *DH SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/ufs-weather-model UPDATE_DISCONNECTED ON INSTALL_DIR ${DEPEND_LIB_ROOT} From c8df9b39c1315f68b97d33dd2cf9aba6aba3e344 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Mon, 25 Sep 2023 11:45:25 -0600 Subject: [PATCH 4/8] Trigger CI From 339300d80cef203d7527cfc80b43a28cd65ccb33 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Tue, 26 Sep 2023 09:25:33 -0600 Subject: [PATCH 5/8] Trigger CI again From f1a8ee578668e56c66d65b5e05dad4c288e3e592 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Tue, 26 Sep 2023 14:59:28 -0600 Subject: [PATCH 6/8] [skip ci] Revert CMakeLists.txt --- CMakeLists.txt | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c528199..7597fb5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -99,10 +99,7 @@ ExternalProject_Add(ufs-weather-model PREFIX ${CMAKE_CURRENT_BINARY_DIR}/ufs-weather-model GIT_REPOSITORY https://github.com/climbfuji/ufs-weather-model GIT_SUBMODULES_RECURSE TRUE - # DH* 20230925 temporarily for testing - #GIT_TAG feature/consolidate_dom_update_20221114 # updated from develop on 2023/07/17 - GIT_TAG feature/consolidate_dom_update_20221114_tmp_gocart_workaround_spst150 - # *DH + GIT_TAG feature/consolidate_dom_update_20221114 # updated from develop on 2023/07/17 SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/ufs-weather-model UPDATE_DISCONNECTED ON INSTALL_DIR ${DEPEND_LIB_ROOT} From b6a2f57f5e7b4b92b00b6f9d2836995d5911a3d7 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Tue, 26 Sep 2023 16:14:36 -0600 Subject: [PATCH 7/8] trigger CI From 89e382974cd49734dc0ac5ed14eea1d0922ce7a0 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Wed, 27 Sep 2023 06:24:29 -0600 Subject: [PATCH 8/8] Trigger CI