Skip to content

Commit

Permalink
small bug fix
Browse files Browse the repository at this point in the history
  • Loading branch information
nwlambert committed Dec 19, 2024
1 parent 609a23b commit 141ccd9
Showing 1 changed file with 5 additions and 7 deletions.
12 changes: 5 additions & 7 deletions qutip/solver/heom/bofin_solvers.py
Original file line number Diff line number Diff line change
Expand Up @@ -909,8 +909,8 @@ def _grad_next(self, he_n, k):

def _grad_next_bosonic(self, he_n, k):
if (self.ados.exponents[k].type != BathExponent.types.Input and
self.ados.exponents[k].type != BathExponent.types.Output_fn_L and
self.ados.exponents[k].type != BathExponent.types.Output_fn_R and
self.ados.exponents[k].type != BathExponent.types.Output_fn_L and
self.ados.exponents[k].type != BathExponent.types.Output_fn_R and
self.ados.exponents[k].type != BathExponent.types.Output_L and
self.ados.exponents[k].type != BathExponent.types.Output_R):
op = _data.mul(self._s_pre_minus_post_Q[k], -1j) #op = (self._s_pre_minus_post_Q[k]* -1j)
Expand Down Expand Up @@ -969,7 +969,7 @@ def _rhs(self):
op = self._grad_prev(he_n, k)
if self.ados.exponents[k].type in (BathExponent.types.Input,
BathExponent.types.Output_fn_L,
BathExponent.types.Output_fn_L):
BathExponent.types.Output_fn_R):
ops.add_op(he_n, prev_he, op, self.ados.ck[k], k)
else:
ops.add_op(he_n, prev_he, op)
Expand Down Expand Up @@ -1413,12 +1413,10 @@ class _GatherHEOMRHS:
nhe : int
The number of ADOs in the hierarchy.
"""
#<<<<<<< HEAD

def __init__(self, f_idx, block, nhe, rhs_dims):
#=======

#def __init__(self, f_idx, block, nhe, rhs_dims):
#>>>>>>> upstream/master

self._block_size = block
self._n_blocks = nhe
self._f_idx = f_idx
Expand Down

0 comments on commit 141ccd9

Please sign in to comment.