From 984c430e4b7f7492195614ecfe24c2179933dd32 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Fri, 19 Nov 2021 11:29:09 -0700 Subject: [PATCH 01/17] Add additional diagnostic arrays for radiation-microphysics development --- ccpp/data/GFS_typedefs.F90 | 22 ++++++- ccpp/data/GFS_typedefs.meta | 42 ++++++++++++ ccpp/driver/GFS_diagnostics.F90 | 112 ++++++++++++++++++++++++++++++++ ccpp/physics | 2 +- 4 files changed, 175 insertions(+), 3 deletions(-) diff --git a/ccpp/data/GFS_typedefs.F90 b/ccpp/data/GFS_typedefs.F90 index cd01dbbc8..5ae6f4f38 100644 --- a/ccpp/data/GFS_typedefs.F90 +++ b/ccpp/data/GFS_typedefs.F90 @@ -1660,6 +1660,12 @@ module GFS_typedefs real (kind=kind_phys), pointer :: cldfra (:,:) => null() !< instantaneous 3D cloud fraction !--- MP quantities for 3D diagnositics real (kind=kind_phys), pointer :: refl_10cm(:,:) => null() !< instantaneous refl_10cm + real (kind=kind_phys), pointer :: cldfra2d (:) => null() !< instantaneous 2D cloud fraction + real (kind=kind_phys), pointer :: total_albedo (:) => null() !< total sky (with cloud) albedo at toa + real (kind=kind_phys), pointer :: lwp_ex (:) => null() !< liquid water path from microphysics + real (kind=kind_phys), pointer :: iwp_ex (:) => null() !< ice water path from microphysics + real (kind=kind_phys), pointer :: lwp_fc (:) => null() !< liquid water path from cloud fraction scheme + real (kind=kind_phys), pointer :: iwp_fc (:) => null() !< ice water path from cloud fraction scheme !--- Extra PBL diagnostics real (kind=kind_phys), pointer :: dkt(:,:) => null() !< Eddy diffusitivity for heat @@ -6500,7 +6506,13 @@ subroutine diag_create (Diag, IM, Model) if (Model%imp_physics == Model%imp_physics_fer_hires) then allocate (Diag%train (IM,Model%levs)) end if - allocate (Diag%cldfra (IM,Model%levs)) + allocate (Diag%cldfra (IM,Model%levr+LTP)) + allocate (Diag%cldfra2d (IM)) + allocate (Diag%total_albedo (IM)) + allocate (Diag%lwp_ex (IM)) + allocate (Diag%iwp_ex (IM)) + allocate (Diag%lwp_fc (IM)) + allocate (Diag%iwp_fc (IM)) !--- 3D diagnostics if (Model%ldiag3d) then @@ -6757,6 +6769,12 @@ subroutine diag_phys_zero (Diag, Model, linit, iauwindow_center) Diag%train = zero end if Diag%cldfra = zero + Diag%cldfra2d = zero + Diag%total_albedo = zero + Diag%lwp_ex = zero + Diag%iwp_ex = zero + Diag%lwp_fc = zero + Diag%iwp_fc = zero Diag%totprcpb = zero Diag%cnvprcpb = zero @@ -6867,7 +6885,7 @@ subroutine diag_phys_zero (Diag, Model, linit, iauwindow_center) Diag%dku = zero ! max hourly diagnostics - Diag%refl_10cm = zero + Diag%refl_10cm = -35. Diag%refdmax = -35. Diag%refdmax263k = -35. Diag%t02max = -999. diff --git a/ccpp/data/GFS_typedefs.meta b/ccpp/data/GFS_typedefs.meta index 0b5abf86e..5b27d9ca4 100644 --- a/ccpp/data/GFS_typedefs.meta +++ b/ccpp/data/GFS_typedefs.meta @@ -7027,6 +7027,48 @@ dimensions = (horizontal_loop_extent,adjusted_vertical_layer_dimension_for_radiation) type = real kind = kind_phys +[cldfra2d] + standard_name = max_in_column_cloud_fraction + long_name = instantaneous 2D (max-in-column) cloud fraction + units = frac + dimensions = (horizontal_loop_extent) + type = real + kind = kind_phys +[lwp_ex] + standard_name = liq_water_path_from_microphysics + long_name = total liquid water path from explicit microphysics + units = kg m-2 + dimensions = (horizontal_loop_extent) + type = real + kind = kind_phys +[iwp_ex] + standard_name = ice_water_path_from_microphysics + long_name = total ice water path from explicit microphysics + units = kg m-2 + dimensions = (horizontal_loop_extent) + type = real + kind = kind_phys +[lwp_fc] + standard_name = liq_water_path_from_cloud_fraction + long_name = total liquid water path from cloud fraction scheme + units = kg m-2 + dimensions = (horizontal_loop_extent) + type = real + kind = kind_phys +[iwp_fc] + standard_name = ice_water_path_from_cloud_fraction + long_name = total ice water path from cloud fraction scheme + units = kg m-2 + dimensions = (horizontal_loop_extent) + type = real + kind = kind_phys +[total_albedo] + standard_name = total_sky_albedo + long_name = total sky albedo at toa + units = frac + dimensions = (horizontal_loop_extent) + type = real + kind = kind_phys [edmf_a] standard_name = emdf_updraft_area long_name = updraft area from mass flux scheme diff --git a/ccpp/driver/GFS_diagnostics.F90 b/ccpp/driver/GFS_diagnostics.F90 index 529700ca9..f49a5d7fc 100644 --- a/ccpp/driver/GFS_diagnostics.F90 +++ b/ccpp/driver/GFS_diagnostics.F90 @@ -160,6 +160,78 @@ subroutine GFS_externaldiag_populate (ExtDiag, Model, Statein, Stateout, Sfcprop idx = 0 + idx = idx + 1 + ExtDiag(idx)%axes = 2 + ExtDiag(idx)%name = 'cldfra2d' + ExtDiag(idx)%desc = 'instantaneous 2D (max-in-column) cloud fraction' + ExtDiag(idx)%unit = 'frac' + ExtDiag(idx)%mod_name = 'gfs_phys' + ExtDiag(idx)%intpl_method = 'bilinear' + allocate (ExtDiag(idx)%data(nblks)) + do nb = 1,nblks + ExtDiag(idx)%data(nb)%var2 => IntDiag(nb)%cldfra2d(:) + enddo + + idx = idx + 1 + ExtDiag(idx)%axes = 2 + ExtDiag(idx)%name = 'total_albedo' + ExtDiag(idx)%desc = 'total sky albedo at toa' + ExtDiag(idx)%unit = 'frac' + ExtDiag(idx)%mod_name = 'gfs_phys' + ExtDiag(idx)%intpl_method = 'bilinear' + allocate (ExtDiag(idx)%data(nblks)) + do nb = 1,nblks + ExtDiag(idx)%data(nb)%var2 => IntDiag(nb)%total_albedo(:) + enddo + + idx = idx + 1 + ExtDiag(idx)%axes = 2 + ExtDiag(idx)%name = 'lwp_ex' + ExtDiag(idx)%desc = 'total liquid water path from explicit microphysics' + ExtDiag(idx)%unit = 'kg m-2' + ExtDiag(idx)%mod_name = 'gfs_phys' + ExtDiag(idx)%intpl_method = 'bilinear' + allocate (ExtDiag(idx)%data(nblks)) + do nb = 1,nblks + ExtDiag(idx)%data(nb)%var2 => IntDiag(nb)%lwp_ex(:) + enddo + + idx = idx + 1 + ExtDiag(idx)%axes = 2 + ExtDiag(idx)%name = 'iwp_ex' + ExtDiag(idx)%desc = 'total ice water path from explicit microphysics' + ExtDiag(idx)%unit = 'kg m-2' + ExtDiag(idx)%mod_name = 'gfs_phys' + ExtDiag(idx)%intpl_method = 'bilinear' + allocate (ExtDiag(idx)%data(nblks)) + do nb = 1,nblks + ExtDiag(idx)%data(nb)%var2 => IntDiag(nb)%iwp_ex(:) + enddo + + idx = idx + 1 + ExtDiag(idx)%axes = 2 + ExtDiag(idx)%name = 'lwp_fc' + ExtDiag(idx)%desc = 'total liquid water path from cloud fraction scheme' + ExtDiag(idx)%unit = 'kg m-2' + ExtDiag(idx)%mod_name = 'gfs_phys' + ExtDiag(idx)%intpl_method = 'bilinear' + allocate (ExtDiag(idx)%data(nblks)) + do nb = 1,nblks + ExtDiag(idx)%data(nb)%var2 => IntDiag(nb)%lwp_fc(:) + enddo + + idx = idx + 1 + ExtDiag(idx)%axes = 2 + ExtDiag(idx)%name = 'iwp_fc' + ExtDiag(idx)%desc = 'total ice water path from cloud fraction scheme' + ExtDiag(idx)%unit = 'kg m-2' + ExtDiag(idx)%mod_name = 'gfs_phys' + ExtDiag(idx)%intpl_method = 'bilinear' + allocate (ExtDiag(idx)%data(nblks)) + do nb = 1,nblks + ExtDiag(idx)%data(nb)%var2 => IntDiag(nb)%iwp_fc(:) + enddo + idx = idx + 1 ExtDiag(idx)%axes = 2 ExtDiag(idx)%name = 'ALBDO_ave' @@ -215,6 +287,46 @@ subroutine GFS_externaldiag_populate (ExtDiag, Model, Statein, Stateout, Sfcprop ExtDiag(idx)%data(nb)%var2 => IntDiag(nb)%ulwsfc(:) enddo + idx = idx + 1 + ExtDiag(idx)%axes = 2 + ExtDiag(idx)%name = 'rad_swdnt' + ExtDiag(idx)%desc = 'instantaneous top of atmos downward shortwave flux' + ExtDiag(idx)%unit = 'W/m**2' + ExtDiag(idx)%mod_name = 'gfs_phys' + ExtDiag(idx)%cnvfac = cn_one + ExtDiag(idx)%intpl_method = 'bilinear' + allocate (ExtDiag(idx)%data(nblks)) + do nb = 1,nblks + ExtDiag(idx)%data(nb)%var2 => IntDiag(nb)%fluxr(:,23) + enddo + + + idx = idx + 1 + ExtDiag(idx)%axes = 2 + ExtDiag(idx)%name = 'rad_swupt' + ExtDiag(idx)%desc = 'instantaneous top of atmos upward shortwave flux' + ExtDiag(idx)%unit = 'W/m**2' + ExtDiag(idx)%mod_name = 'gfs_phys' + ExtDiag(idx)%cnvfac = cn_one + ExtDiag(idx)%intpl_method = 'bilinear' + allocate (ExtDiag(idx)%data(nblks)) + do nb = 1,nblks + ExtDiag(idx)%data(nb)%var2 => IntDiag(nb)%fluxr(:,2) + enddo + + idx = idx + 1 + ExtDiag(idx)%axes = 2 + ExtDiag(idx)%name = 'rad_lwupt' + ExtDiag(idx)%desc = 'instantaneous top of atmos upward longwave flux' + ExtDiag(idx)%unit = 'W/m**2' + ExtDiag(idx)%mod_name = 'gfs_phys' + ExtDiag(idx)%cnvfac = cn_one + ExtDiag(idx)%intpl_method = 'bilinear' + allocate (ExtDiag(idx)%data(nblks)) + do nb = 1,nblks + ExtDiag(idx)%data(nb)%var2 => IntDiag(nb)%fluxr(:,1) + enddo + idx = idx + 1 ExtDiag(idx)%axes = 2 ExtDiag(idx)%name = 'ULWRFI' diff --git a/ccpp/physics b/ccpp/physics index 27a312cd8..84593de03 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 27a312cd87705fe9e0f9ff0d2026744ad3cea14d +Subproject commit 84593de03f804564dbdb10ef71d6e1c5a4f801e8 From 6c961cc8c648c29ad032d692577c70c3e2cc28b5 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Tue, 23 Nov 2021 06:40:50 -0700 Subject: [PATCH 02/17] Bug fixes for WAM model runs with levr < levs --- ccpp/data/CCPP_typedefs.F90 | 4 ++-- ccpp/data/GFS_typedefs.F90 | 7 +++++-- ccpp/data/GFS_typedefs.meta | 6 +++--- ccpp/physics | 2 +- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/ccpp/data/CCPP_typedefs.F90 b/ccpp/data/CCPP_typedefs.F90 index 01695bc4a..1e2171838 100644 --- a/ccpp/data/CCPP_typedefs.F90 +++ b/ccpp/data/CCPP_typedefs.F90 @@ -141,8 +141,8 @@ subroutine interstitial_create (Interstitial, is, ie, isd, ied, js, je, jsd, jed ! For multi-gases physics integer, intent(in) :: nwat integer, intent(in), optional :: ngas - real(kind_dyn), intent(in), optional :: rilist(:) - real(kind_dyn), intent(in), optional :: cpilist(:) + real(kind_dyn), intent(in), optional :: rilist(0:) + real(kind_dyn), intent(in), optional :: cpilist(0:) integer, intent(in) :: mpirank integer, intent(in) :: mpiroot ! diff --git a/ccpp/data/GFS_typedefs.F90 b/ccpp/data/GFS_typedefs.F90 index 5ae6f4f38..9a410b45b 100644 --- a/ccpp/data/GFS_typedefs.F90 +++ b/ccpp/data/GFS_typedefs.F90 @@ -3880,6 +3880,9 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, & if (levr < 0) then Model%levr = levs + else if (levr > levs) then + write(0,*) "Logic error, number of radiatiton levels (levr) cannot exceed number of model levels (levs)" + stop else Model%levr = levr endif @@ -4767,12 +4770,12 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, & Model%restart = restart Model%hydrostatic = hydrostatic Model%jdat(1:8) = jdat(1:8) - allocate(Model%si(Model%levr+1)) + allocate(Model%si(Model%levs+1)) !--- Define sigma level for radiation initialization !--- The formula converting hybrid sigma pressure coefficients to sigma coefficients follows Eckermann (2009, MWR) !--- ps is replaced with p0. The value of p0 uses that in http://www.emc.ncep.noaa.gov/officenotes/newernotes/on461.pdf !--- ak/bk have been flipped from their original FV3 orientation and are defined sfc -> toa - Model%si = (ak + bk * con_p0 - ak(Model%levr+1)) / (con_p0 - ak(Model%levr+1)) + Model%si(1:Model%levs+1) = (ak(1:Model%levs+1) + bk(1:Model%levs+1) * con_p0 - ak(Model%levs+1)) / (con_p0 - ak(Model%levs+1)) Model%sec = 0 Model%yearlen = 365 Model%julian = -9999. diff --git a/ccpp/data/GFS_typedefs.meta b/ccpp/data/GFS_typedefs.meta index 5b27d9ca4..d840e8d6a 100644 --- a/ccpp/data/GFS_typedefs.meta +++ b/ccpp/data/GFS_typedefs.meta @@ -2505,13 +2505,13 @@ standard_name = sigma_pressure_hybrid_coordinate_a_coefficient long_name = a parameter for sigma pressure level calculations units = Pa - dimensions = (vertical_interface_dimension_for_radiation) + dimensions = (vertical_interface_dimension) type = real [bk] standard_name = sigma_pressure_hybrid_coordinate_b_coefficient long_name = b parameter for sigma pressure level calculations units = none - dimensions = (vertical_interface_dimension_for_radiation) + dimensions = (vertical_interface_dimension) type = real [levsp1] standard_name = vertical_interface_dimension @@ -5205,7 +5205,7 @@ standard_name = sigma_pressure_hybrid_vertical_coordinate long_name = vertical sigma coordinate for radiation initialization units = none - dimensions = (vertical_interface_dimension_for_radiation) + dimensions = (vertical_interface_dimension) type = real kind = kind_phys [dxinv] diff --git a/ccpp/physics b/ccpp/physics index 84593de03..aba5331ea 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 84593de03f804564dbdb10ef71d6e1c5a4f801e8 +Subproject commit aba5331ea8d1807ef501da0ea83b777fed975e97 From d3ab491d04bfeb0f619cd67cf48fdc6a4bc1ee26 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Tue, 23 Nov 2021 10:14:36 -0700 Subject: [PATCH 03/17] Update submodule pointer for ccpp-physocs --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index 84593de03..112077914 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 84593de03f804564dbdb10ef71d6e1c5a4f801e8 +Subproject commit 112077914442e3555effbba0a4a231483206ce8a From 086f326f290af03e6aac650d72a12f21232851ca Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Tue, 23 Nov 2021 14:46:11 -0700 Subject: [PATCH 04/17] 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 a54f243ae..91feb6523 100644 --- a/.gitmodules +++ b/.gitmodules @@ -8,5 +8,7 @@ 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/gthompsnWRF/ccpp-physics + branch = new_thompson_cloud_fraction diff --git a/ccpp/physics b/ccpp/physics index 112077914..7e119fc85 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 112077914442e3555effbba0a4a231483206ce8a +Subproject commit 7e119fc859eb7c3fe705538e2da701b5a9dad2f5 From 4cb7110ad8fb5dad4ff8bd4c8bbe3d2b5882af97 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Mon, 29 Nov 2021 16:15:24 -0700 Subject: [PATCH 05/17] 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 cd00e167a..f1dd32788 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit cd00e167a705672e8df27bf78a276643716b4dbe +Subproject commit f1dd32788a1bab3706239066df949c6ebdba9108 From 6bc920db138d7fb9b49eb97577c7fd8fd3566702 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Mon, 6 Dec 2021 15:02:22 -0700 Subject: [PATCH 06/17] 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 a54f243ae..12910d427 100644 --- a/.gitmodules +++ b/.gitmodules @@ -8,5 +8,7 @@ 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/climbfuji/ccpp-physics + branch = wam_debug_and_thompson_suggestions diff --git a/ccpp/physics b/ccpp/physics index aba5331ea..15513be21 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit aba5331ea8d1807ef501da0ea83b777fed975e97 +Subproject commit 15513be21b598036843ac4b22a921f9a4c670a48 From 6163991568736d0eeff5f4ba10aeb6e90e9ea980 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Mon, 6 Dec 2021 15:21:09 -0700 Subject: [PATCH 07/17] Change output names of new radiation diagnostic variables in ccpp/driver/GFS_diagnostics.F90 --- ccpp/driver/GFS_diagnostics.F90 | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/ccpp/driver/GFS_diagnostics.F90 b/ccpp/driver/GFS_diagnostics.F90 index 4c39c7d24..8d9e67cdb 100644 --- a/ccpp/driver/GFS_diagnostics.F90 +++ b/ccpp/driver/GFS_diagnostics.F90 @@ -272,7 +272,6 @@ subroutine GFS_externaldiag_populate (ExtDiag, Model, Statein, Stateout, Sfcprop ExtDiag(idx)%data(nb)%var2 => IntDiag(nb)%dlwsfci(:) enddo - idx = idx + 1 ExtDiag(idx)%axes = 2 ExtDiag(idx)%name = 'ULWRF' @@ -289,7 +288,7 @@ subroutine GFS_externaldiag_populate (ExtDiag, Model, Statein, Stateout, Sfcprop idx = idx + 1 ExtDiag(idx)%axes = 2 - ExtDiag(idx)%name = 'rad_swdnt' + ExtDiag(idx)%name = 'DSWRFItoa' ExtDiag(idx)%desc = 'instantaneous top of atmos downward shortwave flux' ExtDiag(idx)%unit = 'W/m**2' ExtDiag(idx)%mod_name = 'gfs_phys' @@ -300,10 +299,9 @@ subroutine GFS_externaldiag_populate (ExtDiag, Model, Statein, Stateout, Sfcprop ExtDiag(idx)%data(nb)%var2 => IntDiag(nb)%fluxr(:,23) enddo - idx = idx + 1 ExtDiag(idx)%axes = 2 - ExtDiag(idx)%name = 'rad_swupt' + ExtDiag(idx)%name = 'USWRFItoa' ExtDiag(idx)%desc = 'instantaneous top of atmos upward shortwave flux' ExtDiag(idx)%unit = 'W/m**2' ExtDiag(idx)%mod_name = 'gfs_phys' @@ -316,7 +314,7 @@ subroutine GFS_externaldiag_populate (ExtDiag, Model, Statein, Stateout, Sfcprop idx = idx + 1 ExtDiag(idx)%axes = 2 - ExtDiag(idx)%name = 'rad_lwupt' + ExtDiag(idx)%name = 'ULWRFItoa' ExtDiag(idx)%desc = 'instantaneous top of atmos upward longwave flux' ExtDiag(idx)%unit = 'W/m**2' ExtDiag(idx)%mod_name = 'gfs_phys' From 7165cd02d307a2db8c296bae353b24c7a5d507a3 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Tue, 7 Dec 2021 15:17:59 -0700 Subject: [PATCH 08/17] 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 8edb75932..b5b237ec6 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 8edb75932ae282fbebae230d591e288a1fa71f3a +Subproject commit b5b237ec6a1ecf7f49a83b5e6360b9bb714bcf07 From fbd7b521bbbbb8fedd1d0c6b54348ce880554af6 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Thu, 9 Dec 2021 10:28:03 -0700 Subject: [PATCH 09/17] 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 00b428482..a1cfb1605 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 00b428482b658086ae2fa2f1df91a60903bd4185 +Subproject commit a1cfb1605e02f8159265847e87ccd1e346396cd4 From c03355580f082b04e8ddd4c8af1c4de9dd3d7ffd Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Thu, 9 Dec 2021 19:41:50 -0700 Subject: [PATCH 10/17] 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 a1cfb1605..d76a4e974 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit a1cfb1605e02f8159265847e87ccd1e346396cd4 +Subproject commit d76a4e974d47ca5d8c198f879c3ac143e6fb358d From 8e4866be39c5d7f58737fd63fe1b04775a917a19 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Thu, 9 Dec 2021 20:26:35 -0700 Subject: [PATCH 11/17] Fix ccpp-physics branch name in .gitmodules --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 9a59c0836..033b79321 100644 --- a/.gitmodules +++ b/.gitmodules @@ -11,7 +11,7 @@ #url = https://github.com/NCAR/ccpp-physics #branch = main url = https://github.com/gthompsnWRF/ccpp-physics - branch = new_thompson_cloud_fraction + branch = greg_new_thompson_cloud_fraction_with_ruiyu_cloud_cover_change_xu_randall [submodule "upp"] path = upp url = https://github.com/NOAA-EMC/UPP From 4e5639f2bdff7f30e65b488e31c2022daa8af1eb Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Thu, 9 Dec 2021 20:40:22 -0700 Subject: [PATCH 12/17] Fix .gitmodules one more time --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 033b79321..82791542c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -10,7 +10,7 @@ path = ccpp/physics #url = https://github.com/NCAR/ccpp-physics #branch = main - url = https://github.com/gthompsnWRF/ccpp-physics + url = https://github.com/climbfuji/ccpp-physics branch = greg_new_thompson_cloud_fraction_with_ruiyu_cloud_cover_change_xu_randall [submodule "upp"] path = upp From b10942fed69294b357db83951da3ff9e55068e86 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Thu, 9 Dec 2021 20:52:31 -0700 Subject: [PATCH 13/17] 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 d76a4e974..6788593c4 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit d76a4e974d47ca5d8c198f879c3ac143e6fb358d +Subproject commit 6788593c46a44463a2f6491ce2ea345764114aa8 From e961f388b9fcd495073b2fb130561b2947d08103 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Wed, 22 Dec 2021 13:05:18 -0700 Subject: [PATCH 14/17] 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 bca4fcec4..c73a22a50 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit bca4fcec47c1cd8d21abfe9cd976f1cb39c86805 +Subproject commit c73a22a507c6d480e8ed2f34ab7436eaaccdcd51 From 33d41affd6241b088b33fc2422e746e13a705f77 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Wed, 22 Dec 2021 13:33:01 -0700 Subject: [PATCH 15/17] 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 c73a22a50..b6dcb5220 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit c73a22a507c6d480e8ed2f34ab7436eaaccdcd51 +Subproject commit b6dcb52209056db5bd0b552f2ffa81c2cc23e725 From 16629268971eb9446bee9d595231e99c9b1b105b Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Tue, 28 Dec 2021 20:52:57 -0700 Subject: [PATCH 16/17] Update submodule pointer fr ccpp-physics --- .gitmodules | 2 +- ccpp/physics | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index b34dd296c..42e985d03 100644 --- a/.gitmodules +++ b/.gitmodules @@ -11,7 +11,7 @@ #url = https://github.com/NCAR/ccpp-physics #branch = main url = https://github.com/climbfuji/ccpp-physics - branch = wam_debug_and_thompson_suggestions + branch = wam_debug_only [submodule "upp"] path = upp url = https://github.com/NOAA-EMC/UPP diff --git a/ccpp/physics b/ccpp/physics index 2d73cc836..da362d6be 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 2d73cc8362b0135d1cfca31b2d777f6c11685847 +Subproject commit da362d6bebacdd332185bcda533c1b6ed3cec0ef From fc17228d9bbc888058c24eacd8820783e09fef84 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Thu, 30 Dec 2021 06:51:48 -0700 Subject: [PATCH 17/17] Revert .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 42e985d03..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/climbfuji/ccpp-physics - branch = wam_debug_only + 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 da362d6be..1f907e44a 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit da362d6bebacdd332185bcda533c1b6ed3cec0ef +Subproject commit 1f907e44aa47224c22c7d34f19b0f840facd9eb8