Skip to content

fix(boundnames): Fixed problem loading boundnames #757

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
christianlangevin merged 2 commits into from
Dec 12, 2019
Merged

fix(boundnames): Fixed problem loading boundnames #757

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ff041e0
fix(boundnames): Fixed problem where boundnames did not get loaded fo…
spaulins-usgs Dec 11, 2019
50bd727
fix(line length)
spaulins-usgs Dec 12, 2019
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
10 changes: 7 additions & 3 deletions autotest/t505_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -493,17 +493,17 @@ def test021_twri():
stress_period_data = []
drn_heads = [0.0, 0.0, 10.0, 20.0, 30.0, 50.0, 70.0, 90.0, 100.0]
for col, head in zip(range(1, 10), drn_heads):
stress_period_data.append(((0, 7, col), head, 1.0))
stress_period_data.append(((0, 7, col), head, 1.0,
'name_{}'.format(col)))
drn_package = ModflowGwfdrn(model, print_input=True, print_flows=True,
save_flows=True, maxbound=9,
save_flows=True, maxbound=9, boundnames=True,
stress_period_data=stress_period_data)
rch_package = ModflowGwfrcha(model, readasarrays=True, fixed_cell=True,
recharge={0: 0.00000003},
auxiliary=[('iface', 'conc')], aux=auxdata)

aux = rch_package.aux.get_data()


stress_period_data = []
layers = [2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
rows = [4, 3, 5, 8, 8, 8, 8, 10, 10, 10, 10, 12, 12, 12, 12]
Expand All @@ -527,9 +527,12 @@ def test021_twri():
model2 = sim2.get_model()
ic2 = model2.get_package('ic')
strt2 = ic2.strt.get_data()
drn2 = model2.get_package('drn')
drn_spd = drn2.stress_period_data.get_data()
assert(strt2[0,0,0] == 0.0)
assert(strt2[1,0,0] == 1.0)
assert(strt2[2,0,0] == 2.0)
assert(drn_spd[0][1][3] == 'name_2')

# compare output to expected results
head_file = os.path.join(os.getcwd(), expected_head_file)
Expand Down Expand Up @@ -742,6 +745,7 @@ def test005_advgw_tidal():
((0, 6, 7), 'river_stage_2', 1008.0, 36.2, None),
((0, 6, 8), 'river_stage_2', 1009.0, 36.1),
((0, 6, 9), 'river_stage_2', 1010.0, 36.0)]

riv_period[0] = riv_period_array
# riv time series
ts_data = [(0.0, 40.0, 41.0), (1.0, 41.0, 41.5), (2.0, 43.0, 42.0),
Expand Down
5 changes: 3 additions & 2 deletions flopy/mf6/data/mffileaccess.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1012,7 +1012,7 @@ def read_list_data_from_file(self, file_handle, storage, current_key,
data_item, data_index, None,
current_key, self._data_line,
False)[0:2]
elif data_item.name == 'boundnames' and \
elif data_item.name == 'boundname' and \
self._data_dimensions.package_dim.\
boundnames():
self._data_line += (convert_data(
Expand Down Expand Up @@ -1473,7 +1473,8 @@ def _append_data_list(self, storage, data_item, arr_line, arr_line_len,
if arr_line is None:
data_converted = None
if add_to_last_line:
self._last_line_info[-1].append([data_index, None, 0])
self._last_line_info[-1].append([data_index,
data_item.type, 0])
else:
if arr_line[data_index].lower() in \
self._data_dimensions.package_dim.get_tsnames():
Expand Down