Skip to content

Physics bakeoff: CCPP version of GFS suite2 #209

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
climbfuji merged 3 commits into from
Feb 25, 2019
Merged

Physics bakeoff: CCPP version of GFS suite2 #209

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b482f11
physics/GFS_PBL_generic.F90: add compatibility with satmedmf
climbfuji Feb 23, 2019
b77ed10
physics/satmedmfvdif.F: use diffused tracer arrays as in moninedmf (h…
climbfuji Feb 23, 2019
632925d
Merge branch 'master' of https://github.com/NCAR/ccpp-physics into gf…
climbfuji Feb 23, 2019
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
11 changes: 7 additions & 4 deletions physics/GFS_PBL_generic.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ end subroutine GFS_PBL_generic_pre_finalize
!! | imp_physics_thompson | flag_for_thompson_microphysics_scheme | choice of Thompson microphysics scheme | flag | 0 | integer | | in | F |
!! | imp_physics_wsm6 | flag_for_wsm6_microphysics_scheme | choice of WSM6 microphysics scheme | flag | 0 | integer | | in | F |
!! | ltaerosol | flag_for_aerosol_physics | flag for aerosol physics | flag | 0 | logical | | in | F |
!! | hybedmf | flag_for_hedmf | flag for hybrid edmf pbl scheme (moninedmf) | flag | 0 | logical | | in | F |
!! | do_shoc | flag_for_shoc | flag for SHOC | flag | 0 | logical | | in | F |
!! | satmedmf | flag_for_scale_aware_TKE_moist_EDMF_PBL | flag for scale-aware TKE moist EDMF PBL scheme | flag | 0 | logical | | in | F |
!! | qgrs | tracer_concentration | model layer mean tracer concentration | kg kg-1 | 3 | real | kind_phys | in | F |
!! | vdftra | vertically_diffused_tracer_concentration | tracer concentration diffused by PBL scheme | kg kg-1 | 3 | real | kind_phys | inout | F |
Expand All @@ -48,7 +50,7 @@ end subroutine GFS_PBL_generic_pre_finalize
subroutine GFS_PBL_generic_pre_run (im, levs, nvdiff, ntrac, &
ntqv, ntcw, ntiw, ntrw, ntsw, ntlnc, ntinc, ntwa, ntia, ntgl, ntoz, ntke, ntkev, &
imp_physics, imp_physics_gfdl, imp_physics_thompson, imp_physics_wsm6, &
ltaerosol, satmedmf, qgrs, vdftra, errmsg, errflg)
ltaerosol, hybedmf, do_shoc, satmedmf, qgrs, vdftra, errmsg, errflg)

use machine, only : kind_phys

