Skip to content

Commit

Permalink
get up to date with ruff
Browse files Browse the repository at this point in the history
  • Loading branch information
emorway-usgs committed Sep 30, 2024
1 parent 644bac0 commit 84f629a
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 14 deletions.
9 changes: 3 additions & 6 deletions autotest/test_gwe_drycell_cnd3.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@
# Imports

import os

import flopy
import numpy as np
import pytest
import flopy

from framework import TestFramework


Expand Down Expand Up @@ -145,7 +145,6 @@ def isMonotonic(A):


def add_gwf_model(sim, gwfname, newton=False):

# Instantiating MODFLOW 6 groundwater flow model
if newton:
gwf = flopy.mf6.ModflowGwf(
Expand Down Expand Up @@ -275,7 +274,6 @@ def add_gwf_model(sim, gwfname, newton=False):


def add_gwe_model(sim, gwename):

gwe = flopy.mf6.ModflowGwe(
sim, modelname=gwename, model_nam_file="{}.nam".format(gwename)
)
Expand Down Expand Up @@ -402,12 +400,11 @@ def add_gwe_model(sim, gwename):


def build_models(idx, test):

# Base MF6 GWF model type
ws = test.workspace
name = cases[idx]

print("Building MF6 model...()".format(name))
print("Building MF6 model...{}".format(name))

# generate names for each model
gwfname1 = "gwf-" + name + "nwt1"
Expand Down
8 changes: 4 additions & 4 deletions autotest/test_gwf_sfrsft_gwdischrg.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
# Test groundwater discharge to a stream and then go on to test
# that a transport model with a single reach works.

import math
import pathlib as pl

import flopy
import numpy as np
import pytest

from framework import TestFramework

cases = ["sfr-gwfout", "sfr-gwf-trnsprt"]
Expand Down Expand Up @@ -224,7 +222,8 @@ def check_output(idx, test):
try:
# load simulated concentration in SFT
cobj = flopy.utils.HeadFile(
sft_obs_fl, text="CONCENTRATION" # precision="double"
sft_obs_fl,
text="CONCENTRATION", # precision="double"
)
sim_conc_sft = cobj.get_alldata()
except:
Expand All @@ -236,7 +235,8 @@ def check_output(idx, test):
try:
# load simulated concentration of groundwater
cobj = flopy.utils.HeadFile(
gwt_sim_conc, text="CONCENTRATION" # precision="double"
gwt_sim_conc,
text="CONCENTRATION", # precision="double"
)
conc_gw = cobj.get_alldata()
except:
Expand Down
7 changes: 3 additions & 4 deletions autotest/test_gwt_uztmvt2x1.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@
# Imports

import os

import flopy
import numpy as np
import pytest
import flopy

from framework import TestFramework

# Base simulation and model name and workspace
Expand Down Expand Up @@ -177,12 +177,11 @@


def build_models(idx, test):

# Base MF6 GWF model type
ws = test.workspace
name = cases[idx]

print("Building MF6 model...()".format(name))
print("Building MF6 model...{}".format(name))

# generate names for each model
gwfname = "gwf-" + name
Expand Down

0 comments on commit 84f629a

Please sign in to comment.