emerge 0.6.10__py3-none-any.whl → 0.6.11__py3-none-any.whl

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

@@ -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.dist-info → emerge-0.6.11.dist-info}/RECORD

@@ -1,4 +1,4 @@
-emerge/__init__.py,sha256=8FrSyF_ro5TDOwMM76VyItYnpfiK_LOumuCAugk2DiI,2977
+emerge/__init__.py,sha256=8X7w9dvw71aPyXHg5rkdSRVqMzoRNMpw9L1SVhf7tlo,2977
 emerge/__main__.py,sha256=WVf16sfrOI910QWohrQDaChZdRifMNoS6VKzCT6f3ZA,92
 emerge/cli.py,sha256=NU1uhwuZ6i50680v3_I4kDZPTHqz74gOYK71UBhb8oE,666
 emerge/ext.py,sha256=IBoHH5PQFj5pYMfp6r-uMpNNgbSe8c0g9x8qjBzzVmU,223
@@ -7,13 +7,13 @@ emerge/plot.py,sha256=AH2D9rKeWUXlSOlh-pUUfLt0oxVLcqF_piki-BmPEg0,83
 emerge/pyvista.py,sha256=-Ht2YcZYsh8-dici5ZPNAWwsis6uz5wNj8n8mxv5fog,42
 emerge/_emerge/__init__.py,sha256=aidfiILy33dt3VyiZ2mgtA87mq-WQ5pXItZUE5wR5ws,703
 emerge/_emerge/_cache_check.py,sha256=_m9rV-VcaC4uNfETZ2Rp1tkA-gZ5FD3xL3KOHlgdvyA,1547
-emerge/_emerge/bc.py,sha256=TeSVNkDgOGaoHw5raTzhUV0ngtyHa33sXAoL2hRn70M,8077
+emerge/_emerge/bc.py,sha256=-fIfUwi1lIZADEbQ2wRJjrEmCVJQdRSOVYM_mzmZRdY,8080
 emerge/_emerge/const.py,sha256=PTZZTSDOP5NsZ8XnJrKTY2P0tPUhmutBJ1yrm-t7xsI,129
 emerge/_emerge/coord.py,sha256=BKvyrcnHY-_bgHqysnByy5k9_DK4VVfr9KKkRaawG2E,4371
 emerge/_emerge/cs.py,sha256=gULfov6s0jODOdQkH6NmGBbG5wvny1-bJU8fdAlpCHo,19730
 emerge/_emerge/dataset.py,sha256=UcSAJ_siLrOjNBBWRWsS3GUZUpayp63EM6pP6ClwKDI,1534
 emerge/_emerge/geo2d.py,sha256=e_HkX1GQ2iYrdO0zeEgzVOzfGyU1WGJyjeGBAobOttE,3323
-emerge/_emerge/geometry.py,sha256=OcQ0wvritkg7Q8oihQI_hLjDGx7JkFaPwfEeJ3_u3Bs,19987
+emerge/_emerge/geometry.py,sha256=mBe6BALh5XTwhs93SYLJOww3-wr9qBR35VwOLRYdElM,20002
 emerge/_emerge/howto.py,sha256=c4UxUNpA1tygr3OoR-LH-h0UZv-Tf9K8tpCiAU18BKE,8173
 emerge/_emerge/logsettings.py,sha256=s8UboFEtB0aIuLB2FSL2WIbw0_kB363iHNIy4uGQi7w,3711
 emerge/_emerge/material.py,sha256=bVuMyrmts08at4nUc4ttgYHPsY1cLYNKNmJ4RwgR9TY,15462
