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.

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

UFS-dev PR#223 #1095

Merged
merged 28 commits into from
Oct 22, 2024
Merged
Changes from 1 commit
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
ce7fde9
Update physics/Interstitials/UFS_SCM_NEPTUNE/GFS_debug.* to use chunk…
climbfuji Feb 27, 2024
547b739
Merge branch 'ufs/dev' of https://github.com/ufs-community/ccpp-physi…
climbfuji Mar 6, 2024
084b702
Merge branch 'ufs/dev' of https://github.com/ufs-community/ccpp-physi…
climbfuji Apr 10, 2024
53a98be
Merge branch 'ufs/dev' of https://github.com/ufs-community/ccpp-physi…
climbfuji May 13, 2024
6f6175a
Update MPI communicator in GFS_debug.F90
climbfuji May 13, 2024
e176e67
Merge branch 'ufs/dev' of https://github.com/ufs-community/ccpp-physi…
climbfuji May 22, 2024
4ed1b4f
Bug fixes in Thompson MP and CLM Lake found by Dusan
climbfuji Jun 3, 2024
ddbd127
Refactor h2o photochemistry scheme following the ozone photochemistry…
dustinswales Jun 12, 2024
cf89e99
Bug fix
dustinswales Jun 12, 2024
afa2bc0
Use assumed-size arrays in lakeini routine in physics/SFC_Models/Lake…
climbfuji Jun 13, 2024
a446fec
Some bugfixes
dustinswales Jun 13, 2024
99c02ef
Now B4B Identical
dustinswales Jun 14, 2024
de95e37
Output tendency_of_vertically_diffused_tracer_concentration from MYNN…
lisa-bengtsson Jun 26, 2024
c866747
Merge branch 'ufs/dev' of https://github.com/ufs-community/ccpp-physi…
climbfuji Jul 12, 2024
80bade7
Merge branch 'ufs/dev' of https://github.com/ufs-community/ccpp-physi…
lisa-bengtsson Jul 15, 2024
3395bba
Merge branch 'ufs/dev' of https://github.com/ufs-community/ccpp-physi…
dustinswales Jul 15, 2024
420317e
Address reviewers comments
dustinswales Jul 15, 2024
2a50ccc
Merge pull request #219 from HelinWei-NOAA/land_upgrade_hr4
grantfirl Jul 23, 2024
9e736da
Merge branch 'ufs/dev' of https://github.com/ufs-community/ccpp-physi…
climbfuji Jul 24, 2024
97f1b64
Merge branch 'ufs/dev' of https://github.com/ufs-community/ccpp-physi…
lisa-bengtsson Aug 7, 2024
1d9b076
Merge pull request #183 from climbfuji/feature/gfs_debug_update
grantfirl Aug 8, 2024
d45ce2f
Merge branch 'ufs/dev' of https://github.com/ufs-community/ccpp-physi…
lisa-bengtsson Aug 22, 2024
8a3d61f
Merge branch 'ufs/dev' into combo_213_218
grantfirl Aug 22, 2024
8485c1d
Merge branch 'myc3' into combo_213_218
grantfirl Aug 22, 2024
cde7c10
add missing dimensions attribute for initialized flag
grantfirl Aug 23, 2024
fbb1515
Merge branch 'combo_213_218' into ufs-dev-PR223
grantfirl Oct 17, 2024
69aacf5
fix typo in GFS_phys_time_vary.scm.F90
grantfirl Oct 17, 2024
cbe4ce7
Merge branch 'main' into ufs-dev-PR223
grantfirl Oct 22, 2024
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
Prev Previous commit
Next Next commit
Output tendency_of_vertically_diffused_tracer_concentration from MYNN…
… PBL
  • Loading branch information
