Merge pull request #73 from kc-ml2/DEV/main

Dev/main

Author: yonghakim

meent/on_jax/emsolver/transfer_method.py

@@ -299,8 +299,8 @@ def transfer_2d_wv(ff_xy, Kx, E_conv_i, Ky, o_E_conv_i, E_conv, device='cpu', ty
 
     S2_from_S = jnp.block(
         [
-            [Ky ** 2 + B @ o_E_conv_i, Kx @ (E_conv_i @ Ky @ E_conv - Ky)],
-            [Ky @ (E_conv_i @ Kx @ o_E_conv_i - Kx), Kx ** 2 + D @ E_conv]
+            [Ky ** 2 + B @ E_conv, Kx @ (E_conv_i @ Ky @ E_conv - Ky)],
+            [Ky @ (E_conv_i @ Kx @ E_conv - Kx), Kx ** 2 + D @ E_conv]
         ])
 
     eigenvalues, W = eig(S2_from_S, type_complex=type_complex, perturbation=perturbation, device=device)
@@ -314,7 +314,7 @@ def transfer_2d_wv(ff_xy, Kx, E_conv_i, Ky, o_E_conv_i, E_conv, device='cpu', ty
     U1_from_S = jnp.block(
         [
             [-Kx @ Ky, Kx ** 2 - E_conv],
-            [o_E_conv_i - Ky ** 2, Ky @ Kx]
+            [E_conv - Ky ** 2, Ky @ Kx]
         ]
     )
     V = U1_from_S @ W @ Q_i

meent/on_numpy/emsolver/transfer_method.py

@@ -271,8 +271,8 @@ def transfer_2d_wv(ff_xy, Kx, E_conv_i, Ky, o_E_conv_i, E_conv, type_complex=np.
 
     S2_from_S = np.block(
         [
-            [Ky ** 2 + B @ o_E_conv_i, Kx @ (E_conv_i @ Ky @ E_conv - Ky)],
-            [Ky @ (E_conv_i @ Kx @ o_E_conv_i - Kx), Kx ** 2 + D @ E_conv]
+            [Ky ** 2 + B @ E_conv, Kx @ (E_conv_i @ Ky @ E_conv - Ky)],
+            [Ky @ (E_conv_i @ Kx @ E_conv - Kx), Kx ** 2 + D @ E_conv]
         ])
 
     eigenvalues, W = np.linalg.eig(S2_from_S)
@@ -281,12 +281,14 @@ def transfer_2d_wv(ff_xy, Kx, E_conv_i, Ky, o_E_conv_i, E_conv, type_complex=np.
 
     Q = np.diag(q)
     Q_i = np.linalg.inv(Q)
+
     U1_from_S = np.block(
         [
             [-Kx @ Ky, Kx ** 2 - E_conv],
-            [o_E_conv_i - Ky ** 2, Ky @ Kx]
+            [E_conv - Ky ** 2, Ky @ Kx]
         ]
     )
+
     V = U1_from_S @ W @ Q_i
 
     return W, V, q

meent/on_torch/emsolver/transfer_method.py

@@ -304,8 +304,8 @@ def transfer_2d_wv(ff_xy, Kx, E_conv_i, Ky, o_E_conv_i, E_conv, device='cpu', ty
 
     S2_from_S = torch.cat(
         [
-            torch.cat([Ky ** 2 + B @ o_E_conv_i, Kx @ (E_conv_i @ Ky @ E_conv - Ky)], dim=1),
-            torch.cat([Ky @ (E_conv_i @ Kx @ o_E_conv_i - Kx), Kx ** 2 + D @ E_conv], dim=1)
+            torch.cat([Ky ** 2 + B @ E_conv, Kx @ (E_conv_i @ Ky @ E_conv - Ky)], dim=1),
+            torch.cat([Ky @ (E_conv_i @ Kx @ E_conv - Kx), Kx ** 2 + D @ E_conv], dim=1)
         ])
 
     Eig.perturbation = perturbation
@@ -316,7 +316,7 @@ def transfer_2d_wv(ff_xy, Kx, E_conv_i, Ky, o_E_conv_i, E_conv, device='cpu', ty
     U1_from_S = torch.cat(
         [
             torch.cat([-Kx @ Ky, Kx ** 2 - E_conv], dim=1),
-            torch.cat([o_E_conv_i - Ky ** 2, Ky @ Kx], dim=1)
+            torch.cat([E_conv - Ky ** 2, Ky @ Kx], dim=1)
         ]
     )
     V = U1_from_S @ W @ Q_i

setup.py

@@ -12,7 +12,7 @@
 }
 setup(
     name='meent',
-    version='0.9.11',
+    version='0.9.12',
     url='https://github.com/kc-ml2/meent',
     author='KC ML2',
     author_email='[email protected]',