Merge pull request #2986 from julian-evers/develop

Realign 'count' increment
pybamm-team · May 30, 2023 · 56b63e9 · 56b63e9
2 parents 57d06db + 4645b66
commit 56b63e9
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # [Unreleased](https://github.com/pybamm-team/PyBaMM/)
 
+## Bug fixes
+
+- Realign 'count' increment in CasadiSolver._integrate() ([#2986](https://github.com/pybamm-team/PyBaMM/pull/2986))
+
 ## Features
 
 - Enable multithreading in IDAKLU solver ([#2947](https://github.com/pybamm-team/PyBaMM/pull/2947))

diff --git a/examples/notebooks/parameterization/parameter-values.ipynb b/examples/notebooks/parameterization/parameter-values.ipynb
@@ -258,6 +258,7 @@
    ]
   },
   {
+   "attachments": {},
    "cell_type": "markdown",
    "metadata": {},
    "source": [
@@ -270,7 +271,7 @@
     "The toy model used is:\n",
     "$$\\frac{\\mathrm{d} u}{\\mathrm{d} t} = -a u$$\n",
     "\n",
-    "with initial conditions $u(0) = b$. The model is first solved with $a = 3, b = 2$, then with $a = 4, b = -1$"
+    "with initial conditions $u(0) = b$. The model is first solved with $a = 3, b = 2$, then with $a = -1, b = 2$"
    ]
   },
   {

diff --git a/pybamm/solvers/casadi_solver.py b/pybamm/solvers/casadi_solver.py
@@ -261,14 +261,15 @@ def _integrate(self, model, t_eval, inputs_dict=None):
                     except pybamm.SolverError as error:
                         pybamm.logger.debug("Failed, halving step size")
                         dt /= 2
+                        count += 1
                         # also reduce maximum step size for future global steps,
                         # but skip them in the beginning
                         # sometimes, for the first integrator smaller timesteps are
                         # needed, but this won't affect the global timesteps. The
                         # global timestep will only be reduced after the first timestep.
                         if first_ts_solved:
                             dt_max = dt
-                        if count >= self.max_step_decrease_count:
+                        if count > self.max_step_decrease_count:
                             message = (
                                 "Maximum number of decreased steps occurred at "
                                 f"t={t} (final SolverError: '{error}'). "
@@ -287,7 +288,6 @@ def _integrate(self, model, t_eval, inputs_dict=None):
                                     "return the solution object up to the point where "
                                     "failure occured."
                                 )
-                    count += 1
                 if termination_due_to_small_dt:
                     break
                 # Check if the sign of an event changes, if so find an accurate