Merge pull request #3 from SamuelTrahanNOAA/C3_updates_updates

Merge PR #121 and resolve conflicts

physics/samfdeepcnv.f

@@ -84,7 +84,7 @@ subroutine samfdeepcnv_run (im,km,first_time_step,restart,        &
      &    clam,c0s,c1,betal,betas,evef,pgcon,asolfac,                   &
      &    do_ca, ca_closure, ca_entr, ca_trigger, nthresh,ca_deep,      &
      &    rainevap,sigmain,sigmaout,betadcu,betamcu,betascu,            &
-     &    errmsg,errflg)
+     &    maxMF, do_mynnedmf,errmsg,errflg)
 !
       use machine , only : kind_phys
       use funcphys , only : fpvs
@@ -100,12 +100,13 @@ subroutine samfdeepcnv_run (im,km,first_time_step,restart,        &
      &   prslp(:,:),  garea(:), hpbl(:), dot(:,:), phil(:,:)
       real(kind=kind_phys), dimension(:), intent(in) :: fscav
       logical, intent(in)  :: first_time_step,restart,hwrf_samfdeep,    &
-     &     progsigma
+     &     progsigma,do_mynnedmf
       real(kind=kind_phys), intent(in) :: nthresh,betadcu,betamcu,      &
-     &                                    betascu                       
+     &                                    betascu
       real(kind=kind_phys), intent(in) :: ca_deep(:)
       real(kind=kind_phys), intent(in) :: sigmain(:,:),qmicro(:,:),     &
      &     tmf(:,:,:),q(:,:), prevsq(:,:)
+      real(kind=kind_phys),    dimension (:), intent(in) :: maxMF
       real(kind=kind_phys), intent(out) :: rainevap(:)
       real(kind=kind_phys), intent(out) :: sigmaout(:,:)
       logical, intent(in)  :: do_ca,ca_closure,ca_entr,ca_trigger
@@ -349,6 +350,9 @@ subroutine samfdeepcnv_run (im,km,first_time_step,restart,        &
 !
       do i=1,im
         cnvflg(i) = .true.
+        if(do_mynnedmf) then
+            if(maxMF(i).gt.0.)cnvflg(i)=.false.
+        endif
         sfcpbl(i) = sfclfac * hpbl(i)
         rn(i)=0.
         mbdt(i)=10.

physics/samfdeepcnv.meta

@@ -473,6 +473,21 @@
   dimensions = ()
   type = real
   intent = in
+[maxMF]
+  standard_name = maximum_mass_flux
+  long_name = maximum mass flux within a column
+  units = m s-1
+  dimensions = (horizontal_loop_extent)
+  type = real
+  kind = kind_phys
+  intent = in
+[do_mynnedmf]
+  standard_name = flag_for_mellor_yamada_nakanishi_niino_pbl_scheme
+  long_name = flag to activate MYNN-EDMF
+  units = flag 
+  dimensions = ()
+  type = logical
+  intent = in
 [qlcn]
   standard_name = mass_fraction_of_convective_cloud_liquid_water
   long_name = mass fraction of convective cloud liquid water