Skip to content

Combo for #41 and #45 #53

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 7 commits into from
Mar 15, 2023
Merged

Combo for #41 and #45 #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
58402e8
Add missing dependency on libsp to CMakeLists.txt
climbfuji Feb 17, 2023
710b9e1
add nssl_alphar, nssl_ehw0_in, nssl_ehlw0_in to namelist entries for …
JiliDong-NOAA Mar 2, 2023
6153f77
Merge branch 'ufs-community:ufs/dev' into rrfs_dev
Jili-Dong Mar 2, 2023
466ed77
update the standard name for hail/graupel collection efficiency
JiliDong-NOAA Mar 7, 2023
229c923
update the long names for parameters related to NSSL microphysics
JiliDong-NOAA Mar 7, 2023
9b778fb
Merge branch 'feature/ufs_dom' into 20230313_combo
grantfirl Mar 13, 2023
eb9f64a
Merge branch 'rrfs_dev' into 20230313_combo
grantfirl Mar 13, 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
4 changes: 3 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,9 @@ set_target_properties(ccpp_physics PROPERTIES VERSION ${PROJECT_VERSION}
target_include_directories(ccpp_physics PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>)

target_link_libraries(ccpp_physics PUBLIC w3emc::w3emc_d NetCDF::NetCDF_Fortran)
target_link_libraries(ccpp_physics PUBLIC w3emc::w3emc_d
sp::sp_d
NetCDF::NetCDF_Fortran)

# Define where to install the library
install(TARGETS ccpp_physics
Expand Down
1 change: 1 addition & 0 deletions physics/module_mp_nssl_2mom.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1228,6 +1228,7 @@ SUBROUTINE nssl_2mom_init( &
rho_qh = nssl_params(8)
rho_qhl = nssl_params(9)
rho_qs = nssl_params(10)
alphar = nssl_params(14)

! ipelec = Nint(nssl_params(11))
! isaund = Nint(nssl_params(12))
Expand Down
5 changes: 4 additions & 1 deletion physics/mp_nssl.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ subroutine mp_nssl_init(ncol, nlev, errflg, errmsg, threads, restart, &
con_t0c, con_cliq, con_csol, con_eps, &
imp_physics, imp_physics_nssl, &
nssl_cccn, nssl_alphah, nssl_alphahl, &
nssl_alphar, nssl_ehw0_in, nssl_ehlw0_in, &
nssl_ccn_on, nssl_hail_on, nssl_invertccn )


Expand All @@ -52,6 +53,7 @@ subroutine mp_nssl_init(ncol, nlev, errflg, errmsg, threads, restart, &
integer, intent(in) :: imp_physics
integer, intent(in) :: imp_physics_nssl
real(kind_phys), intent(in) :: nssl_cccn, nssl_alphah, nssl_alphahl
real(kind_phys), intent(in) :: nssl_alphar, nssl_ehw0_in, nssl_ehlw0_in
logical, intent(in) :: nssl_ccn_on, nssl_hail_on, nssl_invertccn

! Local variables: dimensions used in nssl_init
Expand Down Expand Up @@ -115,6 +117,7 @@ subroutine mp_nssl_init(ncol, nlev, errflg, errmsg, threads, restart, &
nssl_params(11) = 0 ! nssl_ipelec_tmp
nssl_params(12) = 11 ! nssl_isaund
nssl_params(13) = 0 ! 1= turn on cccna; 0 = turn off
nssl_params(14) = nssl_alphar

nssl_qccn = nssl_cccn/1.225
! if (mpirank==mpiroot) then
Expand All @@ -129,7 +132,7 @@ subroutine mp_nssl_init(ncol, nlev, errflg, errmsg, threads, restart, &

! write(0,*) 'call nssl_2mom_init'
CALL nssl_2mom_init(ims,ime, jms,jme, kms,kme,nssl_params,ipctmp=5,mixphase=0, &
ihvol=ihailv,errmsg=errmsg,errflg=errflg,myrank=mpirank,mpiroot=mpiroot)
ihvol=ihailv,nssl_ehw0=nssl_ehw0_in,nssl_ehlw0=nssl_ehlw0_in,errmsg=errmsg,errflg=errflg,myrank=mpirank,mpiroot=mpiroot)

! For restart runs, the init is done here
if (restart) then
Expand Down
40 changes: 32 additions & 8 deletions physics/mp_nssl.meta
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,37 +151,61 @@
intent = in
[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
intent = in
[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
intent = in
[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
intent = in
[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
intent = in
[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
intent = in
[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
intent = in
[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
intent = in
[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 Expand Up @@ -571,21 +595,21 @@
intent = in
[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
intent = in
[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
intent = in
[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