Fixes important bug in disc field.

luizfelippesr · Jul 10, 2018 · cbcb3a7 · cbcb3a7
1 parent fc82fa8
commit cbcb3a7
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/galmag/B_generators/B_generator_disk.py b/galmag/B_generators/B_generator_disk.py
@@ -68,7 +68,7 @@ def _builtin_parameter_defaults(self):
             'disk_shear_function': prof.Clemens_Milky_Way_shear_rate, # S(r)
             'disk_rotation_function': prof.Clemens_Milky_Way_rotation_curve, # V(r)
             'disk_height_function': prof.exponential_scale_height, # h(r)
-            'disk_regularization_radius': 1., # kpc
+            'disk_regularization_radius': None, # kpc
             'solar_radius': 8.5, # kpc
             'disk_field_decay': True,
             'disk_newman_boundary_condition_envelope': False
@@ -284,6 +284,7 @@ def _convert_coordinates_to_B_values(self, local_r_cylindrical_grid,
                                                               1.0,
                                                               parameters,
                                                               mode='inner')
+
             renormalization = (Br_sun**2 + Bphi_sun**2 + Bz_sun**2)**-0.5
 
             mode_normalization *= renormalization
@@ -375,9 +376,9 @@ def _get_B_mode(self, grid_arrays, mode_number, mode_normalization,
             Omega, Shear = prof.regularize(r_grid, Omega, Shear, rreg, Om_reg)
 
         # Scaleheight in disk radius units (same units as s)
-        h = disk_height*disk_height_ref/disk_radius
+        h = disk_height *disk_height_ref/disk_radius
         # Local dynamo number
-        Dlocal = dynamo_number * Shear * Omega * h**2
+        Dlocal = dynamo_number * Shear * Omega * disk_height**2
         sqrt_Dlocal = np.sqrt(-Dlocal)
         # Normalization correction
         K0 =  (-Dlocal*4./pi -Dlocal*9./pi**3/16 + 1.0)**(-0.5)