diff --git a/quantarhei/qm/liouvillespace/foerstertensor.py b/quantarhei/qm/liouvillespace/foerstertensor.py index 9ae815c..2c2dae2 100644 --- a/quantarhei/qm/liouvillespace/foerstertensor.py +++ b/quantarhei/qm/liouvillespace/foerstertensor.py @@ -31,6 +31,7 @@ def __init__(self, ham, sbi, initialize=True, cutoff_time=None, self._has_cutoff_time = False self.as_operators = False self.pure_dephasing = pure_dephasing + self.has_Iterm = False if cutoff_time is not None: self.cutoff_time = cutoff_time diff --git a/quantarhei/qm/liouvillespace/nefoerstertensor.py b/quantarhei/qm/liouvillespace/nefoerstertensor.py index 5636bfb..f2ac027 100644 --- a/quantarhei/qm/liouvillespace/nefoerstertensor.py +++ b/quantarhei/qm/liouvillespace/nefoerstertensor.py @@ -3,12 +3,14 @@ #import matplotlib.pyplot as plt import scipy.interpolate as interp + from ..corfunctions.correlationfunctions import c2g from ...core.managers import energy_units from .tdfoerstertensor import TDFoersterRelaxationTensor from .tdfoerstertensor import _td_reference_implementation from ... import COMPLEX, REAL + import time @@ -36,7 +38,6 @@ def initialize(self): """ - print("START INIT") tt = self.SystemBathInteraction.TimeAxis.data Nt = len(tt) @@ -114,8 +115,6 @@ def initialize(self): self.updateStructure() self.add_dephasing() - - print("... DONE") @@ -256,8 +255,6 @@ def initial_term_nsc(self, rhoi): -1j*self.II[:,aa,bb,nn,mm]*rhoi.data[nn,mm] - print("Calculated II") - self.Iterm = II self.has_Iterm = True @@ -280,7 +277,6 @@ def _kernel_at_t(ti, tt, gtd, gta, ed, ea, ld): return prod - def _nsc_kernel_at_t(ti, tt, aa, bb, cc, dd, HH, gt): """ Two-time kernel to be integrated @@ -488,24 +484,20 @@ def _nsc_reference_implementation(Na, Nt, HH, tt, gt, ll, fce): for ii in range(Na): JJ[ii,ii] = 0.0 - print("Reference implementation ...") t1 = time.time() - print("INTEGRALS") t1I = time.time() # # Integrals # for a in range(Na): for b in range(Na): - print(a,b,"of",Na,Na) for c in range(Na): for d in range(Na): fKK[:,a,b,c,d] = fce(tt, d, b, a, c, HH, gt) t2I = time.time() - print("... INTEGRALS in", t2I-t1I,"sec") - print("OPERATORS") + # # Operator part of the non-eq. Foerster # @@ -514,7 +506,6 @@ def _nsc_reference_implementation(Na, Nt, HH, tt, gt, ll, fce): for c in range(Na): RR[:,a,b] -= JJ[a,c]*JJ[c,b]*fKK[:,c,c,b,a] - print("TENSOR") # # Tensor elements # @@ -530,7 +521,6 @@ def _nsc_reference_implementation(Na, Nt, HH, tt, gt, ll, fce): KK[:,a,b,c,d] += numpy.conj(RR[:,b,d]) t2 = time.time() - print("...done in", t2-t1,"sec") return KK @@ -560,7 +550,6 @@ def fce2(tt, aa, bb, cc, dd, HH, gt): return fkernel - def _nsc_fintegral(tt, a, b, c, d, HH, gt): """Time dependent non-secular effective non-equilibrium Foerster integral diff --git a/quantarhei/qm/propagators/rdmpropagator.py b/quantarhei/qm/propagators/rdmpropagator.py index 6c04a94..fc41fc9 100644 --- a/quantarhei/qm/propagators/rdmpropagator.py +++ b/quantarhei/qm/propagators/rdmpropagator.py @@ -946,7 +946,7 @@ def __propagate_short_exp_with_TD_relaxation(self,rhoi,L=4): try: self.has_Iterm = self.RelaxationTensor.has_Iterm except: - print(self, "This tensor does not support has_Iterm") + print("Warning: This relaxation tensor does not support has_Iterm") self.has_Iterm = False if self.has_Iterm: