Skip to content

Commit 45689bf

Browse files
emorway-usgsemorway-usgs
committed
ruff'led
1 parent d594002 commit 45689bf

File tree

3 files changed

+69
-101
lines changed

3 files changed

+69
-101
lines changed

‎autotest/test_gwe_drycell_cnd3.py‎

Lines changed: 28 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -152,14 +152,14 @@ def add_gwf_model(sim, gwfname, newton=False):
152152
modelname=gwfname,
153153
newtonoptions="NEWTON",
154154
save_flows=True,
155-
model_nam_file="{}.nam".format(gwfname),
155+
model_nam_file=f"{gwfname}.nam",
156156
)
157157
else:
158158
gwf = flopy.mf6.ModflowGwf(
159159
sim,
160160
modelname=gwfname,
161161
save_flows=True,
162-
model_nam_file="{}.nam".format(gwfname),
162+
model_nam_file=f"{gwfname}.nam",
163163
)
164164

165165
# Instantiating MODFLOW 6 solver for flow model
@@ -176,7 +176,7 @@ def add_gwf_model(sim, gwfname, newton=False):
176176
scaling_method="NONE",
177177
reordering_method="NONE",
178178
relaxation_factor=relax,
179-
filename="{}.ims".format(gwfname),
179+
filename=f"{gwfname}.ims",
180180
)
181181
sim.register_ims_package(imsgwf, [gwfname])
182182

@@ -193,7 +193,7 @@ def add_gwf_model(sim, gwfname, newton=False):
193193
botm=bot,
194194
idomain=1,
195195
pname="DIS",
196-
filename="{}.dis".format(gwfname),
196+
filename=f"{gwfname}.dis",
197197
)
198198

199199
# Instantiating MODFLOW 6 storage package
@@ -205,7 +205,7 @@ def add_gwf_model(sim, gwfname, newton=False):
205205
steady_state=steady,
206206
transient=transient,
207207
pname="STO",
208-
filename="{}.sto".format(gwfname),
208+
filename=f"{gwfname}.sto",
209209
)
210210

211211
# Instantiating MODFLOW 6 node-property flow package
@@ -217,22 +217,22 @@ def add_gwf_model(sim, gwfname, newton=False):
217217
k33=k33,
218218
save_specific_discharge=True,
219219
pname="NPF",
220-
filename="{}.npf".format(gwfname),
220+
filename=f"{gwfname}.npf",
221221
)
222222

223223
# Instantiating MODFLOW 6 initial conditions package for flow model
224224
flopy.mf6.ModflowGwfic(
225225
gwf,
226226
strt=strthd,
227-
filename="{}.ic".format(gwfname),
227+
filename=f"{gwfname}.ic",
228228
)
229229

230230
# Instantiating MODFLOW 6 output control package for flow model
231231
flopy.mf6.ModflowGwfoc(
232232
gwf,
233233
pname="OC",
234-
head_filerecord="{}.hds".format(gwfname),
235-
budget_filerecord="{}.cbc".format(gwfname),
234+
head_filerecord=f"{gwfname}.hds",
235+
budget_filerecord=f"{gwfname}.cbc",
236236
headprintrecord=[("COLUMNS", 10, "WIDTH", 15, "DIGITS", 6, "GENERAL")],
237237
saverecord=[("HEAD", "ALL"), ("BUDGET", "ALL")],
238238
printrecord=[("HEAD", "ALL"), ("BUDGET", "ALL")],
@@ -259,7 +259,7 @@ def add_gwf_model(sim, gwfname, newton=False):
259259
connectiondata=connectiondata,
260260
perioddata=sfr_perioddata,
261261
pname=pname,
262-
filename="{}.sfr".format(gwfname),
262+
filename=f"{gwfname}.sfr",
263263
)
264264
fname = f"{gwfname}.sfr.obs"
265265
sfr_obs = {
@@ -274,9 +274,7 @@ def add_gwf_model(sim, gwfname, newton=False):
274274

275275

276276
def add_gwe_model(sim, gwename):
277-
gwe = flopy.mf6.ModflowGwe(
278-
sim, modelname=gwename, model_nam_file="{}.nam".format(gwename)
279-
)
277+
gwe = flopy.mf6.ModflowGwe(sim, modelname=gwename, model_nam_file=f"{gwename}.nam")
280278
gwe.name_file.save_flows = True
281279

282280
imsgwe = flopy.mf6.ModflowIms(
@@ -292,7 +290,7 @@ def add_gwe_model(sim, gwename):
292290
scaling_method="NONE",
293291
reordering_method="NONE",
294292
relaxation_factor=relax,
295-
filename="{}.ims".format(gwename),
293+
filename=f"{gwename}.ims",
296294
)
297295
sim.register_ims_package(imsgwe, [gwe.name])
298296

@@ -309,18 +307,14 @@ def add_gwe_model(sim, gwename):
309307
botm=bot,
310308
idomain=1,
311309
pname="DIS",
312-
filename="{}.dis".format(gwename),
310+
filename=f"{gwename}.dis",
313311
)
314312

