From 31e447fb10f1ac133a185a44d722e27d3b3d2c70 Mon Sep 17 00:00:00 2001 From: Aaron LI Date: Thu, 21 Feb 2019 22:23:50 +0800 Subject: clusters/halo: Update fp_diffusion() against base turbulence When the (merger-induced) turbulence is not active, invoke the tau_acceleration() with 'is_end=True' to calculate the acceleration timescale w.r.t. the base turbulence. --- fg21sim/extragalactic/clusters/halo.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'fg21sim/extragalactic/clusters') diff --git a/fg21sim/extragalactic/clusters/halo.py b/fg21sim/extragalactic/clusters/halo.py index 64d2321..40a7054 100644 --- a/fg21sim/extragalactic/clusters/halo.py +++ b/fg21sim/extragalactic/clusters/halo.py @@ -674,10 +674,16 @@ class RadioHalo1M: """ tau_acc = tau_max = 10.0 # [Gyr] if self._is_turb_active(t): - t_merger = self._merger_time(t) - tau_acc = self.tau_acceleration(t_merger) + tt = self._merger_time(t) + is_end = False + else: + tt = self._merger_end_time(t) + is_end = True + + tau_acc = self.tau_acceleration(tt, is_end) if tau_acc > tau_max: tau_acc = tau_max + return np.square(gamma) / (4 * tau_acc) # [Gyr^-1] def fp_advection(self, gamma, t): -- cgit v1.2.2