From ca1b9a4914828430480234c1108b6723611e846a Mon Sep 17 00:00:00 2001 From: Mark Potts Date: Fri, 20 Nov 2020 09:06:10 -0500 Subject: [PATCH 1/6] updated CMakeLists.txt --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 320a1580b..f251baca1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -136,7 +136,7 @@ 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 + target_link_libraries(ccppphys PUBLIC sp::sp_d w3nco::w3nco_d) endif() From f27e6b385aa8d31f89e81079cf13ce969990c40d Mon Sep 17 00:00:00 2001 From: Mark Potts Date: Fri, 20 Nov 2020 10:57:56 -0500 Subject: [PATCH 2/6] Changes for JEDI linking/control --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 37285a443..f251baca1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -136,7 +136,7 @@ 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 + target_link_libraries(ccppphys PUBLIC sp::sp_d w3nco::w3nco_d) endif() @@ -189,7 +189,7 @@ target_link_libraries(fv3atm PUBLIC nemsio::nemsio esmf) if(INLINE_POST) - target_link_libraries(fv3atm PUBLIC upp::upp) + target_link_libraries(fv3atm PUBLIC nceppost::nceppost) endif() if(OpenMP_Fortran_FOUND) From 8fb4158888655975815636f802cf1186c3229578 Mon Sep 17 00:00:00 2001 From: Mark Potts Date: Fri, 20 Nov 2020 11:24:27 -0500 Subject: [PATCH 3/6] changed nceppost to upp --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f251baca1..70a0ce783 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -189,7 +189,7 @@ target_link_libraries(fv3atm PUBLIC nemsio::nemsio esmf) if(INLINE_POST) - target_link_libraries(fv3atm PUBLIC nceppost::nceppost) + target_link_libraries(fv3atm PUBLIC upp::upp) endif() if(OpenMP_Fortran_FOUND) From d5944a1fbbffdbe6af67b9a1a0317666c888ac8e Mon Sep 17 00:00:00 2001 From: Mark Potts Date: Mon, 7 Dec 2020 16:43:20 -0500 Subject: [PATCH 4/6] cherry picked merge --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d5013e53e..d59702147 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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() ############################################################################### From 45b6ff3b7cfdcdd12a9659f14d9805e2b3fed91f Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Thu, 10 Dec 2020 07:40:18 -0700 Subject: [PATCH 5/6] Update .gitmodules and submodule pointer for ccpp-physics for code review and testing --- .gitmodules | 6 ++++-- ccpp/physics | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index d253f6966..b0bee3d26 100644 --- a/.gitmodules +++ b/.gitmodules @@ -8,5 +8,7 @@ branch = master [submodule "ccpp/physics"] path = ccpp/physics - url = https://github.com/NCAR/ccpp-physics - branch = master + #url = https://github.com/NCAR/ccpp-physics + #branch = master + url = https://github.com/climbfuji/ccpp-physics + branch = update_to_head_of_master_and_rrtmgp_update diff --git a/ccpp/physics b/ccpp/physics index d076cc2ba..c48bf3485 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit d076cc2bac2e34fc22a00e145ce6423def61abdb +Subproject commit c48bf348578ab23bf24cce36c0e573da028a1686 From 0995be38c0717524a0606f30d0060dd6b1906ba7 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Fri, 11 Dec 2020 09:36:23 -0700 Subject: [PATCH 6/6] Revert change to .gitmodules and update submodule pointer for ccpp-physics --- .gitmodules | 6 ++---- ccpp/physics | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index b0bee3d26..d253f6966 100644 --- a/.gitmodules +++ b/.gitmodules @@ -8,7 +8,5 @@ branch = master [submodule "ccpp/physics"] path = ccpp/physics - #url = https://github.com/NCAR/ccpp-physics - #branch = master - url = https://github.com/climbfuji/ccpp-physics - branch = update_to_head_of_master_and_rrtmgp_update + url = https://github.com/NCAR/ccpp-physics + branch = master diff --git a/ccpp/physics b/ccpp/physics index c48bf3485..cb37b8ab4 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit c48bf348578ab23bf24cce36c0e573da028a1686 +Subproject commit cb37b8ab469b799fa2fcee8e0d97fca0fb3dc3e2