Skip to content

Fifth reconciliation PR from production/RRFS.v1 #231

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
grantfirl merged 5 commits into from
Dec 30, 2024
Merged

Fifth reconciliation PR from production/RRFS.v1 #231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5d1a4aa
Fix improperly assigned fire emissions for ebb_dcycle==1 for retrospe…
jordanschnell Mar 28, 2024
4403bf8
Merge branch 'ufs/dev' into rrfsv1-to-ufs/dev5
grantfirl Nov 13, 2024
c69a7c3
Merge branch 'ufs/dev' into rrfsv1-to-ufs/dev5
grantfirl Dec 2, 2024
5d7c8f1
Merge branch 'ufs/dev' into rrfsv1-to-ufs/dev5
grantfirl Dec 6, 2024
2594a9e
add back Anning's change to evaporation in Thompson when using MERRA2…
grantfirl Dec 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion physics/MP/Thompson/module_mp_thompson.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
9 changes: 0 additions & 9 deletions physics/smoke_dust/module_add_emiss_burn.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down