From d46cd1bb6d2faad56d456ecb9b8c186837914982 Mon Sep 17 00:00:00 2001 From: Joshua Larsen Date: Wed, 11 Jan 2023 16:45:35 -0700 Subject: [PATCH 1/2] update(Modpath7): update path construction for modflow model files in nam file --- flopy/modpath/mp7.py | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/flopy/modpath/mp7.py b/flopy/modpath/mp7.py index 464649652f..73d05b3ef5 100644 --- a/flopy/modpath/mp7.py +++ b/flopy/modpath/mp7.py @@ -128,6 +128,7 @@ def __init__( # set flowmodel and flow_version attributes self.flowmodel = flowmodel self.flow_version = self.flowmodel.version + self._flowmodel_ws = flowmodel.model_ws if self.flow_version == "mf6": # get discretization package @@ -380,13 +381,21 @@ def write_name_file(self): if self.dis_file is not None: f.write(f"DIS {self.dis_file}\n") if self.grbdis_file is not None: - f.write(f"{self.grbtag:10s} {self.grbdis_file}\n") + f.write( + f"{self.grbtag:10s} {os.path.join(self._flowmodel_ws, self.grbdis_file)}\n" + ) if self.tdis_file is not None: - f.write(f"TDIS {self.tdis_file}\n") + f.write( + f"TDIS {os.path.join(self._flowmodel_ws, self.tdis_file)}\n" + ) if self.headfilename is not None: - f.write(f"HEAD {self.headfilename}\n") + f.write( + f"HEAD {os.path.join(self._flowmodel_ws, self.headfilename)}\n" + ) if self.budgetfilename is not None: - f.write(f"BUDGET {self.budgetfilename}\n") + f.write( + f"BUDGET {os.path.join(self._flowmodel_ws, self.budgetfilename)}\n" + ) f.close() @classmethod From 2f8f9105a84ab933fcdec5e403ecb48f9c1176ca Mon Sep 17 00:00:00 2001 From: Joshua Larsen Date: Wed, 11 Jan 2023 17:44:56 -0700 Subject: [PATCH 2/2] create relative path to flow model from modpath sim path --- flopy/modpath/mp7.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/flopy/modpath/mp7.py b/flopy/modpath/mp7.py index 73d05b3ef5..618ea20aa9 100644 --- a/flopy/modpath/mp7.py +++ b/flopy/modpath/mp7.py @@ -128,7 +128,9 @@ def __init__( # set flowmodel and flow_version attributes self.flowmodel = flowmodel self.flow_version = self.flowmodel.version - self._flowmodel_ws = flowmodel.model_ws + self._flowmodel_ws = os.path.relpath( + flowmodel.model_ws, self._model_ws + ) if self.flow_version == "mf6": # get discretization package