Merge branch 'master' of https://github.com/NCAR/ccpp-physics into ma…

…ster-ncar-d1be22d

README.md

@@ -15,4 +15,6 @@ For the use of CCPP with its Single Column Model, see the [Single Column Model U
 
 For the use of CCPP with NOAA's Unified Forecast System (UFS), see the [UFS Medium-Range Application User's Guide](https://ufs-mrweather-app.readthedocs.io/en/latest/) and the [UFS Weather Model User's Guide](https://ufs-weather-model.readthedocs.io/en/latest/).
 
+The Apache license will be in effect unless superseded by an existing license in specific files.
+
 Questions can be directed to the [CCPP Help Desk](mailto:gmtb-help@ucar.edu). When using the CCPP with NOAA's UFS, questions can be posted in the [UFS Weather Model](https://forums.ufscommunity.org/forum/ufs-weather-model) section of the [UFS Forum](https://forums.ufscommunity.org/)

physics/drag_suite.F90

@@ -1260,7 +1260,7 @@ subroutine drag_suite_run(                                           &
             eng1 = 0.5*( (rcs*(u1(i,k)+(dtaux+dtauxb)*deltim))**2 + &
                          (rcs*(v1(i,k)+(dtauy+dtauyb)*deltim))**2 )
             ! Modify theta tendency
-            dtdt(i,k) = dtdt(i,k) + max((eng0-eng1),0.0)/cp/deltim/prslk(i,k)
+            dtdt(i,k) = dtdt(i,k) + max((eng0-eng1),0.0)/cp/deltim
          end if
 
          dusfc(i)   = dusfc(i) + taud_ls(i,k)*xn(i)*del(i,k) + taud_bl(i,k)*xn(i)*del(i,k)

physics/unified_ugwp.F90

@@ -244,7 +244,8 @@ subroutine unified_ugwp_run(me,  master, im,  levs, ntrac, dtp, fhzero, kdt,
     integer,                 intent(in) :: gwd_opt
     integer,                 intent(in), dimension(im)       :: kpbl
     real(kind=kind_phys),    intent(in), dimension(im)       :: oro, oro_uf, hprime, oc, theta, sigma, gamma
-    real(kind=kind_phys),    intent(in), dimension(im)       :: varss,oc1ss,oa4ss,ol4ss,dx
+    real(kind=kind_phys),    intent(in), dimension(im)       :: varss,oc1ss,dx
+    real(kind=kind_phys),    intent(in), dimension(im,4)     :: oa4ss,ol4ss
     logical,                 intent(in)                      :: flag_for_gwd_generic_tend
     ! elvmax is intent(in) for CIRES UGWP, but intent(inout) for GFS GWDPS
     real(kind=kind_phys),    intent(inout), dimension(im)    :: elvmax