Skip to content
Snippets Groups Projects
Commit 04f15420 authored by Keon Hee KIM's avatar Keon Hee KIM
Browse files

Removed unnecessary initial values for form factors

parent 7ff9b28c
No related branches found
No related tags found
2 merge requests!14Faster CircularResistiveWall,!3Yokoya elliptic (reopened)
This commit is part of merge request !14. Comments created here will be created in the context of that merge request.
...@@ -286,21 +286,13 @@ def yokoya_elliptic(x_radius, y_radius): ...@@ -286,21 +286,13 @@ def yokoya_elliptic(x_radius, y_radius):
yokydip_pp = np.pi**2/12 yokydip_pp = np.pi**2/12
yokxquad_pp = -np.pi**2/24 yokxquad_pp = -np.pi**2/24
yokyquad_pp = np.pi**2/24 yokyquad_pp = np.pi**2/24
if y_radius > x_radius:
yokxdip_pp, yokydip_pp = yokydip_pp, yokxdip_pp
yokxquad_pp, yokyquad_pp = yokyquad_pp, yokxquad_pp
small_semiaxis_th = large_semiaxis*(1-qr_th)/(1+qr_th) small_semiaxis_th = large_semiaxis*(1-qr_th)/(1+qr_th)
F_th = np.sqrt(large_semiaxis**2 - small_semiaxis_th**2) F_th = np.sqrt(large_semiaxis**2 - small_semiaxis_th**2)
mu_b_th = np.arccosh(large_semiaxis/F_th) mu_b_th = np.arccosh(large_semiaxis/F_th)
yoklong_th = 0.0 ip_range = np.arange(51)
yokxdip_th = 0.0 il_range = np.arange(51)
yokydip_th = 0.0
yokxquad_th = 0.0
ip_range = np.arange(50)
il_range = np.arange(50)
ip, il = np.meshgrid(ip_range, il_range, indexing="ij") ip, il = np.meshgrid(ip_range, il_range, indexing="ij")
ff_values = np.array(function_ff(small_semiaxis_th, F_th, mu_b_th, ip, il)) ff_values = np.array(function_ff(small_semiaxis_th, F_th, mu_b_th, ip, il))
...@@ -319,6 +311,8 @@ def yokoya_elliptic(x_radius, y_radius): ...@@ -319,6 +311,8 @@ def yokoya_elliptic(x_radius, y_radius):
if y_radius > x_radius: if y_radius > x_radius:
yokxdip_th, yokydip_th = yokydip_th, yokxdip_th yokxdip_th, yokydip_th = yokydip_th, yokxdip_th
yokxquad_th, yokyquad_th = yokyquad_th, yokxquad_th yokxquad_th, yokyquad_th = yokyquad_th, yokxquad_th
yokxdip_pp, yokydip_pp = yokydip_pp, yokxdip_pp
yokxquad_pp, yokyquad_pp = yokyquad_pp, yokxquad_pp
qr_array = np.array([qr_th, 1.0]) qr_array = np.array([qr_th, 1.0])
yoklong_array = np.array([yoklong_th, yoklong_pp]) yoklong_array = np.array([yoklong_th, yoklong_pp])
...@@ -334,13 +328,8 @@ def yokoya_elliptic(x_radius, y_radius): ...@@ -334,13 +328,8 @@ def yokoya_elliptic(x_radius, y_radius):
yokyquad = np.interp(qr, qr_array, yokyquad_array) yokyquad = np.interp(qr, qr_array, yokyquad_array)
else: else:
yoklong = 0.0 ip_range = np.arange(51)
yokxdip = 0.0 il_range = np.arange(51)
yokydip = 0.0
yokxquad = 0.0
ip_range = np.arange(50)
il_range = np.arange(50)
ip, il = np.meshgrid(ip_range, il_range, indexing="ij") ip, il = np.meshgrid(ip_range, il_range, indexing="ij")
ff_values = np.array(function_ff(small_semiaxis, F, mu_b, ip, il)) ff_values = np.array(function_ff(small_semiaxis, F, mu_b, ip, il))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment