Skip to content

ufs/dev PR295 #604

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 8 commits into from
Aug 6, 2025
Merged

ufs/dev PR295 #604

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
676e4b2
ccpp-physics ufs-dev-pr279 branch
scrasmussen Jul 1, 2025
d006737
Updated physics
dustinswales Jul 14, 2025
d98f15e
Changes from NOAA-EMC/fv3atm 950
dustinswales Jul 14, 2025
7bed725
update .gitmodules
dustinswales Jul 14, 2025
336ecc3
Merge branch 'ufs-dev-pr279' of https://github.com/scrasmussen/ccpp-s…
dustinswales Jul 15, 2025
6941e67
Updated physics
dustinswales Jul 16, 2025
191fe17
Merge branch 'main' of https://github.com/NCAR/ccpp-scm into ufs-dev-…
dustinswales Jul 16, 2025
06f0cef
update ccpp/physics after merge
grantfirl Aug 6, 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
2 changes: 1 addition & 1 deletion ccpp/physics
Open in desktop
Submodule physics updated 10 files
+6 −1 CMakeLists.txt
+3 −1 physics/CONV/C3/cu_c3_driver.F90
+2 −1 physics/GWD/cires_ugwpv1_oro.F90
+1 −1 physics/GWD/cires_ugwpv1_triggers.F90
+956 −0 physics/GWD/ecmwf_ngw.F90
+23 −7 physics/GWD/ugwpv1_gsldrag.F90
+15 −1 physics/GWD/ugwpv1_gsldrag.meta
+5 −2 physics/Interstitials/UFS_SCM_NEPTUNE/sfcsub.F
+1 −1 physics/Radiation/mersenne_twister.f
+2 −2 physics/Radiation/radiation_aerosols.f
12 changes: 8 additions & 4 deletions scm/src/GFS_typedefs.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1155,6 +1155,7 @@ module GFS_typedefs
logical :: do_ugwp_v1 !< flag for version 1 ugwp GWD
logical :: do_ugwp_v1_orog_only !< flag for version 1 ugwp GWD (orographic drag only)
logical :: do_ugwp_v1_w_gsldrag !< flag for version 1 ugwp with OGWD of GSL
logical :: do_ngw_ec !< flag for ecmwf ngw
logical :: mstrat !< flag for moorthi approach for stratus
logical :: moist_adj !< flag for moist convective adjustment
logical :: cscnv !< flag for Chikira-Sugiyama convection
Expand Down Expand Up @@ -3737,6 +3738,7 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, &
logical :: do_ugwp_v1 = .false. !< flag for version 1 ugwp GWD
logical :: do_ugwp_v1_orog_only = .false. !< flag for version 1 ugwp GWD (orographic drag only)
logical :: do_ugwp_v1_w_gsldrag = .false. !< flag for version 1 ugwp GWD (orographic drag only)
logical :: do_ngw_ec = .false. !< flag for ecmwf ngwd algorithm
!--- vay-2018
logical :: ldiag_ugwp = .false. !< flag for UGWP diag fields
logical :: ugwp_seq_update = .false. !< flag for updating winds between UGWP steps
Expand Down Expand Up @@ -4190,7 +4192,7 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, &
gwd_opt, do_ugwp_v0, do_ugwp_v0_orog_only, &
do_ugwp_v0_nst_only, &
do_gsl_drag_ls_bl, do_gsl_drag_ss, do_gsl_drag_tofd, &
do_gwd_opt_psl, &
do_gwd_opt_psl, do_ngw_ec, &
do_ugwp_v1, do_ugwp_v1_orog_only, do_ugwp_v1_w_gsldrag, &
ugwp_seq_update, var_ric, coef_ric_l, coef_ric_s, hurr_pbl, &
do_myjsfc, do_myjpbl, &
Expand Down Expand Up @@ -5170,6 +5172,7 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, &
Model%do_gsl_drag_ss = do_gsl_drag_ss
Model%do_gsl_drag_tofd = do_gsl_drag_tofd
Model%do_gwd_opt_psl = do_gwd_opt_psl
Model%do_ngw_ec = do_ngw_ec
Model%do_ugwp_v1 = do_ugwp_v1
Model%do_ugwp_v1_orog_only = do_ugwp_v1_orog_only
Model%do_ugwp_v1_w_gsldrag = do_ugwp_v1_w_gsldrag
Expand Down Expand Up @@ -5441,7 +5444,7 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, &
! Last index of outermost dimension of dtend
Model%ndtend = 0
allocate (Model%dtidx(Model%ntracp100,Model%nprocess))
Model%dtidx = -99
Model%dtidx = no_tracer

if(Model%ntchm>0) then
Model%ntdu1 = get_tracer_index(Model%tracer_names, 'dust1')
Expand Down Expand Up @@ -5700,8 +5703,8 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, &
ENDIF
error stop
ENDIF
Model%ntccn = -99
Model%ntccna = -99
Model%ntccn = no_tracer
Model%ntccna = no_tracer
ELSEIF ( Model%ntccn < 1 ) THEN
if (Model%me == Model%master) then
write(*,*) 'NSSL micro: error! CCN is ON but ntccn < 1. Must have ccn_nc in field_table if nssl_ccn_on=T'
Expand Down Expand Up @@ -7044,6 +7047,7 @@ subroutine control_print(Model)
print *, ' do_gsl_drag_tofd : ', Model%do_gsl_drag_tofd
print *, ' do_gwd_opt_psl : ', Model%do_gwd_opt_psl
print *, ' do_ugwp_v1 : ', Model%do_ugwp_v1
print *, ' do_ngw_ec : ', Model%do_ngw_ec
print *, ' do_ugwp_v1_orog_only : ', Model%do_ugwp_v1_orog_only
print *, ' do_ugwp_v1_w_gsldrag : ', Model%do_ugwp_v1_w_gsldrag
print *, ' hurr_pbl : ', Model%hurr_pbl
Expand Down
6 changes: 6 additions & 0 deletions scm/src/GFS_typedefs.meta
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7810,6 +7810,12 @@
dimensions = ()
type = real
kind = kind_phys
[do_ngw_ec]
standard_name = flag_for_ngw_ec
long_name = flag to activate ecmwf ngwd
units = flag
dimensions = ()
type = logical
[do_ugwp_v1]
standard_name = flag_for_ugwp_version_1
long_name = flag to activate ver 1 CIRES UGWP
Expand Down
Loading