Merge pull request #194 from AnningCheng-NOAA/mr2_innl

fixed excessive evaporation when both innerloop=T and mraerosol=T

Author: grantfirl

physics/MP/Thompson/module_mp_thompson.F90

@@ -3587,7 +3587,7 @@ subroutine mp_thompson (qv1d, qc1d, qi1d, qr1d, qs1d, qg1d, ni1d,    &
 
 !+---+-----------------------------------------------------------------+ !  EVAPORATION
            elseif (clap .lt. -eps .AND. ssatw(k).lt.-1.E-6 .AND.     &
-                  (is_aerosol_aware .or. merra2_aerosol_aware)) then  
+                  is_aerosol_aware) then  
             tempc = temp(k) - 273.15
             otemp = 1./temp(k)
             rvs = rho(k)*qvs(k)