emerge 0.6.3__py3-none-any.whl → 0.6.6__py3-none-any.whl

emerge/__init__.py

@@ -18,7 +18,7 @@ along with this program; if not, see
 """
 import os
 
-__version__ = "0.6.3"
+__version__ = "0.6.6"
 
 ############################################################
 #               HANDLE ENVIRONMENT VARIABLES              #
@@ -52,6 +52,7 @@ from ._emerge.cs import CoordinateSystem, CS, GCS, Plane, Axis, XAX, YAX, ZAX, X
 from ._emerge.coord import Line
 from ._emerge import geo
 from ._emerge.selection import Selection, FaceSelection, DomainSelection, EdgeSelection
+from ._emerge.geometry import select
 from ._emerge.mth.common_functions import norm, coax_rout, coax_rin
 from ._emerge.physics.microwave.sc import stratton_chu
 from ._emerge.periodic import RectCell, HexCell

emerge/_emerge/geo/__init__.py

@@ -19,6 +19,6 @@ from .pcb import PCB
 from .pmlbox import pmlbox
 from .horn import Horn
 from .shapes import Cylinder, CoaxCylinder, Box, XYPlate, HalfSphere, Sphere, Plate, OldBox, Alignment, Cone
-from .operations import subtract, add, embed, remove, rotate, mirror, change_coordinate_system, translate, intersect
+from .operations import subtract, add, embed, remove, rotate, mirror, change_coordinate_system, translate, intersect, unite
 from .polybased import XYPolygon, GeoPrism, Disc, Curve
 from .step import STEPItems

emerge/_emerge/geo/operations.py

@@ -15,8 +15,8 @@
 # along with this program; if not, see
 # <https://www.gnu.org/licenses/>.
 
-from typing import TypeVar
-from ..geometry import GeoSurface, GeoVolume, GeoObject, GeoPoint, GeoEdge
+from typing import TypeVar, overload
+from ..geometry import GeoSurface, GeoVolume, GeoObject, GeoPoint, GeoEdge, GeoPolygon
 from ..cs import CoordinateSystem, GCS
 import gmsh
 import numpy as np
@@ -144,7 +144,8 @@ def rotate(main: GeoVolume,
            c0: tuple[float, float, float],
            ax: tuple[float, float, float],
            angle: float,
-           degree=True) -> GeoVolume:
+           make_copy: bool = False,
+           degree=True) -> GeoObject:
     """Rotates a GeoVolume object around an axist defined at a coordinate.
 
     Args:
