Merge branch 'ufs/dev' into rrfsv1-to-ufs/dev9

grantfirl · Jan 2, 2025 · 8a565e3 · 8a565e3
2 parents a1d1d23 + dfad42f
commit 8a565e3
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 10 deletions.
diff --git a/physics/MP/Thompson/module_mp_thompson.F90 b/physics/MP/Thompson/module_mp_thompson.F90
@@ -3615,7 +3615,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)

diff --git a/physics/smoke_dust/module_add_emiss_burn.F90 b/physics/smoke_dust/module_add_emiss_burn.F90
@@ -66,15 +66,6 @@ subroutine add_emis_burn(dtstep,dz8w,rho_phy,pi,ebb_min,          &
     timeq= mod(timeq,timeq_max)
     coef_con=1._kind_phys/((2._kind_phys*pi)**0.5)
 
-! RAR: for option #1 ebb and frp are ingested for 24 hours. No modification is applied! 
-    if (ebb_dcycle==1) then
-      do k=kts,kte
-        do i=its,ite
-         ebu(i,k,1)=ebu_in(i,1)  
-        enddo
-      enddo
-     endif
-
     if (ebb_dcycle==2) then
 
      do j=jts,jte