emerge 0.6.2__py3-none-any.whl → 0.6.5__py3-none-any.whl

emerge/__init__.py

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

emerge/_emerge/geo/polybased.py

@@ -16,7 +16,7 @@
 # <https://www.gnu.org/licenses/>.
 from __future__ import annotations
 import numpy as np
-from ..cs import CoordinateSystem, GCS, Axis
+from ..cs import CoordinateSystem, GCS, Axis, _parse_axis
 from ..geometry import GeoVolume, GeoPolygon, GeoEdge, GeoSurface
 from .shapes import Alignment
 import gmsh
@@ -158,7 +158,35 @@ def rotate_point(point: tuple[float, float, float],
     rotated += o
     return tuple(rotated)
 
+def _dist(p1: tuple[float, float], p2: tuple[float, float]) -> float:
+    return ((p2[0]-p1[0])**2 + (p2[1]-p1[1])**2)**(0.5)
 
+def _pair_points(x1: np.ndarray,
+                 y1: np.ndarray,
+                 x2: np.ndarray,
+                 y2: np.ndarray) -> list[tuple[int,int]]:
+    if x1.shape[0]==x2.shape[0]:
+        return [(i,i) for i in range(x1.shape[0])]
+
+    #create point tuples
+    p1s = [(x,y) for x,y in zip(x1, y1)]
+    p2s = [(x,y) for x,y in zip(x2, y2)]
+    
+    pairs = []
+    for i, p1 in enumerate(p1s):
+        d1 = _dist(p1, p2s[i-1])
+        d2 = _dist(p1, p2s[i])
+        d3 = _dist(p1, p2s[i+1])
+        mind = min([d1, d2, d3])
+        if mind==d1:
+            pairs.append((i,i-1))
+            continue
+        elif mind==d2:
+            pairs.append((i,i))
+        else:
+            pairs.append((i,i+1))
+    return pairs
+            
 def orthonormalize(axis: np.ndarray) -> tuple[np.ndarray, np.ndarray, np.ndarray]:
     """Generates a set of orthonormal vectors given an input vector X
 
@@ -233,8 +261,9 @@ class XYPolygon:
     """This class generalizes a polygon in an un-embedded XY space that can be embedded in 3D space.
     """
     def __init__(self, 
-                 xs: np.ndarray | list | tuple = None,
-                 ys: np.ndarray | list | tuple = None):
+                 xs: np.ndarray | list | tuple | None = None,
+                 ys: np.ndarray | list | tuple | None = None,
+                 cs: CoordinateSystem | None = None):
         """Constructs an XY-plane placed polygon.
 
         Args:
@@ -250,7 +279,13 @@ class XYPolygon:
         self.y: np.ndarray = np.asarray(ys)
 
         self.fillets: list[tuple[float, int]] = []
+        
+        self._cs: CoordinateSystem = cs
 
+    @property
+    def center(self) -> tuple[float, float]:
+        return np.mean(self.x), np.mean(self.y)
+    
     @property
     def length(self):
         return sum([((self.x[i2]-self.x[i1])**2 + (self.y[i2]-self.y[i1])**2)**0.5 for i1, i2 in zip(range(self.N-1),range(1, self.N))])
@@ -282,6 +317,10 @@ class XYPolygon:
         """
         return 0.5*np.abs(np.dot(self.x,np.roll(self.y,1))-np.dot(self.y,np.roll(self.x,1)))
 
+    def incs(self, cs: CoordinateSystem) -> XYPolygon:
+        self._cs = cs
+        return self
+
     def extend(self, xpts: list[float], ypts: list[float]) -> XYPolygon:
         """Adds a series for x and y coordinates to the existing polygon.
 
@@ -301,7 +340,7 @@ class XYPolygon:
         for i in range(self.N):
             yield (self.x[i], self.y[i])
 
-    def fillet(self, radius: float, *indices: int) -> None:
+    def fillet(self, radius: float, *indices: int) -> XYPolygon:
         """Add a fillet rounding with a given radius to the provided nodes.
 
         Example:
@@ -313,8 +352,9 @@ class XYPolygon:
         """
         for i in indices:
             self.fillets.append((radius, i))
+        return self
 
-    def _finalize(self, cs: CoordinateSystem = None) -> GeoPolygon:
+    def _make_wire(self, cs: CoordinateSystem) -> tuple[list[int], list[int], int]:
         """Turns the XYPolygon object into a GeoPolygon that is embedded in 3D space.
 
         The polygon will be placed in the XY-plane of the provided coordinate center.
@@ -340,13 +380,27 @@ class XYPolygon:
         
         add = 0
         for radius, index in self.fillets:
-            t1 = lines[index + add]
-            t2 = lines[(index+add-1) % len(lines)]
+            t1 = lines[(index + add-1) % len(lines)]
+            t2 = lines[index + add]
             tag = gmsh.model.occ.fillet2_d(t1, t2, radius)
             lines.insert(index, tag)
             add += 1
 
         wiretag = gmsh.model.occ.add_wire(lines)
+        return ptags, lines, wiretag
+        
+    def _finalize(self, cs: CoordinateSystem) -> GeoPolygon:
+        """Turns the XYPolygon object into a GeoPolygon that is embedded in 3D space.
+
+        The polygon will be placed in the XY-plane of the provided coordinate center.
+
+        Args:
+            cs (CoordinateSystem, optional): The coordinate system in which to put the polygon. Defaults to None.
+
+        Returns:
+            GeoPolygon: The resultant 3D GeoPolygon object.
+        """
+        ptags, lines, wiretag = self._make_wire(cs)
         surftag = gmsh.model.occ.add_plane_surface([wiretag,])
         poly = GeoPolygon([surftag,])
         poly.points = ptags
@@ -384,6 +438,8 @@ class XYPolygon:
         Returns:
             GeoPolygon: The resultant object.
         """
+        if self._cs is not None:
+            return self._finalize(self._cs)
         if cs is None:
             cs = GCS
         return self._finalize(cs) 
@@ -500,7 +556,34 @@ class XYPolygon:
         self.extend(xs, ys)
         return self
     
+    def connect(self, other: XYPolygon) -> GeoVolume:
+        """Connect two XYPolygons with a defined coordinate system
 
+        The coordinate system must be defined before this function can be used. To add a coordinate systme without
+        rendering the Polygon to a GeoVolume, use:
+        >>> polygon.incs(my_cs_obj)
+        
+        Args:
+            other (XYPolygon): _descrThe otheiption_
+
+        Returns:
+            GeoVolume: The resultant volume object
+        """
+        if self._cs is None:
+            raise RuntimeError('Cannot connect XYPolygons without a defined coordinate system. Set this first using .incs()')
+        if other._cs is None:
+            raise RuntimeError('Cannot connect XYPolygons without a defined coordinate system. Set this first using .incs()')
+        p1, l1, w1 = self._make_wire(self._cs)
+        p2, l2, w2 = other._make_wire(other._cs)
+        o1 = np.array(self._cs.in_global_cs(*self.center, 0)).flatten()
+        o2 = np.array(other._cs.in_global_cs(*other.center, 0)).flatten()
+        dts = gmsh.model.occ.addThruSections([w1, w2], True, parametrization="IsoParametric")
+        vol = GeoVolume([t for d,t in dts if d==3])
+        
+        vol._add_face_pointer('front',o1, self._cs.zax.np)
+        vol._add_face_pointer('back', o2, other._cs.zax.np)
+        return vol
+            
 class Disc(GeoSurface):
     
     def __init__(self, origin: tuple[float, float, float],
@@ -525,8 +608,7 @@ class Curve(GeoEdge):
                  degree: int = 3,
                  weights: list[float] | None = None,
                  knots: list[float] | None = None,
-                 ctype: Literal['Spline','BSpline','Bezier'] = 'Bezier',
-                 dstart: tuple[float, float, float] | None = None):
+                 ctype: Literal['Spline','BSpline','Bezier'] = 'Spline'):
         """Generate a Spline/Bspline or Bezier curve based on a series of points
 
         This calls the different curve features in OpenCASCADE.
@@ -547,11 +629,6 @@ class Curve(GeoEdge):
         self.xpts: np.ndarray = xpts
         self.ypts: np.ndarray = ypts
         self.zpts: np.ndarray = zpts
-        
-        if dstart is None:
-            dstart = (xpts[1]-xpts[0], ypts[1]-ypts[0], zpts[1]-zpts[0])
-        
-        self.dstart: tuple[float, float, float] = dstart
 
         points = [gmsh.model.occ.add_point(x,y,z) for x,y,z in zip(xpts, ypts, zpts)]
         
@@ -571,6 +648,14 @@ class Curve(GeoEdge):
         gmsh.model.occ.remove([(0,tag) for tag in points])
         super().__init__(tags)
     
+        gmsh.model.occ.synchronize()
+        p1 = gmsh.model.getValue(self.dim, self.tags[0], [0,])
+        p2 = gmsh.model.getValue(self.dim, self.tags[0], [1e-6])
+        self.dstart: tuple[float, float, float] = (p2[0]-p1[0], p2[1]-p1[1], p2[2]-p1[2])
+    
+        
+        
+    
     @property
     def p0(self) -> tuple[float, float, float]:
         """The start coordinate
