jan/meanas
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add callback for block mode solve progress

Browse Source
This commit is contained in:
Jan Petykiewicz 2019-07-09 20:07:13 -07:00
parent 1f9a9949c0
commit c7d4c4a8e6
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fdfd_tools/bloch.py
View File

@ -369,6 +369,7 @@ def find_k(frequency: float,
band: int = 0, band: int = 0,
k_min: float = 0, k_min: float = 0,
k_max: float = 0.5, k_max: float = 0.5,
solve_callback: Callable = None
) -> Tuple[numpy.ndarray, float]: ) -> Tuple[numpy.ndarray, float]:
""" """
Search for a bloch vector that has a given frequency. Search for a bloch vector that has a given frequency.
@ -389,8 +390,10 @@ def find_k(frequency: float,
def get_f(k0_mag: float, band: int = 0): def get_f(k0_mag: float, band: int = 0):
k0 = direction * k0_mag k0 = direction * k0_mag
n, _v = eigsolve(band + 1, k0, G_matrix=G_matrix, epsilon=epsilon, mu=mu) n, v = eigsolve(band + 1, k0, G_matrix=G_matrix, epsilon=epsilon, mu=mu)
f = numpy.sqrt(numpy.abs(numpy.real(n[band]))) f = numpy.sqrt(numpy.abs(numpy.real(n[band])))
if solve_callback:
solve_callback(k0_mag, n, v, f)
return f return f
res = scipy.optimize.minimize_scalar(lambda x: abs(get_f(x, band) - frequency), res = scipy.optimize.minimize_scalar(lambda x: abs(get_f(x, band) - frequency),