From 93bc4dfe83f5c6f0650816f545b5e69c0406826c Mon Sep 17 00:00:00 2001 From: Aaron LI Date: Thu, 17 Jan 2019 15:23:36 +0800 Subject: clusters/halo: Update the estimation of radius_turbulence() The radius_turbulence is estimated as the stripping radius (r_s) if r_s is larger than the core radius (r_c) of the main cluster, otherwise, r_c. --- fg21sim/extragalactic/clusters/halo.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/fg21sim/extragalactic/clusters/halo.py b/fg21sim/extragalactic/clusters/halo.py index 9867ba2..4eb475d 100644 --- a/fg21sim/extragalactic/clusters/halo.py +++ b/fg21sim/extragalactic/clusters/halo.py @@ -229,9 +229,10 @@ class RadioHalo1M: @lru_cache() def radius_turbulence(self, t): """ - The radius of the turbulence injection region, which is calculated - as the mean of the stripping radius of the sub-cluster and the core - radius of the main cluster. + The radius of the turbulence region, which is estimated as the + stripping radius ``r_s`` of the sub-cluster if ``r_s`` is larger + than the core radius ``r_c`` of the main cluster, otherwise, as + ``r_c``. Unit: [kpc] """ @@ -239,7 +240,10 @@ class RadioHalo1M: M_main = self.mass_main(t) r_c = self.f_rc * helper.radius_virial(M_main, z) r_s = self.radius_stripping(t) - return (r_c + r_s) / 2 + if r_s >= r_c: + return r_s + else: + return r_c @lru_cache() def radius_stripping(self, t): -- cgit v1.2.2