From c389f3bb95483f975efc5e47bf60ae4981b06ac1 Mon Sep 17 00:00:00 2001 From: "Michael Kavulich, Jr" Date: Tue, 5 Apr 2022 02:26:13 +0000 Subject: [PATCH 1/4] Update hashes of all components to latest version. --- Externals.cfg | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Externals.cfg b/Externals.cfg index c13eb54263..88f43bc461 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -3,7 +3,7 @@ protocol = git repo_url = https://github.com/ufs-community/regional_workflow # Specify either a branch name or a hash but not both. #branch = develop -hash = 405553b +hash = 3f83cde local_path = regional_workflow required = True @@ -12,7 +12,7 @@ protocol = git repo_url = https://github.com/ufs-community/UFS_UTILS # Specify either a branch name or a hash but not both. #branch = develop -hash = f30740e +hash = 31271f7 local_path = src/UFS_UTILS required = True @@ -21,7 +21,7 @@ protocol = git repo_url = https://github.com/ufs-community/ufs-weather-model # Specify either a branch name or a hash but not both. #branch = develop -hash = e593349 +hash = 96dffa1 local_path = src/ufs-weather-model required = True @@ -30,7 +30,7 @@ protocol = git repo_url = https://github.com/NOAA-EMC/UPP # Specify either a branch name or a hash but not both. #branch = develop -hash = 4a16052 +hash = 394917e local_path = src/UPP required = True From 34942356937b89ca99626ee6caa451653b4495c6 Mon Sep 17 00:00:00 2001 From: "Michael Kavulich, Jr" Date: Mon, 4 Apr 2022 21:40:36 -0600 Subject: [PATCH 2/4] Latest UPP hash requires CMake 3.19 or higher --- env/build_cheyenne_gnu.env | 4 ++-- env/build_cheyenne_intel.env | 2 +- env/build_orion_intel.env | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/env/build_cheyenne_gnu.env b/env/build_cheyenne_gnu.env index 36dea1137d..7af896ebc0 100644 --- a/env/build_cheyenne_gnu.env +++ b/env/build_cheyenne_gnu.env @@ -1,8 +1,8 @@ -#Setup instructions for CISL Cheyenne using Intel-19.1.1 (bash shell) +#Setup instructions for CISL Cheyenne using GNU-10.1.0 (bash shell) module purge -module load cmake/3.18.2 +module load cmake/3.22.0 module load ncarenv/1.3 module load gnu/10.1.0 module load mpt/2.22 diff --git a/env/build_cheyenne_intel.env b/env/build_cheyenne_intel.env index 75ffc0fa62..7a06f2f3bf 100644 --- a/env/build_cheyenne_intel.env +++ b/env/build_cheyenne_intel.env @@ -2,7 +2,7 @@ module purge -module load cmake/3.18.2 +module load cmake/3.22.0 module load ncarenv/1.3 module load intel/2021.2 module load mpt/2.22 diff --git a/env/build_orion_intel.env b/env/build_orion_intel.env index 52d7e7e909..24db81de42 100644 --- a/env/build_orion_intel.env +++ b/env/build_orion_intel.env @@ -4,7 +4,7 @@ module purge module load contrib noaatools -module load cmake/3.18.1 +module load cmake/3.22.1 module load python/3.9.2 module use /apps/contrib/NCEP/libs/hpc-stack/modulefiles/stack From b8809951b314446918490ebbb621abc5d906d57a Mon Sep 17 00:00:00 2001 From: "Michael Kavulich, Jr" Date: Mon, 4 Apr 2022 23:07:28 -0600 Subject: [PATCH 3/4] Latest UFS_UTILS requires g2 version 3.4.3 --- env/srw_common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/env/srw_common b/env/srw_common index f45a439d5d..6de48669e9 100644 --- a/env/srw_common +++ b/env/srw_common @@ -12,7 +12,7 @@ module load fms/2021.03 module load bacio/2.4.1 module load crtm/2.3.0 -module load g2/3.4.2 +module load g2/3.4.3 module load g2tmpl/1.10.0 module load ip/3.3.3 module load sp/2.3.3 From acd78097761e1834ef312046913f0ae7d5736727 Mon Sep 17 00:00:00 2001 From: "Michael Kavulich, Jr" Date: Mon, 4 Apr 2022 23:29:18 -0600 Subject: [PATCH 4/4] Hack to get latest UFS_UTILS built on Cheyenne --- env/build_cheyenne_gnu.env | 1 + env/build_cheyenne_intel.env | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/env/build_cheyenne_gnu.env b/env/build_cheyenne_gnu.env index 7af896ebc0..6cc15ce757 100644 --- a/env/build_cheyenne_gnu.env +++ b/env/build_cheyenne_gnu.env @@ -16,6 +16,7 @@ module load hpc-gnu/10.1.0 module load hpc-mpt/2.22 module load srw_common +module load g2/3.4.3 export CMAKE_C_COMPILER=mpicc export CMAKE_CXX_COMPILER=mpicxx diff --git a/env/build_cheyenne_intel.env b/env/build_cheyenne_intel.env index 7a06f2f3bf..31dbc3da2b 100644 --- a/env/build_cheyenne_intel.env +++ b/env/build_cheyenne_intel.env @@ -1,4 +1,4 @@ -#Setup instructions for CISL Cheyenne using Intel-19.1.1 (bash shell) +#Setup instructions for CISL Cheyenne using Intel-2021.2 (bash shell) module purge @@ -16,6 +16,7 @@ module load hpc-intel/2021.2 module load hpc-mpt/2.22 module load srw_common +module load g2/3.4.3 export CMAKE_C_COMPILER=mpicc export CMAKE_CXX_COMPILER=mpicxx