Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
7543e4e
Delete correlation.py
diego-bernal Oct 22, 2017
e759ab0
Delete correlation.py
diego-bernal Oct 22, 2017
0038b9c
Merge branch 'steady_state' of https://github.com/diego-bernal/quantu…
diego-bernal Oct 22, 2017
0bda624
Merge branch 'steady_state' of https://github.com/diego-bernal/quantu…
diego-bernal Oct 22, 2017
57a73a1
Merge branch 'steady_state' of https://github.com/diego-bernal/quantu…
diego-bernal Oct 22, 2017
215c2b3
Merge branch 'steady_state' of https://github.com/diego-bernal/quantu…
diego-bernal Oct 22, 2017
9a1e8ca
Merge branch 'steady_state' of https://github.com/diego-bernal/quantu…
diego-bernal Oct 22, 2017
c40d1b5
Merge branch 'steady_state' of https://github.com/diego-bernal/quantu…
diego-bernal Oct 22, 2017
4c3c79c
Merge branch 'steady_state' of https://github.com/diego-bernal/quantu…
diego-bernal Oct 22, 2017
39ae46d
Merge branch 'steady_state' of https://github.com/diego-bernal/quantu…
diego-bernal Oct 22, 2017
2a02045
Merge branch 'steady_state' of https://github.com/diego-bernal/quantu…
diego-bernal Oct 22, 2017
3841d2f
Merge branch 'steady_state' of https://github.com/diego-bernal/quantu…
diego-bernal Oct 22, 2017
325f971
Merge branch 'steady_state' of https://github.com/diego-bernal/quantu…
diego-bernal Oct 23, 2017
d6ade85
Merge branch 'steady_state' of https://github.com/diego-bernal/quantu…
diego-bernal Oct 23, 2017
a9cf7db
Merge branch 'steady_state' of https://github.com/diego-bernal/quantu…
diego-bernal Oct 23, 2017
68a4687
Merge branch 'master' into steady_state
diego-bernal Oct 23, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion quantum/mesolve.py
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,6 @@ def mesolve(H, rho0, tlist, c_ops=[], e_ops=[], args={}, options=None,
#check if should use OPENMP
check_use_openmp(options)


res = None

#
Expand Down
2 changes: 1 addition & 1 deletion quantum/steadystate.py
Original file line number Diff line number Diff line change
Expand Up @@ -960,7 +960,7 @@ def _pseudo_inverse_dense(L, rhoss, w=None, **pseudo_args):
L = L
else:
L = 1.0j * w * spre(tr_mat) + L
# It's possible that there's an error here!
# It's possible that there's an error here because of the use of the spre function.

if pseudo_args['method'] == 'direct':
try:
Expand Down
2 changes: 2 additions & 0 deletions quantum/superoperator.py
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,8 @@ def spre(A):

# In the following, the uncommented lines correspond to the QuTip original
# assignations
# The creation of a vector from a matrix in QuTip approach is ordering in
# columns, while our approach is to order in rows.
#------------------------------------------------------------------------------
def operator_to_vector(op):
"""
Expand Down