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

Revert PR #6313 aborting run on negative channel storage #6623

Merged
merged 1 commit into from
Sep 18, 2024

Conversation

wlin7
Copy link
Contributor

@wlin7 wlin7 commented Sep 17, 2024

The enforced abort whenever MOSART has negative channel storage
may prevent v3.LR simulations from finishing, if the code base that includes
#6313 is used. This PR is to revert #6313 until v3.0.1 tag is created,
to ensure new v3.LR simulations that need to use the latest commits to master
are free from this issue.

Fixes #6622.
[BFB]


Issue #6302 is expected to reemerge.

…c63' (PR #6313)"

This reverts commit 427b860, reversing
changes made to cf32a25.
Copy link

PR Preview Action v1.4.7
🚀 Deployed preview to https://E3SM-Project.github.io/E3SM/pr-preview/pr-6623/
on branch gh-pages at 2024-09-17 02:41 UTC

@wlin7 wlin7 added this to the v3.0.1 milestone Sep 17, 2024
@wlin7 wlin7 added the MOSART MOSART river model label Sep 17, 2024
@@ -682,8 +682,8 @@ subroutine Euler

! check for negative channel storage
if (negchan < -1.e-10) then
write(iulog,*) 'Error: Negative channel storage found! ',negchan
call shr_sys_abort('mosart: negative channel storage')
write(iulog,*) 'Warning: Negative channel storage found! ',negchan
Copy link
Member

@rljacob rljacob Sep 17, 2024

Choose a reason for hiding this comment

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

are you sure you want to print a warning? Was that the old behavior?

Copy link
Member

Choose a reason for hiding this comment

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

Yes looks like it was.

Copy link
Contributor

Choose a reason for hiding this comment

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

Another PR, #6568, resolved this aborting issue with a cleaner solution. Should we discuss and then discuss how to proceed with these two options?

Copy link
Member

Choose a reason for hiding this comment

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

This one will have to go in for the 3.0.1 tag. Then your other fix can be used for 3.1.0.

@peterdschwartz
Copy link
Contributor

peterdschwartz commented Sep 17, 2024

Should I merge this today?

wlin7 added a commit that referenced this pull request Sep 17, 2024
…#6623)

Revert PR #6313 aborting run on negative channel storage

The enforced abort whenever MOSART has negative channel storage
may prevent v3.LR simulations from finishing, if the code base that includes
to ensure new v3.LR simulations that need to use the latest commits to master
are free from this issue.

Fixes #6622.

[BFB]
@wlin7 wlin7 assigned wlin7 and unassigned peterdschwartz Sep 17, 2024
@wlin7
Copy link
Contributor Author

wlin7 commented Sep 17, 2024

I just merged it to next, @peterdschwartz , after seeing Rob's message on slack.

@wlin7 wlin7 merged commit 81312e9 into master Sep 18, 2024
5 checks passed
@wlin7 wlin7 deleted the wlin/rof/revert_neg_channel_storage_abort branch September 18, 2024 17:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
MOSART MOSART river model
Projects
None yet
Development

Successfully merging this pull request may close these issues.

MOSART negative channel storage stopped v3.LR simulation
5 participants