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

grantfirl · Jan 3, 2025 · fa3f1ce · fa3f1ce
2 parents 409df9b + a7fe01c
commit fa3f1ce
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 14 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/SFC_Models/Land/RUC/module_sf_ruclsm.F90 b/physics/SFC_Models/Land/RUC/module_sf_ruclsm.F90
@@ -1077,8 +1077,6 @@ SUBROUTINE LSMRUC(xlat,xlon,                                 &
                   tso(i,k,j) = tso1d(k)
         enddo
 
-        tso(i,nzs,j) = tbot(i,j)
-
         do k=1,nzs
              smfr3d(i,k,j) = smfrkeep(k)
            keepfr3dflag(i,k,j) = keepfr (k)
@@ -1104,8 +1102,10 @@ SUBROUTINE LSMRUC(xlat,xlon,                                 &
         if(snow(i,j)==zero) EMISSL(i,j) = EMISBCK(i,j)
         EMISS (I,J) = EMISSL(I,J)
         ! SNOW is in [mm], SNWE is in [m]; CANWAT is in mm, CANWATR is in m
-        SNOW   (i,j) = SNWE*1000._kind_phys
-        SNOWH  (I,J) = SNHEI 
+        !-- 17 may 2024 - cap snow for points at high elevations where all year round skin temperatures are close to 0 C 
+        !-- Snow density for these points will be 3000/7.5=400 [kg/m^3]
+        SNOW   (i,j) = min(3._kind_phys,SNWE)*1000._kind_phys ! cap to be < 3 m
+        SNOWH  (I,J) = min(7.5_kind_phys,SNHEI) ! cap to be < 7.5 m
         CANWAT (I,J) = CANWATR*1000._kind_phys
 
      if (debug_print) then

diff --git a/physics/smoke_dust/module_add_emiss_burn.F90 b/physics/smoke_dust/module_add_emiss_burn.F90
@@ -71,15 +71,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