From 6b921a377eed3db9bf6ef14f5164dbbf3a254e77 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Wed, 15 Dec 2021 16:41:35 -0700 Subject: [PATCH 1/4] Remove old comments from GFS_typedefs.F90, update .gitmodules and submodule pointer for ccpp-physics --- .gitmodules | 8 ++++++-- ccpp/data/GFS_typedefs.F90 | 18 ------------------ ccpp/physics | 2 +- 3 files changed, 7 insertions(+), 21 deletions(-) diff --git a/.gitmodules b/.gitmodules index 6bb663df1..0a34ee502 100644 --- a/.gitmodules +++ b/.gitmodules @@ -8,8 +8,12 @@ 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/RuiyuSun/ccpp-physics + #branch = cloud_cover_xr + url = https://github.com/climbfuji/ccpp-physics + branch = cloud_cover_xr_dom [submodule "upp"] path = upp url = https://github.com/NOAA-EMC/UPP diff --git a/ccpp/data/GFS_typedefs.F90 b/ccpp/data/GFS_typedefs.F90 index 3be66033f..f09b36099 100644 --- a/ccpp/data/GFS_typedefs.F90 +++ b/ccpp/data/GFS_typedefs.F90 @@ -5063,7 +5063,6 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, & Model%num_p3d = 4 Model%num_p2d = 3 Model%shcnvcw = .false. -! Model%ncnd = 1 ! ncnd is the number of cloud condensate types Model%nT2delt = 1 Model%nqv2delt = 2 Model%nTdelt = 3 @@ -5080,7 +5079,6 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, & Model%npdf3d = 3 Model%num_p3d = 4 Model%num_p2d = 3 -! Model%ncnd = 1 if (Model%me == Model%master) print *,'Using Zhao/Carr/Sundqvist Microphysics with PDF Cloud' else if (Model%imp_physics == Model%imp_physics_fer_hires) then ! Ferrier-Aligo scheme @@ -5089,8 +5087,6 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, & Model%num_p2d = 1 Model%pdfcld = .false. Model%shcnvcw = .false. - ! DH* REALLY ? -! Model%ncnd = 3 !???????? need to clarify this - Moorthi Model%nleffr = 1 Model%nieffr = 2 Model%nseffr = 3 @@ -5110,7 +5106,6 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, & !Model%num_p2d = 1 !Model%pdfcld = .false. !Model%shcnvcw = .false. -! !Model%ncnd = 5 !Model%nleffr = 1 !Model%nieffr = 2 !Model%nseffr = 3 @@ -5122,7 +5117,6 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, & Model%num_p2d = 1 Model%pdfcld = .false. Model%shcnvcw = .false. -! Model%ncnd = 5 Model%nleffr = 1 Model%nieffr = 2 Model%nseffr = 3 @@ -5153,7 +5147,6 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, & Model%num_p2d = 1 Model%pdfcld = .false. Model%shcnvcw = .false. -! Model%ncnd = 2 Model%nleffr = 2 Model%nieffr = 3 Model%nreffr = 4 @@ -5166,16 +5159,6 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, & print *,' Morrison-Gettelman MP requires nwat to be set to 6 - job aborted' stop end if -! if (abs(Model%fprcp) == 1) then -! Model%ncnd = 4 -! elseif (Model%fprcp >= 2) then -! Model%ncnd = 4 -! if (Model%mg_do_graupel .or. Model%mg_do_hail) then -! Model%ncnd = 5 -! endif -! Model%num_p3d = 6 -! Model%ngeffr = 6 -! endif if (Model%me == Model%master) & print *,' Using Morrison-Gettelman double moment microphysics', & ' iaerclm=', Model%iaerclm, ' iccn=', Model%iccn, & @@ -5212,7 +5195,6 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, & Model%num_p2d = 1 Model%pdfcld = .false. Model%shcnvcw = .false. -! Model%ncnd = 5 if (nwat /= 6) then print *,' GFDL MP requires nwat to be set to 6 - job aborted' stop diff --git a/ccpp/physics b/ccpp/physics index 98ebf42c0..39954f5a9 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 98ebf42c08d960addf4debe08226aff79e960211 +Subproject commit 39954f5a996a95aec058e1522cad276bc94c9c2b From 93ab9c37f2e6f11bac2b0ea49af3ed76839638b1 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Thu, 16 Dec 2021 06:53:04 -0700 Subject: [PATCH 2/4] Update logic that sets Model%cnvcld = .false. --- .gitmodules | 6 ++---- ccpp/data/GFS_typedefs.F90 | 2 +- ccpp/physics | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.gitmodules b/.gitmodules index 0a34ee502..4f1d3777c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -10,10 +10,8 @@ path = ccpp/physics #url = https://github.com/NCAR/ccpp-physics #branch = main - #url = https://github.com/RuiyuSun/ccpp-physics - #branch = cloud_cover_xr - url = https://github.com/climbfuji/ccpp-physics - branch = cloud_cover_xr_dom + url = https://github.com/RuiyuSun/ccpp-physics + branch = cloud_cover_xr [submodule "upp"] path = upp url = https://github.com/NOAA-EMC/UPP diff --git a/ccpp/data/GFS_typedefs.F90 b/ccpp/data/GFS_typedefs.F90 index f09b36099..280f9aa76 100644 --- a/ccpp/data/GFS_typedefs.F90 +++ b/ccpp/data/GFS_typedefs.F90 @@ -5208,7 +5208,7 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, & endif if(Model%ras .or. Model%cscnv) Model%cnvcld = .false. - if(Model%do_shoc .or. Model%pdfcld .or. Model%do_mynnedmf) Model%cnvcld = .false. + if(Model%do_shoc .or. Model%pdfcld .or. Model%do_mynnedmf .or. Model%imfdeepcnv == Model%imfdeepcnv_gf) Model%cnvcld = .false. if(Model%cnvcld) Model%ncnvcld3d = 1 !--- get cnvwind index in phy_f2d; last entry in phy_f2d array diff --git a/ccpp/physics b/ccpp/physics index 39954f5a9..890df49c4 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 39954f5a996a95aec058e1522cad276bc94c9c2b +Subproject commit 890df49c48af34c7d6db972962182aa40becc8c9 From f87fa9cdbf75c68f5b2fc7bc36bce27df571ec41 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Fri, 17 Dec 2021 09:13:58 -0700 Subject: [PATCH 3/4] Update submodule pointer for ccpp-physics --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index d1bac2525..5600c0983 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit d1bac252555c758ba4bf43bd72d90162906b389d +Subproject commit 5600c0983384d46fbea68b1201108e0b3cfcc08a From b6eed5ce5175ea7a18ac84526933357f9c2346d7 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Mon, 20 Dec 2021 08:07:05 -0700 Subject: [PATCH 4/4] 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 4f1d3777c..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/RuiyuSun/ccpp-physics - branch = cloud_cover_xr + 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 5600c0983..84654b79d 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 5600c0983384d46fbea68b1201108e0b3cfcc08a +Subproject commit 84654b79d526d5c2ce8f3851629d46152ee4936c