Skip to content

Tenth reconciliation PR from production/RRFS.v1 #252

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
rhaesung merged 27 commits into from
Feb 19, 2025
Merged

Tenth reconciliation PR from production/RRFS.v1 #252

Show file tree
Hide file tree
Changes from 24 commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
274a696
"Update MYNN PBL for RRFS.v1"
haiqinli Mar 5, 2024
09d7f2f
Merge pull request #179 from grantfirl/thompson_refactor_RRFS
grantfirl Mar 8, 2024
89533c6
Merge branch 'production/RRFS.v1' into production/RRFS.v1-mynn
haiqinli Mar 8, 2024
7eab4ef
"smoke updates for RRFS.v1"
haiqinli Mar 13, 2024
766360b
"update to address UFS reviewer's comments"
haiqinli Mar 13, 2024
0935794
"merge physics PR #186 from Jili"
haiqinli Mar 14, 2024
85fabc0
Merge pull request #180 from haiqinli/production/RRFS.v1-mynn
dustinswales Mar 18, 2024
3dd1dd3
Fix improperly assigned fire emissions for ebb_dcycle==1 for retrospe…
jordanschnell Mar 28, 2024
d889bae
Merge pull request #191 from jordanschnell/ebb_dcycle_fix
grantfirl Apr 11, 2024
1b089ec
Add SW clear-sky downward flux at surface to available diagnostics
dustinswales Apr 23, 2024
2d590da
Merge pull request #198 from dustinswales/production/RRFS.v1/swdnclrs…
grantfirl May 7, 2024
7d1a689
"update deep soil temperature of RUC LSM"
haiqinli Jun 26, 2024
4128e06
Merge pull request #217 from haiqinli/production/RRFS.v1-fms-ruc
dustinswales Jul 3, 2024
7a28e0b
"Update to scale the RAVE fire emission and duirnal cycle of agriculu…
haiqinli Jul 23, 2024
5cb99bf
Merge pull request #211 from haiqinli/production/RRFS.v1-final
dustinswales Aug 3, 2024
ceb35f3
add a new parameter to control if G-F cold starts or not
JiliDong-NOAA Aug 22, 2024
cfe8a0c
Merge pull request #221 from JiliDong-NOAA/fix_ens_crash
grantfirl Sep 4, 2024
7223b8c
saSAS sigmab initialization modification
JiliDong-NOAA Sep 13, 2024
8302de4
format fix
JiliDong-NOAA Sep 16, 2024
a2f5f83
code cleanup
JiliDong-NOAA Sep 19, 2024
b2d5032
code clean up #2
JiliDong-NOAA Sep 24, 2024
e1b6a92
Merge branch 'sigmab_fix' into rrfsv1-to-ufs/dev10
grantfirl Feb 7, 2025
1e5a6d3
remove changes not in ufs/dev PR#225
grantfirl Feb 7, 2025
91cf2ab
Merge branch 'ufs/dev' into rrfsv1-to-ufs/dev10
grantfirl Feb 10, 2025
26783c8
fix line leading to reproducibility problems in progsigma_calc.f90
grantfirl Feb 14, 2025
04cd3b0
Merge branch 'rrfsv1-to-ufs/dev6' into rrfsv1-to-ufs/dev10
grantfirl Feb 14, 2025
5f6ffca
Merge branch 'ufs/dev' into rrfsv1-to-ufs/dev10
grantfirl Feb 14, 2025
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
7 changes: 4 additions & 3 deletions physics/CONV/SAMF/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, &
& maxMF, do_mynnedmf,errmsg,errflg)
& maxMF, do_mynnedmf,sigmab_coldstart,errmsg,errflg)
!
use machine , only : kind_phys
use funcphys , only : fpvs
Expand All @@ -100,7 +100,7 @@ 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,do_mynnedmf
& progsigma,do_mynnedmf,sigmab_coldstart
real(kind=kind_phys), intent(in) :: nthresh,betadcu,betamcu, &
& betascu
real(kind=kind_phys), intent(in), optional :: ca_deep(:)
Expand Down Expand Up @@ -2917,7 +2917,8 @@ subroutine samfdeepcnv_run (im,km,first_time_step,restart, &
if(progsigma)then

!Initial computations, dynamic q-tendency
if(first_time_step .and. .not.restart)then
if(first_time_step .and. (.not.restart
& .or. sigmab_coldstart))then
do k = 1,km
do i = 1,im
qadv(i,k)=0.
Expand Down
7 changes: 7 additions & 0 deletions physics/CONV/SAMF/samfdeepcnv.meta
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -494,6 +494,13 @@
dimensions = ()
type = logical
intent = in
[sigmab_coldstart]
standard_name = flag_to_cold_start_for_sigmab_init
long_name = flag to cold start for sigmab initialization
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
20 changes: 9 additions & 11 deletions physics/CONV/progsigma_calc.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ subroutine progsigma_calc (im,km,flag_init,flag_restart,flag_shallow,&

real(kind=kind_phys) :: gcvalmx,epsilon,ZZ,cvg,mcon,buy2, &
fdqb,dtdyn,dxlim,rmulacvg,tem, &
DEN,dp1,invdelt
DEN,dp1,invdelt,sigmind_new

!Parameters
gcvalmx = 0.1
Expand All @@ -63,6 +63,12 @@ subroutine progsigma_calc (im,km,flag_init,flag_restart,flag_shallow,&
km1=km-1
invdelt = 1./delt

if (flag_init) then
Comment thread
grantfirl marked this conversation as resolved.
Outdated
sigmind_new=0.0
else
sigmind_new=sigmind
end if

!Initialization 2D
do k = 1,km
do i = 1,im
Expand Down Expand Up @@ -168,13 +174,6 @@ subroutine progsigma_calc (im,km,flag_init,flag_restart,flag_shallow,&
enddo

!sigmab
if(flag_init .and. .not. flag_restart)then
do i = 1,im
if(cnvflg(i))then
sigmab(i)=0.03
endif
enddo
else
do i = 1,im
if(cnvflg(i))then
DEN=MIN(termC(i)+termB(i),1.E8)
Expand All @@ -186,11 +185,10 @@ subroutine progsigma_calc (im,km,flag_init,flag_restart,flag_shallow,&
sigmab(i)=(ZZ*(termA(i)+cvg))/(DEN+(1.0-ZZ))
if(sigmab(i)>0.)then
sigmab(i)=MIN(sigmab(i),0.95)
sigmab(i)=MAX(sigmab(i),0.01)
sigmab(i)=MAX(sigmab(i),sigmind_new)
endif
endif!cnvflg
enddo
endif

do k=1,km
do i=1,im
Expand Down Expand Up @@ -219,7 +217,7 @@ subroutine progsigma_calc (im,km,flag_init,flag_restart,flag_shallow,&
do i= 1, im
if(cnvflg(i)) then
sigmab(i)=sigmab(i)/betadcu
sigmab(i)=MAX(sigmind,sigmab(i))
sigmab(i)=MAX(sigmind_new,sigmab(i))
endif
enddo
endif
Expand Down