From ef788da2084b81b7d82a56e4c39dc38f90001628 Mon Sep 17 00:00:00 2001 From: "Haiqin.Li" Date: Wed, 5 Jun 2024 20:40:01 +0000 Subject: [PATCH] "update to address the UFS code managers' comments" --- physics/MP/Thompson/module_mp_thompson.F90 | 2 +- physics/PBL/MYNN_EDMF/module_bl_mynn.F90 | 2 +- physics/smoke_dust/module_add_emiss_burn.F90 | 2 +- physics/smoke_dust/rrfs_smoke_wrapper.F90 | 2 +- physics/smoke_dust/rrfs_smoke_wrapper.meta | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/physics/MP/Thompson/module_mp_thompson.F90 b/physics/MP/Thompson/module_mp_thompson.F90 index 327da88d5..866a35012 100644 --- a/physics/MP/Thompson/module_mp_thompson.F90 +++ b/physics/MP/Thompson/module_mp_thompson.F90 @@ -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 diff --git a/physics/PBL/MYNN_EDMF/module_bl_mynn.F90 b/physics/PBL/MYNN_EDMF/module_bl_mynn.F90 index 7c22c0387..97325b892 100644 --- a/physics/PBL/MYNN_EDMF/module_bl_mynn.F90 +++ b/physics/PBL/MYNN_EDMF/module_bl_mynn.F90 @@ -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 diff --git a/physics/smoke_dust/module_add_emiss_burn.F90 b/physics/smoke_dust/module_add_emiss_burn.F90 index 7466a0a8c..129dc4417 100755 --- a/physics/smoke_dust/module_add_emiss_burn.F90 +++ b/physics/smoke_dust/module_add_emiss_burn.F90 @@ -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 diff --git a/physics/smoke_dust/rrfs_smoke_wrapper.F90 b/physics/smoke_dust/rrfs_smoke_wrapper.F90 index d76383ee1..11a6a90cd 100755 --- a/physics/smoke_dust/rrfs_smoke_wrapper.F90 +++ b/physics/smoke_dust/rrfs_smoke_wrapper.F90 @@ -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 diff --git a/physics/smoke_dust/rrfs_smoke_wrapper.meta b/physics/smoke_dust/rrfs_smoke_wrapper.meta index 14ec275ae..d5afb1831 100755 --- a/physics/smoke_dust/rrfs_smoke_wrapper.meta +++ b/physics/smoke_dust/rrfs_smoke_wrapper.meta @@ -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 @@ -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