Skip to content

restart fixes for two-stream - #1321

Merged
rgknox merged 20 commits into
NGEET:mainfrom
rgknox:twostream-restart-fixes-v2
Mar 26, 2025
Merged

rgknox merged 20 commits into
NGEET:mainfrom
rgknox:twostream-restart-fixes-v2

Conversation

@rgknox

@rgknox rgknox commented Jan 30, 2025 •

Copy link
Copy Markdown
Contributor

Description:

This set of changes, as well as changes to the host, enable restart tests to pass when two-stream radiation is active. Also, subtle updates were made to zenith angle handling, specifically zenith angle is passed at the site level and there is no need to pass in a zenith active flag. Some minor code clean up is also included.

Synchronize with CTSM #2949

Collaborators:

@ckoven

Expectation of Answer Changes:

This may change answers slightly, but should not have any meaningful science changes.

Checklist

If this is your first time contributing, please read the CONTRIBUTING document.

All checklist items must be checked to enable merging this pull request:

Contributor

  • The in-code documentation has been updated with descriptive comments
  • The documentation has been assessed to determine if updates are necessary

Integrator

  • FATES PASS/FAIL regression tests were run
  • Evaluation of test results for answer changes was performed and results provided

Documentation

Test Results:

CTSM (or) E3SM (specify which) test hash-tag:

CTSM (or) E3SM (specify which) baseline hash-tag:

FATES baseline hash-tag:

Test Output:

@rgknox rgknox added the draft label Jan 31, 2025
@rgknox

rgknox commented Feb 2, 2025

Copy link
Copy Markdown
Contributor Author

Note: this branch merged in luh2_nocomp_merge-bcindex from #1226

@glemieux

glemieux commented Feb 3, 2025

Copy link
Copy Markdown
Contributor

This should address ESCOMP/CTSM#2325, correct?

…fusion of ground albedos and performing a solve at the same time as constructing scattering elements
@rgknox

rgknox commented Feb 4, 2025 •

Copy link
Copy Markdown
Contributor Author

yes, I'll link the fix on the ctsm side of the PR

@rgknox rgknox removed the draft label Feb 11, 2025
@glemieux glemieux added science: radiation case: restart Pertaining to CIME case modes labels Mar 13, 2025

! if(isnan(r_diff_dn))then !RGK: NVHPC HAS A BUG IN THIS INTRINSIC (01-2024)
! if(shr_infnan_isnan(r_diff_dn)) then !RGK: this statement simply didn't work
! Dont trigger an endrun, we flag an error with r_diff_dn,

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

@rgknox I'm looking at this code and just noticing that the comment here says not to trigger an endrun, but it still seems like it does end up with an endrun anyway?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Will update comments in future pr since tests are complete

@glemieux glemieux moved this from Finding Reviewers to Final Testing in FATES Pull Request Planning and Status Mar 24, 2025
@glemieux
glemieux self-requested a review March 24, 2025 18:40

@glemieux glemieux left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

This looks good. Very compact and atomic PR.

@rgknox
rgknox merged commit 0f321cd into NGEET:main Mar 26, 2025
@github-project-automation github-project-automation Bot moved this from Final Testing to Ready to Integrate in FATES Pull Request Planning and Status Mar 26, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

case: restart Pertaining to CIME case modes science: radiation

Projects

Development

Successfully merging this pull request may close these issues.

3 participants