Merge branch 'dtc/develop' of https://github.com/NCAR/ccpp-physics in…

…to HAFS_fer_hires
climbfuji · Dec 5, 2019 · 41086af · 41086af
2 parents 92d9edf + f895fc0
commit 41086af
Show file tree

Hide file tree

Showing 21 changed files with 872 additions and 382 deletions.
diff --git a/physics/GFS_suite_interstitial.F90 b/physics/GFS_suite_interstitial.F90
@@ -662,7 +662,7 @@ end subroutine GFS_suite_interstitial_4_finalize
     subroutine GFS_suite_interstitial_4_run (im, levs, ltaerosol, cplchm, tracers_total, ntrac, ntcw, ntiw, ntclamt, &
       ntrw, ntsw, ntrnc, ntsnc, ntgl, ntgnc, ntlnc, ntinc, nn, imp_physics, imp_physics_gfdl, imp_physics_thompson,  &
       imp_physics_zhao_carr, imp_physics_zhao_carr_pdf, dtf, save_qc, save_qi, con_pi,                               &
-      gq0, clw, dqdti, errmsg, errflg)
+      gq0, clw, dqdti, imfdeepcnv, imfdeepcnv_gf, errmsg, errflg)
 
       use machine,               only: kind_phys
 
@@ -672,7 +672,7 @@ subroutine GFS_suite_interstitial_4_run (im, levs, ltaerosol, cplchm, tracers_to
 
       integer,                                  intent(in) :: im, levs, tracers_total, ntrac, ntcw, ntiw, ntclamt, ntrw,  &
         ntsw, ntrnc, ntsnc, ntgl, ntgnc, ntlnc, ntinc, nn, imp_physics, imp_physics_gfdl, imp_physics_thompson,           &
-        imp_physics_zhao_carr, imp_physics_zhao_carr_pdf
+        imp_physics_zhao_carr, imp_physics_zhao_carr_pdf, imfdeepcnv, imfdeepcnv_gf
 
       logical,                                  intent(in) :: ltaerosol, cplchm
 
@@ -736,7 +736,8 @@ subroutine GFS_suite_interstitial_4_run (im, levs, ltaerosol, cplchm, tracers_to
               gq0(i,k,ntcw) = clw(i,k,2)                     ! water
             enddo
           enddo
-          if (imp_physics == imp_physics_thompson) then
+!         if (imp_physics == imp_physics_thompson) then
+          if (imp_physics == imp_physics_thompson .and. imfdeepcnv /= imfdeepcnv_gf) then
             if (ltaerosol) then
               do k=1,levs
                 do i=1,im

diff --git a/physics/GFS_suite_interstitial.meta b/physics/GFS_suite_interstitial.meta
@@ -1701,6 +1701,22 @@
   kind = kind_phys
   intent = inout
   optional = F
+[imfdeepcnv]
+  standard_name = flag_for_mass_flux_deep_convection_scheme
+  long_name = flag for mass-flux deep convection scheme
+  units = flag
+  dimensions = ()
+  type = integer
+  intent = in
+  optional = F
+[imfdeepcnv_gf]
+  standard_name = flag_for_gf_deep_convection_scheme
+  long_name = flag for Grell-Freitas deep convection scheme
+  units = flag
+  dimensions = ()
+  type = integer
+  intent = in
+  optional = F
 [errmsg]
   standard_name = ccpp_error_message
   long_name = error message for error handling in CCPP

diff --git a/physics/GFS_surface_composites.F90 b/physics/GFS_surface_composites.F90
@@ -123,7 +123,7 @@ subroutine GFS_surface_composites_pre_run (im, frac_grid, flag_cice, cplflx, lan
             if (cice(i) < one) then
               wet(i) = .true.
   !           tsfco(i) = tgice
-              tsfco(i) = max(tisfc(i), tgice)
+              if (.not. cplflx) tsfco(i) = max(tisfc(i), tgice)
   !           tsfco(i) = max((tsfc(i) - cice(i)*tisfc(i)) &
   !                                     / (one - cice(i)), tgice)
             endif