From 620b78204b3f34d355f9e611378ed9927309e638 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Tue, 20 Apr 2021 08:20:43 -0600 Subject: [PATCH 1/2] 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 703d90758..109736fad 100644 --- a/.gitmodules +++ b/.gitmodules @@ -8,5 +8,7 @@ branch = gsl/develop [submodule "ccpp/physics"] path = ccpp/physics - url = https://github.com/NOAA-GSL/ccpp-physics - branch = gsl/develop-chem + #url = https://github.com/NOAA-GSL/ccpp-physics + #branch = gsl/develop-chem + url = https://github.com/climbfuji/ccpp-physics + branch = move_plumrise_to_gocart_repo diff --git a/ccpp/physics b/ccpp/physics index 9f731456a..86e07dbe2 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 9f731456a452ed72927a1276baada04b02c21001 +Subproject commit 86e07dbe2b79182746b710c2674fbd1e6aef336e From ce5901a5f07c2f2ebc28584acd131b9dad9efd90 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Tue, 20 Apr 2021 08:21:05 -0600 Subject: [PATCH 2/2] Add dependency of ccpp-physics on gocart to CMakeLists.txt --- CMakeLists.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b7fbd2c0e..be426762e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -127,15 +127,17 @@ endif() add_subdirectory(ccpp) add_subdirectory(ccpp/data) add_subdirectory(ccpp/driver) -add_dependencies(ccppphys ccpp) +add_dependencies(ccppphys ccpp gocart) add_dependencies(ccppdata ccpp ccppphys) add_dependencies(ccppdriver ccpp ccppphys ccppdata) add_dependencies(fv3dycore ccppdriver ccpp ccppphys ccppdata) target_include_directories(fv3dycore PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/ccpp/framework/src ${CMAKE_CURRENT_BINARY_DIR}/ccpp/physics ${CMAKE_CURRENT_BINARY_DIR}/ccpp/driver) + target_link_libraries(ccppphys PUBLIC sp::sp_d - w3nco::w3nco_d) + w3nco::w3nco_d + gocart) ############################################################################### ### stochastic_physics