fix autotests

Author: wpbonelli

autotest/prt/test_prt_exg01.py

@@ -28,7 +28,6 @@
 from prt_test_utils import check_budget_data, check_track_data, get_gwf_sim
 
 from framework import TestFramework
-from simulation import TestSimulation
 
 simname = "prtexg01"
 ex = [simname, f"{simname}bnms"]
@@ -154,17 +153,17 @@ def build_mp7_sim(ctx, idx, ws, mp7, gwf):
     return mp
 
 
-def eval_results(ctx, sim):
-    print(f"Evaluating results for sim {sim.name}")
-    simpath = Path(sim.simpath)
+def eval_results(ctx, test):
+    print(f"Evaluating results for sim {test.name}")
+    simpath = Path(test.workspace)
 
     # check budget data
-    check_budget_data(simpath / f"{sim.name}_prt.lst", ctx.perlen, ctx.nper)
+    check_budget_data(simpath / f"{test.name}_prt.lst", ctx.perlen, ctx.nper)
 
     # check particle track data
-    prt_track_file = simpath / f"{sim.name}_prt.trk"
-    prt_track_hdr_file = simpath / f"{sim.name}_prt.trk.hdr"
-    prt_track_csv_file = simpath / f"{sim.name}_prt.trk.csv"
+    prt_track_file = simpath / f"{test.name}_prt.trk"
+    prt_track_hdr_file = simpath / f"{test.name}_prt.trk.hdr"
+    prt_track_csv_file = simpath / f"{test.name}_prt.trk.csv"
     assert prt_track_file.exists()
     assert prt_track_hdr_file.exists()
     assert prt_track_csv_file.exists()
@@ -181,17 +180,14 @@ def test_mf6model(idx, name, function_tmpdir, targets):
     sim, ctx = build_sim(idx, str(ws), targets.mf6)
     sim.write_simulation()
 
-    test = TestFramework()
-    test.run(
-        TestSimulation(
-            name=name,
-            exe_dict=targets,
-            exfunc=lambda s: eval_results(ctx, s),
-            idxsim=0,
-            make_comparison=False,
-        ),
-        str(ws),
+    test = TestFramework(
+        name=name,
+        workspace=ws,
+        targets=targets,
+        check=lambda s: eval_results(ctx, s),
+        compare=None,
     )
+    test.run()
 
     # model names
     gwfname = get_model_name(idx, "gwf")