Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update hashes of external components and remove RRFS_v1alpha ccpp suite #327

Merged
merged 7 commits into from
Jul 12, 2022
Merged

Update hashes of external components and remove RRFS_v1alpha ccpp suite #327

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
eea86e5
update hashes
chan-hoo Jul 5, 2022
e186300
update srw_common
chan-hoo Jul 5, 2022
2d84d2e
Remove RRFS_v1alpha ccpp suite
chan-hoo Jul 6, 2022
0841e89
comment out ncio for test
chan-hoo Jul 7, 2022
5a0feb9
ncio is back
chan-hoo Jul 7, 2022
28695fb
update docs
chan-hoo Jul 7, 2022
d1a28c8
update hash of regional_workflow
chan-hoo Jul 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions Externals.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
[regional_workflow]
protocol = git
repo_url = https://github.com/ufs-community/regional_workflow
#repo_url = https://github.com/ufs-community/regional_workflow
repo_url = https://github.com/chan-hoo/regional_workflow
# Specify either a branch name or a hash but not both.
chan-hoo marked this conversation as resolved.
Show resolved Hide resolved
#branch = develop
hash = de59f5c
#hash = 2e336c1
branch = feature/update_hash
local_path = regional_workflow
required = True

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

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

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

Expand Down
1 change: 1 addition & 0 deletions modulefiles/build_hera_intel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions modulefiles/build_jet_intel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions modulefiles/build_orion_intel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions modulefiles/srw_common
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@chan-hoo For any given software, how do you find out what version numbers to update to?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@gsketefian, I usually check the module files in ufs-weather-model/modulefiles/, UFS_UTILS/modulefiles/, and UPP/modulefiles. I presume that they were tested and verified on their side before merged.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah ok, thanks.

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
Expand Down
2 changes: 1 addition & 1 deletion src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down