Skip to content

Commit

Permalink
fix black and typo
Browse files Browse the repository at this point in the history
  • Loading branch information
martinvonk committed Jan 17, 2024
1 parent 6fb502b commit cd9d38e
Showing 1 changed file with 40 additions and 18 deletions.
58 changes: 40 additions & 18 deletions flopy/utils/gridgen.py
Original file line number Diff line number Diff line change
Expand Up @@ -526,7 +526,9 @@ def build(self, verbose=False):
self._mkvertdict()

# read and save nodelay array to self
self.nodelay = self.read_qtg_nodesperlay_dat(model_ws=self.model_ws, nlay=self.nlay)
self.nodelay = self.read_qtg_nodesperlay_dat(
model_ws=self.model_ws, nlay=self.nlay
)

# Create a recarray of the grid polygon shapefile
shapename = os.path.join(self.model_ws, "qtgrid")
Expand Down Expand Up @@ -758,7 +760,7 @@ def get_nod_recarray(self):
Recarray representation of the node file with zero-based indexing
"""
node_ra = self.read_gtq_nod(model_ws=self.model_ws, nodes_only=False)
node_ra = self.read_qtg_nod(model_ws=self.model_ws, nodes_only=False)
return node_ra

def get_disu(
Expand Down Expand Up @@ -803,7 +805,7 @@ def get_disu(
"""

