Fix of 'fix'

Former-commit-id: dbe7380806dd273f431d09269c2656b5262a2dac
This commit is contained in:
Marek Nečada 2017-02-16 01:08:58 +00:00
parent ad563aaef2
commit 4b665cfe31
1 changed files with 8 additions and 6 deletions

View File

@ -378,14 +378,16 @@ for trfile in os.scandir(translations_dir):
leftmatrixlist_s = np.reshape(leftmatrixlist,(klist.shape[0], 2*2*nelem,2*2*nelem))[nnlist] leftmatrixlist_s = np.reshape(leftmatrixlist,(klist.shape[0], 2*2*nelem,2*2*nelem))[nnlist]
leftmatrixlist_TE = leftmatrixlist_s[np.ix_(np.arange(leftmatrixlist_s.shape[0]),TEč,TEč)] leftmatrixlist_TE = leftmatrixlist_s[np.ix_(np.arange(leftmatrixlist_s.shape[0]),TEč,TEč)]
leftmatrixlist_TM = leftmatrixlist_s[np.ix_(np.arange(leftmatrixlist_s.shape[0]),TMč,TMč)] leftmatrixlist_TM = leftmatrixlist_s[np.ix_(np.arange(leftmatrixlist_s.shape[0]),TMč,TMč)]
svarr = np.linalg.svd(leftmatrixlist_TE, compute_uv=False) #svarr = np.linalg.svd(leftmatrixlist_TE, compute_uv=False)
argsortlist = np.argsort(svarr, axis=-1)[...,:svn] #argsortlist = np.argsort(svarr, axis=-1)[...,:svn]
minsvTElist[nnlist] = svarr[...,argsortlist] #minsvTElist[nnlist] = svarr[...,argsortlist]
#minsvTElist[nnlist] = np.amin(np.linalg.svd(leftmatrixlist_TE, compute_uv=False), axis=-1) #minsvTElist[nnlist] = np.amin(np.linalg.svd(leftmatrixlist_TE, compute_uv=False), axis=-1)
svarr = np.linalg.svd(leftmatrixlist_TM, compute_uv=False) minsvTElist[nnlist] = np.linalg.svd(leftmatrixlist_TE, compute_uv=False)[...,-svn:]
argsortlist = np.argsort(svarr, axis=-1)[...,:svn] #svarr = np.linalg.svd(leftmatrixlist_TM, compute_uv=False)
minsvTMlist[nnlist] = svarr[...,argsortlist] #argsortlist = np.argsort(svarr, axis=-1)[...,:svn]
#minsvTMlist[nnlist] = svarr[...,argsortlist]
#minsvTMlist[nnlist] = np.amin(np.linalg.svd(leftmatrixlist_TM, compute_uv=False), axis=-1) #minsvTMlist[nnlist] = np.amin(np.linalg.svd(leftmatrixlist_TM, compute_uv=False), axis=-1)
minsvTMlist[nnlist] = np.linalg.svd(leftmatrixlist_TM, compute_uv=False)[...,-svn:]
minsvTMlistlist.append(minsvTMlist) minsvTMlistlist.append(minsvTMlist)
minsvTElistlist.append(minsvTElist) minsvTElistlist.append(minsvTElist)