fix: changes to support running of existing tests (#6)

MODFLOW-USGS · Jul 20, 2022 · 933c797 · 933c797
1 parent 64e500b
commit 933c797
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/modflow_devtools/__init__.py b/modflow_devtools/__init__.py
@@ -45,7 +45,7 @@
     get_mf6_nper,
     get_namefiles,
     get_sim_name,
-    setup,
+    model_setup,
     setup_comparison,
     setup_mf6,
     setup_mf6_comparison,
@@ -90,7 +90,7 @@
     "testing_framework",
     # testing
     "eval_bud_diff",
-    "setup",
+    "model_setup",
     "setup_comparison",
     "teardown",
     "get_namefiles",

diff --git a/modflow_devtools/simulation.py b/modflow_devtools/simulation.py
@@ -231,7 +231,7 @@ def run(self):
         # run mf6 models
         target_dict = get_target_dictionary()
         target, ext = os.path.splitext(target_dict["mf6"])
-        exe = os.path.abspath(target_dict[target])
+        exe = os.path.abspath(target)
         msg = sfmt.format("using executable", exe)
         print(msg)
         try:

diff --git a/modflow_devtools/testing/testing.py b/modflow_devtools/testing/testing.py
@@ -70,7 +70,7 @@
 )
 
 
-def setup(namefile, dst, remove_existing=True, extrafiles=None):
+def model_setup(namefile, dst, remove_existing=True, extrafiles=None):
     """Setup MODFLOW-based model files for autotests.
 
     Parameters
@@ -245,7 +245,7 @@ def setup_comparison(namefile, dst, remove_existing=True):
                         os.path.join(cmppth, os.path.basename(file))
                     )
                     nf = os.path.join(src, action, os.path.basename(file))
-                    setup(nf, dst, remove_existing=remove_existing)
+                    model_setup(nf, dst, remove_existing=remove_existing)
                     break
 
     return action
@@ -669,7 +669,7 @@ def setup_mf6_comparison(src, dst, remove_existing=True):
                         srcf = os.path.join(cmppth, os.path.basename(file))
                         files2copy.append(srcf)
                         nf = os.path.join(src, action, os.path.basename(file))
-                        setup(nf, dst, remove_existing=remove_existing)
+                        model_setup(nf, dst, remove_existing=remove_existing)
                         break
 
     return action