Skip to content

Update gsd/develop from NCAR master 2020/07/07 #43

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
DomHeinzeller merged 6 commits into from
Jul 8, 2020
Merged

Update gsd/develop from NCAR master 2020/07/07 #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
531d557
Fixes to run the CCPP multi_gases option with 32 bit
XiaqiongZhou-NOAA Apr 28, 2020
d4c6755
Merge remote-tracking branch 'NCAR/master' into rt_multigases
XiaqiongZhou-NOAA Jun 22, 2020
daddd74
Cleanup/revert changes after merge of gsd/develop into master
climbfuji Jun 30, 2020
8a90168
Merge pull request #465 from climbfuji/update_master_from_gsl_develop…
climbfuji Jul 2, 2020
44d3891
Merge remote-tracking branch 'NCAR/master' into rt_multigases
XiaqiongZhou-NOAA Jul 2, 2020
e9ca908
Merge pull request #444 from XiaqiongZhou-NOAA/rt_multigases
climbfuji Jul 7, 2020
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 physics/GFS_rrtmg_pre.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -865,7 +865,7 @@ subroutine GFS_rrtmg_pre_run (Model, Grid, Sfcprop, Statein, & ! input
endif

elseif(Model%imp_physics == 6 .or. Model%imp_physics == 15) then
if (Model%kdt == 1 ) then
if (Model%kdt == 1) then
Tbd%phy_f3d(:,:,Model%nleffr) = 10.
Tbd%phy_f3d(:,:,Model%nieffr) = 50.
Tbd%phy_f3d(:,:,Model%nseffr) = 250.
Expand Down
3 changes: 1 addition & 2 deletions physics/GFS_surface_generic.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,8 +221,7 @@ subroutine GFS_surface_generic_post_run (im, cplflx, cplwav, lssav, icy, wet, dt
dvisdfi_cpl, dnirbm_cpl, dnirdf_cpl, dvisbm_cpl, dvisdf_cpl, nlwsfci_cpl, nlwsfc_cpl, t2mi_cpl, q2mi_cpl, u10mi_cpl, &
v10mi_cpl, tsfci_cpl, psurfi_cpl, nnirbmi_cpl, nnirdfi_cpl, nvisbmi_cpl, nvisdfi_cpl, nswsfci_cpl, nswsfc_cpl, nnirbm_cpl, &
nnirdf_cpl, nvisbm_cpl, nvisdf_cpl, gflux, evbsa, evcwa, transa, sbsnoa, snowca, snohfa, ep, &
runoff, srunoff, runof, drain, lheatstrg, z0fac, e0fac, zorl, hflx, evap, hflxq, evapq, hffac, hefac, &
errmsg, errflg)
runoff, srunoff, runof, drain, lheatstrg, z0fac, e0fac, zorl, hflx, evap, hflxq, evapq, hffac, hefac, errmsg, errflg)

implicit none

Expand Down
40 changes: 20 additions & 20 deletions physics/multi_gases.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@ subroutine multi_gases_init(ngas, nwat, ri, cpi, is_master)
! vicv(0): cv0/cv_air
!--------------------------------------------
integer, intent(in):: ngas, nwat
real, intent(in):: ri(0:ngas)
real, intent(in):: cpi(0:ngas)
real(kind=kind_dyn), intent(in):: ri(0:ngas)
real(kind=kind_dyn), intent(in):: cpi(0:ngas)
logical, intent(in):: is_master
! Local:
integer n
Expand Down Expand Up @@ -121,11 +121,11 @@ subroutine multi_gases_init(ngas, nwat, ri, cpi, is_master)
enddo

if( is_master ) then
write(*,*) ' multi_gases_init with ind_gas=',ind_gas
write(*,*) ' multi_gases_init with num_gas=',num_gas
write(*,*) ' multi_gases_init with vir =',vir
write(*,*) ' multi_gases_init with vicp=',vicp
write(*,*) ' multi_gases_init with vicv=',vicv
write(*,*) ' ccpp multi_gases_init with ind_gas=',ind_gas
write(*,*) ' ccpp multi_gases_init with num_gas=',num_gas
write(*,*) ' ccpp multi_gases_init with vir =',vir
write(*,*) ' ccpp multi_gases_init with vicp=',vicp
write(*,*) ' ccpp multi_gases_init with vicv=',vicv
endif

