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

test: update last_state1 after updating state2 #220

Draft
wants to merge 7 commits into
base: master
Choose a base branch
from
Draft

test: update last_state1 after updating state2 #220

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c88a85b
test: update last_state1 after updating state2
pesekon2 Sep 21, 2023
5b8a0c5
Merge branch 'master' into test_update_last_state1_after_state2
pesekon2 Nov 16, 2023
4fdcfe0
Merge branch 'master' into test_update_last_state1_after_state2
pesekon2 Nov 17, 2023
bcf1743
Merge branch 'master' into test_update_last_state1_after_state2
pesekon2 Nov 21, 2023
83330f9
Merge branch 'master' into test_update_last_state1_after_state2
pesekon2 Mar 21, 2024
52120fd
Merge branch 'master' into test_update_last_state1_after_state2
pesekon2 Apr 9, 2024
7827f38
Merge branch 'master' into test_update_last_state1_after_state2
pesekon2 Apr 10, 2024
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
14 changes: 9 additions & 5 deletions smoderp2d/runoff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -410,11 +410,6 @@ def run(self):
2,
self.surface.arr.state
)
self.surface.arr.h_last_state1 = ma.where(
state_1_cond,
self.surface.arr.h_total_pre,
self.surface.arr.h_last_state1
)
# update state == 2
self.surface.arr.state = ma.where(
ma.logical_and(
Expand All @@ -424,6 +419,15 @@ def run(self):
1,
self.surface.arr.state
)
state_1_cond = ma.logical_and(
self.surface.arr.state == 1,
self.surface.arr.h_total_new < self.surface.arr.h_total_pre,
)
self.surface.arr.h_last_state1 = ma.where(
state_1_cond,
self.surface.arr.h_total_pre,
self.surface.arr.h_last_state1
)

self.surface.arr.h_total_pre = ma.copy(self.surface.arr.h_total_new)

Expand Down
Loading