Skip to content
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

Merge PR #121 and resolve conflicts #3

Merged
merged 7 commits into from
Nov 9, 2023
Merged

Merge PR #121 and resolve conflicts #3

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
91415d4
Add a switch to turn off samfdeepcnv when the MYNN shallow convection…
XiaqiongZhou-NOAA Oct 20, 2023
b314eab
Fix the undefined dimension issue for maxmf in tests with GNU debug
XiaqiongZhou-NOAA Oct 24, 2023
31b5570
Merge remote-tracking branch 'ufs-community/ufs/dev' into switch_sas
XiaqiongZhou-NOAA Nov 6, 2023
fffadd8
Merge remote-tracking branch 'ufs-community/ufs/dev' into switch_sas
XiaqiongZhou-NOAA Nov 8, 2023
bf709bb
merge PR #121
SamuelTrahanNOAA Nov 8, 2023
c2ec9e5
Merge pull request #121 from XiaqiongZhou-NOAA/switch_sas
grantfirl Nov 9, 2023
22f0f4b
Merge remote-tracking branch 'upstream/ufs/dev' into C3_updates_updates
SamuelTrahanNOAA Nov 9, 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
10 changes: 7 additions & 3 deletions physics/samfdeepcnv.f
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ subroutine samfdeepcnv_run (im,km,first_time_step,restart, &
& clam,c0s,c1,betal,betas,evef,pgcon,asolfac, &
& do_ca, ca_closure, ca_entr, ca_trigger, nthresh,ca_deep, &
& rainevap,sigmain,sigmaout,betadcu,betamcu,betascu, &
& errmsg,errflg)
& maxMF, do_mynnedmf,errmsg,errflg)
!
use machine , only : kind_phys
use funcphys , only : fpvs
Expand All @@ -100,12 +100,13 @@ subroutine samfdeepcnv_run (im,km,first_time_step,restart, &
& prslp(:,:), garea(:), hpbl(:), dot(:,:), phil(:,:)
real(kind=kind_phys), dimension(:), intent(in) :: fscav
logical, intent(in) :: first_time_step,restart,hwrf_samfdeep, &
& progsigma
& progsigma,do_mynnedmf
real(kind=kind_phys), intent(in) :: nthresh,betadcu,betamcu, &
& betascu
& betascu
real(kind=kind_phys), intent(in) :: ca_deep(:)
real(kind=kind_phys), intent(in) :: sigmain(:,:),qmicro(:,:), &
& tmf(:,:,:),q(:,:), prevsq(:,:)
real(kind=kind_phys), dimension (:), intent(in) :: maxMF
real(kind=kind_phys), intent(out) :: rainevap(:)
real(kind=kind_phys), intent(out) :: sigmaout(:,:)
logical, intent(in) :: do_ca,ca_closure,ca_entr,ca_trigger
Expand Down Expand Up @@ -349,6 +350,9 @@ subroutine samfdeepcnv_run (im,km,first_time_step,restart, &
!
do i=1,im
cnvflg(i) = .true.
if(do_mynnedmf) then
if(maxMF(i).gt.0.)cnvflg(i)=.false.
endif
sfcpbl(i) = sfclfac * hpbl(i)
rn(i)=0.
mbdt(i)=10.
Expand Down
15 changes: 15 additions & 0 deletions physics/samfdeepcnv.meta
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -473,6 +473,21 @@
dimensions = ()
type = real
intent = in
[maxMF]
standard_name = maximum_mass_flux
long_name = maximum mass flux within a column
units = m s-1
dimensions = (horizontal_loop_extent)
type = real
kind = kind_phys
intent = in
[do_mynnedmf]
standard_name = flag_for_mellor_yamada_nakanishi_niino_pbl_scheme
long_name = flag to activate MYNN-EDMF
units = flag
dimensions = ()
type = logical
intent = in
[qlcn]
standard_name = mass_fraction_of_convective_cloud_liquid_water
long_name = mass fraction of convective cloud liquid water
Expand Down