Skip to content

NRL combination #640

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 4 commits into from
Nov 21, 2025
Merged

NRL combination #640

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bad94ac
add n_diag_buckets to 2 diag variables
grantfirl Nov 19, 2025
76e5cf9
fix array order for diagnostic buckets
grantfirl Nov 19, 2025
9ae2e30
Merge branch 'main' into NRL_combo_20251119
grantfirl Nov 21, 2025
632cbd3
update ccpp/physics
grantfirl Nov 21, 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
6 changes: 4 additions & 2 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@
branch = main
[submodule "ccpp-physics"]
path = ccpp/physics
url = https://github.com/NCAR/ccpp-physics
branch = main
#url = https://github.com/NCAR/ccpp-physics
#branch = main
url = https://github.com/grantfirl/ccpp-physics
branch = NRL_combo_20251119
[submodule "CMakeModules"]
path = CMakeModules
url = https://github.com/noaa-emc/CMakeModules
Expand Down
2 changes: 1 addition & 1 deletion ccpp/physics
Open in desktop
Submodule physics updated 11 files
+2 −2 physics/GWD/ugwpv1_gsldrag.F90
+0 −8 physics/GWD/ugwpv1_gsldrag.meta
+2 −2 physics/GWD/unified_ugwp.F90
+0 −8 physics/GWD/unified_ugwp.meta
+13 −7 physics/Interstitials/UFS_SCM_NEPTUNE/GFS_MP_generic_post.F90
+9 −2 physics/Interstitials/UFS_SCM_NEPTUNE/GFS_MP_generic_post.meta
+2 −2 physics/Interstitials/UFS_SCM_NEPTUNE/GFS_SCNV_generic_post.F90
+0 −8 physics/Interstitials/UFS_SCM_NEPTUNE/GFS_SCNV_generic_post.meta
+17 −12 physics/Interstitials/UFS_SCM_NEPTUNE/GFS_stochastics.F90
+9 −2 physics/Interstitials/UFS_SCM_NEPTUNE/GFS_stochastics.meta
+19 −30 physics/Radiation/radiation_aerosols.f
14 changes: 9 additions & 5 deletions scm/src/GFS_typedefs.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -726,6 +726,7 @@ module GFS_typedefs
integer :: logunit
integer :: latidxprnt
integer :: ipr
integer :: n_diag_buckets
real(kind=kind_phys) :: fhzero !< hours between clearing of diagnostic buckets (current bucket)
real(kind=kind_phys) :: fhzero_array(2) !< array to hold the the hours between clearing of diagnostic buckets
real(kind=kind_phys) :: fhzero_fhour(2) !< the maximum forecast length for the hours between clearing of diagnostic buckets
Expand Down Expand Up @@ -2009,7 +2010,7 @@ module GFS_typedefs
real (kind=kind_phys), pointer :: dtsfc (:) => null() !< sensible heat flux (w/m2)
real (kind=kind_phys), pointer :: dqsfc (:) => null() !< latent heat flux (w/m2)
real (kind=kind_phys), pointer :: totprcp(:) => null() !< accumulated total precipitation (kg/m2)
real (kind=kind_phys), pointer :: totprcpb(:) => null() !< accumulated total precipitation in bucket(kg/m2)
real (kind=kind_phys), pointer :: totprcpb(:,:) => null() !< accumulated total precipitation in bucket(kg/m2)
real (kind=kind_phys), pointer :: gflux (:) => null() !< groud conductive heat flux
real (kind=kind_phys), pointer :: dlwsfc (:) => null() !< time accumulated sfc dn lw flux ( w/m**2 )
real (kind=kind_phys), pointer :: ulwsfc (:) => null() !< time accumulated sfc up lw flux ( w/m**2 )
Expand All @@ -2025,7 +2026,7 @@ module GFS_typedefs
real (kind=kind_phys), pointer :: dvgwd (:) => null() !< vertically integrated v change by OGWD
real (kind=kind_phys), pointer :: psmean (:) => null() !< surface pressure (kPa)
real (kind=kind_phys), pointer :: cnvprcp(:) => null() !< accumulated convective precipitation (kg/m2)
real (kind=kind_phys), pointer :: cnvprcpb(:) => null() !< accumulated convective precipitation in bucket (kg/m2)
real (kind=kind_phys), pointer :: cnvprcpb(:,:) => null() !< accumulated convective precipitation in bucket (kg/m2)
real (kind=kind_phys), pointer :: spfhmin(:) => null() !< minimum specific humidity
real (kind=kind_phys), pointer :: spfhmax(:) => null() !< maximum specific humidity
real (kind=kind_phys), pointer :: u10mmax(:) => null() !< maximum u-wind
Expand Down Expand Up @@ -4467,6 +4468,7 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, &
Model%fn_nml = fn_nml
Model%logunit = logunit
Model%latidxprnt = 1
Model%n_diag_buckets = 1
Model%fhzero = fhzero
Model%fhzero_array = fhzero_array
Model%fhzero_fhour = fhzero_fhour
Expand Down Expand Up @@ -6862,6 +6864,7 @@ subroutine control_print(Model)
print *, ' fhzero : ', Model%fhzero
print *, ' fhzero_array : ', Model%fhzero_array
print *, ' fhzero_fhour : ', Model%fhzero_fhour
print *, ' n_diag_buckets : ', Model%n_diag_buckets
print *, ' ldiag3d : ', Model%ldiag3d
print *, ' qdiag3d : ', Model%qdiag3d
print *, ' lssav : ', Model%lssav
Expand Down Expand Up @@ -8080,11 +8083,12 @@ end subroutine label_dtend_cause
subroutine diag_create (Diag, Model)
class(GFS_diag_type) :: Diag
type(GFS_control_type), intent(in) :: Model
integer :: IM
integer :: IM, ndb
logical, save :: linit
logical :: have_pbl, have_dcnv, have_scnv, have_mp, have_oz_phys

