From c459e7202dcc08d91bb5f1da0fa8f3b68e312aee Mon Sep 17 00:00:00 2001 From: spaulins-usgs Date: Tue, 3 Dec 2019 14:23:46 -0800 Subject: [PATCH 1/2] fix(#740): Modified code to insure model gets registered before model relative path is set. --- autotest/t505_test.py | 1 + flopy/mf6/mfmodel.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/autotest/t505_test.py b/autotest/t505_test.py index 5bdc55ec49..1933116e4b 100644 --- a/autotest/t505_test.py +++ b/autotest/t505_test.py @@ -93,6 +93,7 @@ def np001(): kwargs['xul'] = 20.5 good_model = ModflowGwf(test_sim, modelname=model_name, model_nam_file='{}.nam'.format(model_name), + model_rel_path='model_folder', **kwargs) # create simulation diff --git a/flopy/mf6/mfmodel.py b/flopy/mf6/mfmodel.py index 49e0d1cbef..97d382ad78 100644 --- a/flopy/mf6/mfmodel.py +++ b/flopy/mf6/mfmodel.py @@ -103,11 +103,11 @@ def __init__(self, simulation, model_type='gwf6', modelname='model', if model_nam_file is None: model_nam_file = '{}.nam'.format(modelname) - self.set_model_relative_path(model_rel_path) if add_to_simulation: self.structure = simulation.register_model(self, model_type, modelname, model_nam_file) + self.set_model_relative_path(model_rel_path) else: self.structure = structure self.exe_name = exe_name From 5ee455e0c637a7fb1a1403807b4aaf1ef0ceb9f7 Mon Sep 17 00:00:00 2001 From: spaulins-usgs Date: Tue, 3 Dec 2019 15:16:21 -0800 Subject: [PATCH 2/2] fix(#740) --- flopy/mf6/mfmodel.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flopy/mf6/mfmodel.py b/flopy/mf6/mfmodel.py index 97d382ad78..2c322c4ff8 100644 --- a/flopy/mf6/mfmodel.py +++ b/flopy/mf6/mfmodel.py @@ -107,9 +107,9 @@ def __init__(self, simulation, model_type='gwf6', modelname='model', self.structure = simulation.register_model(self, model_type, modelname, model_nam_file) - self.set_model_relative_path(model_rel_path) else: self.structure = structure + self.set_model_relative_path(model_rel_path) self.exe_name = exe_name self.dimensions = modeldimensions.ModelDimensions(self.name, self.simulation_data)