Skip to content

Commit

Permalink
"update to address the UFS code managers' comments"
Browse files Browse the repository at this point in the history
  • Loading branch information
haiqinli committed Jun 5, 2024
1 parent 140588e commit ef788da
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion physics/MP/Thompson/module_mp_thompson.F90
Original file line number Diff line number Diff line change
Expand Up @@ -5186,7 +5186,7 @@ real function Eff_aero(D, Da, visc,rhoa,Temp,species)
implicit none
real(wp):: D, Da, visc, rhoa, Temp
character(LEN=1),intent(in):: species
real:: aval, Cc, diff, Re, Sc, St, St2, vt, Eff, rho_p
real(wp):: aval, Cc, diff, Re, Sc, St, St2, vt, Eff, rho_p
real(wp), parameter:: boltzman = 1.3806503E-23
real(wp), parameter:: meanPath = 0.0256E-6

Expand Down
2 changes: 1 addition & 1 deletion physics/PBL/MYNN_EDMF/module_bl_mynn.F90
Original file line number Diff line number Diff line change
Expand Up @@ -5305,7 +5305,7 @@ SUBROUTINE mynn_mix_chem(kts,kte,i, &
IF ( frp > frp_threshold .and. znt .ge. 0.6) THEN ! SRB: znt>0.6 correlates to forests [05/23/24]
kmaxfire = ceiling(log(frp))
IF ( k .ge. 3 .and. k .le. kmaxfire ) THEN ! SRB: k=3 is ~60m above ground, avg evergreen forest canopy height [05/23/24]
khdz(k) = MAX(1.1*khdz(k), (1. - k/(real(kmaxfire)*2.)) * ((log(frp))**2.- 2.*log(frp)) / dz(k)*rhoz(k)) ! JLS 12/21/21
khdz(k) = MAX(1.1*khdz(k), (1. - k/(real(kmaxfire,kind=kind_phys)*2.)) * ((log(frp))**2.- 2.*log(frp)) / dz(k)*rhoz(k)) ! JLS 12/21/21
ENDIF
! khdz(k) = MAX(khdz(k),khdz_back)
ENDIF
Expand Down
2 changes: 1 addition & 1 deletion physics/smoke_dust/module_add_emiss_burn.F90
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ subroutine add_emis_burn(dtstep,dz8w,rho_phy,pi,ebb_min, &
real(kind_phys) :: timeq, fire_age, age_hr, dt1,dt2,dtm ! For BB emis. diurnal cycle calculation

! For Gaussian diurnal cycle
real(kind_phys), INTENT(IN) :: sc_factor ! to scale up the wildfire emissions, Jordan please make this a namelist option
real(kind_phys), INTENT(IN) :: sc_factor ! to scale up the wildfire emissions
real(kind_phys), PARAMETER :: rinti=2.1813936e-8, ax2=3400., const2=130., &
coef2=10.6712963e-4, cx2=7200., timeq_max=3600.*24.
!>-- Fire parameters: Fores west, Forest east, Shrubland, Savannas, Grassland, Cropland
Expand Down
2 changes: 1 addition & 1 deletion physics/smoke_dust/rrfs_smoke_wrapper.F90
Original file line number Diff line number Diff line change
Expand Up @@ -951,7 +951,7 @@ subroutine rrfs_smoke_prep( &

!---- Calculate HWP based on selected method
hwp_local = 0._kind_phys
precip_factor = 2.5_kind_phys + real(hour_int)*5._kind_phys/24._kind_phys
precip_factor = 2.5_kind_phys + real(hour_int,type=kind_phys)*5._kind_phys/24._kind_phys
! total precip is only in the SMOKE_RRFS_DATA if ebb_dcycle == 2 and should be
! filled here before calculating HWP
! !!WARNING!! IF EBB_DYCLE != 2 and HWP_METHOD = 1 | 3, HWP will not take into account totprcp_24hrs
Expand Down
4 changes: 2 additions & 2 deletions physics/smoke_dust/rrfs_smoke_wrapper.meta
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@
[hwp_method_in]
standard_name = control_for_HWP_equation
long_name = control for HWP equation
units = index
units = 1
dimensions = ()
type = integer
intent = in
Expand All @@ -109,7 +109,7 @@
[sc_factor_in]
standard_name = scale_factor_for_wildfire_emissions
long_name = scale factor for wildfire emissions
units = none
units = 1
dimensions = ()
type = real
kind = kind_phys
Expand Down

0 comments on commit ef788da

Please sign in to comment.