From 540b28fd1ef923aa536d1d0d067aefc45c0cd6a7 Mon Sep 17 00:00:00 2001 From: Xiaqiong Zhou Date: Thu, 18 Mar 2021 09:56:01 -0500 Subject: [PATCH 1/7] Point dycore to GFDL dev/emc and ccpp_physics to the personal branch; update cmakelist to compile the 202101 FV3 --- .gitmodules | 6 +++--- CMakeLists.txt | 7 ++++++- atmos_cubed_sphere | 2 +- ccpp/physics | 2 +- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.gitmodules b/.gitmodules index d253f6966..aecf11377 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "atmos_cubed_sphere"] path = atmos_cubed_sphere - url = https://github.com/NOAA-EMC/GFDL_atmos_cubed_sphere + url = https://github.com/NOAA-GFDL/GFDL_atmos_cubed_sphere branch = dev/emc [submodule "ccpp/framework"] path = ccpp/framework @@ -8,5 +8,5 @@ branch = master [submodule "ccpp/physics"] path = ccpp/physics - url = https://github.com/NCAR/ccpp-physics - branch = master + url = https://github.com/XiaqiongZhou-NOAA/ccpp-physics + branch = 202101 diff --git a/CMakeLists.txt b/CMakeLists.txt index df1fc2344..b278a0dc8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -47,8 +47,12 @@ list(APPEND _fv3dycore_srcs atmos_cubed_sphere/model/tp_core.F90 atmos_cubed_sphere/model/nh_core.F90 atmos_cubed_sphere/model/nh_utils.F90 + atmos_cubed_sphere/tools/coarse_grained_diagnostics.F90 + atmos_cubed_sphere/tools/coarse_grained_restart_files.F90 + atmos_cubed_sphere/tools/coarse_graining.F90 atmos_cubed_sphere/tools/external_ic.F90 atmos_cubed_sphere/tools/external_sst.F90 + atmos_cubed_sphere/tools/fv_diag_column.F90 atmos_cubed_sphere/tools/fv_diagnostics.F90 atmos_cubed_sphere/tools/fv_eta.F90 atmos_cubed_sphere/tools/fv_grid_tools.F90 @@ -103,7 +107,8 @@ set_target_properties(fv3dycore PROPERTIES Fortran_MODULE_DIRECTORY ${CMAKE_CURR target_compile_definitions(fv3dycore PRIVATE "${_fv3dycore_defs_private}") target_include_directories(fv3dycore PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/atmos_cubed_sphere - ${CMAKE_CURRENT_BINARY_DIR}/ccpp/driver/mod) + ${CMAKE_CURRENT_SOURCE_DIR}/atmos_cubed_sphere/tools + ${CMAKE_CURRENT_BINARY_DIR}/ccpp/driver/mod) target_include_directories(fv3dycore INTERFACE $ $) diff --git a/atmos_cubed_sphere b/atmos_cubed_sphere index 306ff3137..20b3da489 160000 --- a/atmos_cubed_sphere +++ b/atmos_cubed_sphere @@ -1 +1 @@ -Subproject commit 306ff31371e74694e5d9f4a57584295c7122b9ac +Subproject commit 20b3da4895d1cf36571673b17939a4c8a7c3bbce diff --git a/ccpp/physics b/ccpp/physics index 7242a6de9..96bb85e86 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 7242a6de94466d49c9e9150c43b7c0e75a655bb0 +Subproject commit 96bb85e86f588de4583f29423e4c66b2fc85ac32 From 50e89c5fd733cfc73bb1531ec14d9fc112bd04a8 Mon Sep 17 00:00:00 2001 From: "xiaqiong.zhou" Date: Fri, 26 Mar 2021 13:17:53 +0000 Subject: [PATCH 2/7] Update ccpp_physics --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index 96bb85e86..935a3f775 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 96bb85e86f588de4583f29423e4c66b2fc85ac32 +Subproject commit 935a3f7750a076e2a34ae8ed4f54e6f4c4bafeee From 534d8bd1e1d52b8492e6c2817665d93f33c4493b Mon Sep 17 00:00:00 2001 From: "xiaqiong.zhou" Date: Fri, 26 Mar 2021 13:57:05 +0000 Subject: [PATCH 3/7] =?UTF-8?q?=C3=AF=C2=BC=C3=A2=C2=80update=20dycore?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- atmos_cubed_sphere | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/atmos_cubed_sphere b/atmos_cubed_sphere index 20b3da489..b144fc24b 160000 --- a/atmos_cubed_sphere +++ b/atmos_cubed_sphere @@ -1 +1 @@ -Subproject commit 20b3da4895d1cf36571673b17939a4c8a7c3bbce +Subproject commit b144fc24b391378bcf0e6aa2e6b4e073d5e29819 From 7df568e664f0c508653b0a6cae44589d476a85b4 Mon Sep 17 00:00:00 2001 From: "xiaqiong.zhou" Date: Sat, 27 Mar 2021 01:29:25 +0000 Subject: [PATCH 4/7] Point ccpp-physics to a new version --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index 935a3f775..02ee43319 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 935a3f7750a076e2a34ae8ed4f54e6f4c4bafeee +Subproject commit 02ee43319fd2160628c1cbf32a802e5cecb2376f From d96cd1aa23eed32c3d359018581f4de6e5f5a0ab Mon Sep 17 00:00:00 2001 From: Xiaqiong Zhou Date: Mon, 29 Mar 2021 15:20:35 +0000 Subject: [PATCH 5/7] Point dycore to a new version --- atmos_cubed_sphere | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/atmos_cubed_sphere b/atmos_cubed_sphere index b144fc24b..03a7ae7dc 160000 --- a/atmos_cubed_sphere +++ b/atmos_cubed_sphere @@ -1 +1 @@ -Subproject commit b144fc24b391378bcf0e6aa2e6b4e073d5e29819 +Subproject commit 03a7ae7dc0b93ca9eec0f9e133bfceccf004b083 From 4ac148205dc47a95135ea67b787e374e5e40b9f2 Mon Sep 17 00:00:00 2001 From: Xiaqiong Zhou Date: Tue, 30 Mar 2021 12:33:28 +0000 Subject: [PATCH 6/7] Point ccpp_physics to NCAR master --- .gitmodules | 4 ++-- ccpp/physics | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index aecf11377..d12a4cfd1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -8,5 +8,5 @@ branch = master [submodule "ccpp/physics"] path = ccpp/physics - url = https://github.com/XiaqiongZhou-NOAA/ccpp-physics - branch = 202101 + url = https://github.com/NCAR/ccpp-physics + branch = master diff --git a/ccpp/physics b/ccpp/physics index 02ee43319..08b72bc1c 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 02ee43319fd2160628c1cbf32a802e5cecb2376f +Subproject commit 08b72bc1c23c48a823626d81f8e0a398685a35a3 From a5f886b4934dadd2c4c952b73b1dd695aacecc2a Mon Sep 17 00:00:00 2001 From: Xiaqiong Zhou Date: Tue, 30 Mar 2021 12:41:29 +0000 Subject: [PATCH 7/7] Remove extra space in .gitmodules --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index d12a4cfd1..1f7526633 100644 --- a/.gitmodules +++ b/.gitmodules @@ -8,5 +8,5 @@ branch = master [submodule "ccpp/physics"] path = ccpp/physics - url = https://github.com/NCAR/ccpp-physics + url = https://github.com/NCAR/ccpp-physics branch = master