315313
# Instantiating MODFLOW 6 transport initial concentrations
316-
flopy.mf6.ModflowGweic(
317-
gwe, strt=strt_temp, pname="IC", filename="{}.ic".format(gwename)
318-
)
314+
flopy.mf6.ModflowGweic(gwe, strt=strt_temp, pname="IC", filename=f"{gwename}.ic")
319315

320316
# Instantiating MODFLOW 6 transport advection package
321-
flopy.mf6.ModflowGweadv(
322-
gwe, scheme=scheme, pname="ADV", filename="{}.adv".format(gwename)
323-
)
317+
flopy.mf6.ModflowGweadv(gwe, scheme=scheme, pname="ADV", filename=f"{gwename}.adv")
324318

325319
# Instantiating MODFLOW 6 transport dispersion package
326320
flopy.mf6.ModflowGwecnd(
@@ -331,10 +325,11 @@ def add_gwe_model(sim, gwename):
331325
ktw=ktw * 86400,
332326
kts=kts * 86400,
333327
pname="CND",
334-
filename="{}.cnd".format(gwename),
328+
filename=f"{gwename}.cnd",
335329
)
336330

337-
# Instantiating MODFLOW 6 transport mass storage package (formerly "reaction" package in MT3DMS)
331+
# Instantiating MODFLOW 6 transport mass storage package
332+
# (formerly "reaction" package in MT3DMS)
338333
flopy.mf6.ModflowGweest(
339334
gwe,
340335
save_flows=True,
@@ -345,7 +340,7 @@ def add_gwe_model(sim, gwename):
345340
heat_capacity_solid=cps,
346341
density_solid=rhos,
347342
pname="EST",
348-
filename="{}.est".format(gwename),
343+
filename=f"{gwename}.est",
349344
)
350345

351346
# Instantiating MODFLOW 6 source/sink mixing package for dealing with
@@ -355,18 +350,16 @@ def add_gwe_model(sim, gwename):
355350
gwe,
356351
sources=sourcerecarray,
357352
pname="SSM",
358-
filename="{}.ssm".format(gwename),
353+
filename=f"{gwename}.ssm",
359354
)
360355

361356
# Instantiate MODFLOW 6 heat transport output control package
362357
flopy.mf6.ModflowGweoc(
363358
gwe,
364359
pname="OC",
365-
budget_filerecord="{}.cbc".format(gwename),
366-
temperature_filerecord="{}.ucn".format(gwename),
367-
temperatureprintrecord=[
368-
("COLUMNS", 10, "WIDTH", 15, "DIGITS", 6, "GENERAL")
369-
],
360+
budget_filerecord=f"{gwename}.cbc",
361+
temperature_filerecord=f"{gwename}.ucn",
362+
temperatureprintrecord=[("COLUMNS", 10, "WIDTH", 15, "DIGITS", 6, "GENERAL")],
370363
saverecord=[("TEMPERATURE", "ALL"), ("BUDGET", "ALL")],
371364
printrecord=[("TEMPERATURE", "ALL"), ("BUDGET", "ALL")],
372365
)
@@ -393,7 +386,7 @@ def add_gwe_model(sim, gwename):
393386
reachperioddata=sfe_perioddata,
394387
flow_package_name=flwpckname,
395388
pname="SFE",
396-
filename="{}.sfe".format(gwename),
389+
filename=f"{gwename}.sfe",
397390
)
398391

399392
return sim
@@ -404,7 +397,7 @@ def build_models(idx, test):
404397
ws = test.workspace
405398
name = cases[idx]
406399

407-
print("Building MF6 model...{}".format(name))
400+
print(f"Building MF6 model...{name}")
408401

409402
# generate names for each model
410403
gwfname1 = "gwf-" + name + "nwt1"
@@ -417,9 +410,7 @@ def build_models(idx, test):
417410
)
418411

419412
# Instantiating MODFLOW 6 time discretization
420-
flopy.mf6.ModflowTdis(
421-
sim, nper=nper, perioddata=tdis_rc, time_units=time_units
422-
)
413+
flopy.mf6.ModflowTdis(sim, nper=nper, perioddata=tdis_rc, time_units=time_units)
423414

424415
# Build two flow models, one with NWT, one without
425416
sim = add_gwf_model(sim, gwfname1, newton=True)
@@ -436,7 +427,7 @@ def build_models(idx, test):
436427
exgmnamea=gwfname1,
437428
exgmnameb=gwename1,
438429
pname="GWFGWE1",
439-
filename="{}.gwfgwe1".format(gwename1),
430+
filename=f"{gwename1}.gwfgwe1",
440431
)
441432

