Skip to content
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.

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

UFS-dev PR#118 #1040

Merged
merged 8 commits into from
Feb 2, 2024
Merged

UFS-dev PR#118 #1040

merged 8 commits into from
Feb 2, 2024

Conversation

grantfirl
Copy link
Collaborator

@grantfirl grantfirl commented Dec 3, 2023

@grantfirl grantfirl marked this pull request as ready for review January 30, 2024 22:02
@grantfirl grantfirl requested review from mkavulich and removed request for dustinswales, gthompsnWRF, RuiyuSun and AndersJensen-NOAA January 30, 2024 22:03
@@ -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
Collaborator

@AndersJensen-NOAA AndersJensen-NOAA Jan 31, 2024

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
Collaborator Author

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.

Copy link
Collaborator

@AndersJensen-NOAA AndersJensen-NOAA left a comment

Choose a reason for hiding this comment

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

See comment on combining with aerosol aware code already in place.

@grantfirl grantfirl dismissed AndersJensen-NOAA’s stale review February 2, 2024 14:10

Requested changes should go elsewhere to avoid deltas between main and ufs/dev branches.

@grantfirl grantfirl merged commit c7a9e0d into NCAR:main Feb 2, 2024
2 of 3 checks passed
@grantfirl grantfirl mentioned this pull request Feb 2, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants