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

fixes and clarification

Browse Source
This commit is contained in:
jan 2018-01-08 23:33:22 -08:00
parent c4cbdff751
commit e02040c709
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
fdfd_tools/bloch.py
View File

@ -385,7 +385,9 @@ def eigsolve(num_modes: int,
G_matrix: numpy.ndarray, G_matrix: numpy.ndarray,
epsilon: field_t, epsilon: field_t,
mu: field_t = None, mu: field_t = None,
tolerance = 1e-20, tolerance: float = 1e-20,
max_iters: int = 10000,
reset_iters: int = 100,
) -> Tuple[numpy.ndarray, numpy.ndarray]: ) -> Tuple[numpy.ndarray, numpy.ndarray]:
""" """
Find the first (lowest-frequency) num_modes eigenmodes with Bloch wavevector Find the first (lowest-frequency) num_modes eigenmodes with Bloch wavevector
@ -447,16 +449,15 @@ def eigsolve(num_modes: int,
continue continue
break break
max_iters = 10000
for iter in range(max_iters): for iter in range(max_iters):
ZtZ = Z.conj().T @ Z ZtZ = Z.conj().T @ Z
U = numpy.linalg.inv(ZtZ) U = numpy.linalg.inv(ZtZ)
AZ = scipy_op @ Z AZ = scipy_op @ Z
AZU = AZ @ U AZU = AZ @ U
ZtAZU = Z.conj().T @ AZU ZtAZU = Z.conj().T @ AZU
E = real(trace(ZtAZU)) E_signed = real(trace(ZtAZU))
sgn = numpy.sign(E) sgn = numpy.sign(E_signed)
E = numpy.abs(E) E = numpy.abs(E_signed)
G = (AZU - Z @ U @ ZtAZU) * sgn G = (AZU - Z @ U @ ZtAZU) * sgn
if iter > 0 and abs(E - prev_E) < tolerance * 0.5 * (E + prev_E + 1e-7): if iter > 0 and abs(E - prev_E) < tolerance * 0.5 * (E + prev_E + 1e-7):
@ -466,9 +467,8 @@ def eigsolve(num_modes: int,
KG = scipy_iop @ G KG = scipy_iop @ G
traceGtKG = _rtrace_AtB(G, KG) traceGtKG = _rtrace_AtB(G, KG)
reset_iters = 100 # TODO
if prev_traceGtKG == 0 or iter % reset_iters == 0: if prev_traceGtKG == 0 or iter % reset_iters == 0:
logger.inf('CG reset') logger.info('CG reset')
gamma = 0 gamma = 0
else: else:
gamma = traceGtKG / prev_traceGtKG gamma = traceGtKG / prev_traceGtKG