# nodes, nlay, ivsd, itmuni, lenuni, idsymrd, laycbd
nodes = self.read_gtq_nod(model_ws=self.model_ws, nodes_only=True)
nodes = self.read_qtg_nod(model_ws=self.model_ws, nodes_only=True)
nlay = self.nlay
ivsd = 0
idsymrd = 0
Expand All @@ -813,12 +815,16 @@ def get_disu(
self.nodes = nodes

# nodelay
nodelay = self.read_qtg_nodesperlay_dat(model_ws=self.model_ws, nlay=nlay)
nodelay = self.read_qtg_nodesperlay_dat(
model_ws=self.model_ws, nlay=nlay
)

# top
top = [0] * nlay
for k in range(nlay):
tpk = self.read_quadtreegrid_top_dat(model_ws=self.model_ws, nodelay=nodelay, lay=k)
tpk = self.read_quadtreegrid_top_dat(
model_ws=self.model_ws, nodelay=nodelay, lay=k
)
if tpk.min() == tpk.max():
tpk = tpk.min()
else:
Expand All @@ -834,7 +840,9 @@ def get_disu(
# bot
bot = [0] * nlay
for k in range(nlay):
btk = self.read_quadtreegrid_bot_dat(model_ws=self.model_ws, nodelay=nodelay, lay=k)
btk = self.read_quadtreegrid_bot_dat(
model_ws=self.model_ws, nodelay=nodelay, lay=k
)
if btk.min() == btk.max():
btk = btk.min()
else:
Expand Down Expand Up @@ -956,7 +964,9 @@ def get_nodelay(self):
"""
nlay = self.get_nlay()
nodelay = self.read_qtg_nodesperlay_dat(model_ws=self.model_ws, nlay=nlay)
nodelay = self.read_qtg_nodesperlay_dat(
model_ws=self.model_ws, nlay=nlay
)
return nodelay

def get_top(self):
Expand All @@ -976,7 +986,9 @@ def get_top(self):
istart = 0
for k in range(nlay):
istop = istart + nodelay[k]
tpk = self.read_quadtreegrid_top_dat(model_ws=self.model_ws, nodelay=nodelay, lay=k)
tpk = self.read_quadtreegrid_top_dat(
model_ws=self.model_ws, nodelay=nodelay, lay=k
)
top[istart:istop] = tpk
istart = istop
return top
Expand All @@ -998,7 +1010,12 @@ def get_bot(self):
istart = 0
for k in range(nlay):
istop = istart + nodelay[k]
btk = self.read_quadtreegrid_dat(model_ws=self.model_ws, top_or_bot='bot', nodelay=nodelay, lay=k)
btk = self.read_quadtreegrid_dat(
model_ws=self.model_ws,
top_or_bot="bot",
nodelay=nodelay,
lay=k,
)
bot[istart:istop] = btk
istart = istop
return bot
Expand Down Expand Up @@ -1863,7 +1880,7 @@ def _mkvertdict(self):
"""
# ensure there are active leaf cells from gridgen
nodes = self.read_gtq_nod(model_ws=self.model_ws, nodes_only=True)
nodes = self.read_qtg_nod(model_ws=self.model_ws, nodes_only=True)
if nodes == 0:
raise Exception("Gridgen resulted in no active cells.")

Expand All @@ -1879,7 +1896,9 @@ def _mkvertdict(self):
return

@staticmethod
def read_qtg_nod(model_ws: Union[str, os.PathLike], nodes_only:bool=False):
def read_qtg_nod(
model_ws: Union[str, os.PathLike], nodes_only: bool = False
):
"""Read qtg.nod file
Parameters
Expand Down Expand Up @@ -1942,7 +1961,7 @@ def read_qtgrid_shp(model_ws: Union[str, os.PathLike]):
return shapefile.Reader(fname)

@staticmethod
def read_qtg_nodesperlay_dat(model_ws: Union[str, os.PathLike], nlay:int):
def read_qtg_nodesperlay_dat(model_ws: Union[str, os.PathLike], nlay: int):
"""Read qtgrid.shp file
Parameters
Expand All @@ -1961,7 +1980,9 @@ def read_qtg_nodesperlay_dat(model_ws: Union[str, os.PathLike], nlay:int):
return read1d(f=f, a=np.empty((nlay), dtype=int))

@staticmethod
def read_quadtreegrid_top_dat(model_ws: Union[str, os.PathLike], nodelay: List[int], lay: int):
def read_quadtreegrid_top_dat(
model_ws: Union[str, os.PathLike], nodelay: List[int], lay: int
):
"""Read quadtreegrid.top_.dat file
Parameters
Expand All @@ -1982,7 +2003,9 @@ def read_quadtreegrid_top_dat(model_ws: Union[str, os.PathLike], nodelay: List[i
return read1d(f=f, a=np.empty((nodelay[lay]), dtype=np.float32))

@staticmethod
def read_quadtreegrid_bot_dat(model_ws: Union[str, os.PathLike], nodelay: List[int], lay: int):
def read_quadtreegrid_bot_dat(
model_ws: Union[str, os.PathLike], nodelay: List[int], lay: int
):
"""Read quadtreegrid.bot_.dat file
Parameters
Expand All @@ -2002,7 +2025,6 @@ def read_quadtreegrid_bot_dat(model_ws: Union[str, os.PathLike], nodelay: List[i
with fname.open("r") as f:
return read1d(f=f, a=np.empty((nodelay[lay]), dtype=np.float32))


@staticmethod
def read_qtg_area_dat(model_ws: Union[str, os.PathLike], nodes: int):
"""Read qtg.area.dat file
Expand Down Expand Up @@ -2037,9 +2059,9 @@ def read_qtg_iac_dat(model_ws: Union[str, os.PathLike], nodes: int):
-------
np.ndarray
"""
fname = Path(model_ws) / "qtg.iac.dat"
fname = Path(model_ws) / "qtg.iac.dat"
with fname.open("r") as f:
return read1d(f=f, a= np.empty((nodes), dtype=int))
return read1d(f=f, a=np.empty((nodes), dtype=int))

@staticmethod
def read_qtg_ja_dat(model_ws: Union[str, os.PathLike], nja: int):
Expand Down Expand Up @@ -2076,7 +2098,7 @@ def read_qtg_fldr_dat(model_ws: Union[str, os.PathLike], nja: int):
-------
np.ndarray
"""
fname = Path(model_ws) / "qtg.fldr.dat"
fname = Path(model_ws) / "qtg.fldr.dat"
with fname.open("r") as f:
return read1d(f=f, a=np.empty((nja), dtype=int))

Expand Down

0 comments on commit cd9d38e

Please sign in to comment.