From ec15cd71c884c0f09329e8a22b5cda441470e13d Mon Sep 17 00:00:00 2001 From: "Chan-Hoo.Jeon-NOAA" <60152248+chan-hoo@users.noreply.github.com> Date: Tue, 12 Jul 2022 06:02:51 -0400 Subject: [PATCH] Update hashes of external components and remove RRFS_v1alpha ccpp suite (#327) * update hashes * update srw_common * Remove RRFS_v1alpha ccpp suite * update docs * update hash of regional_workflow --- Externals.cfg | 8 ++++---- docs/UsersGuide/source/ConfigWorkflow.rst | 1 - modulefiles/build_hera_intel | 1 + modulefiles/build_jet_intel | 1 + modulefiles/build_orion_intel | 1 + modulefiles/srw_common | 4 ++-- src/CMakeLists.txt | 2 +- 7 files changed, 10 insertions(+), 8 deletions(-) diff --git a/Externals.cfg b/Externals.cfg index c416638d1a..05d468ee8e 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 = de59f5c +hash = ac120a0 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 = b6efa86 +hash = c5cfcf4 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 = 830b507 +hash = 65cf401 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 = fbd41a5 +hash = 8767929 local_path = src/UPP required = True diff --git a/docs/UsersGuide/source/ConfigWorkflow.rst b/docs/UsersGuide/source/ConfigWorkflow.rst index da8803b66e..474b0a58a8 100644 --- a/docs/UsersGuide/source/ConfigWorkflow.rst +++ b/docs/UsersGuide/source/ConfigWorkflow.rst @@ -407,7 +407,6 @@ CCPP Parameter | ``"FV3_GFS_2017_gfdlmp_regional"`` | ``"FV3_GFS_v15p2"`` | ``"FV3_GFS_v15_thompson_mynn_lam3km"`` - | ``"FV3_RRFS_v1alpha"`` Stochastic Physics Parameters ================================ diff --git a/modulefiles/build_hera_intel b/modulefiles/build_hera_intel index 91e1c2f522..275ef2fe32 100644 --- a/modulefiles/build_hera_intel +++ b/modulefiles/build_hera_intel @@ -23,6 +23,7 @@ module load hpc-impi/2022.1.2 module load srw_common module load nccmp/1.8.9.0 +module load nco/4.9.3 setenv CMAKE_C_COMPILER mpiicc setenv CMAKE_CXX_COMPILER mpiicpc diff --git a/modulefiles/build_jet_intel b/modulefiles/build_jet_intel index adb34c9193..7a4da30519 100644 --- a/modulefiles/build_jet_intel +++ b/modulefiles/build_jet_intel @@ -22,6 +22,7 @@ module load srw_common module load nccmp/1.8.9.0 module load prod_util/1.2.2 +module load nco/4.9.3 setenv CMAKE_C_COMPILER mpiicc setenv CMAKE_CXX_COMPILER mpiicpc diff --git a/modulefiles/build_orion_intel b/modulefiles/build_orion_intel index a5804e52a0..f2171a4a53 100644 --- a/modulefiles/build_orion_intel +++ b/modulefiles/build_orion_intel @@ -20,6 +20,7 @@ module load hpc-impi/2022.1.2 module load srw_common module load nccmp/1.8.9.0 +module load nco/4.9.3 setenv CMAKE_C_COMPILER mpiicc setenv CMAKE_CXX_COMPILER mpiicpc diff --git a/modulefiles/srw_common b/modulefiles/srw_common index 386dc4f469..fcb75c6cfa 100644 --- a/modulefiles/srw_common +++ b/modulefiles/srw_common @@ -20,9 +20,9 @@ module load ip/3.3.3 module load sp/2.3.3 module load w3nco/2.4.1 -module load-any gftl-shared/v1.3.3 gftl-shared/1.3.3 +module load-any gftl-shared/v1.5.0 gftl-shared/1.5.0 module load-any yafyaml/v0.5.1 yafyaml/0.5.1 -module load-any mapl/2.11.0-esmf-8.3.0b09 mapl/2.11.0-esmf-8.2.0 +module load-any mapl/2.22.0-esmf-8.3.0b09 mapl/2.11.0-esmf-8.2.0 module load nemsio/2.5.4 module load sfcio/1.4.1 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 171b8e3f0c..9b65840774 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -14,7 +14,7 @@ ExternalProject_Add(UFS_UTILS ) if(NOT CCPP_SUITES) - set(CCPP_SUITES "FV3_GFS_2017_gfdlmp,FV3_GFS_2017_gfdlmp_regional,FV3_GFS_v15p2,FV3_GFS_v16,FV3_RRFS_v1beta,FV3_HRRR,FV3_RRFS_v1alpha,FV3_GFS_v15_thompson_mynn_lam3km") + set(CCPP_SUITES "FV3_GFS_2017_gfdlmp,FV3_GFS_2017_gfdlmp_regional,FV3_GFS_v15p2,FV3_GFS_v16,FV3_RRFS_v1beta,FV3_HRRR,FV3_GFS_v15_thompson_mynn_lam3km") endif() if(NOT APP)