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.

Sign up for GitHub

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

Jump to bottom

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

Merged
merged 1 commit into from
Sep 18, 2024
Merged

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

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions components/mosart/src/riverroute/MOSART_physics_mod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 •
edited
Loading

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.

! call shr_sys_abort('mosart: negative channel storage')
endif
TRunoff%flow = TRunoff%flow / Tctl%DLevelH2R
TRunoff%erowm_regi(:,nt_nmud:nt_nsan) = TRunoff%erowm_regi(:,nt_nmud:nt_nsan) / Tctl%DLevelH2R
Expand Down