#664 fix casadi solver

pybamm-team · Oct 26, 2019 · 372fa0c · 372fa0c
1 parent 15e6b73
commit 372fa0c
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 9 deletions.
diff --git a/examples/scripts/compare-dae-solver.py b/examples/scripts/compare-dae-solver.py
@@ -16,9 +16,7 @@
 
 # set mesh
 var = pybamm.standard_spatial_vars
-
-var_pts = {var.x_n: 50, var.x_s: 10, var.x_p: 50, var.r_n: 20, var.r_p: 20}
-# var_pts = model.default_var_pts
+var_pts = {var.x_n: 50, var.x_s: 50, var.x_p: 50, var.r_n: 20, var.r_p: 20}
 mesh = pybamm.Mesh(geometry, model.default_submesh_types, var_pts)
 
 # discretise model

diff --git a/examples/scripts/compare_lithium_ion.py b/examples/scripts/compare_lithium_ion.py
@@ -48,7 +48,7 @@
 t_eval = np.linspace(0, 0.17, 100)
 for i, model in enumerate(models):
     model.convert_to_format = "casadi"
-    solutions[i] = model.default_solver.solve(model, t_eval)
+    solutions[i] = pybamm.CasadiSolver().solve(model, t_eval)
 
 # plot
 plot = pybamm.QuickPlot(models, mesh, solutions)

diff --git a/pybamm/solvers/casadi_solver.py b/pybamm/solvers/casadi_solver.py
@@ -101,8 +101,3 @@ def integrate_casadi(self, problem, y0, t_eval, mass_matrix=None):
             # If it doesn't work raise error
             raise pybamm.SolverError(e.args[0])
 
-    def calculate_consistent_initial_conditions(
-        self, rhs, algebraic, y0_guess, jac=None
-    ):
-        "No need to calculate initial conditions separately with this solver"
-        return y0_guess