Skip to content

Commit 3eeaad1

Browse files
authored
Revert "fix(column lengths): autoscale array write to ncol for structured mul…"
This reverts commit 351c5b7.
1 parent 351c5b7 commit 3eeaad1

2 files changed

Lines changed: 1 addition & 29 deletions

File tree

autotest/test_model_splitter.py

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,6 @@
1414
def test_structured_model_splitter(function_tmpdir):
1515
sim_path = get_example_data_path() / "mf6-freyberg"
1616

17-
from pathlib import Path
18-
19-
function_tmpdir = Path("./temp")
20-
21-
split_path = function_tmpdir / "split_model"
22-
2317
sim = MFSimulation.load(sim_ws=sim_path)
2418
sim.set_sim_path(function_tmpdir)
2519
sim.write_simulation()
@@ -38,7 +32,7 @@ def test_structured_model_splitter(function_tmpdir):
3832
mfsplit = Mf6Splitter(sim)
3933
new_sim = mfsplit.split_model(array)
4034

41-
new_sim.set_sim_path(split_path)
35+
new_sim.set_sim_path(function_tmpdir / "split_model")
4236
new_sim.write_simulation()
4337
new_sim.run_simulation()
4438

@@ -55,21 +49,6 @@ def test_structured_model_splitter(function_tmpdir):
5549
err_msg = "Heads from original and split models do not match"
5650
np.testing.assert_allclose(new_heads, original_heads, err_msg=err_msg)
5751

58-
# test that line length is ncol for each model....
59-
ll_dict = {
60-
split_path / "freyberg_001.npf": ml0.dis.ncol.get_data(),
61-
split_path / "freyberg_100.npf": ml1.dis.ncol.get_data(),
62-
}
63-
for f, ncol in ll_dict.items():
64-
with open(f) as foo:
65-
while "internal" not in foo.readline().lower():
66-
continue
67-
68-
line = foo.readline().strip()
69-
tmp = line.split()
70-
if len(tmp) != ncol:
71-
raise AssertionError("Array column length is not equal to ncol")
72-
7352

7453
@requires_exe("mf6")
7554
def test_vertex_model_splitter(function_tmpdir):

flopy/mf6/mfmodel.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1318,13 +1318,6 @@ def write(self, ext_file_action=ExtFileAction.copy_relative_paths):
13181318

13191319
self.name_file.write(ext_file_action=ext_file_action)
13201320

1321-
if not self.simulation_data.max_columns_user_set:
1322-
grid_type = self.get_grid_type()
1323-
if grid_type == DiscretizationType.DIS:
1324-
self.simulation_data.max_columns_of_data = self.dis.ncol.get_data()
1325-
self.simulation_data.max_columns_user_set = False
1326-
self.simulation_data.max_columns_auto_set = True
1327-
13281321
# write packages
13291322
for pp in self.packagelist:
13301323
if (

0 commit comments

Comments
 (0)