@@ -653,7 +738,7 @@ class Curve(GeoEdge):
             zp[2] += d/2*dz
             dp = tuple(Z)
         
-        return Curve(xp, yp, zp, ctype='Spline', dstart=dp)
+        return Curve(xp, yp, zp, ctype='Spline')
     
     @staticmethod
     def helix_lh(pstart: tuple[float, float, float],
@@ -731,9 +816,12 @@ class Curve(GeoEdge):
             zp[2] += d/2*dz
             dp = tuple(Z)
         
-        return Curve(xp, yp, zp, ctype='Spline', dstart=dp)
+        return Curve(xp, yp, zp, ctype='Spline')
         
-    def pipe(self, crossection: GeoSurface | XYPolygon, max_mesh_size: float | None = None) -> GeoVolume:
+    def pipe(self, crossection: GeoSurface | XYPolygon, 
+             max_mesh_size: float | None = None,
+             start_tangent: Axis | tuple[float, float, float] | np.ndarray | None = None,
+             x_axis: Axis | tuple[float, float, float] | np.ndarray | None = None) -> GeoVolume:
         """Extrudes a surface or XYPolygon object along the given curve
 
         If a GeoSurface object is used, make sure it starts at the center of the curve. This property
@@ -744,25 +832,31 @@ class Curve(GeoEdge):
         Args:
             crossection (GeoSurface | XYPolygon): The cross section definition to be used
             max_mesh_size (float, optional): The maximum mesh size. Defaults to None
+            start_tangent (Axis, tuple, ndarray, optional): The input polygon plane normal direction. Defaults to None
+            x_axis (Axis, tuple, ndarray optional): The reference X-axis to align the input polygon. Defaults to None
         Returns:
             GeoVolume: The resultant volume object
         """
         if isinstance(crossection, XYPolygon):
-            zax = self.dstart
-            cs = Axis(np.array(zax)).construct_cs(self.p0)
-            surf = crossection.geo(cs)
+            if start_tangent is None:
+                start_tangent = self.dstart
+            if x_axis is not None:
+                xax = _parse_axis(x_axis)
+                zax = _parse_axis(self.dstart)
+                yax = zax.cross(xax)
+                cs = CoordinateSystem(xax, yax, zax, self.p0)
+            else:
+                zax = self.dstart
+                cs = Axis(np.array(zax)).construct_cs(self.p0)
+                surf = crossection.geo(cs)
         else:
             surf = crossection
         x1, y1, z1, x2, y2, z2 = gmsh.model.occ.getBoundingBox(*surf.dimtags[0])
         diag = ((x2-x1)**2 + (y2-y1)**2 + (z2-z1)**2)**(0.5)
-        
         pipetag = gmsh.model.occ.addPipe(surf.dimtags, self.tags[0], 'GuidePlan')
-        
         self.remove()
         surf.remove()
-        
         volume = GeoVolume(pipetag[0][1])
-        
         volume.max_meshsize = diag/2
         return volume
         

emerge/_emerge/physics/microwave/microwave_3d.py

@@ -1026,4 +1026,4 @@ class Microwave3D:
         """DEPRICATED VERSION: Use run_sweep() instead.
         """
         logger.warning('This function is depricated. Please use run_sweep() instead')
-        self.run_sweep(*args, **kwargs)
+        return self.run_sweep(*args, **kwargs)

emerge/_emerge/physics/microwave/microwave_data.py

@@ -249,7 +249,7 @@ class MWData:
         self.sim.new(**vars)['report'] = report
     
 @dataclass
-class FarfieldData:
+class FarFieldData:
     E: np.ndarray
     H: np.ndarray
     theta: np.ndarray
@@ -816,7 +816,7 @@ class MWField:
                          ang_range: tuple[float, float] = (-180, 180),
                          Npoints: int = 201,
                          origin: tuple[float, float, float] | None = None,
-                         syms: list[Literal['Ex','Ey','Ez', 'Hx','Hy','Hz']] | None = None) -> FarfieldData:#tuple[np.ndarray, np.ndarray, np.ndarray]:
+                         syms: list[Literal['Ex','Ey','Ez', 'Hx','Hy','Hz']] | None = None) -> FarFieldData:#tuple[np.ndarray, np.ndarray, np.ndarray]:
         """Compute the farfield electric and magnetic field defined by a circle.
 
         Args:
@@ -836,14 +836,14 @@ class MWField:
         theta, phi = arc_on_plane(refdir, plane_normal_parsed, ang_range, Npoints)
         E,H = self.farfield(theta, phi, faces, origin, syms = syms)
         angs = np.linspace(*ang_range, Npoints)*np.pi/180
-        return FarfieldData(E, H, theta, phi, ang=angs)
+        return FarFieldData(E, H, theta, phi, ang=angs)
 
     def farfield_3d(self, 
                     faces: FaceSelection | GeoSurface,
                     thetas: np.ndarray | None = None,
                     phis: np.ndarray | None = None,
                     origin: tuple[float, float, float] | None = None,
-                    syms: list[Literal['Ex','Ey','Ez', 'Hx','Hy','Hz']] | None = None) -> FarfieldData:
+                    syms: list[Literal['Ex','Ey','Ez', 'Hx','Hy','Hz']] | None = None) -> FarFieldData:
         """Compute the farfield in a 3D angular grid
 
         If thetas and phis are not provided, they default to a sample space of 2 degrees.
