Skip to content

Commit

Permalink
Merge branch 'feature/bofin-lorentzian-fermionic-baths' into feature/…
Browse files Browse the repository at this point in the history
…bofin-docs
  • Loading branch information
hodgestar committed Dec 2, 2021
2 parents ce3f774 + 3d4713a commit d3b16d4
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 0 deletions.
4 changes: 4 additions & 0 deletions qutip/nonmarkov/heom.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@
"DrudeLorentzPadeBath",
"UnderDampedBath",
"FermionicBath",
"LorentzianBath",
"LorentzianPadeBath",
"HEOMSolver",
"HSolverDL",
]
Expand All @@ -40,6 +42,8 @@
DrudeLorentzPadeBath,
UnderDampedBath,
FermionicBath,
LorentzianBath,
LorentzianPadeBath,
)

from .bofin_solvers import (
Expand Down
4 changes: 4 additions & 0 deletions qutip/tests/test_heom.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
DrudeLorentzPadeBath,
UnderDampedBath,
FermionicBath,
LorentzianBath,
LorentzianPadeBath,
HEOMSolver,
HSolverDL,
)
Expand All @@ -25,6 +27,8 @@ def test_api(self):
assert DrudeLorentzPadeBath
assert UnderDampedBath
assert FermionicBath
assert LorentzianBath
assert LorentzianPadeBath


class TestSolverAPI:
Expand Down

0 comments on commit d3b16d4

Please sign in to comment.