Commit 53b9afb8 authored by Theo Steininger's avatar Theo Steininger

updated to newest version of ham-x

parent d73e9904
...@@ -12,8 +12,9 @@ class WMAP3yrMagneticField(MagneticField): ...@@ -12,8 +12,9 @@ class WMAP3yrMagneticField(MagneticField):
'psi0': ('./Galaxy/MagneticField/Regular/WMAP/psi0', 'value'), 'psi0': ('./Galaxy/MagneticField/Regular/WMAP/psi0', 'value'),
'psi1': ('./Galaxy/MagneticField/Regular/WMAP/psi1', 'value'), 'psi1': ('./Galaxy/MagneticField/Regular/WMAP/psi1', 'value'),
'chi0': ('./Galaxy/MagneticField/Regular/WMAP/chi0', 'value'), 'chi0': ('./Galaxy/MagneticField/Regular/WMAP/chi0', 'value'),
'random_rms': ('./Galaxy/MagneticField/Random/rms', 'value'), 'random_rms': ('./Galaxy/MagneticField/Random/Iso/rms', 'value'),
'random_rho': ('./Galaxy/MagneticField/Random/rho', 'value')} 'random_rho': ('./Galaxy/MagneticField/Random/Anisoglob/rho',
'value')}
return lookup return lookup
def _create_field(self): def _create_field(self):
......
...@@ -50,9 +50,12 @@ ...@@ -50,9 +50,12 @@
<Integration> <Integration>
<shell value="1"/> <shell value="1"/>
<nside value="64"/> <nside value="64"/>
<!-- maximum radius in earth/galactic centric frame -->
<ec_r_max value="30.0"/> <!-- kpc --> <ec_r_max value="30.0"/> <!-- kpc -->
<gc_r_max value="20.0"/> <!-- kpc --> <gc_r_max value="20.0"/> <!-- kpc -->
<!-- maximum height in galactic centric frame -->
<gc_z_max value="10.0"/> <!-- kpc --> <gc_z_max value="10.0"/> <!-- kpc -->
<!-- radial resolution -->
<ec_r_res value="0.1"/> <!-- kpc --> <ec_r_res value="0.1"/> <!-- kpc -->
<!-- lower limit on galactic latitude --> <!-- lower limit on galactic latitude -->
<lat_lim value="0."/> <!-- [0,90] --> <lat_lim value="0."/> <!-- [0,90] -->
...@@ -82,20 +85,21 @@ ...@@ -82,20 +85,21 @@
</Local> </Local>
</Regular> </Regular>
<!-- turbulent fields --> <!-- turbulent fields -->
<Random cue="0" type="Gauss" seed="-1"> <Random cue="0" type="Iso" seed="-1">
<rms value="1.0"/> <!-- isotropic -->
<rho value="1.0"/> <Iso>
<!-- Gaussian random --> <rms value="1.0"/> <!-- norm at k0 -->
<Gauss> <k0 value="0.5"/> <!-- k0 = 1/(Lambda in kpc) -->
<p0 value="2.0"/> <!-- norm at k0 --> <a0 value="1.7"/> <!-- 5/3, Kolmogrov -->
<k0 value="1.0"/> <!-- k0 = 1/Lambda in kpc --> </Iso>
<a0 value="-1.7"/> <!-- global anisotropy -->
</Gauss> <Anisoglob>
<!-- Gaussian + Aniso --> <rho value="0.5"/>
<GaussPlus> </Anisoglob>
<!-- use Gaussian random setting above --> <!-- local turbulent -->
<beta value="0.5"/> <Anisolocal>
</GaussPlus> <beta value="1.0"/>
</Anisolocal>
<!-- rescaling --> <!-- rescaling -->
<Rescal> <Rescal>
<r0 value="8.0"/> <!-- in kpc --> <r0 value="8.0"/> <!-- in kpc -->
...@@ -181,12 +185,12 @@ ...@@ -181,12 +185,12 @@
</YMW16> </YMW16>
<!-- turbulent free electron --> <!-- turbulent free electron -->
<Random cue="0" type="Gauss"> <Random cue="0" type="Iso" seed="-1">
<Gauss> <Iso>
<p0 value="1.0"/> <rms value="1.0"/>
<k0 value="2.0"/> <!-- k0 = 1/Lambda in kpc --> <k0 value="2.0"/> <!-- k0 = 1/Lambda in kpc -->
<a0 value="-1.7"/> <a0 value="-1.7"/>
</Gauss> </Iso>
<!-- rescaling --> <!-- rescaling -->
<Rescal> <Rescal>
<r0 value="8.0"/> <!-- in kpc --> <r0 value="8.0"/> <!-- in kpc -->
...@@ -245,7 +249,4 @@ ...@@ -245,7 +249,4 @@
</Numeric> </Numeric>
</CRE> </CRE>
<!-- DRAGON GRID FOR NUMERICAL CRE INPUT -->
</root> </root>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment