emerge 0.6.2__tar.gz → 0.6.3__tar.gz

{emerge-0.6.2 → emerge-0.6.3}/.bumpversion.toml

@@ -1,5 +1,5 @@
 [tool.bumpversion]
-current_version = "0.6.2"
+current_version = "0.6.3"
 parse = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<patch>\\d+)"
 serialize = ["{major}.{minor}.{patch}"]
 search = "{current_version}"

{emerge-0.6.2 → emerge-0.6.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: emerge
-Version: 0.6.2
+Version: 0.6.3
 Summary: An open source EM FEM simulator in Python
 Project-URL: Homepage, https://github.com/FennisRobert/EMerge
 Project-URL: Issues, https://github.com/FennisRobert/EMerge/issues

{emerge-0.6.2 → emerge-0.6.3}/emerge/__init__.py

@@ -18,7 +18,7 @@ along with this program; if not, see
 """
 import os
 
-__version__ = "0.6.2"
+__version__ = "0.6.3"
 
 ############################################################
 #               HANDLE ENVIRONMENT VARIABLES              #

{emerge-0.6.2 → emerge-0.6.3}/emerge/_emerge/physics/microwave/microwave_data.py

@@ -1027,6 +1027,42 @@ class MWScalarNdim:
     def S(self, i1: int, i2: int) -> np.ndarray:
         return self.Sp[...,self._portmap[i1], self._portmap[i2]]
     
+    @property
+    def Smat(self) -> np.ndarray:
+        """Returns the full S-matrix
+
+        Returns:
+            np.ndarray: The S-matrix with shape (nF, nP, nP)
+        """
+        Nports = len(self._portmap)
+        nfreq = self.freq.shape[0]
+
+        Smat = np.zeros((nfreq,Nports,Nports), dtype=np.complex128)
+        
+        for i in self._portnumbers:
+            for j in self._portnumbers:
+                Smat[:,i-1,j-1] = self.S(i,j)
+
+        return Smat
+    
+    def emmodel(self, f_sample: np.ndarray | None = None) -> tuple[np.ndarray, np.ndarray]:
+        """Returns the required date for a Heavi S-parameter component
+
+        Returns:
+            tuple[np.ndarray, np.ndarray]: Heavi data
+        """
+        
+        if f_sample is not None:
+            f = f_sample
+            S = self.model_Smat(f_sample)
+        else:
+            f = self.freq
+            S = self.Smat
+        
+        Z0s = self.Z0
+        S = renormalise_s(S, Z0s, 50.0)
+        return f, S
+
     def model_S(self, i: int, j: int, 
             freq: np.ndarray, 
             Npoles: int | Literal['auto'] = 'auto', 
@@ -1062,7 +1098,7 @@ class MWScalarNdim:
         Returns:
             np.ndarray: The (Nf,Np,Np) S-parameter matrix
         """
-        Nports = len(self.datasets[0].excitation)
+        Nports = len(self._portmap)
         nfreq = frequencies.shape[0]
 
         Smat = np.zeros((nfreq,Nports,Nports), dtype=np.complex128)

{emerge-0.6.2 → emerge-0.6.3}/pyproject.toml

@@ -3,7 +3,7 @@ allow-direct-references = true
 
 [project]
 name = "emerge"
-version = "0.6.2"
+version = "0.6.3"
 description = "An open source EM FEM simulator in Python"
 readme = "README.md"
 requires-python = ">=3.10, <4.0"

{emerge-0.6.2 → emerge-0.6.3}/uv.lock

@@ -236,7 +236,7 @@ wheels = [
 
 [[package]]
 name = "emerge"
-version = "0.6.2"
+version = "0.6.3"
 source = { editable = "." }
 dependencies = [
     { name = "gmsh" },