aboutsummaryrefslogtreecommitdiffstats
path: root/fg21sim
diff options
context:
space:
mode:
Diffstat (limited to 'fg21sim')
-rw-r--r--fg21sim/extragalactic/clusters/halo.py7
-rw-r--r--fg21sim/extragalactic/clusters/solver.py2
2 files changed, 6 insertions, 3 deletions
diff --git a/fg21sim/extragalactic/clusters/halo.py b/fg21sim/extragalactic/clusters/halo.py
index a481ce5..3ce3ed7 100644
--- a/fg21sim/extragalactic/clusters/halo.py
+++ b/fg21sim/extragalactic/clusters/halo.py
@@ -294,8 +294,11 @@ class RadioHalo:
# to improve the results.
# XXX: is this necessary???
nstep_min = 20
- if (tstop - tstart) / self.fpsolver.tstep < nstep_min:
- self.fpsolver.tstep = (tstop - tstart) / nstep_min
+ if (tstop - tstart) / self.time_step < nstep_min:
+ tstep = (tstop - tstart) / nstep_min
+ logger.debug("Decreased time step: %g -> %g [Gyr]" %
+ (self.time_step, self.fpsolver.tstep))
+ self.fpsolver.tstep = tstep
self.electron_spec = self.fpsolver.solve(u0=n0_e, tstart=tstart,
tstop=tstop)
diff --git a/fg21sim/extragalactic/clusters/solver.py b/fg21sim/extragalactic/clusters/solver.py
index c29748e..2fd800a 100644
--- a/fg21sim/extragalactic/clusters/solver.py
+++ b/fg21sim/extragalactic/clusters/solver.py
@@ -408,7 +408,7 @@ class FokkerPlanckSolver:
tstep = self.tstep
logger.debug("Solving Fokker-Planck equation: " +
"time: %.3f - %.3f" % (tstart, tstop))
- nstep = int((tstop - tc) / tstep)
+ nstep = int(np.ceil((tstop - tc) / tstep))
logger.debug("Constant time step: %.3f (#%d steps)" % (tstep, nstep))
i = 0
while tc+tstep < tstop: