emerge 0.6.10__tar.gz → 0.6.11__tar.gz

{emerge-0.6.10 → emerge-0.6.11}/.bumpversion.toml

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

{emerge-0.6.10 → emerge-0.6.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: emerge
-Version: 0.6.10
+Version: 0.6.11
 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.10 → emerge-0.6.11}/emerge/__init__.py

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

{emerge-0.6.10 → emerge-0.6.11}/emerge/_emerge/bc.py

@@ -53,7 +53,7 @@ class BoundaryCondition:
         
         
         if isinstance(assignment, GeoObject):
-            assignment = assignment.select
+            assignment = assignment.selection
         
         self.selection: Selection = assignment
         self.tags: list[int] = self.selection.tags

{emerge-0.6.10 → emerge-0.6.11}/emerge/_emerge/geometry.py

@@ -250,7 +250,7 @@ class GeoObject:
         return self.material._metal
     
     @property
-    def select(self) -> Selection:
+    def selection(self) -> Selection:
         '''Returns a corresponding Face/Domain or Edge Selection object'''
         if self.dim==1:
             return EdgeSelection(self.tags)
@@ -517,14 +517,14 @@ class GeoVolume(GeoObject):
             self.tags = [tag,]
 
     @property
-    def select(self) -> DomainSelection:
+    def selection(self) -> DomainSelection:
         return DomainSelection(self.tags)
     
 class GeoPoint(GeoObject):
     dim = 0
 
     @property
-    def select(self) -> PointSelection:
+    def selection(self) -> PointSelection:
         return PointSelection(self.tags)
     
     def __init__(self, tag: int | list[int]):
@@ -540,7 +540,7 @@ class GeoEdge(GeoObject):
     dim = 1
 
     @property
-    def select(self) -> EdgeSelection:
+    def selection(self) -> EdgeSelection:
         return EdgeSelection(self.tags)
     
     def __init__(self, tag: int | list[int]):
@@ -558,7 +558,7 @@ class GeoSurface(GeoObject):
     dim = 2
 
     @property
-    def select(self) -> FaceSelection:
+    def selection(self) -> FaceSelection:
         return FaceSelection(self.tags)
     
     def __init__(self, tag: int | list[int]):

{emerge-0.6.10 → emerge-0.6.11}/emerge/_emerge/physics/microwave/microwave_3d.py

@@ -311,22 +311,25 @@ class Microwave3D:
 
         if points.size==0:
             raise SimulationError(f'The lumped port {port} has no nodes associated with it')
+        
         xs = self.mesh.nodes[0,points]
         ys = self.mesh.nodes[1,points]
         zs = self.mesh.nodes[2,points]
 
         dotprod = xs*field_axis[0] + ys*field_axis[1] + zs*field_axis[2]
 
-        start_id = points[np.argwhere(dotprod == np.min(dotprod))]
+        start_id = np.argwhere(dotprod == np.min(dotprod)).flatten()
+        
+        xs = xs[start_id]
+        ys = ys[start_id]
+        zs = zs[start_id]
         
-        start = _pick_central(self.mesh.nodes[:,start_id.flatten()])
-        logger.info(f'Starting node = {_dimstring(start)}')
-        end = start + port.Vdirection.np*port.height
-
-
-        port.vintline = Line.from_points(start, end, 21)
 
-        logger.info(f'Ending node = {_dimstring(end)}')
+        for x,y,z in zip(xs, ys, zs):
+            start = np.array([x,y,z])
+            end = start + port.Vdirection.np*port.height
+            port.vintline.append(Line.from_points(start, end, 21))
+            logger.trace(f'Port[{port.port_number}] integration line {start} -> {end}.')
         
         port.v_integration = True
     
@@ -1003,7 +1006,8 @@ class Microwave3D:
             if bc.Z0 is None:
                 raise SimulationError('Trying to compute the impedance of a boundary condition with no characteristic impedance.')
             
-            V = bc.vintline.line_integral(fieldfunction)
+            Voltages = [line.line_integral(fieldfunction) for line in bc.vintline]
+            V = sum(Voltages)/len(Voltages)
             
             if bc.active:
                 if bc.voltage is None:

{emerge-0.6.10 → emerge-0.6.11}/emerge/_emerge/physics/microwave/microwave_bc.py

@@ -834,7 +834,7 @@ class LumpedPort(PortBC):
         # logger.info('Constructing coordinate system from normal port')
         # self.cs = Axis(self.selection.normal).construct_cs()  # type: ignore
         self.cs = GCS
-        self.vintline: Line | None = None
+        self.vintline: list[Line] = []
         self.v_integration = True
 
     @property

{emerge-0.6.10 → emerge-0.6.11}/emerge/_emerge/plot/matplotlib/mpldisplay.py

@@ -145,7 +145,7 @@ def _norm(x, y, z):
 
 def _select(obj: GeoObject | Selection) -> Selection:
     if isinstance(obj, GeoObject):
-        return obj.select
+        return obj.selection
     return obj
 
 def _merge(lst: list[GeoObject | Selection]) -> Selection:

{emerge-0.6.10 → emerge-0.6.11}/emerge/_emerge/plot/pyvista/display.py

@@ -186,7 +186,7 @@ def _norm(x, y, z):
 
 def _select(obj: GeoObject | Selection) -> Selection:
     if isinstance(obj, GeoObject):
-        return obj.select
+        return obj.selection
     return obj
 
 def _merge(lst: Iterable[GeoObject | Selection]) -> Selection:
@@ -523,18 +523,19 @@ class PVDisplay(BaseDisplay):
         d = _min_distance(xf, yf, zf)
 
         if port.vintline is not None:
-            xs, ys, zs = port.vintline.cpoint
-            p_line = pv.Line(
-                pointa=(xs[0], ys[0], zs[0]),
-                pointb=(xs[-1], ys[-1], zs[-1]),
-            )
-            self._plot.add_mesh(
-                p_line,
-                color='red',
-                pickable=False,
-                line_width=3.0,
-            )
-        
+            for line in port.vintline:
+                xs, ys, zs = line.cpoint
+                p_line = pv.Line(
+                    pointa=(xs[0], ys[0], zs[0]),
+                    pointb=(xs[-1], ys[-1], zs[-1]),
+                )
+                self._plot.add_mesh(
+                    p_line,
+                    color='red',
+                    pickable=False,
+                    line_width=3.0,
+                )
+            
         if k0 is None:
             if isinstance(port, ModalPort):
                 k0 = port.get_mode(0).k0

{emerge-0.6.10 → emerge-0.6.11}/examples/demo10_sgh.py

@@ -29,7 +29,7 @@ dx = 2 * mm              # distance from horn exit to PML start
 
 # Create simulation object
 m = em.Simulation('HornAntenna')
-m.check_version("0.6.10") # Checks version compatibility.
+m.check_version("0.6.11") # Checks version compatibility.
 # --- Coordinate system for horn geometry -------------------------------
 hornCS = em.CS(em.YAX, em.ZAX, em.XAX)
 

{emerge-0.6.10 → emerge-0.6.11}/examples/demo11_lumped_element_filter.py

@@ -29,7 +29,7 @@ def Cf(C):
 pack = '0603'         # package footprint for lumped components
 # Create simulation and PCB layouter with substrate thickness and material
 m = em.Simulation('LumpedFilter')
-m.check_version("0.6.10") # Checks version compatibility.
+m.check_version("0.6.11") # Checks version compatibility.
 
 th = 0.5         # substrate thickness (meters)
 Hair = 2.0

{emerge-0.6.10 → emerge-0.6.11}/examples/demo12_mode_alignment.py

@@ -12,7 +12,7 @@ direction (+Z vs -Z). In EMerge we can alignm modes using the .align_mode() meth
 
 # First we define our simulation
 m = em.Simulation('aligntest')
-m.check_version("0.6.10") # Checks version compatibility.
+m.check_version("0.6.11") # Checks version compatibility.
 
 # We create a cyllindrical waveguide in the Y-axis.
 cyl = em.geo.Cylinder(0.012, 0.05, em.YAX.construct_cs())

{emerge-0.6.10 → emerge-0.6.11}/examples/demo13_helix_antenna.py

@@ -25,7 +25,7 @@ porth = 2*mm                    # vertical height of the feed extrusion
 
 # --- Simulation object -------------------------------------------------------
 model = em.Simulation('helix')
-model.check_version("0.6.10") # Checks version compatibility.
+model.check_version("0.6.11") # Checks version compatibility.
 
 dfeed = 3*mm                    # straight feed length before the helix starts
 

{emerge-0.6.10 → emerge-0.6.11}/examples/demo14_boundary_selection.py

@@ -37,7 +37,7 @@ wgb = 10.16*mm
 L = 50*mm
 
 model = em.Simulation('Test Mode')
-model.check_version("0.6.10") # Checks version compatibility.
+model.check_version("0.6.11") # Checks version compatibility.
 
 # first lets define a WR90 waveguide
 wg_box = em.geo.Box(L, wga, wgb, position=(-L, -wga/2, -wgb/2))

{emerge-0.6.10 → emerge-0.6.11}/examples/demo1_stepped_imp_filter.py

@@ -28,7 +28,7 @@ pcbmat = em.Material(er=er, color="#217627", opacity=0.2)
 # We start by creating our simulation object.
 
 m = em.Simulation('Demo1_SIF', loglevel='INFO')
-m.check_version("0.6.10") # Checks version compatibility.
+m.check_version("0.6.11") # Checks version compatibility.
 # To accomodate PCB routing we make use of the PCBLayouter class. To use it we need to 
 # supply it with a thickness, the desired air-box height, the units at which we supply
 # the dimensions and the PCB material.

