Skip to content

UFS-dev PR#53 #373

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
grantfirl merged 3 commits into from
Apr 6, 2023
Merged

UFS-dev PR#53 #373

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
79d0676
updates to GFS_typedefs to work with the ccpp/physics ufs/dev PR#53
grantfirl Apr 5, 2023
5b810a3
remove extra line added by mistake
grantfirl Apr 5, 2023
a74f731
update .gitmodules and ccpp/physics submodule pointer
grantfirl Apr 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,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/grantfirl/ccpp-physics
branch = ufs-dev-PR53
[submodule "CMakeModules"]
path = CMakeModules
url = https://github.com/noaa-emc/CMakeModules
Expand Down
2 changes: 1 addition & 1 deletion ccpp/physics
Open in desktop
Submodule physics updated 5 files
+3 −1 CMakeLists.txt
+1 −0 physics/module_mp_nssl_2mom.F90
+4 −1 physics/mp_nssl.F90
+32 −8 physics/mp_nssl.meta
+1 −1 physics/rrtmgp_lw_main.meta
14 changes: 14 additions & 0 deletions scm/src/GFS_typedefs.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -903,6 +903,9 @@ module GFS_typedefs
real(kind=kind_phys) :: nssl_cccn !< CCN concentration (m-3)
real(kind=kind_phys) :: nssl_alphah !< graupel shape parameter
real(kind=kind_phys) :: nssl_alphahl !< hail shape parameter
real(kind=kind_phys) :: nssl_alphar ! shape parameter for rain (imurain=1 only)
real(kind=kind_phys) :: nssl_ehw0_in ! constant or max assumed graupel-droplet collection efficiency
real(kind=kind_phys) :: nssl_ehlw0_in! constant or max assumed hail-droplet collection efficiency
logical :: nssl_hail_on !< NSSL flag to activate the hail category
logical :: nssl_ccn_on !< NSSL flag to activate the CCN category
logical :: nssl_invertccn !< NSSL flag to treat CCN as activated (true) or unactivated (false)
Expand Down Expand Up @@ -3136,6 +3139,9 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, &
real(kind=kind_phys) :: nssl_cccn = 0.6e9 !< CCN concentration (m-3)
real(kind=kind_phys) :: nssl_alphah = 0.0 !< graupel shape parameter
real(kind=kind_phys) :: nssl_alphahl = 1.0 !< hail shape parameter
real(kind=kind_phys) :: nssl_alphar = 0.0 ! shape parameter for rain (imurain=1 only)
real(kind=kind_phys) :: nssl_ehw0_in = 0.9 ! constant or max assumed graupel-droplet collection efficiency
real(kind=kind_phys) :: nssl_ehlw0_in = 0.9 ! constant or max assumed hail-droplet collection efficiency
logical :: nssl_hail_on = .false. !< NSSL flag to activate the hail category
logical :: nssl_ccn_on = .true. !< NSSL flag to activate the CCN category
logical :: nssl_invertccn = .true. !< NSSL flag to treat CCN as activated (true) or unactivated (false)
Expand Down Expand Up @@ -3562,6 +3568,8 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, &
ext_diag_thompson, dt_inner, lgfdlmprad, &
sedi_semi, decfl, &
nssl_cccn, nssl_alphah, nssl_alphahl, &
nssl_alphar, nssl_ehw0_in, nssl_ehlw0_in, &
nssl_alphar, nssl_ehw0_in, nssl_ehlw0_in, &
nssl_invertccn, nssl_hail_on, nssl_ccn_on, &
!--- max hourly
avg_max_length, &
Expand Down Expand Up @@ -4152,6 +4160,9 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, &
Model%nssl_cccn = nssl_cccn
Model%nssl_alphah = nssl_alphah
Model%nssl_alphahl = nssl_alphahl
Model%nssl_alphar = nssl_alphar
Model%nssl_ehw0_in = nssl_ehw0_in
Model%nssl_ehlw0_in = nssl_ehlw0_in
Model%nssl_hail_on = nssl_hail_on
Model%nssl_ccn_on = nssl_ccn_on
Model%nssl_invertccn = nssl_invertccn
Expand Down Expand Up @@ -6010,6 +6021,9 @@ subroutine control_print(Model)
print *, ' nssl_cccn - CCCN background CCN conc. : ', Model%nssl_cccn
print *, ' nssl_alphah - graupel shape parameter : ', Model%nssl_alphah
print *, ' nssl_alphahl - hail shape parameter : ', Model%nssl_alphahl
print *, ' nssl_alphar - rain shape parameter : ', Model%nssl_alphar
print *, ' nssl_ehw0_in - graupel-droplet collection effiency : ', Model%nssl_ehw0_in
print *, ' nssl_ehlw0_in - hail-droplet collection effiency : ', Model%nssl_ehlw0_in
print *, ' nssl_hail_on - hail activation flag : ', Model%nssl_hail_on
print *, ' lradar - radar refl. flag : ', Model%lradar
print *, ' lrefres : ', Model%lrefres
Expand Down
31 changes: 26 additions & 5 deletions scm/src/GFS_typedefs.meta
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3949,33 +3949,54 @@
kind = kind_phys
[nssl_alphah]
standard_name = nssl_alpha_graupel
long_name = graupel PSD shape parameter in NSSL micro
long_name = graupel particle size distribution(PSD) shape parameter in NSSL microphysics scheme
units = none
dimensions = ()
type = real
kind = kind_phys
[nssl_alphahl]
standard_name = nssl_alpha_hail
long_name = hail PSD shape parameter in NSSL micro
long_name = hail particle size distribution(PSD) shape parameter in NSSL microphysics scheme
units = none
dimensions = ()
type = real
kind = kind_phys
[nssl_alphar]
standard_name = nssl_alpha_rain
long_name = rain particle size distribution(PSD) shape parameter in NSSL microphysics scheme
units = none
dimensions = ()
type = real
kind = kind_phys
[nssl_ehw0_in]
standard_name = nssl_graupel_collection_efficiency
long_name = graupel droplet collection efficiency in NSSL microphysics scheme
units = none
dimensions = ()
type = real
kind = kind_phys
[nssl_ehlw0_in]
standard_name = nssl_hail_collection_efficiency
long_name = hail droplet collection efficiency in NSSL microphysics scheme
units = none
dimensions = ()
type = real
kind = kind_phys
[nssl_ccn_on]
standard_name = nssl_ccn_on
long_name = CCN activation flag in NSSL micro
long_name = CCN activation flag in NSSL microphysics scheme
units = flag
dimensions = ()
type = logical
[nssl_hail_on]
standard_name = nssl_hail_on
long_name = hail activation flag in NSSL micro
long_name = hail activation flag in NSSL microphysics scheme
units = flag
dimensions = ()
type = logical
[nssl_invertccn]
standard_name = nssl_invertccn
long_name = flag to invert CCN in NSSL micro
long_name = flag to invert CCN in NSSL microphysics scheme
units = flag
dimensions = ()
type = logical
Expand Down