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

emerge/__init__.py

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

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, unite
+from .operations import subtract, add, embed, remove, rotate, mirror, change_coordinate_system, translate, intersect, unite, expand_surface
 from .polybased import XYPolygon, GeoPrism, Disc, Curve
 from .step import STEPItems

emerge/_emerge/geo/operations.py

@@ -60,7 +60,7 @@ def add(main: T, tool: T,
         main._exists = False
     if remove_tool:
         tool._exists = False
-    return output # type: ignore
+    return output.set_material(main.material) # type: ignore
 
 def remove(main: T, tool: T, 
              remove_object: bool = True,
@@ -90,7 +90,7 @@ def remove(main: T, tool: T,
         main._exists = False
     if remove_tool:
         tool._exists = False
-    return output # type: ignore
+    return output.set_material(main.material) # type: ignore
 
 subtract = remove
 
@@ -122,7 +122,7 @@ def intersect(main: T, tool: T,
         main._exists = False
     if remove_tool:
         tool._exists = False
-    return output #type:ignore
+    return output.set_material(main.material) #type:ignore
 
 def embed(main: GeoVolume, other: GeoSurface) -> None:
     ''' Embeds a surface into a volume in the GMSH model.
@@ -301,4 +301,31 @@ def unite(*objects: GeoObject) -> GeoObject:
     new_obj.set_material(main.material)
     new_obj.prio_set(main._priority)
     
-    return new_obj
+    return new_obj
+
+def expand_surface(surface: GeoSurface, distance: float) -> GeoSurface:
+    """EXPERIMENTAL: Expands an input surface. The surface must exist on a 2D plane.
+    
+    The output surface does not inherit material properties.
+    
+    If any problems occur, reach out through email.
+
+    Args:
+        surface (GeoSurface): The input surface to expand
+        distance (float): The exapansion distance
+
+    Returns:
+        GeoSurface: The output surface
+    """
+    surfs = [] 
+    for tag in surface.tags:
+        looptags, _ = gmsh.model.occ.get_curve_loops(tag)
+        new_curves = []
+        for looptag in looptags:
+            curve_tags = gmsh.model.occ.offset_curve(looptag, distance)
+            loop_tag = gmsh.model.occ.addCurveLoop([t for d,t in curve_tags])
+            new_curves.append(loop_tag)
+        surftag = gmsh.model.occ.addPlaneSurface(new_curves)
+        surfs.append(surftag)
+    surf = GeoSurface(surfs)
+    return surf

emerge/_emerge/geo/pcb.py

@@ -963,8 +963,18 @@ class PCB:
         Returns:
             float: the z-height
         """
+        if layer <= 0:
+            return self._zs[layer]
         return self._zs[layer-1]
     
+    @property
+    def top(self) -> float:
+        return self._zs[-1]
+    
+    @property
+    def bottom(self) -> float:
+        return self._zs[0]
+    
     def _get_z(self, element: RouteElement) -> float :
         """Return the z-height of a given Route Element
 
@@ -979,6 +989,31 @@ class PCB:
                 return path.z
         raise RouteException('Requesting z-height of route element that is not contained in a path.')
 
+    def add_vias(self, *coordinates: tuple[float, float], radius: float,
+                 z1: float | None = None,
+                 z2: float | None = None,
+                 segments: int = 6) -> None:
+        """Add a series of vias provided by a list of coordinates.
+        
+        Make sure to define the radius explicitly, otherwise the radius gets interpreted as a coordinate:
+        
+        >>> pcb.add_vias((x1,y1), (x1,y2), radius=1)
+
+        Args:
+            *coordinates (tuple(float, float)): A series of coordinates
+            radius (float): The radius
+            z1 (float | None, optional): The bottom z-coordinate. Defaults to None.
+            z2 (float | None, optional): The top z-coordinate. Defaults to None.
+            segments (int, optional): The number of segmets for the via. Defaults to 6.
+        """
+        if z1 is None:
+            z1 = self.z(0)
+        if z2 is None:
+            z2 = self.z(-1)
+        
+        for x,y in coordinates:
+            self.vias.append(Via(x,y,z1,z2,radius,segments))
+        
     def load(self, name: str) -> StripLine:
         """Acquire the x,y, coordinate associated with the label name.
         
@@ -1060,7 +1095,7 @@ class PCB:
             GeoSurface: _description_
         """
         if width is None or height is None or origin is None:
-            if self.width is None or self.length is None or self.origin:
+            if self.width is None or self.length is None or self.origin is None:
                 raise RouteException('Cannot define a plane with no possible definition of its size.')
             width = self.width
             height = self.length
@@ -1075,6 +1110,7 @@ class PCB:
 
         plane = Plate(origin, (width*self.unit, 0, 0), (0, height*self.unit, 0)) # type: ignore
         plane = change_coordinate_system(plane, self.cs) # type: ignore
+        plane.set_material(COPPER)
         return plane # type: ignore
     
     def generate_pcb(self, 
@@ -1121,7 +1157,7 @@ class PCB:
         """Generate the Air Block object
 
         This requires that the width, depth and origin are deterimed. This 
-        can either be done manually or via the .determine_boudns() method.
+        can either be done manually or via the .determine_bounds() method.
 
         Returns:
             GeoVolume: The PCB Block
@@ -1357,20 +1393,19 @@ class PCB:
             poly = self._gen_poly(pcbpoly.xys, pcbpoly.z)
             poly.material = pcbpoly.material
             polys.append(poly)
+            xs, ys = zip(*pcbpoly.xys)
+            allx.extend(xs)
+            ally.extend(ys)
+            
 
         self.xs = allx
         self.ys = ally
 
         self.traces = polys
+        
         if merge:
             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/shapes.py

@@ -30,6 +30,7 @@ class Alignment(Enum):
     CENTER = 1
     CORNER = 2
 
+
 class Box(GeoVolume):
     """Creates a box volume object.
         Specify the alignment of the box with the provided position. The options are CORNER (default)
@@ -100,7 +101,7 @@ class Box(GeoVolume):
         
         tags = list(reduce(lambda a,b: a+b, tagslist))
         return FaceSelection(tags)
-
+    
     
 class Sphere(GeoVolume):
     """Generates a sphere objected centered ont he position with the given radius
@@ -122,6 +123,7 @@ class Sphere(GeoVolume):
         x,y,z = position
         self.tags: list[int] = [gmsh.model.occ.addSphere(x,y,z,radius),]
 
+
 class XYPlate(GeoSurface):
     """Generates and XY-plane oriented plate
         
@@ -209,27 +211,43 @@ class Plate(GeoSurface):
         tags: list[int] = [gmsh.model.occ.addPlaneSurface([tag_wire,]),]
         super().__init__(tags)
 
+
 class Cylinder(GeoVolume):
+    """Generates a Cylinder object in 3D space.
+        The cylinder will always be placed in the origin of the provided CoordinateSystem.
+        The bottom cylinder plane is always placed in the XY-plane. The length of the cylinder is
+        oriented along the Z-axis.
 
+        By default the cylinder uses the Open Cascade modeling for a cylinder. In this representation
+        the surface of the cylinder is approximated with a tolerance thay may be irregular.
+        As an alternative, the argument Nsections may be provided in which case the Cylinder is replaced
+        by an extrusion of a regular N-sided polygon.
+
+        Args:
+            radius (float): The radius of the Cylinder
+            height (float): The height of the Cylinder
+            cs (CoordinateSystem, optional): The coordinate system. Defaults to GCS.
+            Nsections (int, optional): The number of sections. Defaults to None.
+        """
     def __init__(self, 
                  radius: float,
                  height: float,
-                 cs: CoordinateSystem = None,
-                 Nsections: int = None):
+                 cs: CoordinateSystem = GCS,
+                 Nsections: int | None = None):
         """Generates a Cylinder object in 3D space.
-        The cyllinder will always be placed in the origin of the provided CoordinateSystem.
-        The bottom cyllinder plane is always placed in the XY-plane. The lenth of the cyllinder is
+        The cylinder will always be placed in the origin of the provided CoordinateSystem.
+        The bottom cylinder plane is always placed in the XY-plane. The length of the cylinder is
         oriented along the Z-axis.
 
-        By default the cyllinder uses the Open Cascade modeling for a cyllinder. In this representation
-        the surface of the cyllinder is approximated with a tolerance thay may be irregular.
+        By default the cylinder uses the Open Cascade modeling for a cylinder. In this representation
+        the surface of the cylinder is approximated with a tolerance thay may be irregular.
         As an alternative, the argument Nsections may be provided in which case the Cylinder is replaced
         by an extrusion of a regular N-sided polygon.
 
         Args:
             radius (float): The radius of the Cylinder
             height (float): The height of the Cylinder
-            cs (CoordinateSystem, optional): The coordinate system. Defaults to None.
+            cs (CoordinateSystem, optional): The coordinate system. Defaults to GCS.
             Nsections (int, optional): The number of sections. Defaults to None.
         """
         ax = cs.zax.np
@@ -270,33 +288,46 @@ class Cylinder(GeoVolume):
         xo, yo, zo = self.cs.in_global_cs(x.flatten(), y.flatten(), z.flatten())
         return xo, yo, zo
 
+
 class CoaxCylinder(GeoVolume):
-    """A coaxial cylinder with an inner and outer radius."""
-    
+    """Generates a Coaxial cylinder object in 3D space.
+        The coaxial cylinder will always be placed in the origin of the provided CoordinateSystem.
+        The bottom coax plane is always placed in the XY-plane. The lenth of the coax is
+        oriented along the Z-axis.
+
+        By default the coax uses the Open Cascade modeling for a cylinder. In this representation
+        the surface of the cylinder is approximated with a tolerance thay may be irregular.
+        As an alternative, the argument Nsections may be provided in which case the Cylinder is replaced
+        by an extrusion of a regular N-sided polygon.
+
+        Args:
+            radius (float): The radius of the Cylinder
+            height (float): The height of the Cylinder
+            cs (CoordinateSystem, optional): The coordinate system. Defaults to GCS.
+            Nsections (int, optional): The number of sections. Defaults to None.
+        """
     def __init__(self, 
                  rout: float,
                  rin: float,
                  height: float,
-                 cs: CoordinateSystem = None,
-                 Nsections: int = None):
-        """Generates a Coaxial cyllinder object in 3D space.
-        The coaxial cyllinder will always be placed in the origin of the provided CoordinateSystem.
+                 cs: CoordinateSystem = GCS,
+                 Nsections: int | None = None):
+        """Generates a Coaxial cylinder object in 3D space.
+        The coaxial cylinder will always be placed in the origin of the provided CoordinateSystem.
         The bottom coax plane is always placed in the XY-plane. The lenth of the coax is
         oriented along the Z-axis.
 
-        By default the coax uses the Open Cascade modeling for a cyllinder. In this representation
-        the surface of the cyllinder is approximated with a tolerance thay may be irregular.
+        By default the coax uses the Open Cascade modeling for a cylinder. In this representation
+        the surface of the cylinder is approximated with a tolerance thay may be irregular.
         As an alternative, the argument Nsections may be provided in which case the Cylinder is replaced
         by an extrusion of a regular N-sided polygon.
 
         Args:
             radius (float): The radius of the Cylinder
             height (float): The height of the Cylinder
-            cs (CoordinateSystem, optional): The coordinate system. Defaults to None.
+            cs (CoordinateSystem, optional): The coordinate system. Defaults to GCS.
             Nsections (int, optional): The number of sections. Defaults to None.
         """
-        if cs is None:
-            cs = GCS
         if rout <= rin:
             raise ValueError("Outer radius must be greater than inner radius.")
         
@@ -336,7 +367,7 @@ class CoaxCylinder(GeoVolume):
         return xo, yo, zo
     
 class HalfSphere(GeoVolume):
-
+    """A half sphere volume."""
     def __init__(self,
                  radius: float,
                  position: tuple = (0,0,0),
@@ -362,8 +393,6 @@ class HalfSphere(GeoVolume):
         self._add_face_pointer('back',np.array(position), np.array(direction))
         self._add_face_pointer('bottom',np.array(position), np.array(direction))
         self._add_face_pointer('face',np.array(position), np.array(direction))
-        
-
 
 
 class OldBox(GeoVolume):
@@ -389,8 +418,6 @@ class OldBox(GeoVolume):
             alignment (Alignment, optional): Which point of the box is placed at the position. 
                 Defaults to Alignment.CORNER.
         """
-        
-
         if alignment is Alignment.CORNER:
             position = (position[0]+width/2, position[1]+depth/2, position[2])
         elif alignment is Alignment.CENTER:
@@ -472,7 +499,6 @@ class OldBox(GeoVolume):
         self._add_face_pointer('right', pc + width/2*wax, wax)
         self._add_face_pointer('top', pc + height/2*hax, hax)
         self._add_face_pointer('bottom', pc - height/2*hax, -hax)
-        
     
     def outside(self, *exclude: Literal['bottom','top','right','left','front','back']) -> FaceSelection:
         """Select all outside faces except for the once specified by outside
@@ -485,8 +511,17 @@ class OldBox(GeoVolume):
         tags = list(reduce(lambda a,b: a+b, tagslist))
         return FaceSelection(tags)
 
+
 class Cone(GeoVolume):
-    
+    """Constructis a cone that starts at position p0 and is aimed in the given direction.
+        r1 is the start radius and r2 the end radius. The magnitude of direction determines its length.
+
+        Args:
+            p0 (tuple[float, float, float]): _description_
+            direction (tuple[float, float, float]): _description_
+            r1 (float): _description_
+            r2 (float): _description_
+        """
     def __init__(self, p0: tuple[float, float, float],
                  direction: tuple[float, float, float],
                  r1: float,

emerge/_emerge/physics/microwave/microwave_bc.py

@@ -787,7 +787,6 @@ class LumpedPort(PortBC):
                  width: float | None = None,
                  height: float | None = None,
                  direction: Axis | None = None,
-                 Idirection: Axis | None = None,
                  active: bool = False,
                  power: float = 1,
                  Z0: float = 50):
@@ -814,7 +813,7 @@ class LumpedPort(PortBC):
         if width is None:
             if not isinstance(face, GeoObject):
                 raise ValueError(f'The width, height and direction must be defined. Information cannot be extracted from {face}')
-            width, height, direction, Idirection = face._data('width','height','vdir', 'idir')
+            width, height, direction = face._data('width','height','vdir')
             if width is None or height is None or direction is None:
                 raise ValueError(f'The width, height and direction could not be extracted from {face}')
         
@@ -828,7 +827,6 @@ class LumpedPort(PortBC):
         self.width: float = width
         self.height: float = height # type: ignore
         self.Vdirection: Axis = direction # type: ignore
-        self.Idirection: Axis = Idirection # type: ignore
         self.type = 'TEM'
         
         logger.info('Constructing coordinate system from normal port')
@@ -836,7 +834,6 @@ class LumpedPort(PortBC):
 
         self.vintline: Line | None = None
         self.v_integration = True
-        self.iintline: Line | None = None
 
     @property
     def surfZ(self) -> float:
@@ -923,6 +920,7 @@ class LumpedPort(PortBC):
         Exg, Eyg, Ezg = self.cs.in_global_basis(Ex, Ey, Ez)
         return np.array([Exg, Eyg, Ezg])
 
+
 class LumpedElement(RobinBC):
     
     _include_stiff: bool = True

emerge/_emerge/physics/microwave/microwave_data.py

@@ -731,6 +731,19 @@ class MWField:
                      x: float | None = None,
                      y: float | None = None,
                      z: float | None = None) -> EHField:
+        """Create a cartesian cut plane (XY, YZ or XZ) and compute the E and H-fields there
+
+        Only one coordiante and thus cutplane may be defined. If multiple are defined only the last (x->y->z) is used.
+        
+        Args:
+            ds (float): The discretization step size
+            x (float | None, optional): The X-coordinate in case of a YZ-plane. Defaults to None.
+            y (float | None, optional): The Y-coordinate in case of an XZ-plane. Defaults to None.
+            z (float | None, optional): The Z-coordinate in case of an XY-plane. Defaults to None.
+
+        Returns:
+            EHField: The resultant EHField object
+        """
         xb, yb, zb = self.basis.bounds
         xs = np.linspace(xb[0], xb[1], int((xb[1]-xb[0])/ds))
         ys = np.linspace(yb[0], yb[1], int((yb[1]-yb[0])/ds))

emerge/_emerge/plot/pyvista/display.py

@@ -26,7 +26,7 @@ from typing import Iterable, Literal, Callable, Any
 from ..display import BaseDisplay
 from .display_settings import PVDisplaySettings
 from matplotlib.colors import ListedColormap
-
+from itertools import cycle
 ### Color scale
 
 # Define the colors we want to use
@@ -40,6 +40,40 @@ cmap_names = Literal['bgy','bgyw','kbc','blues','bmw','bmy','kgy','gray','dimgra
                      'bkr','bky','coolwarm','gwv','bjy','bwy','cwr','colorwheel','isolum','rainbow','fire',
                      'cet_fire','gouldian','kbgyw','cwr','CET_CBL1','CET_CBL3','CET_D1A']
 
+
+def _gen_c_cycle():
+    colors = [
+        "#0000aa",
+        "#aa0000",
+        "#009900",
+        "#990099",
+        "#994400",
+        "#005588"
+    ]
+    return cycle(colors)
+
+C_CYCLE = _gen_c_cycle()
+
+class _RunState:
+    
+    def __init__(self):
+        self.state: bool = False
+        self.ctr: int = 0
+        
+        
+    def run(self):
+        self.state = True
+        self.ctr = 0
+        
+    def stop(self):
+        self.state = False
+        self.ctr = 0
+        
+    def step(self):
+        self.ctr += 1
+    
+ANIM_STATE = _RunState()
+
 def gen_cmap(mesh, N: int = 256):
     # build a linear grid of data‐values (not strictly needed for pure colormap)
     vmin, vmax = mesh['values'].min(), mesh['values'].max()
@@ -201,6 +235,7 @@ class PVDisplay(BaseDisplay):
         self._stop: bool = False
         self._objs: list[_AnimObject] = []
         self._do_animate: bool = False
+        self._closed_via_x: bool = False
         self._Nsteps: int  = 0
         self._fps: int = 25
         self._ruler: ScreenRuler = ScreenRuler(self, 0.001)
@@ -216,6 +251,15 @@ class PVDisplay(BaseDisplay):
         self._ctr: int = 0 
         
         self.camera_position = (1, -1, 1)     # +X, +Z, -Y
+    
+    def _wire_close_events(self):
+        self._closed = False
+
+        def mark_closed(*_):
+            self._closed = True
+            self._stop = True
+        
+        self._plot.add_key_event('q', lambda: mark_closed())
         
     def _update_camera(self):
         x,y,z = self._plot.camera.position
@@ -241,8 +285,12 @@ class PVDisplay(BaseDisplay):
         self._update_camera()
         self._add_aux_items()
         if self._do_animate:
+            self._wire_close_events()
+            self.add_text('Press Q to close!',color='red', position='upper_left')
             self._plot.show(auto_close=False, interactive_update=True, before_close_callback=self._close_callback)
             self._animate()
+            
+            
         else:
             self._plot.show()
         self._reset()
@@ -261,25 +309,55 @@ class PVDisplay(BaseDisplay):
         self._plot = pv.Plotter()
         self._stop = False
         self._objs = []
+        C_CYCLE = _gen_c_cycle()
 
-    def _close_callback(self):
+    def _close_callback(self, arg):
         """The private callback function that stops the animation.
         """
         self._stop = True
+        print('CLOSE!')
 
     def _animate(self) -> None:
         """Private function that starts the animation loop.
         """
-        self._plot.update()
-        while not self._stop:
-            for step in range(self._Nsteps):
-                if self._stop:
-                    break
+        
+        self._stop = False
+
+        # guard values
+        steps = max(1, int(self._Nsteps))
+        fps   = max(1, int(self._fps))
+        dt    = 1.0 / fps
+        next_tick = time.perf_counter()
+        step = 0
+
+        while (not self._stop
+                and not self._closed_via_x
+                and self._plot.render_window is not None):
+            # process window/UI events so close button works
+            self._plot.update()
+
+            now = time.perf_counter()
+            if now >= next_tick:
+                step = (step + 1) % steps
+                phi = np.exp(1j * (step / steps) * 2*np.pi)
+
+                # update all animated objects
                 for aobj in self._objs:
-                    phi = np.exp(1j*(step/self._Nsteps)*2*np.pi)
                     aobj.update(phi)
-                self._plot.update()
-                time.sleep(1/self._fps)
+
+                # draw one frame
+                self._plot.render()
+
+                # schedule next frame; catch up if we fell behind
+                next_tick += dt
+                if now > next_tick + dt:
+                    next_tick = now + dt
+
+            # be kind to the CPU
+            time.sleep(0.001)
+
+        # ensure cleanup pathway runs once
+        self._close_callback(None)
 
     def animate(self, Nsteps: int = 35, fps: int = 25) -> PVDisplay:
         """ Turns on the animation mode with the specified number of steps and FPS.
@@ -357,11 +435,29 @@ class PVDisplay(BaseDisplay):
             return None
 
     ## OBLIGATORY METHODS
-    def add_object(self, obj: GeoObject | Selection, *args, **kwargs):
-        kwargs = setdefault(kwargs, color=obj.color_rgb, opacity=obj.opacity, silhouette=False, show_edges=False, pickable=True)
+    def add_object(self, obj: GeoObject | Selection, mesh: bool = False, volume_mesh: bool = True, *args, **kwargs):
+        
+        show_edges = False
+        opacity = obj.opacity
+        line_width = 0.5
+        color = obj.color_rgb
+        style='surface'
+        
+        if mesh is True:
+            show_edges = True
+            opacity = 0.7
+            line_width= 1
+            style='wireframe'
+            color=next(C_CYCLE)
+        
+        kwargs = setdefault(kwargs, color=color, opacity=opacity, line_width=line_width, show_edges=show_edges, pickable=True, style=style)
+        mesh_obj = self.mesh(obj)
         
-        actor = self._plot.add_mesh(self.mesh(obj), *args, **kwargs)
-        self._plot.add_mesh(self._volume_edges(_select(obj)), color='#000000', line_width=1, show_edges=True)
+        if mesh is True and volume_mesh is True:
+            mesh_obj = mesh_obj.extract_all_edges()
+        
+        actor = self._plot.add_mesh(mesh_obj, *args, **kwargs)
+        self._plot.add_mesh(self._volume_edges(_select(obj)), color='#000000', line_width=2, show_edges=True)
 
     def add_scatter(self, xs: np.ndarray, ys: np.ndarray, zs: np.ndarray):
         """Adds a scatter point cloud
@@ -501,7 +597,7 @@ class PVDisplay(BaseDisplay):
         if self._do_animate:
             def on_update(obj: _AnimObject, phi: complex):
                 field = obj.T(np.real(obj.field*phi))
-                obj.grid['anim'] = field
+                obj.grid[name] = field
             self._objs.append(_AnimObject(field_flat, T, grid, actor, on_update)) # type: ignore
         
         
@@ -524,6 +620,8 @@ class PVDisplay(BaseDisplay):
         if abs_position is not None:
             final_position = abs_position
             viewport = True
+        else:
+            final_position = abs_position
         self._plot.add_text(
             text,
             position=final_position,

emerge/_emerge/simmodel.py

@@ -319,24 +319,26 @@ class Simulation:
     def view(self, 
              selections: list[Selection] | None = None, 
              use_gmsh: bool = False,
-             volume_opacity: float = 0.1,
-             surface_opacity: float = 1,
-             show_edges: bool = True) -> None:
+             plot_mesh: bool = False,
+             volume_mesh: bool = True,
+             opacity: float | None = None) -> None:
         """View the current geometry in either the BaseDisplay object (PVDisplay only) or
         the GMSH viewer.
 
         Args:
-            selections (list[Selection], optional): Additional selections to highlight. Defaults to None.
-            use_gmsh (bool, optional): Whether to use the GMSH display. Defaults to False.
-            opacity (float, optional): The global opacity of all objects.. Defaults to None.
-            show_edges (bool, optional): Whether to show the geometry edges. Defaults to None.
+            selections (list[Selection] | None, optional): Optional selections to highlight. Defaults to None.
+            use_gmsh (bool, optional): If GMSH's GUI should be used. Defaults to False.
+            plot_mesh (bool, optional): If the mesh should be plot instead of the object. Defaults to False.
+            volume_mesh (bool, optional): If the internal mesh should be plot instead of only the surface boundary mesh. Defaults to True
+            opacity (float | None, optional): The object/mesh opacity. Defaults to None.
+
         """
         if not (self.display is not None and self.mesh.defined) or use_gmsh:
             gmsh.model.occ.synchronize()
             gmsh.fltk.run()
             return
         for geo in _GEOMANAGER.all_geometries():
-            self.display.add_object(geo)
+            self.display.add_object(geo, mesh=plot_mesh, opacity=opacity, volume_mesh=volume_mesh)
         if selections:
             [self.display.add_object(sel, color='red', opacity=0.3) for sel in selections]
         self.display.show()

emerge/_emerge/solver.py

@@ -674,7 +674,7 @@ class SolverARPACK(EigSolver):
             target_k0: float = 0,
             which: str = 'LM',
             sign: float = 1.0) -> tuple[np.ndarray, np.ndarray]:
-        logger.info(f'Searching around 	β = {target_k0:.2f} rad/m')
+        logger.info(f'Searching around 	β = {target_k0:.2f} rad/m with ARPACK')
         sigma = sign*(target_k0**2)
         eigen_values, eigen_modes = eigs(A, k=nmodes, M=B, sigma=sigma, which=which)
         return eigen_values, eigen_modes
@@ -698,7 +698,7 @@ class SmartARPACK_BMA(EigSolver):
             which: str = 'LM',
             sign: float = 1.) -> tuple[np.ndarray, np.ndarray]:
 
-        logger.info(f'Searching around 	β = {target_k0:.2f} rad/m')
+        logger.info(f'Searching around 	β = {target_k0:.2f} rad/m with SmartARPACK (BMA)')
         qs = np.geomspace(1, self.search_range, self.symmetric_steps)
         tot_eigen_values = []
         tot_eigen_modes = []
@@ -747,7 +747,7 @@ class SmartARPACK(EigSolver):
             target_k0: float = 0,
             which: str = 'LM',
             sign: float = 1.) -> tuple[np.ndarray, np.ndarray]:
-        logger.info(f'Searching around 	β = {target_k0:.2f} rad/m')
+        logger.info(f'Searching around 	β = {target_k0:.2f} rad/m with SmartARPACK')
         qs = np.geomspace(1, self.search_range, self.symmetric_steps)
         tot_eigen_values = []
         tot_eigen_modes = []
@@ -1062,7 +1062,7 @@ class SolveRoutine:
         if direct or A.shape[0] < 1000:
             return self.solvers[EMSolver.LAPACK]  # type: ignore
         else:
-            return self.solvers[EMSolver.ARPACK]  # type: ignore
+            return self.solvers[EMSolver.SMART_ARPACK_BMA]  # type: ignore
     
     def solve(self, A: csr_matrix | csr_matrix, 
               b: np.ndarray, 

{emerge-0.6.6.dist-info → emerge-0.6.7.dist-info}/METADATA

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

@@ -1,4 +1,4 @@
-emerge/__init__.py,sha256=vDTOfX6iIL3c8TpaSgwGStFWAgPYHb-QlQ4vmhyOzAc,2642
+emerge/__init__.py,sha256=YUioR8ldVN1lYGhEP8GA_DZ5XDBpsoEczbrssVIEg3o,2642
 emerge/__main__.py,sha256=WVf16sfrOI910QWohrQDaChZdRifMNoS6VKzCT6f3ZA,92
 emerge/cli.py,sha256=NU1uhwuZ6i50680v3_I4kDZPTHqz74gOYK71UBhb8oE,666
 emerge/ext.py,sha256=IBoHH5PQFj5pYMfp6r-uMpNNgbSe8c0g9x8qjBzzVmU,223
@@ -22,9 +22,9 @@ 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=x8cGN93BAmO80C0gn6feWcW126vorscsZVzhreTOLxs,21298
-emerge/_emerge/simmodel.py,sha256=guiNnSSxdc6qABHr78LAdp9U1dVxb-SPWBgaKTxFzgw,19535
+emerge/_emerge/simmodel.py,sha256=v1cTMuyknJ5yvd6-AyjWFTd4BdYp31laNa0N8jv04QQ,19743
 emerge/_emerge/simulation_data.py,sha256=r9-9lpLeA1Z5HU3jDVOXV1H80GVawnXL5K81_dvmlE4,14506
-emerge/_emerge/solver.py,sha256=PGPI2LuF4XhfyS8KfC-49X9M1mtYUadgHyqopYfPj58,48542
+emerge/_emerge/solver.py,sha256=77qhdRBdZJCneGYEQXkqWvY7btNDrebSJ4Vo124L-ak,48604
 emerge/_emerge/system.py,sha256=p4HNz7d_LMRNE9Gk75vVdFecDH2iN_groAM9u-yQTpk,1618
 emerge/_emerge/elements/__init__.py,sha256=I3n9aic6lJW-oGeqTEZ-Fpxvyl2i-WqsHdnrM3v1oB8,799
 emerge/_emerge/elements/femdata.py,sha256=3rFVz1-PLtqxnDFvTH1Q9dA98lO5VyjcFKecCJCwfQ4,8020
@@ -32,14 +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=WAAnqNuIrbZWMc7k3mgQ3L_qXRK12gZ755N3MLBJD7I,1126
+emerge/_emerge/geo/__init__.py,sha256=TQyNbiBOlSYBTKm5Tk2egBqKlqnwnNUt1sHqiYsvpWA,1142
 emerge/_emerge/geo/horn.py,sha256=h4GzGzEkXgWaQgoBMvhFgGsqOrNRB3CJg3RBKXigCz0,4186
 emerge/_emerge/geo/modeler.py,sha256=gbxmwXAdR7kKW_EFbkd1QPVqJWKJpnTufI7lxaqPyjU,15573
-emerge/_emerge/geo/operations.py,sha256=U6F4vIBW0FnFzeYWBsxxjC3Nf5DS97okgUWYxJzN1KQ,10973
-emerge/_emerge/geo/pcb.py,sha256=kzkpen96KmeRe2qZvMUhOzifPlBv43YaMpQsRG_dzto,52351
+emerge/_emerge/geo/operations.py,sha256=7u3KNa7QbFq358m7FjBX1J6b3APPkzMXTjYn7f6qfpM,12004
+emerge/_emerge/geo/pcb.py,sha256=MmY-A-Xnd85aQw6ouOnsZKcui_kH86fw4l0GoR4qQu0,53442
 emerge/_emerge/geo/pmlbox.py,sha256=TNjuyPtuqrAU5Yl8GrLlievuwYf3hUKJaCEz0cXKSzo,7922
 emerge/_emerge/geo/polybased.py,sha256=loVJRBjYCTUlti5tHwfH8iU-Inb6n2sOS2Cw4gVKid4,31917
-emerge/_emerge/geo/shapes.py,sha256=2B_is3pzsZydWu2yC7XSJZ0T00HNQeQ8Q71EGaOIrNI,21140
+emerge/_emerge/geo/shapes.py,sha256=-ct-TJh69oj5fqJcQql4pNk3acJWTIQzYOQeAFXDfWk,23319
 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,8 +51,8 @@ emerge/_emerge/physics/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3
 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=5P8yyr6e6hFHBS1JAFHq8gsU1CxFG1LTelKVggv7AjY,42007
-emerge/_emerge/physics/microwave/microwave_bc.py,sha256=-fxeZREL42snL4XvXuUqo4QJh24o8lHJ_IcWxkt5yAU,42484
-emerge/_emerge/physics/microwave/microwave_data.py,sha256=rIxHAaVFhKgedeEdEGqEd-2zXT0ZRUtL588NCA_d4XQ,46722
+emerge/_emerge/physics/microwave/microwave_bc.py,sha256=itUDUVGPda_qdHyl45PVsc2OSKgjDwHHgmwYflN4l5Y,42316
+emerge/_emerge/physics/microwave/microwave_data.py,sha256=cgm3i5-MbB6x_7znxAeDw2IpOPwP9cue0vWI68udwcM,47386
 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
@@ -70,7 +70,7 @@ emerge/_emerge/plot/display.py,sha256=TQLlKb-LkaG5ZOSLfxp9KXPlZPRFTxNj1LhVQ-Lp1-
 emerge/_emerge/plot/simple_plots.py,sha256=q3IuoW4qrp5xv2S3vsVgATdE1QajWmA5_59Ma7I6GA0,24433
 emerge/_emerge/plot/matplotlib/mpldisplay.py,sha256=szKafDrgdAW5Nyc5UOHuJC87n0WGkXYackOVv182TDQ,8671
 emerge/_emerge/plot/pyvista/__init__.py,sha256=CPclatEu6mFnJZzCQk09g6T6Fh20WTbiLAJGSwAnPXU,30
-emerge/_emerge/plot/pyvista/display.py,sha256=L7_cy7C6EnIIj_-V5E_-j5ORJtIXscvYCmBE03-eCK4,34692
+emerge/_emerge/plot/pyvista/display.py,sha256=5IYVtT8ZwFu1NRwwzrzoY_FmPwjeRAfsQbg9NK383zE,37098
 emerge/_emerge/plot/pyvista/display_settings.py,sha256=K2OhzKqeFzMXlEfZ5F4CQ9sN3l7nOgVjLplZBuMPjvE,899
 emerge/_emerge/projects/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 emerge/_emerge/projects/_gen_base.txt,sha256=DqQz36PZg6v1ovQjHvPjd0t4AIbmikZdb9dmrNYsK3w,598
@@ -78,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.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-0.6.7.dist-info/METADATA,sha256=J3r6jeI0a4A9x5fzG1t-h1ZL28y1SJizCz17i0Hwdrk,3304
+emerge-0.6.7.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+emerge-0.6.7.dist-info/entry_points.txt,sha256=8rFvAXticpKg4OTC8JEvAksnduW72KIEskCGG9XnFf8,43
+emerge-0.6.7.dist-info/licenses/LICENSE,sha256=SuHm9Fw32RI6tylP2YCyTPITMwpueazVUZwUMFRE_zk,17856
+emerge-0.6.7.dist-info/RECORD,,