return
Expand All @@ -149,7 +149,7 @@ pure real function virq(q)
! !OUTPUT PARAMETERS
! Ouput: variable gas 1+zvir/(1-qc)
!--------------------------------------------
real, intent(in) :: q(num_gas)
real(kind=kind_dyn), intent(in) :: q(num_gas)
! Local:
integer :: n

Expand All @@ -169,7 +169,7 @@ pure real function virq_nodq(q)
! !OUTPUT PARAMETERS
! Ouput: variable gas 1+zvir without dividing by 1-qv or 1-qv-qc
!--------------------------------------------
real, intent(in) :: q(num_gas)
real(kind=kind_dyn), intent(in) :: q(num_gas)
! Local:
integer :: n

Expand All @@ -188,8 +188,8 @@ pure real function virq_max(q, qmin)
! !OUTPUT PARAMETERS
! Ouput: variable gas 1+zvir using max(qmin,q(sphum))
!--------------------------------------------
real, intent(in) :: q(num_gas)
real, intent(in) :: qmin
real(kind=kind_dyn), intent(in) :: q(num_gas)
real(kind=kind_dyn), intent(in) :: qmin
! Local:
integer :: n

Expand All @@ -210,8 +210,8 @@ pure real function virq_qpz(q, qpz)
! !OUTPUT PARAMETERS
! Ouput: variable gas 1+zvir/(1.-qpz): qpz in place of qv+qc from q
!--------------------------------------------
real, intent(in) :: q(num_gas)
real, intent(in) :: qpz
real(kind=kind_dyn), intent(in) :: q(num_gas)
real(kind=kind_dyn), intent(in) :: qpz
! Local:
integer :: n

Expand All @@ -232,7 +232,7 @@ pure real function virqd(q)
! !OUTPUT PARAMETERS
! Ouput: variable gas 1+zvir/(1-(qv+qc)) (dry)
!--------------------------------------------
real, intent(in) :: q(num_gas)
real(kind=kind_dyn), intent(in) :: q(num_gas)
! Local:
integer :: n

Expand All @@ -252,7 +252,7 @@ pure real function vicpqd(q)
! !OUTPUT PARAMETERS
! Ouput: variable gas cp (dry)
!--------------------------------------------
real, intent(in) :: q(num_gas)
real(kind=kind_dyn), intent(in) :: q(num_gas)
! Local:
integer :: n

Expand All @@ -272,8 +272,8 @@ pure real function vicpqd_qpz(q, qpz)
! !OUTPUT PARAMETERS
! Ouput: variable gas cp (dry) with qpz in place of qv+qc from q
!--------------------------------------------
real, intent(in) :: q(num_gas)
real, intent(in) :: qpz
real(kind=kind_dyn), intent(in) :: q(num_gas)
real(kind=kind_dyn), intent(in) :: qpz
! Local:
integer :: n

Expand All @@ -293,7 +293,7 @@ pure real function vicvqd(q)
! !OUTPUT PARAMETERS
! Ouput: variable gas cv (dry)
!--------------------------------------------
real, intent(in) :: q(num_gas)
real(kind=kind_dyn), intent(in) :: q(num_gas)
! Local:
integer :: n

Expand All @@ -313,8 +313,8 @@ pure real function vicvqd_qpz(q,qpz)
! !OUTPUT PARAMETERS
! Ouput: variable gas cv (dry) with qpz in place of qv+qc from q
!--------------------------------------------
real, intent(in) :: q(num_gas)
real, intent(in) :: qpz
real(kind=kind_dyn), intent(in) :: q(num_gas)
real(kind=kind_dyn), intent(in) :: qpz
! Local:
integer :: n

Expand Down