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

[production/RRFS.v1] Fix improperly assigned fire emissions for ebb_dcycle==1 for retrospectives (NOT operational!) #812

Merged

Conversation

jordanschnell
Copy link

Description

For ebb_dcycle==1 (retrospective fire emissions), the 3-d emissions were incorrectly assgined assigned at all levels using the surface data.

Issue(s) addressed

Testing

How were these changes tested?
What compilers / HPCs was it tested with?
Are the changes covered by regression tests? (If not, why? Do new tests need to be added?)
Have the ufs-weather-model regression test been run? On what platform?

  • Will the code updates change regression test baseline? If yes, why? Please show the baseline directory below.
  • Please commit the regression test log files in your ufs-weather-model branch

Dependencies

If testing this branch requires non-default branches in other repositories, list them.
Those branches should have matching names (ideally)

Do PRs in upstream repositories need to be merged first?
If so add the "waiting for other repos" label and list the upstream PRs

  • waiting on noaa-emc/nems/pull/<pr_number>
  • waiting on noaa-emc/fv3atm/pull/<pr_number>

@jordanschnell jordanschnell marked this pull request as draft March 28, 2024 18:37
@MatthewPyle-NOAA MatthewPyle-NOAA changed the title Fix improperly assigned fire emissions for ebb_dcycle==1 for retrospectives (NOT operational!) [production/RRFS.v1] Fix improperly assigned fire emissions for ebb_dcycle==1 for retrospectives (NOT operational!) Apr 1, 2024
@grantfirl
Copy link
Collaborator

@jordanschnell Please pull in the latest production/RRFS.v1 code for testing.

Merge branch 'production/RRFS.v1' into ebb_dcycle_fix
@jordanschnell jordanschnell marked this pull request as ready for review April 9, 2024 15:42
@grantfirl
Copy link
Collaborator

@jordanschnell Please revert the changes to .gitmodules and git add the latest ccpp/physics commit in production/RRFS.v1: ufs-community/ccpp-physics@d889bae in preparation for merge.

@jordanschnell
Copy link
Author

@jordanschnell Please revert the changes to .gitmodules and git add the latest ccpp/physics commit in production/RRFS.v1: ufs-community/ccpp-physics@d889bae in preparation for merge.

HI @grantfirl ,

Want to be clear on this process -

For revert the changes to .gitmodules, should I make the change to what it was before, add, and recommit? Or should I be using some form of git revert

For adding the latest ccpp/physics commit, is this similar to before, i.e., ("ufs-fork" is ufs-community remote, "jordan" is my fork)

git checkout production/RRFS.v1
git pull ufs-fork production/RRFS.v1
git checkout ebb_dcycle_fix
git add ccpp
git merge production/RRFS.v1
git commit
git push -u jordan

@grantfirl
Copy link
Collaborator

@jordanschnell Please revert the changes to .gitmodules and git add the latest ccpp/physics commit in production/RRFS.v1: ufs-community/ccpp-physics@d889bae in preparation for merge.

HI @grantfirl ,

Want to be clear on this process -

For revert the changes to .gitmodules, should I make the change to what it was before, add, and recommit? Or should I be using some form of git revert

For adding the latest ccpp/physics commit, is this similar to before, i.e., ("ufs-fork" is ufs-community remote, "jordan" is my fork)

git checkout production/RRFS.v1 git pull ufs-fork production/RRFS.v1 git checkout ebb_dcycle_fix git add ccpp git merge production/RRFS.v1 git commit git push -u jordan

All we're wanting to do is get the .gitmodules file back to its original state and point to the latest commit of ccpp/physics. So, I would do it like this:

  1. cd into ccpp/physics
  2. git checkout production/RRFS.v1
  3. git pull ufs-fork production/RRFS.v1
  4. git log - make sure that the commit hash corresponds to ufs-community/ccpp-physics@d889bae
  5. cd up to FV3
  6. make sure your ebb_dcycle_fix branch is checked out
  7. git add ccpp/physics
  8. Your choice of editing .gitmodules and git add .gitmodules or just checking out the file from the production/RRFS.v1 branch git checkout production/RRFS.v1 -- .gitmodules
  9. git status - you should see that ccpp/physics and .gitmodules are modified and added
  10. git commit -m "your commit message"
  11. git push -u jordan

@jordanschnell
Copy link
Author

3. git pull ufs-fork production/RRFS.v1

Done! Thank you so much for the detailed explanation - will make future commits so much easier.

Now, once this is merged, the same thing for ufs-weather-model (i.e, updating FV3 to latest commit and reverting .gitmodules)?

@grantfirl
Copy link
Collaborator

@jordanschnell Looks good. @MatthewPyle-NOAA @jkbk2004 This should be ready to review/approve/merge.

@grantfirl
Copy link
Collaborator

  1. git pull ufs-fork production/RRFS.v1

Done! Thank you so much for the detailed explanation - will make future commits so much easier.

Now, once this is merged, the same thing for ufs-weather-model (i.e, updating FV3 to latest commit and reverting .gitmodules)?

Yep

@jkbk2004
Copy link
Collaborator

@MatthewPyle-NOAA Can you merge this pr?

@MatthewPyle-NOAA MatthewPyle-NOAA merged commit 85adf5b into NOAA-EMC:production/RRFS.v1 Apr 11, 2024
grantfirl pushed a commit to grantfirl/fv3atm that referenced this pull request Oct 29, 2024
…cycle==1 for retrospectives (NOT operational!) (NOAA-EMC#812)

* Fix improperly assigned fire emissions for ebb_dcycle==1 for retrospectives (NOT operational!)
* Move ebu_smoke outside of extended_sd_diag IF block in diagnostics
* Update ccpp/physics to relevant commmit, revert .gitmodules back to original state
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.

4 participants