From 84f629a1ed147ac6ea0ad682ffe86e3e35ff4c70 Mon Sep 17 00:00:00 2001 From: emorway-usgs Date: Mon, 30 Sep 2024 12:17:15 -0700 Subject: [PATCH] get up to date with ruff --- autotest/test_gwe_drycell_cnd3.py | 9 +++------ autotest/test_gwf_sfrsft_gwdischrg.py | 8 ++++---- autotest/test_gwt_uztmvt2x1.py | 7 +++---- 3 files changed, 10 insertions(+), 14 deletions(-) diff --git a/autotest/test_gwe_drycell_cnd3.py b/autotest/test_gwe_drycell_cnd3.py index 67d0b922145..36f88996ba1 100644 --- a/autotest/test_gwe_drycell_cnd3.py +++ b/autotest/test_gwe_drycell_cnd3.py @@ -25,10 +25,10 @@ # Imports import os + +import flopy import numpy as np import pytest -import flopy - from framework import TestFramework @@ -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( @@ -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) ) @@ -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" diff --git a/autotest/test_gwf_sfrsft_gwdischrg.py b/autotest/test_gwf_sfrsft_gwdischrg.py index d905697b292..11988a3d2e8 100644 --- a/autotest/test_gwf_sfrsft_gwdischrg.py +++ b/autotest/test_gwf_sfrsft_gwdischrg.py @@ -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"] @@ -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: @@ -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: diff --git a/autotest/test_gwt_uztmvt2x1.py b/autotest/test_gwt_uztmvt2x1.py index 0b78660ebfa..c0b468344bc 100644 --- a/autotest/test_gwt_uztmvt2x1.py +++ b/autotest/test_gwt_uztmvt2x1.py @@ -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 @@ -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