@@ -868,7 +868,7 @@ class MWField:
         E = E.reshape((3, ) + T.shape)
         H = H.reshape((3, ) + T.shape)
         
-        return FarfieldData(E, H, T, P)
+        return FarFieldData(E, H, T, P)
 
     def farfield(self, theta: np.ndarray,
                  phi: np.ndarray,
@@ -924,7 +924,7 @@ class MWField:
         
         return Eff, Hff
 
-    def optycal(self, faces: FaceSelection | GeoSurface | None = None) -> tuple:
+    def optycal_surface(self, faces: FaceSelection | GeoSurface | None = None) -> tuple:
         """Export this models exterior to an Optical acceptable dataset
 
         Args:
@@ -948,7 +948,24 @@ class MWField:
         H = field.H
         k0 = self.k0
         return vertices, triangles, E, H, origin, k0
-        
+    
+    def optycal_antenna(self, faces: FaceSelection | GeoSurface | None = None,
+                        origin: tuple[float, float, float] | None = None,
+                        syms: list[Literal['Ex','Ey','Ez', 'Hx','Hy','Hz']] | None = None) -> dict:
+        """Export this models exterior to an Optical acceptable dataset
+
+        Args:
+            faces (FaceSelection | GeoSurface): The faces to export. Defaults to None
+
+        Returns:
+            tuple: _description_
+        """
+        freq = self.freq
+        def function(theta: np.ndarray, phi: np.ndarray, k0: float):
+            E, H = self.farfield(theta, phi, faces, origin, syms)
+            return E[0,:], E[1,:], E[2,:], H[0,:], H[1,:], H[2,:]
+    
+        return dict(freq=freq, ff_function=function)
 
 class MWScalar:
     """The MWDataSet class stores solution data of FEM Time Harmonic simulations.
@@ -1027,6 +1044,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 +1115,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/_emerge/simmodel.py

@@ -37,7 +37,7 @@ import inspect
 from pathlib import Path
 from atexit import register
 import signal
-
+from .. import __version__
 
 ############################################################
 #                   EXCEPTION DEFINITIONS                  #
@@ -54,6 +54,9 @@ Known problems/solutions:
 class SimulationError(Exception):
     pass
 
+class VersionError(Exception):
+    pass
+
 ############################################################
 #                 BASE 3D SIMULATION MODEL                 #
 ############################################################
@@ -228,6 +231,28 @@ class Simulation:
     #                       PUBLIC FUNCTIONS                  #
     ############################################################
 
+    def check_version(self, version: str) -> None:
+        """Compares the provided version number with the version number of EMerge that is running the script.
+        
+        You may remove any call to check_version to suppress VersionErrors and warnings.
+        
+        Args:
+            version (str): The EMerge version you intend to write this code for.
+
+        Raises:
+            VersionError: A potential version error if incompatibility is possible
+        """
+        vM, vm, vp = [float(x) for x in version.split('.')]
+        cM, cm, cp = [float(x) for x in __version__.split('.')]
+        if vM != cM:
+            raise VersionError(f"You are running a script designed for version {version} with a possibly incompatible version of EMerge {__version__}")
+        if vm != cm:
+            raise VersionError(f"You are running a script designed for version {version} with a possibly incompatible version of EMerge {__version__}")
+        if vp != cp:
+            logger.warning(f"You are running a script designed for version {version} with a possibly incompatible version of EMerge {__version__}")
+            logger.warning("You may suppress this error by removing the call to .check_version().")
+            input('Press enter to proceed...')
+
     def save(self) -> None:
         """Saves the current model in the provided project directory."""
         # Ensure directory exists

{emerge-0.6.2.dist-info → emerge-0.6.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: emerge
-Version: 0.6.2
+Version: 0.6.5
 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.dist-info → emerge-0.6.5.dist-info}/RECORD

@@ -1,4 +1,4 @@
-emerge/__init__.py,sha256=43b0Z3PGzJGeeVwnzkd_akw1rT6ySCQE4OAuE7a5cvo,2605
+emerge/__init__.py,sha256=NGSPQ4EPfFHaKDQJrKTqMiBfEdvgxZhsgNxt4SoubIw,2605
 emerge/__main__.py,sha256=WVf16sfrOI910QWohrQDaChZdRifMNoS6VKzCT6f3ZA,92
 emerge/cli.py,sha256=NU1uhwuZ6i50680v3_I4kDZPTHqz74gOYK71UBhb8oE,666
 emerge/ext.py,sha256=IBoHH5PQFj5pYMfp6r-uMpNNgbSe8c0g9x8qjBzzVmU,223
@@ -22,7 +22,7 @@ emerge/_emerge/mesher.py,sha256=fKgPb6oZe_bqp0XYfZ6UNgBfRaAS3-tjUtZX8NalJe8,1319
 emerge/_emerge/periodic.py,sha256=xfdKKq3qX7iBBestnRizOzJNfXlpr9lCPkiYhfrRIR8,12013
 emerge/_emerge/plot.py,sha256=cf1I9mj7EIUJcq8vmANlUkqoV6QqVaJaP-zlC-T9E18,8041
 emerge/_emerge/selection.py,sha256=6UizuWC01sUGjFodrGTy8N1J1832vfOWA4u5paNupw4,21297
-emerge/_emerge/simmodel.py,sha256=JIUgSyykVTkv9_GiNq7Xq7N___-BgVDczcyB3RiyxVI,18206
+emerge/_emerge/simmodel.py,sha256=guiNnSSxdc6qABHr78LAdp9U1dVxb-SPWBgaKTxFzgw,19535
 emerge/_emerge/simulation_data.py,sha256=r9-9lpLeA1Z5HU3jDVOXV1H80GVawnXL5K81_dvmlE4,14506
 emerge/_emerge/solver.py,sha256=PGPI2LuF4XhfyS8KfC-49X9M1mtYUadgHyqopYfPj58,48542
 emerge/_emerge/system.py,sha256=p4HNz7d_LMRNE9Gk75vVdFecDH2iN_groAM9u-yQTpk,1618
@@ -37,9 +37,8 @@ emerge/_emerge/geo/horn.py,sha256=h4GzGzEkXgWaQgoBMvhFgGsqOrNRB3CJg3RBKXigCz0,41
 emerge/_emerge/geo/modeler.py,sha256=gbxmwXAdR7kKW_EFbkd1QPVqJWKJpnTufI7lxaqPyjU,15573
 emerge/_emerge/geo/operations.py,sha256=LKA7_BU4iw6-i6KOUyuL6l10QjXSwnXsixOaTw-M6Vk,9697
 emerge/_emerge/geo/pcb.py,sha256=b4FZAwZaO8X2NMnRkYYDUTa8w9ZdN2XfZdmyHhZZaGY,52213
-emerge/_emerge/geo/pipes.py,sha256=l1Vm5lpbxMwHQqffZWLTKQU_xNnsXvHq0XNDNCpQKXY,2054
 emerge/_emerge/geo/pmlbox.py,sha256=TNjuyPtuqrAU5Yl8GrLlievuwYf3hUKJaCEz0cXKSzo,7922
-emerge/_emerge/geo/polybased.py,sha256=I-h7c_QTy4lH5whwT0ZWqcnM3VG7YkczH70salvsY-o,27959
+emerge/_emerge/geo/polybased.py,sha256=loVJRBjYCTUlti5tHwfH8iU-Inb6n2sOS2Cw4gVKid4,31917
 emerge/_emerge/geo/shapes.py,sha256=7biZx_5s3sWKgJq6U_rqOBHyMZ3Nt6kHWj7tYsHPkt8,19289
 emerge/_emerge/geo/step.py,sha256=XcAiEN8W4umNmZdYmrGHX_aJUuiMgc6vgT-UIk8Gbqc,2689
 emerge/_emerge/geo/pcb_tools/calculator.py,sha256=eGYUXdXmHUJCPlfJyY96S87wjeAVFG-e4sPOwbYj0eA,832
@@ -51,9 +50,9 @@ emerge/_emerge/mth/pairing.py,sha256=i8bBvTeMmzgF0JdiDNJiTXxx913x4f10777pzD6FJo0
 emerge/_emerge/physics/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 emerge/_emerge/physics/microwave/__init__.py,sha256=QHeILGYWmvbfLl1o9wrTiWLm0evfXDgS0JiikUoMTts,28
 emerge/_emerge/physics/microwave/adaptive_freq.py,sha256=aWhijhCVAbnuwkru-I1AaRdY20uyozf6OWRIh9r2ijg,9786
-emerge/_emerge/physics/microwave/microwave_3d.py,sha256=zKIvFa9WDfDSP6XkYQ-kc_0umZnOIfe0mpBku0piI-4,42000
+emerge/_emerge/physics/microwave/microwave_3d.py,sha256=5P8yyr6e6hFHBS1JAFHq8gsU1CxFG1LTelKVggv7AjY,42007
 emerge/_emerge/physics/microwave/microwave_bc.py,sha256=-fxeZREL42snL4XvXuUqo4QJh24o8lHJ_IcWxkt5yAU,42484
-emerge/_emerge/physics/microwave/microwave_data.py,sha256=3leIYwZe7nAd7D6C2PRRW5GBYgBeuVzOmopngI8wwwY,44972
+emerge/_emerge/physics/microwave/microwave_data.py,sha256=rIxHAaVFhKgedeEdEGqEd-2zXT0ZRUtL588NCA_d4XQ,46722
 emerge/_emerge/physics/microwave/periodic.py,sha256=wYSUgLFVtCLqSG3EDKoCDRU93iPUzBdXzVRdHTRmbpI,3000
 emerge/_emerge/physics/microwave/port_functions.py,sha256=aVU__AkVk8b1kH2J_oDLF5iNReCxC9nzCtesFSSSSQo,2112
 emerge/_emerge/physics/microwave/sc.py,sha256=WZvoPhmHkfEv619RhmN09sXDBV0ryTqybwErA8Rc7lU,4735
@@ -79,8 +78,8 @@ emerge/_emerge/projects/_load_base.txt,sha256=94o0eSWoDKlNR336EmhpG_S5syQHIUPHQx
 emerge/_emerge/projects/generate_project.py,sha256=TNw-0SpLc82MBq0bd9hB_yqvBZCgmuPonCBsHTp91uk,1450
 emerge/_emerge/solve_interfaces/cudss_interface.py,sha256=-SjiTNIyE7iJ8Bm14Cva5e2lpJDgfiS2Mvz1Bgy-UL4,9688
 emerge/_emerge/solve_interfaces/pardiso_interface.py,sha256=iVFxToMmIzhj3hcAP-O_MDHKz82ePFIHY1us11kzUBU,15305
-emerge-0.6.2.dist-info/METADATA,sha256=DlGN5EtFrQieXsEPTEjR8Dyzvs6K0FUQnUdzlE2h3Y4,3304
-emerge-0.6.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-emerge-0.6.2.dist-info/entry_points.txt,sha256=8rFvAXticpKg4OTC8JEvAksnduW72KIEskCGG9XnFf8,43
-emerge-0.6.2.dist-info/licenses/LICENSE,sha256=SuHm9Fw32RI6tylP2YCyTPITMwpueazVUZwUMFRE_zk,17856
-emerge-0.6.2.dist-info/RECORD,,
+emerge-0.6.5.dist-info/METADATA,sha256=Kf2Xyi7EWIR34D7554jWXG0-HscLA6PR3MdQ9r-TjhM,3304
+emerge-0.6.5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+emerge-0.6.5.dist-info/entry_points.txt,sha256=8rFvAXticpKg4OTC8JEvAksnduW72KIEskCGG9XnFf8,43
+emerge-0.6.5.dist-info/licenses/LICENSE,sha256=SuHm9Fw32RI6tylP2YCyTPITMwpueazVUZwUMFRE_zk,17856
+emerge-0.6.5.dist-info/RECORD,,

emerge/_emerge/geo/pipes.py

@@ -1,62 +0,0 @@
-# EMerge is an open source Python based FEM EM simulation module.
-# Copyright (C) 2025  Robert Fennis.
-
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, see
-# <https://www.gnu.org/licenses/>.
-
-from __future__ import annotations
-import gmsh
-import numpy as np
-from typing import Literal, Callable
-from ..geometry import GeoEdge, GeoSurface, GeoVolume
-
-
-
-class Curve(GeoEdge):
-    
-    
-    def __init__(self, xpts: np.ndarray, ypts: np.ndarray, zpts: np.ndarray, 
-                 degree: int = 3,
-                 weights: list[float] | None = None,
-                 knots: list[float] | None = None,
-                 ctype: Literal['Spline','BSpline','Bezier'] = 'Bezier'):
-        self.xpts: np.ndarray = xpts
-        self.ypts: np.ndarray = ypts
-        self.zpts: np.ndarray = zpts
-        
-        points = [gmsh.model.occ.add_point(x,y,z) for x,y,z in zip(xpts, ypts, zpts)]
-        
-        if ctype.lower()=='spline':
-            tags = gmsh.model.occ.addSpline(points)
-            
-        elif ctype.lower()=='bspline':
-            if weights is None:
-                weights = []
-            if knots is None:
-                knots = []
-            tags = gmsh.model.occ.addBSpline(points, degree=degree, weights=weights, knots=knots)
-        else:
-            tags = gmsh.model.occ.addBezier(points)
-        
-        tags = gmsh.model.occ.addWire([tags,])
-        gmsh.model.occ.remove([(0,tag) for tag in points])
-        super().__init__(tags)
-    
-
-
-
-class Helix(GeoVolume):
-    
-    
-