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.

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

Use upp as a submodule #421

Merged
merged 5 commits into from
Nov 22, 2021
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,6 @@
path = ccpp/physics
url = https://github.com/NCAR/ccpp-physics
branch = main
[submodule "upp"]
path = upp
url = https://github.com/DusanJovic-NOAA/UPP
Copy link
Contributor

Choose a reason for hiding this comment

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

@DusanJovic-NOAA When UPP being submodule in the authoritative fv3atm, how will an UPP version be checked out?from the latest branch "develop" or tag "XXX"?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Submodules always point to specific commit, which can be a tag but it does not have to be. I guess most of the time, from the develop fv3atm branch we'll point to a commit in UPP develop branch. Production branch will probably point to a commit in UPP production branch.

Copy link
Contributor

Choose a reason for hiding this comment

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

@DusanJovic-NOAA So in that case, I don't need create a tag from UPP repository site. We may check UPP version via hash number of upp directory on atmfv3 repository, right?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Correct. fv3atm 'knows' only about UPP url (optionally branch) and commit hash.

2 changes: 2 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ add_subdirectory(atmos_cubed_sphere)
### fv3atm
###############################################################################
if(INLINE_POST)
set(BUILD_POSTEXEC OFF)
add_subdirectory(upp)
set(POST_SRC io/inline_post.F90 io/post_nems_routines.F90 io/post_gfs.F90 io/post_regional.F90)
else()
set(POST_SRC io/inline_post_stub.F90)
Expand Down
1 change: 1 addition & 0 deletions upp
Submodule upp added at 057588