@@ -50,8 +50,8 @@ 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=ocyLCLt6iZ2FlmqLvNCqxSDKdFRirUFRQYGNi8xgyRk,42367
-emerge/_emerge/physics/microwave/microwave_bc.py,sha256=YaEkSyOsC9Di7-JItijuRKD60ZA9CmEX8Tu8pViMN90,42114
+emerge/_emerge/physics/microwave/microwave_3d.py,sha256=OHbqEk2ODuKnq0Gc5Fp8STFYinw0bPPJkgie8a9BK0Q,42527
+emerge/_emerge/physics/microwave/microwave_bc.py,sha256=EVIWkDgJSwKCfhkFKAYOjI8o0RjeX3fudmyrjU3h4N8,42111
 emerge/_emerge/physics/microwave/microwave_data.py,sha256=njeNfw_Is4bc97H-hefi-Bk8NSGMElXk0yzDb4v6mVk,50365
 emerge/_emerge/physics/microwave/periodic.py,sha256=wYSUgLFVtCLqSG3EDKoCDRU93iPUzBdXzVRdHTRmbpI,3000
 emerge/_emerge/physics/microwave/port_functions.py,sha256=aVU__AkVk8b1kH2J_oDLF5iNReCxC9nzCtesFSSSSQo,2112
@@ -68,9 +68,9 @@ emerge/_emerge/physics/microwave/assembly/robinbc.py,sha256=syJ-NuHHA0WDQECuaPde
 emerge/_emerge/plot/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 emerge/_emerge/plot/display.py,sha256=TQLlKb-LkaG5ZOSLfxp9KXPlZPRFTxNj1LhVQ-Lp1-s,18476
 emerge/_emerge/plot/simple_plots.py,sha256=lzAyLpY4yaAgMBgNkpeIxdrdSp5nQH6JmBI_ZfjzuhY,25229
-emerge/_emerge/plot/matplotlib/mpldisplay.py,sha256=szKafDrgdAW5Nyc5UOHuJC87n0WGkXYackOVv182TDQ,8671
+emerge/_emerge/plot/matplotlib/mpldisplay.py,sha256=e8V6EhGdCW7nRkSFvjHCcRO5uR-FcD0yHQ1nxPQCbp4,8674
 emerge/_emerge/plot/pyvista/__init__.py,sha256=CPclatEu6mFnJZzCQk09g6T6Fh20WTbiLAJGSwAnPXU,30
-emerge/_emerge/plot/pyvista/display.py,sha256=Y8BT3ML9eeSQw_HLDmi3KCe0xtA8qOahOnCPGgvnM2g,38354
+emerge/_emerge/plot/pyvista/display.py,sha256=vZ7W_FcP1pfENManxUbXxeDSqGYNcqr5qkLv00SQCS4,38435
 emerge/_emerge/plot/pyvista/display_settings.py,sha256=k4JfiNuaVDpPZrZa0sIuuFFwLvYAWDS17tusUCVHNu0,1036
 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=bHsZ4okxa9uu8qP4UOxSAeIQzuwpRtN0i7
 emerge/_emerge/projects/generate_project.py,sha256=TNw-0SpLc82MBq0bd9hB_yqvBZCgmuPonCBsHTp91uk,1450
 emerge/_emerge/solve_interfaces/cudss_interface.py,sha256=Iszyy7RuuCa_FgfROEyTSSWbmR2LzMUkEcR8klzIKOQ,9915
 emerge/_emerge/solve_interfaces/pardiso_interface.py,sha256=iVFxToMmIzhj3hcAP-O_MDHKz82ePFIHY1us11kzUBU,15305
-emerge-0.6.10.dist-info/METADATA,sha256=tmedxST_2MpgTZXZK7GGc0RMNt_9DjEMKlJjw6IFh0g,3339
-emerge-0.6.10.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-emerge-0.6.10.dist-info/entry_points.txt,sha256=8rFvAXticpKg4OTC8JEvAksnduW72KIEskCGG9XnFf8,43
-emerge-0.6.10.dist-info/licenses/LICENSE,sha256=VOCXWddrjMN5j7TvnSAOh1Dx7jkugdwq9Lqhycf5inc,17852
-emerge-0.6.10.dist-info/RECORD,,
+emerge-0.6.11.dist-info/METADATA,sha256=ZyqP0SMK6dLJX8-UmEr9GDujZhGchs0Nsrg0crwKe18,3339
+emerge-0.6.11.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+emerge-0.6.11.dist-info/entry_points.txt,sha256=8rFvAXticpKg4OTC8JEvAksnduW72KIEskCGG9XnFf8,43
+emerge-0.6.11.dist-info/licenses/LICENSE,sha256=VOCXWddrjMN5j7TvnSAOh1Dx7jkugdwq9Lqhycf5inc,17852
+emerge-0.6.11.dist-info/RECORD,,