Skip to content

Commit

Permalink
[pre-commit.ci] auto fixes from pre-commit.com hooks
Browse files Browse the repository at this point in the history 
for more information, see https://pre-commit.ci
  • Loading branch information
@pre-commit-ci
pre-commit-ci[bot] committed Mar 16, 2024
1 parent bddb140 commit e690d01
Show file tree
Hide file tree
Showing 2 changed files with 90 additions and 70 deletions.
30 changes: 19 additions & 11 deletions swn/modflow/_base.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1034,7 +1034,7 @@ def do_linemerge(ij, df, drop_reach_ids):

# each subclass should do more processing with returned object
return obj

def clip_reach_data(self, name, lower=None, upper=None):
self.reaches.loc[:, name] = self.reaches.loc[:, name].clip(lower, upper)

Expand Down Expand Up @@ -1258,22 +1258,30 @@ def get_zcoords(g):
elif method == "rch_len":
grid_dz = np.sqrt((px * col_size) ** 2 + (py * row_size) ** 2)
self.reaches.loc[:, grid_name] = (
grid_dz[self.reaches["i"], self.reaches["j"]] /
self.reaches[lentag])
grid_dz[self.reaches["i"], self.reaches["j"]] / self.reaches[lentag]
)
elif method == "rch_only":
# Estimate slope from to_rno and from_rnos
# deal with to and from rno == 0
to_0 = [_ for _ in self.reaches.index if self.reaches.loc[_, 'to_rno'] == 0]
from_0 = [_ for _ in self.reaches.index if self.reaches.loc[_, 'from_rnos'] == set()]
to_0 = [_ for _ in self.reaches.index if self.reaches.loc[_, "to_rno"] == 0]
from_0 = [
_
for _ in self.reaches.index
if self.reaches.loc[_, "from_rnos"] == set()
]
to_n0 = [_ for _ in self.reaches.index if _ not in to_0]
from_n0 = [_ for _ in self.reaches.index if _ not in from_0]
self.reaches.loc[to_n0, 'min_rtp'] = self.reaches.loc[to_n0, 'to_rno'].apply(lambda x: self.reaches.loc[x, 'rtp'])
self.reaches.loc[to_0, 'min_rtp'] = self.reaches.loc[to_0, 'rtp']
self.reaches.loc[from_n0, 'max_rtp'] = self.reaches.loc[from_n0, 'from_rnos'].apply(lambda x: np.mean([self.reaches.loc[_, 'rtp'] for _ in list(x)]))
self.reaches.loc[from_0, 'max_rtp'] = self.reaches.loc[from_0, 'rtp']
rch_dz = self.reaches['max_rtp'] - self.reaches['min_rtp']
self.reaches.loc[to_n0, "min_rtp"] = self.reaches.loc[
to_n0, "to_rno"
].apply(lambda x: self.reaches.loc[x, "rtp"])
self.reaches.loc[to_0, "min_rtp"] = self.reaches.loc[to_0, "rtp"]
self.reaches.loc[from_n0, "max_rtp"] = self.reaches.loc[
from_n0, "from_rnos"
].apply(lambda x: np.mean([self.reaches.loc[_, "rtp"] for _ in list(x)]))
self.reaches.loc[from_0, "max_rtp"] = self.reaches.loc[from_0, "rtp"]
rch_dz = self.reaches["max_rtp"] - self.reaches["min_rtp"]
self.reaches[grid_name] = rch_dz / self.reaches[lentag]

# Enforce min_slope when less than min_slop or is NaN
sel = (rchs[grid_name] < rchs["min_slope"]) | rchs[grid_name].isna()
if sel.any():
Expand Down
130 changes: 71 additions & 59 deletions swn/modflow/_swnmf6.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -443,15 +443,16 @@ def packagedata_frame(self, style: str, auxiliary: list = [], boundname=None):
from flopy.mf6 import ModflowGwfsfr as Mf6Sfr

