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

jedi-ufs with ccpp-physics submodule update (contains #201) #211

Merged
merged 8 commits into from
Dec 11, 2020
Merged

jedi-ufs with ccpp-physics submodule update (contains #201) #211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ca1b9a4
updated CMakeLists.txt
mark-a-potts Nov 20, 2020
f27e6b3
Changes for JEDI linking/control
mark-a-potts Nov 20, 2020
45f1be3
Merge branch 'develop' into jedi-ufs
mark-a-potts Nov 20, 2020
8fb4158
changed nceppost to upp
mark-a-potts Nov 20, 2020
d5944a1
cherry picked merge
mark-a-potts Dec 7, 2020
f6b0885
Merge branch 'jedi-ufs' of github.com:mark-a-potts/fv3atm into HEAD
mark-a-potts Dec 7, 2020
45b6ff3
Update .gitmodules and submodule pointer for ccpp-physics for code re…
climbfuji Dec 10, 2020
0995be3
Revert change to .gitmodules and update submodule pointer for ccpp-ph…
climbfuji Dec 11, 2020
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
4 changes: 2 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,8 +141,8 @@ if(CCPP)
add_dependencies(ccppphys ccpp)
target_include_directories(fv3dycore PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/ccpp/framework/src
${CMAKE_CURRENT_BINARY_DIR}/ccpp/driver)
target_link_libraries(ccppphys PRIVATE sp::sp_d
w3nco::w3nco_d)
target_link_libraries(ccppphys PUBLIC sp::sp_d
w3nco::w3nco_d)
endif()

###############################################################################
Expand Down
2 changes: 1 addition & 1 deletion ccpp/physics
Open in desktop
Submodule physics updated 3 files
+19 −5 physics/gmtb_scm_sfc_flux_spec.F90
+48 −0 physics/gmtb_scm_sfc_flux_spec.meta
+1 −1 physics/rte-rrtmgp