Merge pull request NCAR#43 from climbfuji/update_gsd_develop_from_nca…

…r_master_20200707

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

physics/GFS_rrtmg_pre.F90

@@ -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.

physics/GFS_surface_generic.F90

@@ -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
 

physics/multi_gases.F90

@@ -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
@@ -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
@@ -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
 
@@ -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
 
@@ -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
 
@@ -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
 
@@ -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
 
@@ -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
 
@@ -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
 
@@ -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
 
@@ -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