@@ -159,17 +160,23 @@ def rotate(main: GeoVolume,
     """
     if degree:
         angle = angle * np.pi/180
-    gmsh.model.occ.rotate(main.dimtags, *c0, *ax, -angle)
-
+    
+    if make_copy:
+        rotate_obj = main.make_copy()
+    else:
+        rotate_obj = main
+     
+    gmsh.model.occ.rotate(rotate_obj.dimtags, *c0, *ax, -angle)
     # Rotate the facepointers
-    for fp in main._all_pointers:
+    for fp in rotate_obj._all_pointers:
         fp.rotate(c0, ax, angle)
-    return main
+    return rotate_obj
 
 def translate(main: GeoVolume,
               dx: float = 0,
               dy: float = 0,
-              dz: float = 0) -> GeoVolume:
+              dz: float = 0,
+              make_copy: bool = False) -> GeoObject:
     """Translates the GeoVolume object along a given displacement
 
     Args:
@@ -177,17 +184,23 @@ def translate(main: GeoVolume,
         dx (float, optional): The X-displacement in meters. Defaults to 0.
         dy (float, optional): The Y-displacement in meters. Defaults to 0.
         dz (float, optional): The Z-displacement in meters. Defaults to 0.
+        make_copy (bool, optional): Whether to make a copy first before translating.
 
     Returns:
-        GeoVolume: The translated object
+        GeoObject: The translated object
     """
-    gmsh.model.occ.translate(main.dimtags, dx, dy, dz)
+    
+    if make_copy:
+        trans_obj = main.make_copy()
+    else:
+        trans_obj = main
+    gmsh.model.occ.translate(trans_obj.dimtags, dx, dy, dz)
     
      # Rotate the facepointers
-    for fp in main._all_pointers:
+    for fp in trans_obj._all_pointers:
         fp.translate(dx, dy, dz)
 
-    return main
+    return trans_obj
 
 def mirror(main: GeoObject,
            origin: tuple[float, float, float] = (0.0, 0.0, 0.0),
@@ -199,6 +212,7 @@ def mirror(main: GeoObject,
         main (GeoVolume): The object to mirror
         origin (tuple[float, float, float], optional): The point of origin in meters. Defaults to (0.0, 0.0, 0.0).
         direction (tuple[float, float, float], optional): The normal axis defining the plane of reflection. Defaults to (1.0, 0.0, 0.0).
+        make_copy (bool, optional): Whether to make a copy first before mirroring.
 
     Returns:
         GeoVolume: The mirrored GeoVolume object
@@ -211,14 +225,12 @@ def mirror(main: GeoObject,
     d = -(a*x0 + b*y0 + c*z0)
     if (a==0) and (b==0) and (c==0):
         return main
+    
     mirror_obj = main
     if make_copy:
-        new_obj = main.make_copy()
-        gmsh.model.occ.mirror(new_obj.dimtags, a,b,c,d)
-        mirror_obj = new_obj
-    else:
-        gmsh.model.occ.mirror(main.dimtags, a,b,c,d)
-
+        mirror_obj = main.make_copy()
+    gmsh.model.occ.mirror(mirror_obj.dimtags, a,b,c,d)
+    
     for fp in mirror_obj._all_pointers:
         fp.mirror(origin, direction)
     return mirror_obj
@@ -237,7 +249,7 @@ def change_coordinate_system(main: GeoObject,
         old_cs (CoordinateSystem, optional): The old coordinate system. Defaults to GCS.
 
     Returns:
-        _type_: _description_
+        GeoObject: The output object
     """
     if new_cs._is_global and old_cs._is_global:
         return main
@@ -254,4 +266,39 @@ def change_coordinate_system(main: GeoObject,
     for fp in main._all_pointers:
         fp.affine_transform(M1)
         fp.affine_transform(M2)
-    return main
+    return main
+
+@overload
+def unite(*objects: GeoVolume) -> GeoVolume: ...
+
+@overload
+def unite(*objects: GeoSurface) -> GeoSurface: ...
+
+@overload
+def unite(*objects: GeoEdge) -> GeoEdge: ...
+
+@overload
+def unite(*objects: GeoPolygon) -> GeoSurface: ...
+
+def unite(*objects: GeoObject) -> GeoObject:
+    """Applies a fusion consisting of all geometries in the argument.
+
+    Returns:
+        GeoObject: The resultant object
+    """
+    main, *rest = objects
+    if not rest:
+        return main
+    main._exists = False
+    dts = []
+    for other in rest:
+        dts.extend(other.dimtags)
+        other._exists = False
+    
+    new_dimtags, mapping = gmsh.model.occ.fuse(main.dimtags, dts)
+    
+    new_obj = GeoObject.from_dimtags(new_dimtags)._take_tools(*objects)
+    new_obj.set_material(main.material)
+    new_obj.prio_set(main._priority)
+    
+    return new_obj

emerge/_emerge/geo/pcb.py

@@ -22,7 +22,7 @@ from ..geometry import GeoPolygon, GeoVolume, GeoSurface
 from ..material import Material, AIR, COPPER
 from .shapes import Box, Plate, Cylinder
 from .polybased import XYPolygon
-from .operations import change_coordinate_system
+from .operations import change_coordinate_system, unite
 from .pcb_tools.macro import parse_macro
 from .pcb_tools.calculator import PCBCalculator
 
@@ -310,7 +310,6 @@ class StripCurve(StripTurn):
         points: list[tuple[float, float]] = []
         Npts = int(np.ceil(abs(self.angle/self.dang)))
         R = self.radius-np.sign(self.angle)*self.width/2
-        print(R, self.circ_origin, self._xhat, self._yhat)
         for i in range(Npts):
             ang = abs((i+1)/Npts * self.angle * np.pi/180)
             pnew = self.circ_origin + R*(self._xhat*np.cos(ang)+self._yhat*np.sin(ang))
@@ -324,7 +323,6 @@ class StripCurve(StripTurn):
 
         Npts = int(np.ceil(abs(self.angle/self.dang)))
         R = self.radius+np.sign(self.angle)*self.width/2
-        print(R, self.circ_origin, self._xhat, self._yhat)
         for i in range(Npts):
             ang = abs((i+1)/Npts * self.angle * np.pi/180)
             pnew = self.circ_origin + R*(self._xhat*np.cos(ang)+self._yhat*np.sin(ang))
@@ -1247,7 +1245,13 @@ class PCB:
         plate = change_coordinate_system(plate, self.cs)
         return plate # type: ignore
 
-    def generate_vias(self, merge=False) -> list[Cylinder] | Cylinder:
+    @overload
+    def generate_vias(self, merge=Literal[True]) -> GeoVolume: ...
+    
+    @overload
+    def generate_vias(self, merge=Literal[False]) -> list[Cylinder]: ...
+        
+    def generate_vias(self, merge=False) -> list[Cylinder] | GeoVolume:
         """Generates the via objects.
 
         Args:
@@ -1321,7 +1325,7 @@ class PCB:
         Returns:
             list[Polygon] | GeoSurface: The output stripline polygons possibly merged if merge = True.
         """
-        polys = []
+        polys: list[GeoSurface] = []
         allx = []
         ally = []
 
@@ -1359,13 +1363,14 @@ class PCB:
 
         self.traces = polys
         if merge:
-            tags = []
-            for p in polys:
-                tags.extend(p.tags)
-                if p.material != COPPER:
-                    logger.warning(f'Merging a polygon with material {p.material} into a single polygon that will be COPPER.')
-            polys = GeoSurface(tags)
-            polys.material = COPPER
+            polys = unite(*polys)
+            # tags = []
+            # for p in polys:
+            #     tags.extend(p.tags)
+            #     if p.material != COPPER:
+            #         logger.warning(f'Merging a polygon with material {p.material} into a single polygon that will be COPPER.')
+            # polys = GeoSurface(tags)
+            # polys.material = COPPER
         return polys
                 
 ############################################################

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/geo/shapes.py

@@ -31,9 +31,18 @@ class Alignment(Enum):
     CORNER = 2
 
 class Box(GeoVolume):
-    """ A class that represents a box shaped volume
+    """Creates a box volume object.
+        Specify the alignment of the box with the provided position. The options are CORNER (default)
+        for the front-left-bottom node of the box or CENTER for the center of the box.
 
-    """
+        Args:
+            width (float): The x-size
+            depth (float): The y-size
+            height (float): The z-size
+            position (tuple, optional): The position of the box. Defaults to (0,0,0).
+            alignment (Alignment, optional): Which point of the box is placed at the position. 
+                Defaults to Alignment.CORNER.
+        """
 
     def __init__(self, 
                  width: float, 
@@ -94,7 +103,12 @@ class Box(GeoVolume):
 
     
 class Sphere(GeoVolume):
+    """Generates a sphere objected centered ont he position with the given radius
 
+    Args:
+        radius (float): The sphere radius
+        position (tuple, optional): The center position. Defaults to (0,0,0).
+    """
     def __init__(self, 
                  radius: float,
                  position: tuple = (0,0,0)):
@@ -109,6 +123,17 @@ class Sphere(GeoVolume):
         self.tags: list[int] = [gmsh.model.occ.addSphere(x,y,z,radius),]
 
 class XYPlate(GeoSurface):
+    """Generates and XY-plane oriented plate
+        
+        Specify the alignment of the plate with the provided position. The options are CORNER (default)
+        for the front-left node of the plate or CENTER for the center of the plate.
+
+        Args:
+            width (float): The x-size of the plate
+            depth (float): The y-size of the plate
+            position (tuple, optional): The position of the alignment node. Defaults to (0,0,0).
+            alignment (Alignment, optional): Which node to align to. Defaults to Alignment.CORNER.
+        """
     def __init__(self, 
                  width: float, 
                  depth: float, 
@@ -134,7 +159,19 @@ class XYPlate(GeoSurface):
 
 
 class Plate(GeoSurface):
-        
+    """A generalized 2D rectangular plate in XYZ-space.
+
+        The plate is specified by an origin (o) in meters coordinate plus two vectors (u,v) in meters
+        that span two of the sides such that all points of the plate are defined by:
+            p1 = o
+            p2 = o+u
+            p3 = o+v
+            p4 = o+u+v
+        Args:
+            origin (tuple[float, float, float]): The origin of the plate in meters
+            u (tuple[float, float, float]): The u-axis of the plate
+            v (tuple[float, float, float]): The v-axis of the plate
+        """
     def __init__(self,
                 origin: tuple[float, float, float],
                 u: tuple[float, float, float],
@@ -297,7 +334,6 @@ class CoaxCylinder(GeoVolume):
 
         xo, yo, zo = self.cs.in_global_cs(x.flatten(), y.flatten(), z.flatten())
         return xo, yo, zo
-        return super().boundary()
     
 class HalfSphere(GeoVolume):
 

emerge/_emerge/geometry.py

@@ -411,8 +411,8 @@ class GeoObject:
         self._priority = _GEOMANAGER.highest_priority()+10
         return self
     
-    def outside(self, *exclude: FaceNames, tags: list[int] | None = None) -> FaceSelection:
-        """Returns the complete set of outside faces.
+    def boundary(self, exclude: tuple[FaceNames,...] | None = None, tags: list[int] | None = None) -> FaceSelection:
+        """Returns the complete set of boundary faces.
 
         If implemented, it is possible to exclude a set of faces based on their name
         or a list of tags (integers)
@@ -420,8 +420,13 @@ class GeoObject:
         Returns:
             FaceSelection: The selected faces
         """
+        if exclude is None:
+            exclude = tuple()
+            
         if tags is None:
             tags = []
+        
+        
         for name in exclude:
             tags.extend(self.face(name).tags)
         dimtags = gmsh.model.get_boundary(self.dimtags, True, False)
@@ -441,6 +446,22 @@ class GeoObject:
         
         return FaceSelection(self._face_tags(name, tool))
 
+    def faces(self, *names: FaceNames, tool: GeoObject | None = None) -> FaceSelection:
+        """Returns the FaceSelection for a given face names.
+        
+        The face name must be defined for the type of geometry.
+
+        Args:
+            name (FaceNames): The name of the face to select.
+
+        Returns:
+            FaceSelection: The selected face
+        """
+        tags = []
+        for name in names:
+            tags.extend(self._face_tags(name, tool))
+        return FaceSelection(tags)
+        
     @property
     def dimtags(self) -> list[tuple[int, int]]:
         return [(self.dim, tag) for tag in self.tags]
@@ -448,15 +469,6 @@ class GeoObject:
     @property
     def embeddings(self) -> list[tuple[int,int]]:
         return []
-    
-    def boundary(self) -> FaceSelection:
-        if self.dim == 3:
-            tags = gmsh.model.get_boundary(self.dimtags, oriented=False)
-            return FaceSelection([t[1] for t in tags])
-        if self.dim == 2:
-            return FaceSelection(self.tags)
-        else:
-            raise ValueError('Can only generate faces for objects of dimension 2 or higher.')
 
     @staticmethod
     def from_dimtags(dimtags: list[tuple[int,int]]) -> GeoVolume | GeoSurface | GeoObject:
@@ -549,6 +561,25 @@ class GeoPolygon(GeoSurface):
         self.points: list[int] = []
         self.lines: list[int] = []
 
-    
-T = TypeVar('T', GeoVolume, GeoEdge, GeoPoint, GeoSurface)
-    
+
+############################################################
+#                      SHORT FUNCTIONS                     #
+############################################################
+
+def select(*items: Selection | GeoObject) -> Selection:
+    """Generate a selection from a series of selections and/or objects that share the same dimension.
+
+    Raises:
+        ValueError: Raised if the dimensions provided are not consistent
+
+    Returns:
+        Selection: An output selection object.
+    """
+    dim = items[0].dim
+    tags = []
+    for item in items:
+        if item.dim!=dim:
+            raise ValueError(f'Cannot group of objects with a dissimilar dimensions. Trying to include {item} in a list of dimension {dim}.')
+        tags.extend(item.tags)
+    return Selection.from_dim_tags(dim, tags)
+            

emerge/_emerge/howto.py

@@ -69,7 +69,7 @@ class _HowtoClass:
         
         The naming convention is left(-X), right(+X), front(-Y), back(+Y), bottom(-Z), top(+Z)
         All outside faces can be selected using
-        >>> outside = object.outside()
+        >>> outside = object.boundary()
         
         If objects are the results from operations, you can access the faces from the
         source objects using the optional tool argument

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.

emerge/_emerge/selection.py

@@ -590,3 +590,4 @@ class Selector:
         return FaceSelection([lowest_key,])
 
 SELECTOR_OBJ = Selector()
+

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.3.dist-info → emerge-0.6.6.dist-info}/METADATA

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

@@ -1,4 +1,4 @@
-emerge/__init__.py,sha256=pvVkVDypxJT4dkNhf0nSV6bjEseFZILcGH7XGjtQ2qI,2605
+emerge/__init__.py,sha256=vDTOfX6iIL3c8TpaSgwGStFWAgPYHb-QlQ4vmhyOzAc,2642
 emerge/__main__.py,sha256=WVf16sfrOI910QWohrQDaChZdRifMNoS6VKzCT6f3ZA,92
 emerge/cli.py,sha256=NU1uhwuZ6i50680v3_I4kDZPTHqz74gOYK71UBhb8oE,666
 emerge/ext.py,sha256=IBoHH5PQFj5pYMfp6r-uMpNNgbSe8c0g9x8qjBzzVmU,223
@@ -13,16 +13,16 @@ emerge/_emerge/coord.py,sha256=BKvyrcnHY-_bgHqysnByy5k9_DK4VVfr9KKkRaawG2E,4371
 emerge/_emerge/cs.py,sha256=YNT2Nn6Dh8fYPUMlT6w0msHnQpZREbbl_ZXTGNppCVs,18392
 emerge/_emerge/dataset.py,sha256=UcSAJ_siLrOjNBBWRWsS3GUZUpayp63EM6pP6ClwKDI,1534
 emerge/_emerge/geo2d.py,sha256=e_HkX1GQ2iYrdO0zeEgzVOzfGyU1WGJyjeGBAobOttE,3323
-emerge/_emerge/geometry.py,sha256=_iBRMAtZB_HQCDAcQrVfwSIkilTT-up6V5-FfKMzHXI,18190
-emerge/_emerge/howto.py,sha256=vrymIkMcrZsf8UB8rQEvAsHv2rC4nLUgup9nW-BfkcA,8172
+emerge/_emerge/geometry.py,sha256=2mxVF2Ezd_rK9y6LecgrK1wZ7NbtzROz2BXgu_mPMjg,19190
+emerge/_emerge/howto.py,sha256=c4UxUNpA1tygr3OoR-LH-h0UZv-Tf9K8tpCiAU18BKE,8173
 emerge/_emerge/logsettings.py,sha256=DcUWIUUhdLe9ev5XC1bd5ZUrJz00MjABkY8rnekFrPY,3373
 emerge/_emerge/material.py,sha256=HTjQ8wDzkBwYA1sLPRuqR8lPeoXsW-4m5K3yXoKqjXQ,4022
 emerge/_emerge/mesh3d.py,sha256=Kszo-ogeByvoAVmrCIASc44PRIw-MblxNtwFB0AHa1A,34500
 emerge/_emerge/mesher.py,sha256=fKgPb6oZe_bqp0XYfZ6UNgBfRaAS3-tjUtZX8NalJe8,13199
 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/selection.py,sha256=x8cGN93BAmO80C0gn6feWcW126vorscsZVzhreTOLxs,21298
+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
@@ -32,15 +32,14 @@ emerge/_emerge/elements/index_interp.py,sha256=DlDy2KrhM5QsF6jYQIl4BJndr9F9wnjFM
 emerge/_emerge/elements/ned2_interp.py,sha256=kMhbjS1fACa1fmhSkQTU35jS3iF63dJcFe5DHl4Xo78,32541
 emerge/_emerge/elements/nedelec2.py,sha256=chU3Ewz7grKZtpyglj2qFJYHvBzCXFQZa1skzjfHoPo,6138
 emerge/_emerge/elements/nedleg2.py,sha256=qVPKtJpT7UCA5dcI_mXNX7Co4tzVCvlxQv5VtsLuKN8,8468
-emerge/_emerge/geo/__init__.py,sha256=dZcdXurnvJG8n-sOP55a2JyBxxPQP7LV2n7PmwSLzXc,1119
+emerge/_emerge/geo/__init__.py,sha256=WAAnqNuIrbZWMc7k3mgQ3L_qXRK12gZ755N3MLBJD7I,1126
 emerge/_emerge/geo/horn.py,sha256=h4GzGzEkXgWaQgoBMvhFgGsqOrNRB3CJg3RBKXigCz0,4186
 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/operations.py,sha256=U6F4vIBW0FnFzeYWBsxxjC3Nf5DS97okgUWYxJzN1KQ,10973
+emerge/_emerge/geo/pcb.py,sha256=kzkpen96KmeRe2qZvMUhOzifPlBv43YaMpQsRG_dzto,52351
 emerge/_emerge/geo/pmlbox.py,sha256=TNjuyPtuqrAU5Yl8GrLlievuwYf3hUKJaCEz0cXKSzo,7922
-emerge/_emerge/geo/polybased.py,sha256=I-h7c_QTy4lH5whwT0ZWqcnM3VG7YkczH70salvsY-o,27959
-emerge/_emerge/geo/shapes.py,sha256=7biZx_5s3sWKgJq6U_rqOBHyMZ3Nt6kHWj7tYsHPkt8,19289
+emerge/_emerge/geo/polybased.py,sha256=loVJRBjYCTUlti5tHwfH8iU-Inb6n2sOS2Cw4gVKid4,31917
+emerge/_emerge/geo/shapes.py,sha256=2B_is3pzsZydWu2yC7XSJZ0T00HNQeQ8Q71EGaOIrNI,21140
 emerge/_emerge/geo/step.py,sha256=XcAiEN8W4umNmZdYmrGHX_aJUuiMgc6vgT-UIk8Gbqc,2689
 emerge/_emerge/geo/pcb_tools/calculator.py,sha256=eGYUXdXmHUJCPlfJyY96S87wjeAVFG-e4sPOwbYj0eA,832
 emerge/_emerge/geo/pcb_tools/macro.py,sha256=0g-0anOFyxrEkFobiSu0cwWFRQ32xB8Az24mmwo0z6M,2992
@@ -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=Wwqu3RAVuMNCUeFfcMGsf4nAs117sFx_xozpoSeMJLM,45945
+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.3.dist-info/METADATA,sha256=KSst45Vl8PLGSgEXm_VcfSZbV6N_osO-H8CVA8g2rz0,3304
-emerge-0.6.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-emerge-0.6.3.dist-info/entry_points.txt,sha256=8rFvAXticpKg4OTC8JEvAksnduW72KIEskCGG9XnFf8,43
-emerge-0.6.3.dist-info/licenses/LICENSE,sha256=SuHm9Fw32RI6tylP2YCyTPITMwpueazVUZwUMFRE_zk,17856
-emerge-0.6.3.dist-info/RECORD,,
+emerge-0.6.6.dist-info/METADATA,sha256=d_K1k2mCNNqBkh6A5SX85lvlwYNR0mVP6e54QX-bX30,3304
+emerge-0.6.6.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+emerge-0.6.6.dist-info/entry_points.txt,sha256=8rFvAXticpKg4OTC8JEvAksnduW72KIEskCGG9XnFf8,43
+emerge-0.6.6.dist-info/licenses/LICENSE,sha256=SuHm9Fw32RI6tylP2YCyTPITMwpueazVUZwUMFRE_zk,17856
+emerge-0.6.6.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):
-    
-    
-