Skip to content

UFS-dev PR#118 #1040

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 8 commits into from
Feb 2, 2024
Merged

UFS-dev PR#118 #1040

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5377c7c
passing nc back from microphysics
AnningCheng-NOAA Sep 22, 2023
dd91c3a
Merge pull request #102 from SamuelTrahanNOAA/c3-pointer-fix
grantfirl Oct 3, 2023
9822325
Merge branch 'ufs/dev' into mrfd
grantfirl Oct 12, 2023
c6204e1
add dlw,dsw inst to cpllnd block
DeniseWorthen Oct 15, 2023
69c9764
Merge pull request #109 from AnningCheng-NOAA/mrfd
grantfirl Oct 17, 2023
19a3bb5
Merge branch 'ufs-community:ufs/dev' into feature/lndinst
DeniseWorthen Oct 17, 2023
4014741
Merge branch 'feature/lndinst' into ufs-dev-PR118
grantfirl Dec 3, 2023
c51a0ce
Merge branch 'main' into ufs-dev-PR118
grantfirl Jan 30, 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
8 changes: 4 additions & 4 deletions physics/GFS_surface_generic_post.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,8 @@ subroutine GFS_surface_generic_post_run (im, cplflx, cplaqm, cplchm, cplwav, cpl

if (cplflx .or. cpllnd) then
do i=1,im
dlwsfci_cpl (i) = adjsfcdlw(i)
dswsfci_cpl (i) = adjsfcdsw(i)
dlwsfc_cpl (i) = dlwsfc_cpl(i) + adjsfcdlw(i)*dtf
dswsfc_cpl (i) = dswsfc_cpl(i) + adjsfcdsw(i)*dtf
psurfi_cpl (i) = pgr(i)
Expand All @@ -138,8 +140,6 @@ subroutine GFS_surface_generic_post_run (im, cplflx, cplaqm, cplchm, cplwav, cpl

if (cplflx) then
do i=1,im
dlwsfci_cpl (i) = adjsfcdlw(i)
dswsfci_cpl (i) = adjsfcdsw(i)
dnirbmi_cpl (i) = adjnirbmd(i)
dnirdfi_cpl (i) = adjnirdfd(i)
dvisbmi_cpl (i) = adjvisbmd(i)
Expand Down Expand Up @@ -242,7 +242,7 @@ subroutine GFS_surface_generic_post_run (im, cplflx, cplaqm, cplchm, cplwav, cpl
tedir(i) = tedir(i) + edir(i) * dtf
if (lsm == lsm_noahmp) then
paha(i) = paha(i) + pah(i) * dtf
twa(i) = waxy(i)
twa(i) = waxy(i)
endif
enddo
endif
Expand All @@ -252,7 +252,7 @@ subroutine GFS_surface_generic_post_run (im, cplflx, cplaqm, cplchm, cplwav, cpl
! heat torage parameterization the kinematic sensible heat flux
! (hflx) as surface boundary forcing to the pbl scheme is
! reduced in a factor of hffac given as a function of surface roughness &
! green vegetation fraction (zvfun)
! green vegetation fraction (zvfun)
!
do i=1,im
hflxq(i) = hflx(i)
Expand Down
8 changes: 8 additions & 0 deletions physics/module_mp_thompson.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1509,6 +1509,14 @@ SUBROUTINE mp_gt_driver(qv, qc, qr, qi, qs, qg, ni, nr, nc, &
enddo
endif

if (merra2_aerosol_aware) then
Copy link
Copy Markdown
Collaborator

@AndersJensen-NOAA AndersJensen-NOAA Jan 31, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think combining code (like done above) is better here than adding more lines. Would this work?

if (is_aerosol_aware) then
    if ( PRESENT (aero_ind_fdb) ) then
        if ( .not. aero_ind_fdb) then
            nwfa1d(kts) = nwfa1d(kts) + nwfa2d(i,j)*dt
            nifa1d(kts) = nifa1d(kts) + nifa2d(i,j)*dt
        endif
    else
        nwfa1d(kts) = nwfa1d(kts) + nwfa2d(i,j)*dt
        nifa1d(kts) = nifa1d(kts) + nifa2d(i,j)*dt
    end if
endif
if (is_aerosol_aware .or. merra2_aerosol_aware) then
    do k = kts, kte
        nc(i,k,j) = nc1d(k)
        nwfa(i,k,j) = nwfa1d(k)
        nifa(i,k,j) = nifa1d(k)
    enddo
endif

Copy link
Copy Markdown
Collaborator Author

@grantfirl grantfirl Jan 31, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@AndersJensen-NOAA Yes, I agree with you. I think it would be best to do this simplification in ufs-community#147. When we bring UFS PRs into the NCAR (root) repo, we're not wanting to introduce new changes that represent "deltas" with the UFS repo.

do k = kts, kte
nc(i,k,j) = nc1d(k)
nwfa(i,k,j) = nwfa1d(k)
nifa(i,k,j) = nifa1d(k)
enddo
endif

do k = kts, kte
qv(i,k,j) = qv1d(k)
qc(i,k,j) = qc1d(k)
Expand Down