From 96c2d84fb7ef50ff509e520cc1517926b6864f9d Mon Sep 17 00:00:00 2001 From: Aaron LI Date: Thu, 8 Nov 2018 16:45:49 +0800 Subject: clusters/halo: Apply option 'f_radius' to derive halo radius The config option 'f_radius' is renamed from the old 'f_lturb'. --- fg21sim/configs/config.spec | 7 +++---- fg21sim/extragalactic/clusters/halo.py | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/fg21sim/configs/config.spec b/fg21sim/configs/config.spec index 85606eb..bf3285e 100644 --- a/fg21sim/configs/config.spec +++ b/fg21sim/configs/config.spec @@ -386,10 +386,9 @@ stream = option("stderr", "stdout", "", default="stderr") # timescale, therefore more efficient acceleration. f_acc = float(default=1.0, min=0.1, max=10) - # The factor that is multiplied to the stripping radius to approximate - # the turbulence injection radius, from which the radio halo size is - # estimated. - f_lturb = float(default=1.0, min=0.5, max=10) + # The factor that is multiplied to the turbulence injection radius + # to derive the radio halo radius. + f_radius = float(default=1.0, min=0.5, max=10) # An efficiency factor describing the effectiveness of plasma # instabilities (e.g., due to spatial or temporal intermittency). diff --git a/fg21sim/extragalactic/clusters/halo.py b/fg21sim/extragalactic/clusters/halo.py index 55107e5..21e3374 100644 --- a/fg21sim/extragalactic/clusters/halo.py +++ b/fg21sim/extragalactic/clusters/halo.py @@ -151,7 +151,7 @@ class RadioHalo: comp = self.compID self.configs = configs self.f_acc = configs.getn(comp+"/f_acc") - self.f_lturb = configs.getn(comp+"/f_lturb") + self.f_radius = configs.getn(comp+"/f_radius") self.zeta_ins = configs.getn(comp+"/zeta_ins") self.eta_turb = configs.getn(comp+"/eta_turb") self.eta_e = configs.getn(comp+"/eta_e") @@ -241,7 +241,7 @@ class RadioHalo: The estimated radius of the simulated radio halo. Unit: [kpc] """ - return self.radius_turbulence(self.age_merger) + return self.radius_turbulence(self.age_merger) * self.f_radius @lru_cache() def radius_turbulence(self, t): -- cgit v1.2.2