#1477 fix bugs in scikits odes tests

martinjrobins · martinjrobins · commit 6ce1d5da0cab · 2021-07-22T08:38:59.000+01:00
diff --git a/pybamm/solvers/scikits_dae_solver.py b/pybamm/solvers/scikits_dae_solver.py
@@ -162,8 +162,6 @@ def jacfn(t, y, ydot, residuals, cj, J):
                 t_root,
                 np.transpose(sol.roots.y),
                 termination,
-                model=model,
-                inputs=inputs_dict,
             )
             sol.integration_time = integration_time
             return sol
diff --git a/pybamm/solvers/scikits_ode_solver.py b/pybamm/solvers/scikits_ode_solver.py
@@ -177,8 +177,6 @@ def jac_times_setupfn(t, y, fy, userdata):
                 t_root,
                 np.transpose(sol.roots.y),
                 termination,
-                model=model,
-                inputs=inputs_dict,
             )
             sol.integration_time = integration_time
             return sol
diff --git a/tox.ini b/tox.ini
@@ -19,7 +19,7 @@ deps =
      !windows-!mac: scikits.odes
      
 commands =
-	 tests: python run-tests.py --unit --folder all
+	 tests: python tests/unit/test_solvers/test_scikits_solvers.py
 	 quick: python run-tests.py --unit
 	 examples: python run-tests.py --examples
 	 dev-!windows-!mac: sh -c "echo export LD_LIBRARY_PATH={env:LD_LIBRARY_PATH} >> {envbindir}/activate"

Original file line number	Diff line number	Diff line change
`@@ -162,8 +162,6 @@ def jacfn(t, y, ydot, residuals, cj, J):`
`162`	`162`	`t_root,`
`163`	`163`	`np.transpose(sol.roots.y),`
`164`	`164`	`termination,`
`165`		`- model=model,`
`166`		`- inputs=inputs_dict,`
`167`	`165`	`)`
`168`	`166`	`sol.integration_time = integration_time`
`169`	`167`	`return sol`
Original file line number	Diff line number	Diff line change
`@@ -177,8 +177,6 @@ def jac_times_setupfn(t, y, fy, userdata):`
`177`	`177`	`t_root,`
`178`	`178`	`np.transpose(sol.roots.y),`
`179`	`179`	`termination,`
`180`		`- model=model,`
`181`		`- inputs=inputs_dict,`
`182`	`180`	`)`
`183`	`181`	`sol.integration_time = integration_time`
`184`	`182`	`return sol`