lisa-bengtsson committed Jun 26, 2024
commit de95e37109358a4afc848eb35a25aed8b81bebc3
25 changes: 22 additions & 3 deletions physics/PBL/MYNN_EDMF/mynnedmf_wrapper.F90
Original file line number Diff line number Diff line change
@@ -140,7 +140,7 @@ SUBROUTINE mynnedmf_wrapper_run( &
& dqdt_cloud_droplet_num_conc, dqdt_ice_num_conc, & ! <=== ntlnc, ntinc
& dqdt_water_aer_num_conc, dqdt_ice_aer_num_conc,& ! <=== ntwa, ntia
& dqdt_cccn, & ! <=== ntccn
& flag_for_pbl_generic_tend, &
& tmf, flag_for_pbl_generic_tend, &
& dtend, dtidx, index_of_temperature, &
& index_of_x_wind, index_of_y_wind, ntke, &
& ntqv, ntcw, ntiw, ntsw, &
@@ -155,7 +155,8 @@ SUBROUTINE mynnedmf_wrapper_run( &
& icloud_bl, do_mynnsfclay, &
& imp_physics, imp_physics_gfdl, &
& imp_physics_thompson, imp_physics_wsm6, &
& imp_physics_fa, &
& imp_physics_fa, imfdeepcnv, imfdeepcnv_c3, &
& imfdeepcnv_samf, &
& chem3d, frp, mix_chem, rrfs_sd, enh_mix, &
& nchem, ndvel, vdep, smoke_dbg, &
& imp_physics_nssl, nssl_ccn_on, &
@@ -205,7 +206,8 @@ SUBROUTINE mynnedmf_wrapper_run( &
& bl_mynn_output, &
& imp_physics, imp_physics_wsm6, &
& imp_physics_thompson, imp_physics_gfdl, &
& imp_physics_nssl, imp_physics_fa, &
& imp_physics_nssl, imp_physics_fa, imfdeepcnv, &
& imfdeepcnv_c3, imfdeepcnv_samf, &
& spp_pbl, &
& tke_budget
real(kind_phys), intent(in) :: &
@@ -252,6 +254,7 @@ SUBROUTINE mynnedmf_wrapper_run( &
& EL_PBL, Sh3D, Sm3D, qc_bl, qi_bl, cldfra_bl, dqdt_cccn
real(kind_phys), dimension(:,:), intent(inout) :: &
& qke_adv
real(kind_phys), dimension(:,:,:), intent(out) :: tmf
!These 10 arrays are only allocated when bl_mynn_output > 0
real(kind_phys), dimension(:,:), intent(inout), optional :: &
& edmf_a,edmf_w,edmf_qt, &
@@ -555,6 +558,13 @@ SUBROUTINE mynnedmf_wrapper_run( &
enddo
enddo

do k=1,levs
do i=1,im
tmf(i,k,1)=0.
enddo
enddo


! Check incoming moist species to ensure non-negative values
! First, create height difference (dz)
do k=1,levs
@@ -1028,6 +1038,15 @@ SUBROUTINE mynnedmf_wrapper_run( &
deallocate(save_qke_adv)
endif

if(imfdeepcnv == imfdeepcnv_c3 .or. imfdeepcnv == imfdeepcnv_samf)then
!LB: save PBL q-tendency for use in prognostic closure
do k=1,levs
do i=1,im
tmf(i,k,1)=dqdt_water_vapor(i,k)
enddo
enddo
endif

CONTAINS

SUBROUTINE dtend_helper(itracer,field,mult)
29 changes: 29 additions & 0 deletions physics/PBL/MYNN_EDMF/mynnedmf_wrapper.meta
Original file line number Diff line number Diff line change
@@ -1150,6 +1150,14 @@
kind = kind_phys
intent = inout
optional = True
[tmf]
standard_name = tendency_of_vertically_diffused_tracer_concentration
long_name = updated tendency of the tracers due to vertical diffusion in PBL scheme
units = kg kg-1 s-1
dimensions = (horizontal_loop_extent,vertical_layer_dimension,number_of_vertical_diffusion_tracers)
type = real
kind = kind_phys
intent = out
[flag_for_pbl_generic_tend]
standard_name = flag_for_generic_tendency_due_to_planetary_boundary_layer
long_name = true if GFS_PBL_generic should calculate tendencies
@@ -1428,6 +1436,27 @@
dimensions = ()
type = integer
intent = in
[imfdeepcnv]
standard_name = control_for_deep_convection_scheme
long_name = flag for mass-flux deep convection scheme
units = flag
dimensions = ()
type = integer
intent = in
[imfdeepcnv_c3]
standard_name = identifier_for_c3_deep_convection
long_name = flag for C3 deep convection scheme
units = flag
dimensions = ()
type = integer
intent = in
[imfdeepcnv_samf]
standard_name = identifer_for_scale_aware_mass_flux_deep_convection
long_name = flag for SAMF deep convection scheme
units = flag
dimensions = ()
type = integer
intent = in
[nssl_ccn_on]
standard_name = nssl_ccn_on
long_name = CCN activation flag in NSSL micro