From 4b87e5e6af2e45b08e4cb7d36c54ba560f9517e2 Mon Sep 17 00:00:00 2001 From: Aaron LI Date: Thu, 21 Feb 2019 20:10:46 +0800 Subject: clusters/halo: Clean up fp_advection() The check of _is_turb_active() is not needed, which is actually a bit wrong, since the calculation of 'electron_spec_init' was updated. --- fg21sim/extragalactic/clusters/halo.py | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/fg21sim/extragalactic/clusters/halo.py b/fg21sim/extragalactic/clusters/halo.py index bce6fd3..55c7ca0 100644 --- a/fg21sim/extragalactic/clusters/halo.py +++ b/fg21sim/extragalactic/clusters/halo.py @@ -641,13 +641,8 @@ class RadioHalo1M: Advection coefficient. Unit: [Gyr^-1] """ - if self._is_turb_active(t): - # Turbulence acceleration and beyond - advection = (abs(self._energy_loss(gamma, t)) - - (self.fp_diffusion(gamma, t) * 2 / gamma)) - else: - # To derive the initial electron spectrum - advection = abs(self._energy_loss(gamma, self.t_begin)) + advection = (abs(self._energy_loss(gamma, t)) - + (self.fp_diffusion(gamma, t) * 2 / gamma)) return advection def _merger_time(self, t=None): -- cgit v1.2.2