Skip to content

Commit 3f6b84c

Browse files
mjrenomjreno
authored andcommitted
remove temp path checks
1 parent f5bda89 commit 3f6b84c

File tree

2 files changed

+8
-23
lines changed

2 files changed

+8
-23
lines changed

flopy4/compound.py

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -381,25 +381,19 @@ def load(cls, f, **kwargs) -> "MFList":
381381
tokens = strip(line).split(maxsplit=maxsplit)
382382
assert len(tokens) == sum(param_cols)
383383
icol = 0
384-
for i, p in enumerate(param_lists):
385-
if param_cols[i] == 1:
384+
for i in range(len(param_types)):
385+
row_l = []
386+
for j in range(param_cols[i]):
386387
if param_types[i] == "integer":
387-
param_lists[i].append(int(tokens[icol]))
388+
row_l.append(int(tokens[icol]))
388389
elif param_types[i] == "double":
389-
param_lists[i].append(float(tokens[icol]))
390+
row_l.append(float(tokens[icol]))
390391
else:
391-
param_lists[i].append(tokens[icol])
392+
row_l.append(tokens[icol])
392393
icol += 1
394+
if param_cols[i] == 1:
395+
param_lists[i].append(row_l[0])
393396
else:
394-
row_l = []
395-
for j in range(param_cols[i]):
396-
if param_types[i] == "integer":
397-
row_l.append(int(tokens[icol]))
398-
elif param_types[i] == "double":
399-
row_l.append(float(tokens[icol]))
400-
else:
401-
row_l.append(tokens[icol])
402-
icol += 1
403397
param_lists[i].append(row_l)
404398

405399
if blk_params and "dimensions" in blk_params:

test/test_sim.py

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -144,26 +144,17 @@ def test_load_sim(tmp_path):
144144
assert "exchanges" in s.nam
145145
assert "solutiongroup" in s.nam
146146
assert "tdis6" in s.nam["timing"]
147-
assert s.nam["timing"]["tdis6"].value == f"{tmp_path}/sim.tdis"
148147
assert "mtype" in s.nam["models"].params["models"]
149148
assert "mfname" in s.nam["models"].params["models"]
150149
assert "mname" in s.nam["models"].params["models"]
151150
assert s.nam["models"].params["models"]["mtype"][0] == "GWF6"
152-
assert (
153-
s.nam["models"].params["models"]["mfname"][0]
154-
== f"{tmp_path}/{name}.nam"
155-
)
156151
assert s.nam["models"].params["models"]["mname"][0] == f"{name}"
157152
assert "slntype" in s.nam["solutiongroup"].params["solutiongroup"]
158153
assert "slnfname" in s.nam["solutiongroup"].params["solutiongroup"]
159154
assert "slnmnames" in s.nam["solutiongroup"].params["solutiongroup"]
160155
assert (
161156
s.nam["solutiongroup"].params["solutiongroup"]["slntype"][0] == "ims6"
162157
)
163-
assert (
164-
s.nam["solutiongroup"].params["solutiongroup"]["slnfname"][0]
165-
== f"{tmp_path}/{name}.ims"
166-
)
167158
assert (
168159
s.nam["solutiongroup"].params["solutiongroup"]["slnmnames"][0]
169160
== f"{name}"

0 commit comments

Comments
 (0)