Skip to content

fix(mnw2): fix issues causing random failures on python 3.5 #739

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

Merged
jdhughes-dev merged 1 commit into from
Nov 23, 2019
Merged

fix(mnw2): fix issues causing random failures on python 3.5 #739

Show file tree
Hide file tree
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
8 changes: 4 additions & 4 deletions autotest/t027_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,11 +157,10 @@ def test_make_package():
m4.write_input()

# make the package from the objects
# reuse second per pumping for last stress period
mnw2fromobj = flopy.modflow.ModflowMnw2(model=m4, mnwmax=2,
mnw=mnw2_4.mnw,
itmp=[2, 2, -1],
# reuse second per pumping for last stress period
)
itmp=[2, 2, -1])
# verify that the two input methods produce the same results
assert np.array_equal(mnw2_4.stress_period_data[1],
mnw2fromobj.stress_period_data[1])
Expand Down Expand Up @@ -318,8 +317,9 @@ def test_blank_lines():
wellids = ['eb-33', 'eb-35', 'eb-36']
rates = [np.float32(-11229.2), np.float32(-534.72), np.float32(-534.72)]

wellids2 = sorted(list(mnw2.mnw.keys()))
emsg = 'incorrect keys returned from load mnw2'
assert list(mnw2.mnw.keys()) == wellids, emsg
assert wellids2 == wellids, emsg

spd = mnw2.stress_period_data[0]

Expand Down
3 changes: 2 additions & 1 deletion flopy/modflow/mfmnw2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1455,7 +1455,8 @@ def make_node_data(self, mnwobjs):
node_data = ModflowMnw2.get_empty_node_data(len(mnwobj_node_data))

for ix, node in enumerate(mnwobj_node_data):
node_data[ix] = node
for jx, name in enumerate(node_data.dtype.names):
node_data[name][ix] = node[jx]

self.node_data = node_data

Expand Down