Skip to content

Conversation

@mvdebolskiy
Copy link
Collaborator

Description of changes

Updated co2 flux when fates is on.

Only includes nbp calculations:
NBP=NPP-fire_closs-grazing_closs
Net carbon exchange is positive to atm.

@kjetilaas, @rosiealice

To bring this in:
0. Checkout this branch.

  1. Do ./bin/git-fleximod update
  2. Go to src/fates
  3. Add rosie's remote
  4. Checkout branch for Nbp nobalancecheck fates#20
  5. Run ./create_test --xml-category aux_clm_noresm
  6. Check if any tests fail (lnd2rof test is expected to fail)
  7. Merge Nbp nobalancecheck fates#20
  8. Fetch, checkout the head of NorESMhub/noresm branch (in src/fates).
  9. Tag merge commit with sci.1.85.1_api.40.0.0_noresm_v1
  10. Push the tag to NorESMhub
  11. Go to source update .gitmodules for fates to sci.1.85.1_api.40.0.0_noresm_v1
  12. Add both .gitmodules and src/fates and commit
  13. Merge this PR
  14. Checkout noresm:HEAD
  15. Tag commit you are on with ctsm5.3.045_noresm_v8
  16. Push the tag.
  17. Ask Tomas to make a NorESM tag with updated ctsm

@mvdebolskiy
Copy link
Collaborator Author

aux_clm_noresm passed.

@rosiealice
Copy link
Collaborator

Thanks @mvdebolskiy :)

Copy link
Collaborator

@rosiealice rosiealice left a comment

Choose a reason for hiding this comment

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

Hi @mvdebolskiy this looks good. I think if/when we make a balance check we might need to do some more before we get to the summary, but given how simple this is now perhaps that reduces the potential for error.

I do think I need to add in the product pool decay flux though. I will try to add it here.

@mvdebolskiy
Copy link
Collaborator Author

@rosiealice I believe there is a balance check within fates already, but it might not include soil fluxes apart from litter.

Copy link
Collaborator

@kjetilaas kjetilaas left a comment

Choose a reason for hiding this comment

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

I agree with @rosiealice: fluxes from the product pool(s) needs to be added here. Otherwise, this looks good to me.

@rosiealice
Copy link
Collaborator

rosiealice commented Jun 18, 2025

Notes on what I actually did (upon realizing we also needed product pools.

  1. Checkout this branch. X
  2. Do ./bin/git-fleximod update X
  3. Go to src/fates X
  4. Add rosie's remote X
  5. Checkout branch for Nbp nobalancecheck fates#20 X
  6. Run ./create_test --xml-category aux_clm_noresm X
  7. Check if any tests fail (lnd2rof test is expected to fail) X
  8. Merge Nbp nobalancecheck fates#20 X

At this point I added new code to add in the product pool fluxes, and ran the test suite. Eventually all the tests passed, and I commited the code in
ee619df
but then I was in detached head state for some reason, so I made. new branch from that state (https://github.com/rosiealice/ctsm/tree/nbp_with_products) and then a new PR from that branch 9https://github.com/rosiealice/ctsm/tree/nbp_with_products)

and then we resume the instructions below...

  1. Fetch, checkout the head of NorESMhub/noresm branch (in src/fates). X
  2. Tag merge commit with sci.1.85.1_api.40.0.0_noresm_v1 (_git tag sci.1.85.1_api.40.0.0_noresm_v1) X
  3. Push the tag to NorESMhub (git push origin tag sci.1.85.1_api.40.0.0_noresm_v1) X
  4. Go to source update .gitmodules for fates to sci.1.85.1_api.40.0.0_noresm_v1 (changed fates tag inside noresm_nbp_updt/components/clm/.gitmodules ) X
  5. Add both .gitmodules and src/fates and commit X
  6. Merge this PR X
  7. Checkout noresm:HEAD X
  8. Tag commit you are on with ctsm5.3.045_noresm_v8 X
  9. Push the tag. X
  10. Ask Tomas to make a NorESM tag with updated ctsm

@maritsandstad maritsandstad merged commit e23a698 into noresm Jun 20, 2025
4 checks passed
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