Merge pull request NCAR#327 from AnningCheng-NOAA/entr_f0f1

address unreasonable large F0 and F1 in entrainment calculation

Author: rhaesung

physics/CONV/SAMF/samfdeepcnv.f

@@ -1110,8 +1110,8 @@ subroutine samfdeepcnv_run (im,km,first_time_step,restart,        &
           if(cnvflg(i).and.
      &      (k > kbcon(i) .and. k < kmax(i))) then
               tem = qeso(i,k)/qeso(i,kbcon(i))
-              fent1(i,k) = tem**2
-              fent2(i,k) = tem**3
+              fent1(i,k) = min(tem**2, 3.0)
+              fent2(i,k) = min(tem**3, 5.2)
           endif
         enddo
       enddo

physics/GWD/ecmwf_ngw.F90

@@ -247,9 +247,9 @@ subroutine ecmwf_ngw_emc(mpi_id, master, KLON, KLEV, kdt, PTSTEP, DX,        &
 !        ZGAUSSB=0.25_kind_phys
 !         ZGAUSSB=0.3_kind_phys
 !          ZGAUSSB=0.35_kind_phys
-          ZGAUSSB=0.38_kind_phys
+!         ZGAUSSB=0.38_kind_phys
 !        ZGAUSSB=-0.25_kind_phys
-!        ZGAUSSB=0.5_kind_phys
+         ZGAUSSB=0.5_kind_phys
 !        ZGAUSSB=0.3_kind_phys
       GCSTAR=1.0_kind_phys
 
@@ -642,7 +642,8 @@ subroutine ecmwf_ngw_emc(mpi_id, master, KLON, KLEV, kdt, PTSTEP, DX,        &
 
        ZGELATDEG=xlatd(JL)-Z50S
        ZGAUSS(JL)=ZGAUSSB*EXP((-ZGELATDEG*ZGELATDEG)&
-     &  /(2*GGAUSSA*GGAUSSA))
+!    &  /(2*GGAUSSA*GGAUSSA))
+     &  /(2*20.*20.))
 
 !       ZGELATDEG=xlatd(JL)
 !       ZGAUSS(JL)=-0.1_kind_phys*EXP((-ZGELATDEG*ZGELATDEG)&
@@ -658,7 +659,7 @@ subroutine ecmwf_ngw_emc(mpi_id, master, KLON, KLEV, kdt, PTSTEP, DX,        &
      &  /(2*GGAUSSA*GGAUSSA))+ZGAUSS(JL)
 
        ZGELATDEG=xlatd(JL)-50.0_kind_phys
-       ZGAUSS(JL)= 0.0022_kind_phys*EXP((-ZGELATDEG*ZGELATDEG)&
+       ZGAUSS(JL)= 0.1_kind_phys*EXP((-ZGELATDEG*ZGELATDEG)&
      &  /(2*10.*10.))+ZGAUSS(JL)