aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron LI <aly@aaronly.me>2019-02-21 20:10:46 +0800
committerAaron LI <aly@aaronly.me>2019-02-21 20:10:46 +0800
commit4b87e5e6af2e45b08e4cb7d36c54ba560f9517e2 (patch)
treeb503e4df6f0736cd4448c2988da3205ccc9f8888
parentc897a7e8165e471ccc5438297a67ca9cff528cbe (diff)
downloadfg21sim-4b87e5e6af2e45b08e4cb7d36c54ba560f9517e2.tar.bz2
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.
-rw-r--r--fg21sim/extragalactic/clusters/halo.py9
1 files 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):