diff options
| author | Aaron LI <aly@aaronly.me> | 2019-02-21 22:23:50 +0800 |
|---|---|---|
| committer | Aaron LI <aly@aaronly.me> | 2019-02-21 22:23:50 +0800 |
| commit | 31e447fb10f1ac133a185a44d722e27d3b3d2c70 (patch) | |
| tree | 4185847406e502690e789f1e9cd196e4ec67c6e9 /fg21sim | |
| parent | 02d9e049e4202e40468f9a341bc34fbc08a9632f (diff) | |
| download | fg21sim-31e447fb10f1ac133a185a44d722e27d3b3d2c70.tar.bz2 | |
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.
Diffstat (limited to 'fg21sim')
| -rw-r--r-- | fg21sim/extragalactic/clusters/halo.py | 10 |
1 files changed, 8 insertions, 2 deletions
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): |