From 808ba59f2747e462ba4093feecacc49c7123edca Mon Sep 17 00:00:00 2001 From: Grant Firl Date: Thu, 3 Nov 2022 15:14:50 -0400 Subject: [PATCH 1/2] transfer updates for fv3atm from ufs-dev PR#14 --- ccpp/physics | 2 +- scm/src/CCPP_typedefs.F90 | 2 ++ scm/src/CCPP_typedefs.meta | 6 ++++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index 35f5e895..97034ed7 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 35f5e8951cc59acb71732054964f60301a2aa5de +Subproject commit 97034ed7a195e1ca857fded5ed1af0d70535e0c3 diff --git a/scm/src/CCPP_typedefs.F90 b/scm/src/CCPP_typedefs.F90 index 0326544c..b14ba29f 100644 --- a/scm/src/CCPP_typedefs.F90 +++ b/scm/src/CCPP_typedefs.F90 @@ -219,6 +219,7 @@ module CCPP_typedefs integer :: nday !< integer :: nf_aelw !< integer :: nf_aesw !< + integer :: nf_albd !< integer :: nn !< integer :: nsamftrac !< integer :: nscav !< @@ -916,6 +917,7 @@ subroutine gfs_interstitial_create (Interstitial, IM, Model) Interstitial%nbdsw = NBDSW Interstitial%nf_aelw = NF_AELW Interstitial%nf_aesw = NF_AESW + Interstitial%nf_albd = NF_ALBD Interstitial%nspc1 = NSPC1 if (Model%oz_phys .or. Model%oz_phys_2015) then Interstitial%oz_coeffp5 = oz_coeff+5 diff --git a/scm/src/CCPP_typedefs.meta b/scm/src/CCPP_typedefs.meta index 4f6c2289..3b031bee 100644 --- a/scm/src/CCPP_typedefs.meta +++ b/scm/src/CCPP_typedefs.meta @@ -1460,6 +1460,12 @@ units = count dimensions = () type = integer +[nf_albd] + standard_name = number_of_components_for_surface_albedo + long_name = number of IR/VIS/UV compinents for surface albedo + units = count + dimensions = () + type = integer [nn] standard_name = number_of_tracers_for_convective_transport long_name = number of tracers for convective transport From c5a3b20b8148a78c57cd821a7a3fb81da68e6a3d Mon Sep 17 00:00:00 2001 From: Grant Firl Date: Wed, 16 Nov 2022 13:27:19 -0500 Subject: [PATCH 2/2] update ccpp/physics submodule pointer --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index 97034ed7..a7330736 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 97034ed7a195e1ca857fded5ed1af0d70535e0c3 +Subproject commit a7330736424acb67df5324579836725ae19b51c5