Skip to content

Commit

Permalink
Revert installation, more info
Browse files Browse the repository at this point in the history
  • Loading branch information
pmenczel committed Nov 26, 2024
1 parent 57f925f commit c6a5daa
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
case-name: [Windows - numpy fallback]
# Version 2 not yet available on conda's default channel
condaforge: [1]
numpy-build: [">=1.24,<1.25"]
numpy-build: [">=2.0.0"]
numpy-requirement: [">=1.24,<1.25"]
scipy-requirement: [">=1.9"]
coverage-requirement: ["==6.5"]
Expand Down
12 changes: 6 additions & 6 deletions qutip/solver/integrator/scipy_integrator.py
Original file line number Diff line number Diff line change
Expand Up @@ -439,24 +439,24 @@ def _one_step(self, t):
# `rhs` can cause exceptions to this, but _backstep catch those cases.
safe_delta = self._ode_solver._integrator.rwork[11]/100 + 1e-15
t_ode = self._ode_solver.t
if np.isnan(self._ode_solver._y).any():
if t_ode > 0.16:
print('one_step: t=', t ,', t_ode=', t_ode)

if t > self._front and t_ode >= self._front:
# The state is at self._front, do a step
self._back = self.get_state()
if np.isnan(self._ode_solver._y).any():
if t_ode > 0.16:
print(' - case 1: ', np.isnan(self._ode_solver._y).any())
self._ode_solver.integrate(min(self._front + safe_delta, t))
if np.isnan(self._ode_solver._y).any():
if t_ode > 0.16:
print(' - after integrate (', self._ode_solver.get_return_code(), '): ', np.isnan(self._ode_solver._y).any())
print(" - old t_ode: ", t_ode, ", new t_ode: ", self._ode_solver.t, " --- successful: ", self._ode_solver.successful())
self._front = self._ode_solver._integrator.rwork[12]
# We asked for a fraction of a step, now complete it.
self._ode_solver.integrate(min(self._front, t))
if np.isnan(self._ode_solver._y).any():
if t_ode > 0.16:
print(' - after integrate 2 (', self._ode_solver.get_return_code(), '): ', np.isnan(self._ode_solver._y).any())
t_ode_new = self._ode_solver.t
print("ALERT: old t_ode: ", t_ode, ", new t_ode: ", t_ode_new, " --- successful: ", self._ode_solver.successful())
print(" - old t_ode: ", t_ode, ", new t_ode: ", self._ode_solver.t, " --- successful: ", self._ode_solver.successful())
elif t > self._front:
# The state is at a time before t_front, advance to t_front
if t_ode > 0.16:
Expand Down

0 comments on commit c6a5daa

Please sign in to comment.