emerge 1.0.4__tar.gz → 1.0.5__tar.gz

{emerge-1.0.4 → emerge-1.0.5}/.bumpversion.toml

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

emerge-1.0.5/.nova/Configuration.json

@@ -0,0 +1,3 @@
+{
+  "python.pythonPath" : "\/Users\/robertfennis\/Documents\/EMerge\/.venv\/bin\/python"
+}

{emerge-1.0.4 → emerge-1.0.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: emerge
-Version: 1.0.4
+Version: 1.0.5
 Summary: An open source EM FEM simulator in Python
 Project-URL: Homepage, https://github.com/FennisRobert/EMerge
 Project-URL: Issues, https://github.com/FennisRobert/EMerge/issues
@@ -32,7 +32,7 @@ Hello everybody. Thanks for showing interest in this repository.
 Feel free to download your version of EMerge and start playing around with it!
 If you have suggestions/changes/questions either use the Github issue system or join the Discord using the following link:
 
-**https://discord.gg/uArxywnz**
+**[Discord Invitation](https://discord.gg/VMftDCZcNz)**
 
 ## How to install
 

{emerge-1.0.4 → emerge-1.0.5}/README.md

@@ -5,7 +5,7 @@ Hello everybody. Thanks for showing interest in this repository.
 Feel free to download your version of EMerge and start playing around with it!
 If you have suggestions/changes/questions either use the Github issue system or join the Discord using the following link:
 
-**https://discord.gg/uArxywnz**
+**[Discord Invitation](https://discord.gg/VMftDCZcNz)**
 
 ## How to install
 

{emerge-1.0.4 → emerge-1.0.5}/emerge/__init__.py

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

{emerge-1.0.4 → emerge-1.0.5}/emerge/_emerge/geo/operations.py

@@ -51,11 +51,13 @@ def add(main: T, tool: T,
     GeoSurface | GeoVolume
         A new object that is the union of the main and tool objects.
     '''
+    
     out_dim_tags, out_dim_tags_map = gmsh.model.occ.fuse(main.dimtags, tool.dimtags, removeObject=remove_object, removeTool=remove_tool)
     if out_dim_tags[0][0] == 3:
         output = GeoVolume([dt[1] for dt in out_dim_tags])._take_tools(tool,main)
     elif out_dim_tags[0][0] == 2:
         output = GeoSurface([dt[1] for dt in out_dim_tags])._take_tools(tool,main)
+    
     if remove_object:
         main._exists = False
     if remove_tool:
@@ -306,10 +308,10 @@ def unite(*objects: GeoObject) -> GeoObject:
     
     main._exists = False
     dts = []
-    for other in rest:
+    for other in objects:
         dts.extend(other.dimtags)
         other._exists = False
-    new_dimtags, mapping = gmsh.model.occ.fuse(main.dimtags, dts)
+    new_dimtags, mapping = gmsh.model.occ.fuse(dts, main.dimtags)
     
     new_obj = GeoObject.from_dimtags(new_dimtags)._take_tools(*objects)
     new_obj.set_material(main.material)

{emerge-1.0.4 → emerge-1.0.5}/emerge/_emerge/geo/polybased.py

@@ -24,6 +24,7 @@ from typing import Generator, Callable
 from ..selection import FaceSelection
 from typing import Literal
 from functools import reduce
+from loguru import logger
 
 
 def _discretize_curve(xfunc: Callable, yfunc: Callable, 
@@ -362,10 +363,20 @@ class XYPolygon:
         self._check()
 
         ptags = []
+        
         xg, yg, zg = cs.in_global_cs(self.x, self.y, 0*self.x)
 
         points = dict()
         for x,y,z in zip(xg, yg, zg):
+            reuse = False
+            for key, (px, py, pz) in points.items():
+                if ((x-px)**2 + (y-py)**2 + (z-pz)**2)**0.5 < 1e-12:
+                    ptags.append(key)
+                    reuse = True
+                    break
+            if reuse:
+                logger.warning(f'Reusing {ptags[-1]}')
+                continue
             ptag = gmsh.model.occ.add_point(x,y,z)
             points[ptag] = (x,y,z)
             ptags.append(ptag)

{emerge-1.0.4 → emerge-1.0.5}/emerge/_emerge/simmodel.py

@@ -241,6 +241,7 @@ class Simulation:
         logger.trace('Storing geometries in data.sim')
         self.data.sim['geos'] = {geo.name: geo for geo in _GEOMANAGER.all_geometries()}
         self.data.sim['mesh'] = self.mesh
+        self.data.sim.entries.append(self.data.sim.stock)
     ############################################################
     #                       PUBLIC FUNCTIONS                  #
     ############################################################
@@ -518,6 +519,7 @@ class Simulation:
         else:
             geometries_parsed = unpack_lists(geometries + tuple([item for item in self.data.sim.default.values() if isinstance(item, GeoObject)]))
         logger.trace(f'Parsed geometries = {geometries_parsed}')
+        
         self._save_geometries()
         
         self.mesher.submit_objects(geometries_parsed)

{emerge-1.0.4 → emerge-1.0.5}/emerge/_emerge/solver.py

@@ -95,6 +95,10 @@ class SolveReport:
         for key, value in kwargs.items():
             self.aux[key] = str(value)
     
+    @property
+    def mdof(self) -> float:
+        return (self.ndof**2)/((self.simtime+1e-6)*1e6)
+    
     def logprint(self, print_cal: Callable | None = None):
         if print_cal is None:
             print_cal = print

{emerge-1.0.4 → emerge-1.0.5}/examples/demo10_sgh.py

@@ -33,7 +33,7 @@ dx = 2 * mm              # distance from horn exit to PML start
 
 # Create simulation object
 m = em.Simulation('StandardGainHornAntenna')
-m.check_version("1.0.4") # Checks version compatibility.
+m.check_version("1.0.5") # Checks version compatibility.
 # --- Coordinate system for horn geometry -------------------------------
 hornCS = em.CS(em.YAX, em.ZAX, em.XAX)
 
@@ -44,7 +44,6 @@ feed = em.geo.Box(
     wgb/2,     # half-height along Z
     position=(-Lfeed, 0, 0)
 )
-
 # --- Horn geometry ------------------------------------------------------
 # Inner horn taper from (D,E) at throat to (B,C) at mouth over length F
 horn_in = em.geo.Horn(
@@ -115,4 +114,3 @@ m.display.add_surf(*data.field[0].farfield_3d(radiation_boundary, syms=['Ez','Hy
                 .surfplot('normE', 'abs', True, True, -30, 5*mm, (Lhorn,0,0)))
 m.display.add_surf(*data.field[0].cutplane(0.25*mm, z=0).scalar('Ez','real'), symmetrize=True)
 m.display.show()
-

{emerge-1.0.4 → emerge-1.0.5}/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("1.0.4") # Checks version compatibility.
+m.check_version("1.0.5") # Checks version compatibility.
 
 th = 0.5         # substrate thickness (meters)
 Hair = 2.0

{emerge-1.0.4 → emerge-1.0.5}/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('AlignmentDemo')
-m.check_version("1.0.4") # Checks version compatibility.
+m.check_version("1.0.5") # 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-1.0.4 → emerge-1.0.5}/examples/demo13_helix_antenna.py

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

{emerge-1.0.4 → emerge-1.0.5}/examples/demo14_boundary_selection.py

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

{emerge-1.0.4 → emerge-1.0.5}/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('SteppedImpedanceFilter')
-m.check_version("1.0.4") # Checks version compatibility.
+m.check_version("1.0.5") # 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-1.0.4 → emerge-1.0.5}/examples/demo2_combline_filter.py

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

{emerge-1.0.4 → emerge-1.0.5}/examples/demo3_coupled_line_filter.py

@@ -38,7 +38,7 @@ extra = 100             # extra margin (mil)
 
 # --- Simulation setup ----------------------------------------------------
 model = em.Simulation('CoupledLineFilter')
-model.check_version("1.0.4") # Checks version compatibility.
+model.check_version("1.0.5") # Checks version compatibility.
 # --- Material and layouter -----------------------------------------------
 mat = em.Material(er=3.55, color="#488343", opacity=0.4)
 

{emerge-1.0.4 → emerge-1.0.5}/examples/demo4_patch_antenna.py

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

{emerge-1.0.4 → emerge-1.0.5}/examples/demo5_revolve.py

@@ -29,7 +29,7 @@ airbox_width = 15*cm                # airbox width
 
 # --- Create simulation object -------------------------------------------
 model = em.Simulation('ConicalHornAntenna')
-model.check_version("1.0.4") # Checks version compatibility
+model.check_version("1.0.5") # Checks version compatibility
 
 # --- Feed geometry -------------------------------------------------------
 feed = em.geo.Cylinder(

{emerge-1.0.4 → emerge-1.0.5}/examples/demo6_striplines_with_vias.py

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

{emerge-1.0.4 → emerge-1.0.5}/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("1.0.4") # Checks version compatibility.
+model.check_version("1.0.5") # 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-1.0.4 → emerge-1.0.5}/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("1.0.4") # Checks version compatibility.
+    sim.check_version("1.0.5") # 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-1.0.4 → emerge-1.0.5}/examples/demo9_dielectric_resonator.py

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

{emerge-1.0.4 → emerge-1.0.5}/pyproject.toml

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

{emerge-1.0.4 → emerge-1.0.5}/uv.lock

@@ -236,7 +236,7 @@ wheels = [
 
 [[package]]
 name = "emerge"
-version = "1.0.4"
+version = "1.0.5"
 source = { editable = "." }
 dependencies = [
     { name = "gmsh" },