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

Tenth reconciliation PR from production/RRFS.v1 #926

Merged
merged 11 commits into from
Feb 19, 2025
Merged

Tenth reconciliation PR from production/RRFS.v1 #926

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
45a330c
add namelist parameter sigmab_coldstart
JiliDong-NOAA Sep 17, 2024
2e3076f
fix for inline post when using RUC LSM
JiliDong-NOAA Oct 11, 2024
8bdaef2
pass landsfcmdl to iSF_SURFACE_PHYSICS in post_fv3
JiliDong-NOAA Oct 18, 2024
f6af755
remove redundant declaration
JiliDong-NOAA Nov 2, 2024
2e7f480
another bug fix for LSM soil output with inline post
JiliDong-NOAA Nov 13, 2024
26b1af9
remove unnecessary change in io/post_fv3.F90
grantfirl Feb 7, 2025
64b2d01
update ccpp/physics
grantfirl Feb 14, 2025
9499285
Merge branch 'develop' into rrfsv1-to-ufs/dev10
grantfirl Feb 14, 2025
e660f16
update ccpp/physics
grantfirl Feb 14, 2025
0cd3820
Merge branch 'develop' into rrfsv1-to-ufs/dev10
grantfirl Feb 14, 2025
9d07380
update physics hash and revert changes in gitmodules
jkbk2004 Feb 19, 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
5 changes: 5 additions & 0 deletions ccpp/data/GFS_typedefs.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1259,6 +1259,7 @@ module GFS_typedefs
real(kind=kind_phys) :: betascu !< Tuning parameter for prog. closure shallow clouds
real(kind=kind_phys) :: betamcu !< Tuning parameter for prog. closure midlevel clouds
real(kind=kind_phys) :: betadcu !< Tuning parameter for prog. closure deep clouds
logical :: sigmab_coldstart !< flag to cold start sigmab

!--- MYNN parameters/switches
logical :: do_mynnedmf
Expand Down Expand Up @@ -3791,6 +3792,7 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, &
real(kind=kind_phys) :: betascu = 8.0 !< Tuning parameter for prog. closure shallow clouds
real(kind=kind_phys) :: betamcu = 1.0 !< Tuning parameter for prog. closure midlevel clouds
real(kind=kind_phys) :: betadcu = 2.0 !< Tuning parameter for prog. closure deep clouds
logical :: sigmab_coldstart = .false. !< flag to cold start sigmab
! *DH
logical :: do_myjsfc = .false. !< flag for MYJ surface layer scheme
logical :: do_myjpbl = .false. !< flag for MYJ PBL scheme
Expand Down Expand Up @@ -4145,6 +4147,7 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, &
do_myjsfc, do_myjpbl, &
hwrf_samfdeep, hwrf_samfshal,progsigma,betascu,betamcu, &
betadcu,h2o_phys, pdfcld, shcnvcw, redrag, hybedmf, satmedmf,&
sigmab_coldstart, &
shinhong, do_ysu, dspheat, lheatstrg, lseaspray, cnvcld, &
xr_cnvcld, random_clds, shal_cnv, imfshalcnv, imfdeepcnv, &
isatmedmf, conv_cf_opt, do_deep, jcap, &
Expand Down Expand Up @@ -4974,6 +4977,7 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, &
Model%betascu = betascu
Model%betamcu = betamcu
Model%betadcu = betadcu
Model%sigmab_coldstart = sigmab_coldstart

if (oz_phys .and. oz_phys_2015) then
write(*,*) 'Logic error: can only use one ozone physics option (oz_phys or oz_phys_2015), not both. Exiting.'
Expand Down Expand Up @@ -7008,6 +7012,7 @@ subroutine control_print(Model)
print *, 'betascu : ', Model%betascu
print *, 'betamcu : ', Model%betamcu
print *, 'betadcu : ', Model%betadcu
print *, 'sigmab_coldstart : ', Model%sigmab_coldstart
print *, ' '
print *, 'cellular automata'
print *, ' nca : ', Model%nca
Expand Down
6 changes: 6 additions & 0 deletions ccpp/data/GFS_typedefs.meta
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5681,6 +5681,12 @@
dimensions = ()
type = real
kind = kind_phys
[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
[isatmedmf]
standard_name = choice_of_scale_aware_TKE_moist_EDMF_PBL
long_name = choice of scale-aware TKE moist EDMF PBL scheme
Expand Down
2 changes: 1 addition & 1 deletion ccpp/physics
Open in desktop
Submodule physics updated 3 files
+4 −3 physics/CONV/SAMF/samfdeepcnv.f
+7 −0 physics/CONV/SAMF/samfdeepcnv.meta
+9 −11 physics/CONV/progsigma_calc.f90
3 changes: 1 addition & 2 deletions io/fv3atm_history_io.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,8 +187,7 @@ subroutine history_type_register(hist, Diag, Time, Atm_block, Model, xlon, xlat,
hist%fhzero = Model%fhzero
! hist%ncld = Model%ncld
hist%ncld = Model%imp_physics
hist%nsoil = Model%lsoil
hist%nsoil_lsm = Model%lsoil_lsm
hist%nsoil = Model%lsoil_lsm
hist%dtp = Model%dtp
hist%imp_physics = Model%imp_physics
hist%landsfcmdl = Model%lsm
Expand Down