Expand All @@ -57,7 +59,7 @@ subroutine GFS_PBL_generic_pre_run (im, levs, nvdiff, ntrac,
integer, intent(in) :: im, levs, nvdiff, ntrac
integer, intent(in) :: ntqv, ntcw, ntiw, ntrw, ntsw, ntlnc, ntinc, ntwa, ntia, ntgl, ntoz, ntke, ntkev
integer, intent(in) :: imp_physics, imp_physics_gfdl, imp_physics_thompson, imp_physics_wsm6
logical, intent(in) :: ltaerosol, satmedmf
logical, intent(in) :: ltaerosol, hybedmf, do_shoc, satmedmf

real(kind=kind_phys), dimension(im, levs, ntrac), intent(in) :: qgrs
real(kind=kind_phys), dimension(im, levs, nvdiff), intent(inout) :: vdftra
Expand All @@ -72,7 +74,8 @@ subroutine GFS_PBL_generic_pre_run (im, levs, nvdiff, ntrac,
errmsg = ''
errflg = 0

if(nvdiff == ntrac) then
!DH: dvdftra is only used if nvdiff != ntrac or (nvdiff == ntrac .and. )
if (nvdiff == ntrac .and. (hybedmf .or. do_shoc .or. satmedmf)) then
vdftra = qgrs
else
if (imp_physics == imp_physics_wsm6) then
Expand Down Expand Up @@ -273,7 +276,7 @@ subroutine GFS_PBL_generic_post_run (im, levs, nvdiff, ntrac,
errmsg = ''
errflg = 0
!GJF: dvdftra is only used if nvdiff != ntrac or (nvdiff == ntrac .and. )
if (nvdiff == ntrac .and. (hybedmf .or. do_shoc)) then
if (nvdiff == ntrac .and. (hybedmf .or. do_shoc .or. satmedmf)) then
dqdt = dvdftra
elseif (nvdiff /= ntrac .and. .not. shinhong .and. .not. do_ysu) then
if (imp_physics == imp_physics_wsm6) then
Expand Down
6 changes: 3 additions & 3 deletions physics/satmedmfvdif.F
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ end subroutine satmedmfvdif_finalize
!! | km | vertical_dimension | vertical layer dimension | count | 0 | integer | | in | F |
!! | ntrac | number_of_vertical_diffusion_tracers | number of tracers to diffuse vertically | count | 0 | integer | | in | F |
!! | ntcw | index_for_liquid_cloud_condensate | tracer index for cloud condensate (or liquid water) | index | 0 | integer | | in | F |
!! | ntiw | index_for_ice_cloud_condensate | tracer index for ice water | index | 0 | integer | | in | F |
!! | ntiw | index_for_ice_cloud_condensate_vertical_diffusion_tracer | tracer index for ice water in the vertically diffused tracer array | index | 0 | integer | | in | F |
!! | ntke | index_for_turbulent_kinetic_energy_vertical_diffusion_tracer | index for turbulent kinetic energy in the vertically diffused tracer array | index | 0 | integer | | in | F |
!! | grav | gravitational_acceleration | gravitational acceleration | m s-2 | 0 | real | kind_phys | in | F |
!! | rd | gas_constant_dry_air | ideal gas constant for dry air | J kg-1 K-1 | 0 | real | kind_phys | in | F |
Expand All @@ -54,11 +54,11 @@ end subroutine satmedmfvdif_finalize
!! | dv | tendency_of_y_wind_due_to_model_physics | updated tendency of the y wind | m s-2 | 2 | real | kind_phys | inout | F |
!! | du | tendency_of_x_wind_due_to_model_physics | updated tendency of the x wind | m s-2 | 2 | real | kind_phys | inout | F |
!! | tdt | tendency_of_air_temperature_due_to_model_physics | updated tendency of the temperature | K s-1 | 2 | real | kind_phys | inout | F |
!! | rtg | tendency_of_tracers_due_to_model_physics | updated tendency of the tracers due to model physics | kg kg-1 s-1 | 3 | real | kind_phys | inout | F |
!! | rtg | tendency_of_vertically_diffused_tracer_concentration | updated tendency of the tracers due to vertical diffusion in PBL scheme | kg kg-1 s-1 | 3 | real | kind_phys | inout | F |
!! | u1 | x_wind | x component of layer wind | m s-1 | 2 | real | kind_phys | in | F |
!! | v1 | y_wind | y component of layer wind | m s-1 | 2 | real | kind_phys | in | F |
!! | t1 | air_temperature | layer mean air temperature | K | 2 | real | kind_phys | in | F |
!! | q1 | tracer_concentration | model layer mean tracer concentration | kg kg-1 | 3 | real | kind_phys | in | F |
!! | q1 | vertically_diffused_tracer_concentration | tracer concentration diffused by PBL scheme | kg kg-1 | 3 | real | kind_phys | in | F |
!! | swh | tendency_of_air_temperature_due_to_shortwave_heating_on_radiation_time_step | total sky shortwave heating rate | K s-1 | 2 | real | kind_phys | in | F |
!! | hlw | tendency_of_air_temperature_due_to_longwave_heating_on_radiation_time_step | total sky longwave heating rate | K s-1 | 2 | real | kind_phys | in | F |
!! | xmu | zenith_angle_temporal_adjustment_factor_for_shortwave_fluxes | zenith angle temporal adjustment factor for shortwave | none | 1 | real | kind_phys | in | F |
Expand Down