From d2cd7d2b15863a3f2e1b8b9bbdf001e927ff2e87 Mon Sep 17 00:00:00 2001 From: Dustin Swales Date: Wed, 1 Sep 2021 14:14:45 +0000 Subject: [PATCH 01/11] Update to physics. New field added to GFS_coupling_type --- ccpp/data/GFS_typedefs.F90 | 3 +++ ccpp/data/GFS_typedefs.meta | 8 ++++++++ ccpp/physics | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ccpp/data/GFS_typedefs.F90 b/ccpp/data/GFS_typedefs.F90 index 17ca800cd..a5c64e343 100644 --- a/ccpp/data/GFS_typedefs.F90 +++ b/ccpp/data/GFS_typedefs.F90 @@ -446,6 +446,7 @@ module GFS_typedefs real (kind=kind_phys), pointer :: fluxlwUP_allsky(:,:) => null() !< GP up LW total sky flux profile ( w/m**2/K ) real (kind=kind_phys), pointer :: fluxlwDOWN_allsky(:,:) => null() !< GP down LW total sky flux profile ( w/m**2/K ) real (kind=kind_phys), pointer :: htrlw(:,:) => null() !< GP updated LW heating rate + real (kind=kind_phys), pointer :: tsfc_radtime(:) => null() !< GP surface temperature on radiation timestep !--- incoming quantities real (kind=kind_phys), pointer :: dusfcin_cpl(:) => null() !< aoi_fld%dusfcin(item,lan) @@ -2810,10 +2811,12 @@ subroutine coupling_create (Coupling, IM, Model) allocate (Coupling%fluxlwUP_allsky (IM,Model%levs+1)) allocate (Coupling%fluxlwDOWN_allsky (IM,Model%levs+1)) allocate (Coupling%htrlw (IM,Model%levs)) + allocate (Coupling%tsfc_radtime (IM)) Coupling%fluxlwUP_jac = clear_val Coupling%fluxlwUP_allsky = clear_val Coupling%fluxlwDOWN_allsky = clear_val Coupling%htrlw = clear_val + Coupling%tsfc_radtime = clear_val endif if (Model%cplflx .or. Model%do_sppt .or. Model%cplchm .or. Model%ca_global) then diff --git a/ccpp/data/GFS_typedefs.meta b/ccpp/data/GFS_typedefs.meta index dc1be40e2..e04131d6d 100644 --- a/ccpp/data/GFS_typedefs.meta +++ b/ccpp/data/GFS_typedefs.meta @@ -1779,6 +1779,14 @@ type = real kind = kind_phys active = (flag_for_rrtmgp_radiation_scheme) +[tsfc_radtime] + standard_name = surface_skin_temperature_on_radiation_timestep + long_name = surface skin temperature on radiation timestep + units = K + dimensions = (horizontal_loop_extent) + type = real + kind = kind_phys + active = (flag_for_rrtmgp_radiation_scheme) [fluxlwUP_jac] standard_name = RRTMGP_jacobian_of_lw_flux_upward long_name = RRTMGP Jacobian upward longwave flux profile diff --git a/ccpp/physics b/ccpp/physics index cabe68f4a..87f513a86 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit cabe68f4a933f72276c12c557a5d6b4a0d909d7d +Subproject commit 87f513a86faadc525532855cfee58d5bd9f58437 From 89962c7c9e1b36d1578f252e8d170c4ca973af70 Mon Sep 17 00:00:00 2001 From: Dustin Swales Date: Tue, 21 Sep 2021 15:29:51 +0000 Subject: [PATCH 02/11] Cleanup metadata. New field for RRTMGP pressure limit. --- ccpp/data/GFS_typedefs.F90 | 5 +++++ ccpp/data/GFS_typedefs.meta | 15 +++++++++++---- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/ccpp/data/GFS_typedefs.F90 b/ccpp/data/GFS_typedefs.F90 index a5c64e343..7077f8a92 100644 --- a/ccpp/data/GFS_typedefs.F90 +++ b/ccpp/data/GFS_typedefs.F90 @@ -741,6 +741,7 @@ module GFS_typedefs real(kind_phys) :: lfnc_p0 !< Logistic function transition level (Pa) logical :: doGP_lwscat !< If true, include scattering in longwave cloud-optics, only compatible w/ GP cloud-optics real(kind_phys) :: minGPpres !< Minimum pressure allowed in RRTMGP. + real(kind_phys) :: maxGPpres !< Maximum pressure allowed in RRTMGP. real(kind_phys) :: minGPtemp !< Minimum temperature allowed in RRTMGP. real(kind_phys) :: maxGPtemp !< Maximum temperature allowed in RRTMGP. @@ -3998,6 +3999,10 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, & write(0,*) "Logic error, Both RRTMGP cloud-optics options cannot be selected. " stop end if + if (.not. Model%doGP_cldoptics_PADE .and. .not. Model%doGP_cldoptics_LUT .and. .not. Model%doG_cldoptics) then + write(0,*) "Logic error, No option for cloud-optics scheme provided. Using RRTMG cloud-optics" + Model%doG_cldoptics = .true. + end if if (Model%rrtmgp_nGptsSW .lt. 0 .or. Model%rrtmgp_nGptsLW .lt. 0 .or. & Model%rrtmgp_nBandsSW .lt. 0 .or. Model%rrtmgp_nBandsLW .lt. 0) then write(0,*) "Logic error, RRTMGP spectral dimensions (bands/gpts) need to be provided." diff --git a/ccpp/data/GFS_typedefs.meta b/ccpp/data/GFS_typedefs.meta index e04131d6d..eb6d18c9e 100644 --- a/ccpp/data/GFS_typedefs.meta +++ b/ccpp/data/GFS_typedefs.meta @@ -2991,6 +2991,13 @@ dimensions = () type = real kind = kind_phys +[maxGPpres] + standard_name = maximum_pressure_in_RRTMGP + long_name = maximum pressure allowed in RRTMGP + units = Pa + dimensions = () + type = real + kind = kind_phys [minGPtemp] standard_name = minimum_temperature_in_RRTMGP long_name = minimum temperature allowed in RRTMGP @@ -10127,17 +10134,17 @@ optional = F active = (flag_for_rrtmgp_radiation_scheme) [p_lay] - standard_name = air_pressure_at_layer_for_RRTMGP_in_hPa + standard_name = air_pressure_at_layer_for_RRTMGP long_name = air pressure layer - units = hPa + units = Pa dimensions = (horizontal_loop_extent,vertical_layer_dimension) type = real kind = kind_phys active = (flag_for_rrtmgp_radiation_scheme) [p_lev] - standard_name = air_pressure_at_interface_for_RRTMGP_in_hPa + standard_name = air_pressure_at_interface_for_RRTMGP long_name = air pressure level - units = hPa + units = Pa dimensions = (horizontal_loop_extent,vertical_interface_dimension) type = real kind = kind_phys From e2837c17d75842b257c2046ba077af3f70309757 Mon Sep 17 00:00:00 2001 From: Dustin Swales Date: Tue, 21 Sep 2021 15:30:27 +0000 Subject: [PATCH 03/11] Updated physics --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index 87f513a86..e6843a3ec 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 87f513a86faadc525532855cfee58d5bd9f58437 +Subproject commit e6843a3ec5424164925ccad5723aa98a92e3f85b From 87b5c1b4fb6fa8b9041d1dc4b8b9b283c91a50c1 Mon Sep 17 00:00:00 2001 From: Dustin Swales Date: Tue, 21 Sep 2021 15:33:15 +0000 Subject: [PATCH 04/11] Updated submodule pointers (Omission fromprevious commit). --- atmos_cubed_sphere | 2 +- ccpp/framework | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/atmos_cubed_sphere b/atmos_cubed_sphere index 86177e14c..bdb078ade 160000 --- a/atmos_cubed_sphere +++ b/atmos_cubed_sphere @@ -1 +1 @@ -Subproject commit 86177e14cdf60ce53fc6ec15829a8876db0c7445 +Subproject commit bdb078ade1e9f81755513d6dbb51b3f40fccaa41 diff --git a/ccpp/framework b/ccpp/framework index bc1826932..922fe4494 160000 --- a/ccpp/framework +++ b/ccpp/framework @@ -1 +1 @@ -Subproject commit bc18269320395826896072308f3d50cf056880ff +Subproject commit 922fe44948acddaec6bc08d2392beaa047fe2587 From 113a6d2f59232ebdcdcf7177ff117e8f02fe7901 Mon Sep 17 00:00:00 2001 From: Dustin Swales Date: Tue, 21 Sep 2021 18:40:30 +0000 Subject: [PATCH 05/11] Updated .gitmodules --- .gitmodules | 4 ++-- ccpp/framework | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index afe6f27dd..b5437befe 100644 --- a/.gitmodules +++ b/.gitmodules @@ -8,5 +8,5 @@ branch = main [submodule "ccpp/physics"] path = ccpp/physics - url = https://github.com/NCAR/ccpp-physics - branch = main + url = https://github.com/dustinswales/ccpp-physics + branch = hotfix_gpflxadj diff --git a/ccpp/framework b/ccpp/framework index 922fe4494..bc1826932 160000 --- a/ccpp/framework +++ b/ccpp/framework @@ -1 +1 @@ -Subproject commit 922fe44948acddaec6bc08d2392beaa047fe2587 +Subproject commit bc18269320395826896072308f3d50cf056880ff From 856625a116fcb10a6f84e03a2d327daaf54f4d93 Mon Sep 17 00:00:00 2001 From: Dustin Swales Date: Tue, 21 Sep 2021 19:23:30 +0000 Subject: [PATCH 06/11] Updated atmos_cubed_sphere. --- atmos_cubed_sphere | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/atmos_cubed_sphere b/atmos_cubed_sphere index bdb078ade..0944c0034 160000 --- a/atmos_cubed_sphere +++ b/atmos_cubed_sphere @@ -1 +1 @@ -Subproject commit bdb078ade1e9f81755513d6dbb51b3f40fccaa41 +Subproject commit 0944c0034585a855bac9143dd3e3cf484d5d97b4 From b17667ccc7d0bd82aab57661c7124ec6ba6a1a6c Mon Sep 17 00:00:00 2001 From: Dustin Swales Date: Wed, 22 Sep 2021 20:28:03 +0000 Subject: [PATCH 07/11] Incorrect branch for submodule atmos_cubed_sphere. point to dev/emc, not master. --- atmos_cubed_sphere | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/atmos_cubed_sphere b/atmos_cubed_sphere index 0944c0034..86177e14c 160000 --- a/atmos_cubed_sphere +++ b/atmos_cubed_sphere @@ -1 +1 @@ -Subproject commit 0944c0034585a855bac9143dd3e3cf484d5d97b4 +Subproject commit 86177e14cdf60ce53fc6ec15829a8876db0c7445 From c4e53a6bdde1eb862f84f11ab09ab2dae7be41a9 Mon Sep 17 00:00:00 2001 From: Dustin Swales Date: Thu, 23 Sep 2021 20:26:04 +0000 Subject: [PATCH 08/11] Updated rte-rrtmgp --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index e6843a3ec..4c4d00021 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit e6843a3ec5424164925ccad5723aa98a92e3f85b +Subproject commit 4c4d000214bca9abea752ee3a5ec5a7e54d4829e From 2aa28ece6b176d606fe9cc5dbfa5f3f0d89a0fed Mon Sep 17 00:00:00 2001 From: Dustin Swales Date: Wed, 6 Oct 2021 15:15:03 +0000 Subject: [PATCH 09/11] Updated submodules --- atmos_cubed_sphere | 2 +- ccpp/framework | 2 +- ccpp/physics | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/atmos_cubed_sphere b/atmos_cubed_sphere index 86177e14c..ab026b794 160000 --- a/atmos_cubed_sphere +++ b/atmos_cubed_sphere @@ -1 +1 @@ -Subproject commit 86177e14cdf60ce53fc6ec15829a8876db0c7445 +Subproject commit ab026b79497ee00530ff3eb6b59dd9b9346e8e7d diff --git a/ccpp/framework b/ccpp/framework index bc1826932..6874fc9b4 160000 --- a/ccpp/framework +++ b/ccpp/framework @@ -1 +1 @@ -Subproject commit bc18269320395826896072308f3d50cf056880ff +Subproject commit 6874fc9b49237b70df7af9b513ea10df697c27d6 diff --git a/ccpp/physics b/ccpp/physics index 4c4d00021..2f8c13f1b 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 4c4d000214bca9abea752ee3a5ec5a7e54d4829e +Subproject commit 2f8c13f1bf75b9066b2f39218cfdbee180244e92 From 0f3c6dd314b0294e94273005cec8ffe7209cc2d7 Mon Sep 17 00:00:00 2001 From: Dustin Swales Date: Thu, 7 Oct 2021 15:55:57 +0000 Subject: [PATCH 10/11] Revert submodule change. --- .gitmodules | 4 ++-- ccpp/physics | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 460c62f7d..c99aef1ab 100644 --- a/.gitmodules +++ b/.gitmodules @@ -8,5 +8,5 @@ branch = main [submodule "ccpp/physics"] path = ccpp/physics - url = https://github.com/dustinswales/ccpp-physics - branch = hotfix_gpflxadj \ No newline at end of file + url = https://github.com/NCAR/ccpp-physics + branch = main \ No newline at end of file diff --git a/ccpp/physics b/ccpp/physics index 2f8c13f1b..3423a1370 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 2f8c13f1bf75b9066b2f39218cfdbee180244e92 +Subproject commit 3423a13700f9b8d4a7329ac155f3923a45c392ec From 40a933c79d521383cd7b8f67909cd38330af4b2c Mon Sep 17 00:00:00 2001 From: Dustin Swales Date: Thu, 7 Oct 2021 16:09:05 +0000 Subject: [PATCH 11/11] Added newline --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index c99aef1ab..a54f243ae 100644 --- a/.gitmodules +++ b/.gitmodules @@ -9,4 +9,4 @@ [submodule "ccpp/physics"] path = ccpp/physics url = https://github.com/NCAR/ccpp-physics - branch = main \ No newline at end of file + branch = main