{emerge-0.6.10 → emerge-0.6.11}/examples/demo2_combline_filter.py

@@ -43,7 +43,7 @@ lfeed = 100*mil
 
 # A usual we start our simulation file
 model = em.Simulation('Combline_DEMO')
-model.check_version("0.6.10") # Checks version compatibility.
+model.check_version("0.6.11") # Checks version compatibility.
 
 # The filter consists of quarter lamba cylindrical pins inside an airbox.
 # First we create the airbox

{emerge-0.6.10 → emerge-0.6.11}/examples/demo3_coupled_line_filter.py

@@ -38,7 +38,7 @@ extra = 100             # extra margin (mil)
 
 # --- Simulation setup ----------------------------------------------------
 model = em.Simulation('Demo3')
-model.check_version("0.6.10") # Checks version compatibility.
+model.check_version("0.6.11") # Checks version compatibility.
 # --- Material and layouter -----------------------------------------------
 mat = em.Material(er=3.55, color="#488343", opacity=0.1)
 # Create PCB layouter with given substrate thickness and units

{emerge-0.6.10 → emerge-0.6.11}/examples/demo4_patch_antenna.py

@@ -34,7 +34,7 @@ f2 = 1.60e9             # stop frequency
 # --- Create simulation object -------------------------------------------
 model = em.Simulation('MyPatchAntenna')
 
-model.check_version("0.6.10") # Checks version compatibility.
+model.check_version("0.6.11") # Checks version compatibility.
 
 # --- Define geometry primitives -----------------------------------------
 # Substrate block centered at origin in XY, thickness in Z (negative down)

{emerge-0.6.10 → emerge-0.6.11}/examples/demo5_revolve.py

@@ -1,7 +1,7 @@
 import emerge as em
 
 model = em.Simulation('Sphere')
-model.check_version("0.6.10") # Checks version compatibility.
+model.check_version("0.6.11") # Checks version compatibility.
 
 poly = em.geo.XYPolygon([0, 0.05, 0.05, 0], [0, 0, 0.1, 0.1])
 vol = poly.revolve(em.XZPLANE.cs(), (0,0,0), (1,0,0))

{emerge-0.6.10 → emerge-0.6.11}/examples/demo6_striplines_with_vias.py

@@ -14,7 +14,7 @@ mm = 0.001    # Define a millimeter
 th = 1.0      # mm
 
 model = em.Simulation('Stripline_test')
-model.check_version("0.6.10") # Checks version compatibility.
+model.check_version("0.6.11") # Checks version compatibility.
 
 # As usual we start by creating our layouter
 ly = em.geo.PCB(th, mm, em.GCS, em.lib.DIEL_RO4350B)

{emerge-0.6.10 → emerge-0.6.11}/examples/demo7_periodic_cells.py

@@ -32,7 +32,7 @@ fl      = 25*mm  # Feed length
 
 # We start again by defining our simulation model
 model = em.Simulation('Periodic')
-model.check_version("0.6.10") # Checks version compatibility.
+model.check_version("0.6.11") # Checks version compatibility.
 
 # Next we will create a PeriodicCell class (in our case a hexagonal cell). This class
 # is simply meant to simplify our lives and improve the simulation setup flow.

{emerge-0.6.10 → emerge-0.6.11}/examples/demo8_waveguide_bpf_synthesis.py

@@ -80,7 +80,7 @@ wgaps = np.linspace(1*mm, 20*mm, 21)
 Ks = []
 hphis = []
 with em.Simulation('IrisSim') as sim:
-    sim.check_version("0.6.10") # Checks version compatibility.
+    sim.check_version("0.6.11") # Checks version compatibility.
     for wgap in sim.parameter_sweep(True, wgap=wgaps):
         # Define two short waveguide sections separated by iris plate
         wg1 = em.geo.Box(wga, Lfeed, wgb, (-wga/2, -Lfeed - t_thickness/2, 0))

{emerge-0.6.10 → emerge-0.6.11}/examples/demo9_dielectric_resonator.py

@@ -33,7 +33,7 @@ Nmodes = 5
 
 # --- Create simulation ---------------------------------------------------
 model = em.Simulation('DielectricResonatorFilter', loglevel="DEBUG")
-model.check_version("0.6.10") # Checks version compatibility.
+model.check_version("0.6.11") # Checks version compatibility.
 
 # --- Build geometry ------------------------------------------------------
 # Metal enclosure box (PEC by default)

{emerge-0.6.10 → emerge-0.6.11}/pyproject.toml

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

{emerge-0.6.10 → emerge-0.6.11}/uv.lock

@@ -245,7 +245,7 @@ wheels = [
 
 [[package]]
 name = "emerge"
-version = "0.6.10"
+version = "0.6.11"
 source = { editable = "." }
 dependencies = [
     { name = "cloudpickle" },