From 71df7532b6b87a91911ba3aed4a99d49059d1131 Mon Sep 17 00:00:00 2001 From: "Chunxi.Zhang-NOAA" Date: Tue, 15 Mar 2022 14:38:48 +0000 Subject: [PATCH 1/7] change ccpp-physics branch to feature/p8c_pbl_cp branch --- .gitmodules | 6 ++++-- ccpp/physics | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 6bb663df1..1c473f14e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -8,8 +8,10 @@ branch = main [submodule "ccpp/physics"] path = ccpp/physics - url = https://github.com/NCAR/ccpp-physics - branch = main +# url = https://github.com/NCAR/ccpp-physics +# branch = main + url = https://github.com/ChunxiZhang-NOAA/ccpp-physics + branch = feature/p8c_pbl_cp [submodule "upp"] path = upp url = https://github.com/NOAA-EMC/UPP diff --git a/ccpp/physics b/ccpp/physics index 979324a89..54a57baa8 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 979324a89894133473c4663fc490d04cdce57ac0 +Subproject commit 54a57baa8d8874a09081cd3b51fc9dc4d53ad4e8 From 902f97a941b28fd3126ba1bfd615e58f663bfa5e Mon Sep 17 00:00:00 2001 From: "Chunxi.Zhang-NOAA" Date: Tue, 29 Mar 2022 17:45:15 +0000 Subject: [PATCH 2/7] change ccpp/physics in feature/p8c_pbl_cp branch --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index 66b0ebf53..e8dc72338 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 66b0ebf530585c8999f684fdfe0a83d064262fd9 +Subproject commit e8dc7233804baa920a3c044a39d29a56d9b18930 From 45967c0863a919c75c5ded4a023544aa19aa248a Mon Sep 17 00:00:00 2001 From: "Chunxi.Zhang-NOAA" Date: Tue, 29 Mar 2022 17:59:22 +0000 Subject: [PATCH 3/7] revised GFS_typedefs.F90 for the paramters in the saSAS scheme --- ccpp/data/GFS_typedefs.F90 | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/ccpp/data/GFS_typedefs.F90 b/ccpp/data/GFS_typedefs.F90 index 25f3de765..2666d59b0 100644 --- a/ccpp/data/GFS_typedefs.F90 +++ b/ccpp/data/GFS_typedefs.F90 @@ -3476,12 +3476,11 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, & real(kind=kind_phys) :: ral_ts = 0.0d0 !< time scale for Rayleigh damping in days !--- mass flux deep convection -! real(kind=kind_phys) :: clam_deep = 0.1 !< c_e for deep convection (Han and Pan, 2011, eq(6)) - real(kind=kind_phys) :: clam_deep = 0.07 !< c_e for deep convection (Han and Pan, 2011, eq(6)) + real(kind=kind_phys) :: clam_deep = 0.1 !< c_e for deep convection (Han and Pan, 2011, eq(6)) real(kind=kind_phys) :: c0s_deep = 0.002 !< convective rain conversion parameter real(kind=kind_phys) :: c1_deep = 0.002 !< conversion parameter of detrainment from liquid water into grid-scale cloud water - real(kind=kind_phys) :: betal_deep = 0.01 !< fraction factor of downdraft air mass reaching ground surface over land - real(kind=kind_phys) :: betas_deep = 0.01 !< fraction factor of downdraft air mass reaching ground surface over sea + real(kind=kind_phys) :: betal_deep = 0.05 !< fraction factor of downdraft air mass reaching ground surface over land + real(kind=kind_phys) :: betas_deep = 0.05 !< fraction factor of downdraft air mass reaching ground surface over sea real(kind=kind_phys) :: evef = 0.09 !< evaporation factor from convective rain real(kind=kind_phys) :: evfact_deep = 0.3 !< evaporation factor from convective rain real(kind=kind_phys) :: evfactl_deep = 0.3 !< evaporation factor from convective rain over land From 429d0469c92d200fa058aca6c6bd17adac7f9568 Mon Sep 17 00:00:00 2001 From: "Chunxi.Zhang-NOAA" Date: Wed, 30 Mar 2022 21:29:24 +0000 Subject: [PATCH 4/7] sync upp --- upp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/upp b/upp index 0dc3c0c1d..5bdb289d1 160000 --- a/upp +++ b/upp @@ -1 +1 @@ -Subproject commit 0dc3c0c1dbdcdc5025dff0c6b06b16aa2a7ddda9 +Subproject commit 5bdb289d1a2c084ba4c50dfb3a653a11fbadb482 From bc47a574872d68237a9ccbccdbd299d92f5eb320 Mon Sep 17 00:00:00 2001 From: "Chunxi.Zhang-NOAA" Date: Wed, 30 Mar 2022 21:53:32 +0000 Subject: [PATCH 5/7] Revert "sync upp" This reverts commit 429d0469c92d200fa058aca6c6bd17adac7f9568. --- upp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/upp b/upp index 5bdb289d1..0dc3c0c1d 160000 --- a/upp +++ b/upp @@ -1 +1 @@ -Subproject commit 5bdb289d1a2c084ba4c50dfb3a653a11fbadb482 +Subproject commit 0dc3c0c1dbdcdc5025dff0c6b06b16aa2a7ddda9 From 80ab65744a27b3d00b1119ca7ac3251fbc0c7113 Mon Sep 17 00:00:00 2001 From: "Chunxi.Zhang-NOAA" Date: Wed, 30 Mar 2022 22:01:20 +0000 Subject: [PATCH 6/7] sync upp to 0185bb9 --- upp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/upp b/upp index 0dc3c0c1d..0185bb9f2 160000 --- a/upp +++ b/upp @@ -1 +1 @@ -Subproject commit 0dc3c0c1dbdcdc5025dff0c6b06b16aa2a7ddda9 +Subproject commit 0185bb9f23ca9c9e96a22bf7ce09baa04c7d3491 From 661d253b40c60cc5912b4b2cce095c2c9571da73 Mon Sep 17 00:00:00 2001 From: "Chunxi.Zhang-NOAA" Date: Mon, 4 Apr 2022 13:57:22 +0000 Subject: [PATCH 7/7] Merge remote-tracking branch remote/main for ccpp-physics and update .gitmodules --- .gitmodules | 6 ++---- ccpp/physics | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index 1c473f14e..6bb663df1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -8,10 +8,8 @@ branch = main [submodule "ccpp/physics"] path = ccpp/physics -# url = https://github.com/NCAR/ccpp-physics -# branch = main - url = https://github.com/ChunxiZhang-NOAA/ccpp-physics - branch = feature/p8c_pbl_cp + url = https://github.com/NCAR/ccpp-physics + branch = main [submodule "upp"] path = upp url = https://github.com/NOAA-EMC/UPP diff --git a/ccpp/physics b/ccpp/physics index 3ee7678bb..6d4acb149 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 3ee7678bb3c9ab889c584fc975715f5760917802 +Subproject commit 6d4acb149ec5a54051359659a2be7dcebbb4976a