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

Update GitHub CCPP branches with Vlab master 20190329 #229

Merged
merged 8 commits into from
Apr 1, 2019
Merged

Update GitHub CCPP branches with Vlab master 20190329 #229

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
3137d3f
physics/{GFS_DCNV_generic.F90,GFS_PBL_generic.F90,GFS_SCNV_generic.F9…
climbfuji Mar 31, 2019
4e6b4e0
New scheme physics/maximum_hourly_diagnostics.F90
climbfuji Mar 31, 2019
bbbb575
physics/GFS_suite_interstitial.F90: change standard_name following ld…
climbfuji Mar 31, 2019
497a412
physics/gfdl_cloud_microphys.F90: update with changes from GFS_physic…
climbfuji Mar 31, 2019
2601917
physics/gwdps.f: add new ldiag3d code in gwdps_pre, change standard n…
climbfuji Mar 31, 2019
26478e9
physics/module_gfdl_cloud_microphys.F90: update code following IPD-ve…
climbfuji Mar 31, 2019
172f8bf
physics/ozphys.f, physics/ozphys_2015.f: update ldiag3d code; physics…
climbfuji Mar 31, 2019
df97e50
Merge branch 'master' of https://github.com/NCAR/ccpp-physics into up…
climbfuji Mar 31, 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
30 changes: 15 additions & 15 deletions physics/GFS_DCNV_generic.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,31 +250,31 @@ subroutine GFS_DCNV_generic_post_run (im, levs, lssav, ldiag3d, lgocart, ras, cs
do k=1,levs
do i=1,im
dt3dt(i,k) = dt3dt(i,k) + (gt0(i,k)-save_t(i,k)) * frain
dq3dt(i,k) = dq3dt(i,k) + (gq0_water_vapor(i,k)-save_qv(i,k)) * frain
! dq3dt(i,k) = dq3dt(i,k) + (gq0_water_vapor(i,k)-save_qv(i,k)) * frain
du3dt(i,k) = du3dt(i,k) + (gu0(i,k)-save_u(i,k)) * frain
dv3dt(i,k) = dv3dt(i,k) + (gv0(i,k)-save_v(i,k)) * frain

upd_mf(i,k) = upd_mf(i,k) + ud_mf(i,k) * (con_g*frain)
dwn_mf(i,k) = dwn_mf(i,k) + dd_mf(i,k) * (con_g*frain)
det_mf(i,k) = det_mf(i,k) + dt_mf(i,k) * (con_g*frain)
! upd_mf(i,k) = upd_mf(i,k) + ud_mf(i,k) * (con_g*frain)
! dwn_mf(i,k) = dwn_mf(i,k) + dd_mf(i,k) * (con_g*frain)
! det_mf(i,k) = det_mf(i,k) + dt_mf(i,k) * (con_g*frain)
enddo
enddo
endif ! if (ldiag3d)

endif ! if (lssav)

!update dqdt_v to include moisture tendency due to deep convection
if (lgocart) then
do k=1,levs
do i=1,im
dqdti (i,k) = (gq0_water_vapor(i,k) - save_qv(i,k)) * frain
upd_mfi(i,k) = upd_mfi(i,k) + ud_mf(i,k) * frain
dwn_mfi(i,k) = dwn_mfi(i,k) + dd_mf(i,k) * frain
det_mfi(i,k) = det_mfi(i,k) + dt_mf(i,k) * frain
cnvqci (i,k) = cnvqci (i,k) + (clw_ice(i,k)+clw_liquid(i,k))*frain
enddo
enddo
endif ! if (lgocart)
! if (lgocart) then
! do k=1,levs
! do i=1,im
! dqdti (i,k) = (gq0_water_vapor(i,k) - save_qv(i,k)) * frain
! upd_mfi(i,k) = upd_mfi(i,k) + ud_mf(i,k) * frain
! dwn_mfi(i,k) = dwn_mfi(i,k) + dd_mf(i,k) * frain
! det_mfi(i,k) = det_mfi(i,k) + dt_mf(i,k) * frain
! cnvqci (i,k) = cnvqci (i,k) + (clw_ice(i,k)+clw_liquid(i,k))*frain
! enddo
! enddo
! endif ! if (lgocart)

if (isppt_deep) then
tconvtend = gt0 - save_t
Expand Down
2 changes: 1 addition & 1 deletion physics/GFS_MP_generic.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@ subroutine GFS_MP_generic_post_run(im, ix, levs, kdt, nrcm, ncld, nncl, ntcw, nt
do k=1,levs
do i=1,im
dt3dt(i,k) = dt3dt(i,k) + (gt0(i,k)-save_t(i,k)) * frain
dq3dt(i,k) = dq3dt(i,k) + (gq0(i,k,1)-save_qv(i,k)) * frain
! dq3dt(i,k) = dq3dt(i,k) + (gq0(i,k,1)-save_qv(i,k)) * frain
enddo
enddo
endif
Expand Down
26 changes: 13 additions & 13 deletions physics/GFS_PBL_generic.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -399,19 +399,19 @@ subroutine GFS_PBL_generic_post_run (im, levs, nvdiff, ntrac,
! enddo
! enddo
! endif
do k=1,levs
do i=1,im
tem = dqdt(i,k,ntqv) * dtf
dq3dt(i,k) = dq3dt(i,k) + tem
enddo
enddo
if (ntoz > 0) then
do k=1,levs
do i=1,im
dq3dt_ozone(i,k) = dq3dt_ozone(i,k) + dqdt(i,k,ntoz) * dtf
enddo
enddo
endif
! do k=1,levs
! do i=1,im
! tem = dqdt(i,k,ntqv) * dtf
! dq3dt(i,k) = dq3dt(i,k) + tem
! enddo
! enddo
! if (ntoz > 0) then
! do k=1,levs
! do i=1,im
! dq3dt_ozone(i,k) = dq3dt_ozone(i,k) + dqdt(i,k,ntoz) * dtf
! enddo
! enddo
! endif
endif

endif ! end if_lssav
Expand Down
16 changes: 8 additions & 8 deletions physics/GFS_SCNV_generic.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,13 +53,13 @@ subroutine GFS_SCNV_generic_pre_run (im, levs, ldiag3d, lgocart, gt0, gq0_water_
enddo
enddo
endif
if (ldiag3d .or. lgocart) then
do k=1,levs
do i=1,im
save_qv(i,k) = gq0_water_vapor(i,k)
enddo
enddo
endif
! if (ldiag3d .or. lgocart) then
! do k=1,levs
! do i=1,im
! save_qv(i,k) = gq0_water_vapor(i,k)
! enddo
! enddo
! endif

end subroutine GFS_SCNV_generic_pre_run

Expand Down Expand Up @@ -139,7 +139,7 @@ subroutine GFS_SCNV_generic_post_run (im, levs, nn, lssav, ldiag3d, lgocart, fra
do k=1,levs
do i=1,im
dt3dt(i,k) = dt3dt(i,k) + (gt0(i,k) - save_t(i,k)) * frain
dq3dt(i,k) = dq3dt(i,k) + (gq0_water_vapor(i,k) - save_qv(i,k)) * frain
! dq3dt(i,k) = dq3dt(i,k) + (gq0_water_vapor(i,k) - save_qv(i,k)) * frain
enddo
enddo
endif
Expand Down
102 changes: 51 additions & 51 deletions physics/GFS_suite_interstitial.F90
View file
Open in desktop

Large diffs are not rendered by default.

7 changes: 5 additions & 2 deletions physics/gfdl_cloud_microphys.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,8 @@ end subroutine gfdl_cloud_microphys_finalize
!! | phys_hydrostatic | flag_for_hydrostatic_heating_from_physics | flag indicating hydrostatic heating from physics | flag | 0 | logical | | in | F |
!! | lradar | flag_for_radar_reflectivity | flag for radar reflectivity | flag | 0 | logical | | in | F |
!! | refl_10cm | radar_reflectivity_10cm | instantaneous refl_10cm | dBZ | 2 | real | kind_phys | inout | F |
!! | kdt | index_of_time_step | current forecast iteration | index | 0 | integer | | in | F |
!! | nsteps_per_reset | number_of_time_steps_per_maximum_hourly_time_interval | number_of_time_steps_per_maximum_hourly_time_interval | count | 0 | integer | | in | F |
!! | effr_in | flag_for_cloud_effective_radii | flag for cloud effective radii calculations in microphysics | | 0 | logical | | in | F |
!! | rew | effective_radius_of_stratiform_cloud_liquid_water_particle_in_um | eff. radius of cloud liquid water particle in micrometer | um | 2 | real | kind_phys | inout | F |
!! | rei | effective_radius_of_stratiform_cloud_ice_particle_in_um | eff. radius of cloud ice water particle in micrometer | um | 2 | real | kind_phys | inout | F |
Expand All @@ -175,7 +177,7 @@ subroutine gfdl_cloud_microphys_run( &
gt0, gu0, gv0, vvl, prsl, phii, del, &
rain0, ice0, snow0, graupel0, prcp0, sr, &
dtp, hydrostatic, phys_hydrostatic, lradar, refl_10cm, &
effr_in, rew, rei, rer, res, reg, errmsg, errflg)
kdt, nsteps_per_reset, effr_in, rew, rei, rer, res, reg, errmsg, errflg)

use machine, only: kind_phys

Expand Down Expand Up @@ -212,6 +214,7 @@ subroutine gfdl_cloud_microphys_run( &

logical, intent (in) :: lradar
real(kind=kind_phys), intent(inout), dimension(1:im,1:levs) :: refl_10cm
integer, intent (in) :: kdt, nsteps_per_reset
logical, intent (in) :: effr_in
real(kind=kind_phys), intent(inout), dimension(1:im,1:levs) :: rew, rei, rer, res, reg

Expand Down Expand Up @@ -288,7 +291,7 @@ subroutine gfdl_cloud_microphys_run( &
qv1, ql1, qr1, qi1, qs1, qg1, qa1, qn1, qv_dt, ql_dt, qr_dt, qi_dt, &
qs_dt, qg_dt, qa_dt, pt_dt, pt, w, uin, vin, u_dt, v_dt, dz, delp, &
garea, dtp, frland, rain0, snow0, ice0, graupel0, hydrostatic, &
phys_hydrostatic, p123, lradar, refl)
phys_hydrostatic, p123, lradar, refl, kdt, nsteps_per_reset)
tem = dtp*con_p001/con_day

! fix negative values
Expand Down
Loading