442433
flopy.mf6.ModflowGwfgwe(
@@ -445,7 +436,7 @@ def build_models(idx, test):
445436
exgmnamea=gwfname2,
446437
exgmnameb=gwename2,
447438
pname="GWFGWE2",
448-
filename="{}.gwfgwe2".format(gwename2),
439+
filename=f"{gwename2}.gwfgwe2",
449440
)
450441

451442
return sim, None

‎autotest/test_gwf_sfrsft_gwdischrg.py‎

Lines changed: 10 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,7 @@
2323

2424

2525
def add_gwt_model(sim, gwtname):
26-
gwt = flopy.mf6.ModflowGwt(
27-
sim, modelname=gwtname, model_nam_file="{}.nam".format(gwtname)
28-
)
26+
gwt = flopy.mf6.ModflowGwt(sim, modelname=gwtname, model_nam_file=f"{gwtname}.nam")
2927
gwt.name_file.save_flows = True
3028

3129
imsgwt = flopy.mf6.ModflowIms(
@@ -41,7 +39,7 @@ def add_gwt_model(sim, gwtname):
4139
scaling_method="NONE",
4240
reordering_method="NONE",
4341
relaxation_factor=relax,
44-
filename="{}.ims".format(gwtname),
42+
filename=f"{gwtname}.ims",
4543
)
4644
sim.register_ims_package(imsgwt, [gwt.name])
4745

@@ -65,7 +63,7 @@ def add_gwt_model(sim, gwtname):
6563
gwt,
6664
sources=sourcerecarray,
6765
pname="SSM",
68-
filename="{}.ssm".format(gwtname),
66+
filename=f"{gwtname}.ssm",
6967
)
7068

7169
# Instantiate Streamflow Transport package
@@ -90,16 +88,14 @@ def add_gwt_model(sim, gwtname):
9088
reachperioddata=sft_perioddata,
9189
flow_package_name=flwpckname,
9290
pname="SFT",
93-
filename="{}.sft".format(gwtname),
91+
filename=f"{gwtname}.sft",
9492
)
9593

9694
flopy.mf6.ModflowGwtoc(
9795
gwt,
9896
budget_filerecord=f"{gwtname}.cbc",
9997
concentration_filerecord=f"{gwtname}.ucn",
100-
concentrationprintrecord=[
101-
("COLUMNS", 10, "WIDTH", 15, "DIGITS", 6, "GENERAL")
102-
],
98+
concentrationprintrecord=[("COLUMNS", 10, "WIDTH", 15, "DIGITS", 6, "GENERAL")],
10399
saverecord=[("CONCENTRATION", "ALL"), ("BUDGET", "ALL")],
104100
printrecord=[("CONCENTRATION", "ALL"), ("BUDGET", "ALL")],
105101
)
@@ -150,10 +146,8 @@ def build_models(idx, test):
150146
)
151147

152148
# sfr data
153-
# <ifno> <cellid(ncelldim)> <rlen> <rwid> <rgrd> <rtp> <rbth> <rhk> <man> <ncon> <ustrf> <ndv>
154-
package_data = [
155-
(0, (0, 0, 0), delr, 1.0, 1e-3, 0.0, 1.0, 1.0, 0.001, 0, 0.0, 0)
156-
]
149+
# <ifno> <cellid> <rlen> <rwid> <rgrd> <rtp> <rbth> <rhk> <man> <ncon> <ustrf> <ndv>
150+
package_data = [(0, (0, 0, 0), delr, 1.0, 1e-3, 0.0, 1.0, 1.0, 0.001, 0, 0.0, 0)]
157151
connection_data = [(0)]
158152

159153
sfr_obs = {
@@ -191,7 +185,7 @@ def build_models(idx, test):
191185
exgmnamea=name,
192186
exgmnameb=gwtname,
193187
pname="GWFGWT1",
194-
filename="{}.gwfgwt1".format(gwtname),
188+
filename=f"{gwtname}.gwfgwt1",
195189
)
196190

197191
return sim, None
@@ -227,9 +221,7 @@ def check_output(idx, test):
227221
)
228222
sim_conc_sft = cobj.get_alldata()
229223
except:
230-
assert (
231-
False
232-
), f'could not load concentration data from "{sft_obs_fl}"'
224+
assert False, f'could not load concentration data from "{sft_obs_fl}"'
233225

234226
gwt_sim_conc = pl.Path(f"{test.workspace}/{gwtname}.ucn")
235227
try:
@@ -240,9 +232,7 @@ def check_output(idx, test):
240232
)
241233
conc_gw = cobj.get_alldata()
242234
except:
243-
assert (
244-
False
245-
), f'could not load temperature data from "{sft_obs_fl}"'
235+
assert False, f'could not load temperature data from "{sft_obs_fl}"'
246236

247237
msg0 = "The simulation is not matching the established answer"
248238
msg1 = (

0 commit comments

Comments
 (0)