defcols_names = [dt[0] for dt in Mf6Sfr.packagedata.dtype(self.model)]
for idx in ['rno', 'ifno']:
for idx in ["rno", "ifno"]:
if idx in defcols_names:
defcols_names.remove(idx) # this is the index
dat = self._init_package_df(
style=style, defcols_names=defcols_names, auxiliary=auxiliary)
style=style, defcols_names=defcols_names, auxiliary=auxiliary
)
# MF6 > 6.2.2 changed from rno to ifno
# TODO: track ifno all the way through?
if 'ifno' in defcols_names:
dat.index.name = 'rno'
if "ifno" in defcols_names:
dat.index.name = "rno"
if "rlen" not in dat.columns:
dat.loc[:, "rlen"] = dat.geometry.length
dat["ncon"] = dat[from_ridxsname].apply(len) + (dat[to_ridxname] > 0).astype(
Expand Down Expand Up @@ -670,8 +671,8 @@ def diversions_frame(self, style: str):
defcols_names = list(defcols_dtype.names)
# MF6 > 6.2.2 changed from rno to ifno
# TODO: track ifno all the way through?
if 'ifno' in defcols_names:
dat.index.name = 'rno'
if "ifno" in defcols_names:
dat.index.name = "rno"
dat = pd.DataFrame(self.diversions[self.diversions["in_model"]].copy())
if "cprior" not in dat.columns:
self.logger.info("diversions missing cprior; assuming UPTO")
Expand Down Expand Up @@ -813,8 +814,8 @@ def package_period_frame(
defcols_names = [dt[0] for dt in lst_tpl.dtype(self.model)]
# MF6 > 6.2.2 changed from rno to ifno
# TODO: track ifno all the way through?
if 'ifno' == defcols_names.index.name:
dat.index.name = 'rno'
if "ifno" == defcols_names.index.name:
dat.index.name = "rno"
dat = self._init_package_df(
style=style, defcols_names=defcols_names, auxiliary=auxiliary
)
Expand Down Expand Up @@ -1748,32 +1749,38 @@ def _check_reach_v_laybot(r, botms, buffer=1.0, rbed_elev=None):
layerbots[k + 1] = layerbots[k] - laythick
self.model.dis.botm.set_data(layerbots)


def _fix_dis(self, buffer=0.5, move_top=True):
botm = self.model.dis.botm.get_data()
top = self.model.dis.top.get_data()
rdf = self.reaches.copy()

rdf['botm0'] = rdf[['i','j']].apply(lambda x: botm[0,x[0],x[1]], axis=1)
rdf['maxbot'] = rdf[['rtp', 'rbth']].apply(lambda x: x[0] - x[1] - buffer, axis=1)
rdf['bdz'] = rdf['botm0'] - rdf['maxbot']
rdf['bdz'].clip(0, None, inplace=True)
rdf['rno'] = rdf.index
# need to get min bdz for each cell (unique 'ij')
rdf['ij'] = rdf[['i','j']].apply(lambda x: (x[0],x[1]), axis=1)
rdf = rdf.select_dtypes(include=[np.number, tuple]).groupby(['ij']).max()
rdf.set_index('rno', inplace=True)
# shift all layers in model column, TODO: enforce min layer thickness instead?
for r in rdf.index:
botm[:,rdf.loc[r, 'i'], rdf.loc[r, 'j']] = botm[:,rdf.loc[r, 'i'], rdf.loc[r, 'j']] - rdf.loc[r,'bdz']
if move_top:
top[rdf.loc[r, 'i'], rdf.loc[r, 'j']] = top[rdf.loc[r, 'i'], rdf.loc[r, 'j']] - rdf.loc[r, 'bdz']
# may do funny things to flopy external file reference?
self.model.dis.botm.set_data(botm)
self.model.dis.top.set_data(top)

def _to_rno_elevs(self, minslope=0.0001, minincise=0.2,
minthick=0.5, buffer=0.5, fix_dis=True):
botm = self.model.dis.botm.get_data()
top = self.model.dis.top.get_data()
rdf = self.reaches.copy()

rdf["botm0"] = rdf[["i", "j"]].apply(lambda x: botm[0, x[0], x[1]], axis=1)
rdf["maxbot"] = rdf[["rtp", "rbth"]].apply(
lambda x: x[0] - x[1] - buffer, axis=1
)
rdf["bdz"] = rdf["botm0"] - rdf["maxbot"]
rdf["bdz"].clip(0, None, inplace=True)
rdf["rno"] = rdf.index
# need to get min bdz for each cell (unique 'ij')
rdf["ij"] = rdf[["i", "j"]].apply(lambda x: (x[0], x[1]), axis=1)
rdf = rdf.select_dtypes(include=[np.number, tuple]).groupby(["ij"]).max()
rdf.set_index("rno", inplace=True)
# shift all layers in model column, TODO: enforce min layer thickness instead?
for r in rdf.index:
botm[:, rdf.loc[r, "i"], rdf.loc[r, "j"]] = (
botm[:, rdf.loc[r, "i"], rdf.loc[r, "j"]] - rdf.loc[r, "bdz"]
)
if move_top:
top[rdf.loc[r, "i"], rdf.loc[r, "j"]] = (
top[rdf.loc[r, "i"], rdf.loc[r, "j"]] - rdf.loc[r, "bdz"]
)
# may do funny things to flopy external file reference?
self.model.dis.botm.set_data(botm)
self.model.dis.top.set_data(top)

def _to_rno_elevs(
self, minslope=0.0001, minincise=0.2, minthick=0.5, buffer=0.5, fix_dis=True
):
"""
Attempt to set reach elevations, pandas approach:
0. ensure minimum incision
Expand Down Expand Up @@ -1806,67 +1813,72 @@ def _to_rno_elevs(self, minslope=0.0001, minincise=0.2,
to_ridxname = f"to_{self.reach_index_name}"

def get_to_rtp():
intp = (rdf['to_rno'] != 0) & (rdf['to_rno'].isin(rdf.index))
trno = rdf.loc[intp, 'to_rno']
intp = (rdf["to_rno"] != 0) & (rdf["to_rno"].isin(rdf.index))
trno = rdf.loc[intp, "to_rno"]
trno.drop_duplicates(inplace=True)
trtp = rdf.loc[trno.index, 'rtp']
rdf['rno'] = rdf.index
ndf = rdf[['rno','to_rno']].merge(trtp,left_on='to_rno',right_on='rno',how='outer')
ndf.dropna(subset=['rno','to_rno'], inplace=True)
ndf[['rno','to_rno']] = ndf[['rno','to_rno']].astype(int)
ndf.set_index('rno', inplace=True, drop=True)
rdf['to_rtp'] = ndf['rtp']
rdf.loc[~intp, 'to_rtp'] = -9999
trtp = rdf.loc[trno.index, "rtp"]
rdf["rno"] = rdf.index
ndf = rdf[["rno", "to_rno"]].merge(
trtp, left_on="to_rno", right_on="rno", how="outer"
)
ndf.dropna(subset=["rno", "to_rno"], inplace=True)
ndf[["rno", "to_rno"]] = ndf[["rno", "to_rno"]].astype(int)
ndf.set_index("rno", inplace=True, drop=True)
rdf["to_rtp"] = ndf["rtp"]
rdf.loc[~intp, "to_rtp"] = -9999

# copy some data
top = self.model.dis.top.array.copy()
delr = self.model.dis.delr.data.copy()
delc = self.model.dis.delc.data.copy()

if 'rtp' not in self.reaches.columns:
self.set_reach_data_from_array('rtp', top)
self.reaches['rtp'] = self.reaches['rtp'] - minincise
if "rtp" not in self.reaches.columns:
self.set_reach_data_from_array("rtp", top)
self.reaches["rtp"] = self.reaches["rtp"] - minincise
rdf = self.reaches.copy()
icols = rdf.columns.to_list()

# add some necessary columns to rdf
# attempt to sort of addresses local grid refinement?
rdf.loc[:,"mindz"] = minslope * \
(delr[rdf.loc[:, "j"]] + delc[rdf.loc[:, "i"]]) / 2.0
rdf.loc[:, "mindz"] = (
minslope * (delr[rdf.loc[:, "j"]] + delc[rdf.loc[:, "i"]]) / 2.0
)
if "rbth" not in rdf.columns:
rdf["rbth"] = minthick
icols.append("rbth")
if "incise" not in rdf.columns:
rdf["incise"] = minincise
icols.append("incise")

rdf['rbth'].where(rdf['rbth'] > minthick, minthick, inplace=True)
rdf["rbth"].where(rdf["rbth"] > minthick, minthick, inplace=True)
# initial criteria
get_to_rtp()
#rdf['to_rtp'] = rdf['to_rno'].apply(lambda x: rdf.loc[x, 'rtp'] if x in rdf.index else -10)
rdf['mx_to_rtp'] = rdf['rtp'] - rdf['mindz']
sel = rdf['to_rtp'] > rdf['mx_to_rtp']
# rdf['to_rtp'] = rdf['to_rno'].apply(lambda x: rdf.loc[x, 'rtp'] if x in rdf.index else -10)
rdf["mx_to_rtp"] = rdf["rtp"] - rdf["mindz"]
sel = rdf["to_rtp"] > rdf["mx_to_rtp"]
loop = 0
while sel.sum() > 0 and loop < 10000:
# this gives geodataframe
mx_rtp = rdf.loc[sel, ['to_rno','mx_to_rtp']].groupby('to_rno').min()
mx_rtp = rdf.loc[sel, ["to_rno", "mx_to_rtp"]].groupby("to_rno").min()
# so make it a series, exclude mx_rtp==0
mx_rtp = mx_rtp['mx_to_rtp']
mx_rtp = mx_rtp["mx_to_rtp"]
mx_rtp.drop([_ for _ in mx_rtp.index if _ not in rdf.index], inplace=True)
# reset rtp values in rdf
rdf.loc[mx_rtp.index, 'rtp'] = mx_rtp.values
rdf.loc[mx_rtp.index, "rtp"] = mx_rtp.values
# report
self.logger.debug("%s changed in loop %s", sel.sum(), loop)
loop += 1
# prep for next
get_to_rtp()
rdf['mx_to_rtp'] = rdf['rtp'] - rdf['mindz']
sel = rdf['to_rtp'] > rdf['mx_to_rtp']
rdf["mx_to_rtp"] = rdf["rtp"] - rdf["mindz"]
sel = rdf["to_rtp"] > rdf["mx_to_rtp"]
if loop >= 10000:
# maybe stronger warning, kill it?
self.logger.debug("to_rno_elev did not find final solution after %s loops", loop)
self.logger.debug(
"to_rno_elev did not find final solution after %s loops", loop
)
# copy here removes pd warning about setting value on copy
self.reaches.loc[:,icols] = rdf.loc[:, icols]
self.reaches.loc[:, icols] = rdf.loc[:, icols]
if fix_dis:
self._fix_dis(buffer)
self.add_model_topbot_to_reaches()
Expand Down

0 comments on commit e690d01

Please sign in to comment.