IM = Model%ncols
ndb = Model%n_diag_buckets

if(Model%print_diff_pgr) then
allocate (Diag%old_pgr(IM))
Expand Down Expand Up @@ -8127,7 +8131,7 @@ subroutine diag_create (Diag, Model)
allocate (Diag%dtsfc (IM))
allocate (Diag%dqsfc (IM))
allocate (Diag%totprcp (IM))
allocate (Diag%totprcpb(IM))
allocate (Diag%totprcpb(IM,ndb))
allocate (Diag%gflux (IM))
allocate (Diag%dlwsfc (IM))
allocate (Diag%ulwsfc (IM))
Expand All @@ -8142,7 +8146,7 @@ subroutine diag_create (Diag, Model)
allocate (Diag%dvgwd (IM))
allocate (Diag%psmean (IM))
allocate (Diag%cnvprcp (IM))
allocate (Diag%cnvprcpb(IM))
allocate (Diag%cnvprcpb(IM,ndb))
allocate (Diag%spfhmin (IM))
allocate (Diag%spfhmax (IM))
allocate (Diag%u10mmax (IM))
Expand Down
10 changes: 8 additions & 2 deletions scm/src/GFS_typedefs.meta
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3525,6 +3525,12 @@
units = index
dimensions = ()
type = integer
[n_diag_buckets]
standard_name = number_of_diagnostic_buckets
long_name = number of diagnostic bucket reset periods
units = count
dimensions = ()
type = integer
[ldiag3d]
standard_name = flag_for_diagnostics_3D
long_name = flag for 3d diagnostic fields
Expand Down Expand Up @@ -9254,7 +9260,7 @@
standard_name = accumulated_lwe_thickness_of_precipitation_amount_in_bucket
long_name = accumulated total precipitation in bucket
units = m
dimensions = (horizontal_dimension)
dimensions = (horizontal_dimension,number_of_diagnostic_buckets)
type = real
kind = kind_phys
[toticeb]
Expand Down Expand Up @@ -9445,7 +9451,7 @@
standard_name = cumulative_lwe_thickness_of_convective_precipitation_amount_in_bucket
long_name = cumulative convective precipitation in bucket
units = m
dimensions = (horizontal_dimension)
dimensions = (horizontal_dimension,number_of_diagnostic_buckets)
type = real
kind = kind_phys
[spfhmin]
Expand Down
8 changes: 4 additions & 4 deletions scm/src/scm_output.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -788,16 +788,16 @@ subroutine output_append_diag_avg(ncid, scm_state, physics)
call output_append_tendency(ncid, physics, physics%Model%dtidx(physics%Model%index_of_y_wind,physics%Model%index_of_process_physics), "dv_dt_phys", scm_state%itt_diag, inverse_n_diag*inverse_dt)
call output_append_tendency(ncid, physics, physics%Model%dtidx(physics%Model%index_of_y_wind,physics%Model%index_of_process_non_physics), "dv_dt_nonphys", scm_state%itt_diag, inverse_n_diag*inverse_dt)

call NetCDF_put_var(ncid, "tprcp_accum", physics%Diag%totprcpb(:), scm_state%itt_diag, inverse_n_diag)
call NetCDF_put_var(ncid, "tprcp_accum", physics%Diag%totprcpb(:,1), scm_state%itt_diag, inverse_n_diag)
call NetCDF_put_var(ncid, "ice_accum", physics%Diag%toticeb(:), scm_state%itt_diag, inverse_n_diag)
call NetCDF_put_var(ncid, "snow_accum", physics%Diag%totsnwb(:), scm_state%itt_diag, inverse_n_diag)
call NetCDF_put_var(ncid, "graupel_accum", physics%Diag%totgrpb(:), scm_state%itt_diag, inverse_n_diag)
call NetCDF_put_var(ncid, "conv_prcp_accum", physics%Diag%cnvprcpb(:), scm_state%itt_diag, inverse_n_diag)
call NetCDF_put_var(ncid, "tprcp_rate_accum", physics%Diag%totprcpb(:), scm_state%itt_diag, inverse_n_diag*inverse_dt)
call NetCDF_put_var(ncid, "conv_prcp_accum", physics%Diag%cnvprcpb(:,1), scm_state%itt_diag, inverse_n_diag)
call NetCDF_put_var(ncid, "tprcp_rate_accum", physics%Diag%totprcpb(:,1), scm_state%itt_diag, inverse_n_diag*inverse_dt)
call NetCDF_put_var(ncid, "ice_rate_accum", physics%Diag%toticeb(:), scm_state%itt_diag, inverse_n_diag*inverse_dt)
call NetCDF_put_var(ncid, "snow_rate_accum", physics%Diag%totsnwb(:), scm_state%itt_diag, inverse_n_diag*inverse_dt)
call NetCDF_put_var(ncid, "graupel_rate_accum", physics%Diag%totgrpb(:), scm_state%itt_diag, inverse_n_diag*inverse_dt)
call NetCDF_put_var(ncid, "conv_prcp_rate_accum", physics%Diag%cnvprcpb(:), scm_state%itt_diag, inverse_n_diag*inverse_dt)
call NetCDF_put_var(ncid, "conv_prcp_rate_accum", physics%Diag%cnvprcpb(:,1), scm_state%itt_diag, inverse_n_diag*inverse_dt)

end subroutine output_append_diag_avg

Expand Down
Loading