diff options
| author | Aaron LI <aly@aaronly.me> | 2019-01-25 15:49:05 +0800 |
|---|---|---|
| committer | Aaron LI <aly@aaronly.me> | 2019-01-25 15:49:05 +0800 |
| commit | 8ab2148f9871920e81562a88f491456fcca4b8b5 (patch) | |
| tree | 5124815c8cda1fef659527cc79ab5c9a4b4a552e /fg21sim/extragalactic | |
| parent | 427b12bb9b4f5b9923494efaf33c83cb213ab3d6 (diff) | |
| download | fg21sim-8ab2148f9871920e81562a88f491456fcca4b8b5.tar.bz2 | |
clusters/halo: Fold parameter "zeta_ins" into "f_acc"
Diffstat (limited to 'fg21sim/extragalactic')
| -rw-r--r-- | fg21sim/extragalactic/clusters/halo.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/fg21sim/extragalactic/clusters/halo.py b/fg21sim/extragalactic/clusters/halo.py index 81b9c0d..4e87f3f 100644 --- a/fg21sim/extragalactic/clusters/halo.py +++ b/fg21sim/extragalactic/clusters/halo.py @@ -151,7 +151,6 @@ class RadioHalo1M: self.configs = configs self.f_acc = configs.getn(comp+"/f_acc") 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") self.x_cr = configs.getn(comp+"/x_cr") @@ -334,9 +333,9 @@ class RadioHalo1M: k_L = 2 * np.pi / L_turb cs = helper.speed_sound(self.kT(t_merger)) # [km/s] v_t = self._velocity_turb(t_merger) # [km/s] - tau = self.x_cr * cs**3 / (8*k_L * self.zeta_ins * v_t**4) + tau = self.x_cr * cs**3 / (8*k_L * v_t**4) tau *= AUC.s2Gyr * AUC.kpc2km # [s kpc/km] -> [Gyr] - tau *= self.f_acc # custom tune parameter + tau /= self.f_acc # tune factor (folded with "zeta_ins") # Impose the maximum acceleration timescale if tau > tau_max: |