Adjusts disc calculation.

luizfelippesr · Jun 18, 2018 · d39ee38 · d39ee38
1 parent e6f960a
commit d39ee38
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/galmag/B_generators/B_generator_disk.py b/galmag/B_generators/B_generator_disk.py
@@ -343,7 +343,6 @@ def _get_B_mode(self, grid_arrays, mode_number, mode_normalization,
         disk_height_ref = parameters['disk_height']
         dynamo_number = parameters['disk_dynamo_number']
         Ralpha = parameters['disk_turbulent_induction']
-        rreg = parameters['disk_regularization_radius']/disk_radius
 
         Cn = mode_normalization
 
@@ -365,7 +364,9 @@ def _get_B_mode(self, grid_arrays, mode_number, mode_normalization,
         disk_height = height_function(r_grid, Rsun=solar_radius,
                                       R_d=disk_radius)
 
-        if rreg is not None:
+        if parameters['disk_regularization_radius'] is not None:
+            rreg = parameters['disk_regularization_radius']/disk_radius
+
             # Finds the value of Omega at the regularization radios
             # (i.e. the value that will remain constant until 0
             Om_reg = prof.Omega(rotation_function, rreg,
@@ -389,14 +390,15 @@ def _get_B_mode(self, grid_arrays, mode_number, mode_normalization,
         piz_half = (pi/2.) * z_grid
         sin_piz_half = np.sin(piz_half)
         cos_piz_half = np.cos(piz_half)
+        Ralpha_local = Omega * Ralpha
 
         # Computes the magnetic field modes
-        Br = Cn*K0 * Omega * Ralpha * j1_knr * \
+        Br = Cn*K0 * Ralpha_local * j1_knr * \
             (cos_piz_half + 3./four_pi32*sqrt_Dlocal*np.cos(3.*piz_half))
 
         Bphi = -2.* Cn*K0 * sqrt_Dlocal/np.sqrt(pi) * j1_knr * cos_piz_half
 
-        Bz = -2.* kn*h /pi *Cn*K0 *Omega*Ralpha * j0_knr  \
+        Bz = -2.* kn*h /pi *Cn*K0 * Ralpha_local * j0_knr  \
             * (sin_piz_half + np.sin(3*piz_half)*sqrt_Dlocal/four_pi32)
 
         if mode == 'outer' and parameters['disk_field_decay']: