emerge 1.0.0__py3-none-any.whl → 1.0.1__py3-none-any.whl

emerge/_emerge/simmodel.py

@@ -309,34 +309,66 @@ class Simulation:
         logger.info('Different cached data detected, rerunning simulation.')
         return True
     
-    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
+    def check_version(self, target_version: str, *, log: bool = False) -> None:
         """
-        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__}. \n You can upgrade your version of emerge with: pip --upgrade emerge")
-        if vm != cm:
-            raise VersionError(f"You are running a script designed for version {version} with a possibly incompatible version of EMerge {__version__}. \n You can upgrade your version of emerge with: pip --upgrade emerge")
-        if vp != cp:
-            logger.warning("You are running a script designed for a different version of EMerge.")
-            logger.warning(f"The script version: {version}")
-            logger.warning(f"EMerge version:     {__version__}")
-            logger.warning("Usually EMerge works without a problem but Errors may occur.")
-            logger.warning("You can upgrade your version of emerge with: pip --upgrade emerge")
-            logger.warning("You may suppress this error by removing the call to .check_version().")
-            logger.warning("Press Ctrl+C to abort.")
-            ans = input('Press enter to proceed or [Q] to quit:')
-            if ans.lower().strip()=='q':
-                quit()
+        Ensure the script targets an EMerge version compatible with the current runtime.
+
+        Parameters
+        ----------
+        target_version : str
+            The EMerge version this script was written for (e.g. "1.4.0").
+        log : bool, optional
+            If True and a `logger` is available, emit a single WARNING with the same
+            message as the exception. Defaults to False.
+
+        Raises
+        ------
+        VersionError
+            If the script's target version differs from the running EMerge version.
+        """
+        try:
+            from packaging.version import Version as _V
+            v_script = _V(target_version)
+            v_runtime = _V(__version__)
+            newer = v_script > v_runtime
+            older = v_script < v_runtime
+        except Exception:
+            def _parse(v: str):
+                try:
+                    return tuple(int(p) for p in v.split("."))
+                except Exception:
+                    # Last-resort: compare as strings to avoid crashing the check itself
+                    return tuple(v.split("."))
+            v_script = _parse(target_version)
+            v_runtime = _parse(__version__)
+            newer = v_script > v_runtime
+            older = v_script < v_runtime
+
+        if not newer and not older:
+            return  # exact match
+
+        if newer:
+            msg = (
+                f"Script targets EMerge {target_version}, but runtime is {__version__}. "
+                "The script may rely on features added after your installed version. "
+                "Recommended: upgrade EMerge (`pip install --upgrade emerge`). "
+                "If you know the script is compatible, you may remove this check."
+            )
+        else:  # older
+            msg = (
+                f"Script targets EMerge {target_version}, but runtime is {__version__}. "
+                "APIs may have changed since the targeted version. "
+                "Recommended: update the script for the current EMerge, or run a matching older release. "
+                "If you know the script is compatible, you may remove this check."
+            )
+
+        if log:
+            try:
+                logger.warning(msg)
+            except Exception:
+                pass
+
+        raise VersionError(msg)
 
     def save(self) -> None:
         """Saves the current model in the provided project directory."""
@@ -414,7 +446,8 @@ class Simulation:
              use_gmsh: bool = False,
              plot_mesh: bool = False,
              volume_mesh: bool = True,
-             opacity: float | None = None) -> None:
+             opacity: float | None = None,
+             labels: bool = False) -> None:
         """View the current geometry in either the BaseDisplay object (PVDisplay only) or
         the GMSH viewer.
 
@@ -424,21 +457,21 @@ class Simulation:
             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.
-
+            labels: (bool, optional): If geometry name labels should be shown. Defaults to False.
         """
         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, mesh=plot_mesh, opacity=opacity, volume_mesh=volume_mesh)
+            self.display.add_object(geo, mesh=plot_mesh, opacity=opacity, volume_mesh=volume_mesh, label=labels)
         if selections:
-            [self.display.add_object(sel, color='red', opacity=0.3) for sel in selections]
+            [self.display.add_object(sel, color='red', opacity=0.3, label=labels) for sel in selections]
         self.display.show()
 
         return None
         
-    def set_periodic_cell(self, cell: PeriodicCell, excluded_faces: list[FaceSelection] | None = None):
+    def set_periodic_cell(self, cell: PeriodicCell, included_faces: FaceSelection | None = None):
         """Set the given periodic cell object as the simulations peridicity.
 
         Args:
@@ -447,6 +480,7 @@ class Simulation:
         """
         self.mw.bc._cell = cell
         self._cell = cell
+        self._cell.included_faces = included_faces
 
     def commit_geometry(self, *geometries: GeoObject | list[GeoObject]) -> None:
         """Finalizes and locks the current geometry state of the simulation.
@@ -460,7 +494,7 @@ class Simulation:
         else:
             geometries_parsed = unpack_lists(geometries + tuple([item for item in self.data.sim.default.values() if isinstance(item, GeoObject)]))
         
-        self.data.sim['geometries'] = geometries_parsed
+        self.data.sim['geos'] = {geo.name: geo for geo in geometries_parsed}
         self.mesher.submit_objects(geometries_parsed)
         self._defined_geometries = True
         self.display._facetags = [dt[1] for dt in gmsh.model.get_entities(2)]

emerge/_emerge/solver.py

@@ -15,8 +15,8 @@
 # along with this program; if not, see
 # <https://www.gnu.org/licenses/>.
 
-
 from __future__ import annotations
+
 from scipy.sparse import csr_matrix # type: ignore
 from scipy.sparse.csgraph import reverse_cuthill_mckee # type: ignore
 from scipy.sparse.linalg import bicgstab, gmres, gcrotmk, eigs, splu # type: ignore
@@ -286,6 +286,7 @@ class Solver:
     """
     real_only: bool = False
     req_sorter: bool = False
+    released_gil: bool = False
 
     def __init__(self):
         self.own_preconditioner: bool = False
@@ -479,7 +480,8 @@ class SolverSuperLU(Solver):
     """ Implements Scipi's direct SuperLU solver."""
     req_sorter: bool = False
     real_only: bool = False
-    
+    released_gil: bool = True
+
     def __init__(self):
         super().__init__()
         self.atol = 1e-5
@@ -502,6 +504,7 @@ class SolverSuperLU(Solver):
     
     def solve(self, A, b, precon, reuse_factorization: bool = False, id: int = -1) -> tuple[np.ndarray, SolveReport]:
         logger.info(f'[ID={id}] Calling SuperLU Solver.')
+
         self.single = True
         if not reuse_factorization:
             logger.trace('Computing LU-Decomposition')
@@ -903,6 +906,10 @@ class SolveRoutine:
             bool: If the solver is legal
         """
         if any(isinstance(solver, solvertype) for solvertype in self.disabled_solver):
+            logger.warning(f'The selected solver {solver} cannot be used as it is disabled.')
+            return False
+        if self.parallel=='MT' and not solver.released_gil:
+            logger.warning(f'The selected solver {solver} cannot be used in MultiThreading as it does not release the GIL')
             return False
         return True
     

emerge/beta/dxf.py

@@ -0,0 +1 @@
+from .._emerge.geo.pcb_tools.dxf import import_dxf

emerge/lib.py

@@ -14,6 +14,8 @@
 """
 from ._emerge.material import Material, AIR, COPPER, PEC
 from ._emerge.const import C0, Z0, PI, EPS0, MU0
+from .materials import isola
+from .materials import rogers
 
 EISO: float = (Z0/(2*PI))**0.5
 EOMNI = (3*Z0/(4*PI))**0.5
@@ -280,6 +282,7 @@ DIEL_XT_Duroid_8100              = Material(er=3.54, tand=0.0049, color="#21912b
 DIEL_XT_Duroid_81000_004IN_Thick = Material(er=3.32, tand=0.0038, color="#21912b", opacity=0.3, name="Rogers XT/duroid 81000 0.004in")
 DIEL_TEFLON = Material(er=2.1, tand=0.0003, color='#eeeeee', opacity=0.3, name="Teflon")
 
+DIEL_IS420_approx   = Material(er=4.5, tand=0.018, color="#CCDE30", opacity=0.3, name="ISOLA420 approximate")
 
 # Legacy FR Materials
 DIEL_FR1 = Material(er=4.8,  tand=0.025, color="#3c9747", opacity=0.3, name="FR-1 (Paper Phenolic)")

emerge/materials/__init__.py

@@ -0,0 +1 @@
+from . import isola

emerge/materials/isola.py

@@ -0,0 +1,294 @@
+from .._emerge.material import Material, FreqDependent
+from scipy.interpolate import interp1d
+import numpy as np
+
+FS_350HR = np.array([100e6, 500e6, 1e9, 2e9, 5e9, 10e9])
+
+def gen_f350(*vals) -> FreqDependent:
+    return FreqDependent(scalar=interp1d(FS_350HR, np.array(vals), bounds_error=False, fill_value=(vals[0], vals[-1])))
+
+
+############################################################
+#                       IS370 SHEETS                      #
+############################################################
+
+IS370HR_1x106_20 = Material(er=gen_f350(3.89, 3.84, 3.81, 3.77, 3.63, 3.63),
+                         tand=gen_f350(0.0018, 0.021, 0.024, 0.025, 0.03, 0.03),
+                         color="#1ea430", opacity=0.3, name='Isola 370HR 1x106 2.0mil')
+
+IS370HR_1x1067_20 = Material(er=gen_f350(3.99, 3.94, 3.91, 3.88, 3.74, 3.74),
+                         tand=gen_f350(0.017, 0.020, 0.022, 0.023, 0.028, 0.028),
+                         color="#1ea430", opacity=0.3, name='Isola 370HR 1x1067 2.0mil')
+
+IS370HR_1x1080_25 = Material(er=gen_f350(4.11, 4.06, 4.04, 4.00, 3.88, 3.88),
+                         tand=gen_f350(0.016, 0.018, 0.021, 0.022, 0.026, 0.026),
+                         color="#1ea430", opacity=0.3, name='Isola 370HR 1x1080 2.5mil')
+
+IS370HR_1x1080_30 = Material(er=gen_f350(4.09, 4.04, 4.02, 3.99, 3.86, 3.86),
+                         tand=gen_f350(0.16, 0.18, 0.021, 0.022, 0.026, 0.026),
+                         color="#1ea430", opacity=0.3, name='Isola 370HR 1x1080 3.0mil')
+
+IS370HR_1x2113_30 = Material(er=gen_f350(4.34, 4.30, 4.28, 4.25, 4.14, 4.14),
+                         tand=gen_f350(0.014, 0.016, 0.018, 0.019, 0.022, 0.022),
+                         color="#1ea430", opacity=0.3, name='Isola 370HR 1x2113 3.0mil')
+
+IS370HR_1x1086_30 = Material(er=gen_f350(4.07, 4.02, 4.00, 3.97, 3.84, 3.84),
+                         tand=gen_f350(0.016, 0.019, 0.021, 0.022, 0.026, 0.026),
+                         color="#1ea430", opacity=0.3, name='Isola 370HR 1x1086 3.0mil')
+
+IS370HR_1x2113_35 = Material(er=gen_f350(4.34, 4.30, 4.28, 4.25, 4.14, 4.14),
+                         tand=gen_f350(0.014, 0.016, 0.018, 0.019, 0.022, 0.022),
+                         color="#1ea430", opacity=0.3, name='Isola 370HR 1x2113 3.5 mil')
+
+IS370HR_1x3313_35 = Material(er=gen_f350(4.24, 4.19, 4.17, 4.14, 4.03, 4.03),
+                         tand=gen_f350(0.015, 0.017, 0.019, 0.02, 0.023, 0.023),
+                         color="#1ea430", opacity=0.3, name='Isola 370HR 1x3313 3.5mil')
+
+IS370HR_2x106_35 = Material(er=gen_f350(3.94, 3.89, 3.86, 3.82, 3.68, 3.68),
+                         tand=gen_f350(0.018, 0.020, 0.023, 0.024, 0.029, 0.029),
+                         color="#1ea430", opacity=0.3, name='Isola 370HR 2x106 3.5 mil')
+
+IS370HR_1x2116_40 = Material(er=gen_f350(4.32, 4.27, 4.26, 4.23, 4.17, 4.17),
+                         tand=gen_f350(0.014, 0.016, 0.018, 0.019, 0.022, 0.022),
+                         color="#1ea430", opacity=0.3, name='Isola 370HR 1x2116 4.0 mil')
+
+IS370HR_1x2113_40 = Material(er=gen_f350(4.16, 4.12, 4.10, 4.05, 3.99, 3.99),
+                         tand=gen_f350(0.016, 0.018, 0.020, 0.024, 0.025, 0.025),
+                         color="#1ea430", opacity=0.3, name='Isola 370HR 1x2113 4.0 mil')
+
+IS370HR_1x106_1x1080_40 = Material(er=gen_f350(4.07, 4.02, 4.00, 3.97, 3.84, 3.83),
+                         tand=gen_f350(0.016, 0.019, 0.021, 0.022, 0.026, 0.026),
+                         color="#1ea430", opacity=0.3, name='Isola 370HR 1x106/1x1080 4.0mil')
+
+IS370HR_1x106_1x1080_43 = Material(er=gen_f350(4.04, 3.99, 3.97, 3.93, 3.80, 3.80),
+                         tand=gen_f350(0.017, 0.019, 0.022, 0.023, 0.027, 0.027),
+                         color="#1ea430", opacity=0.3, name='Isola 370HR 1x106/1x1080 4.3mil')
+
+IS370HR_2116_45 = Material(er=gen_f350(4.24, 4.19, 4.17, 4.14, 4.03, 4.03),
+                         tand=gen_f350(0.015, 0.017, 0.019, 0.020, 0.023, 0.023),
+                         color="#1ea430", opacity=0.3, name='Isola 370HR 1x2116 4.3mil')
+
+IS370HR_2x1080_45 = Material(er=gen_f350(4.16, 4.12, 4.10, 4.05, 3.99, 3.99),
+                         tand=gen_f350(0.016, 0.018, 0.020, 0.021, 0.024, 0.025),
+                         color="#1ea430", opacity=0.3, name='Isola 370HR 2x1080 4.5mil')
+
+IS370HR_1x2116_50 = Material(er=gen_f350(4.18, 4.14, 4.11, 4.08, 3.96, 3.96),
+                         tand=gen_f350(0.015, 0.017, 0.02, 0.021, 0.024, 0.024),
+                         color="#1ea430", opacity=0.3, name='Isola 370HR 1x2116 5.0mil')
+
+IS370HR_1x1652_50 = Material(er=gen_f350(4.40, 4.36, 4.34, 4.32, 4.21, 4.21),
+                         tand=gen_f350(0.014, 0.015, 0.017, 0.018, 0.021, 0.021),
+                         color="#1ea430", opacity=0.3, name='Isola 370HR 1x1652 5.0mil')
+
+IS370HR_2x1080_50 = Material(er=gen_f350(4.11, 4.06, 4.04, 4.00, 3.88, 3.88),
+                         tand=gen_f350(0.016, 0.018, 0.021, 0.022, 0.026, 0.026),
+                         color="#1ea430", opacity=0.3, name='Isola 370HR 2x1080 5.0mil')
+
+IS370HR_1x106_1x2113_53 = Material(er=gen_f350(4.13, 4.08, 4.06, 4.02, 3.90, 3.90),
+                         tand=gen_f350(0.016, 0.018, 0.021, 0.021, 0.025, 0.025),
+                         color="#1ea430", opacity=0.3, name='Isola 370HR 1x106/1x2113 5.3mil')
+
+IS370HR_1x1652_55 = Material(er=gen_f350(4.34, 4.30, 4.28, 4.25, 4.14, 4.14),
+                         tand=gen_f350(0.014, 0.016, 0.018, 0.019, 0.022, 0.022),
+                         color="#1ea430", opacity=0.3, name='Isola 370HR 1x1652 5.5mil')
+
+IS370HR_2x1080_60 = Material(er=gen_f350(4.09, 4.04, 4.02, 3.99, 3.86, 3.86),
+                         tand=gen_f350(0.016, 0.018, 0.021, 0.022, 0.026, 0.026),
+                         color="#1ea430", opacity=0.3, name='Isola 370HR 2x1080 6.0mil')
+
+IS370HR_1x1652_60 = Material(er=gen_f350(4.24, 4.19, 4.17, 4.14, 4.03, 4.03),
+                         tand=gen_f350(0.015, 0.017, 0.019, 0.020, 0.023, 0.023),
+                         color="#1ea430", opacity=0.3, name='Isola 370HR 1x1652 6.0mil')
+
+IS370HR_2x1086_60 = Material(er=gen_f350(4.09, 4.04, 4.02, 3.99, 3.86, 3.86),
+                         tand=gen_f350(0.016, 0.018, 0.021, 0.022, 0.026, 0.026),
+                         color="#1ea430", opacity=0.3, name='Isola 370HR 2x1086 6.0mil')
+
+IS370HR_1x7628_70 = Material(er=gen_f350(4.42, 4.38, 4.36, 4.34, 4.24, 4.24),
+                         tand=gen_f350(0.014, 0.015, 0.017, 0.018, 0.02, 0.02),
+                         color="#1ea430", opacity=0.3, name='Isola 370HR 1x7626 7.0mil')
+
+IS370HR_2x2113_70 = Material(er=gen_f350(4.18, 4.14, 4.11, 4.08, 3.96, 3.96),
+                         tand=gen_f350(0.016, 0.017, 0.02, 0.021, 0.024, 0.024),
+                         color="#1ea430", opacity=0.3, name='Isola 370HR 2x2113 7.0mil')
+
+IS370HR_2x3313_70 = Material(er=gen_f350(4.24, 4.19, 4.17, 4.14, 4.03, 4.03),
+                         tand=gen_f350(0.015, 0.017, 0.019, 0.020, 0.023, 0.023),
+                         color="#1ea430", opacity=0.3, name='Isola 370HR 2x3313 7.0mil')
+
+IS370HR_1x7628_75 = Material(er=gen_f350(4.38, 4.34, 4.32, 4.29, 4.19, 4.19),
+                         tand=gen_f350(0.014, 0.015, 0.017, 0.018, 0.021, 0.021),
+                         color="#1ea430", opacity=0.3, name='Isola 370HR 1x7628 7.5mil')
+
+IS370HR_2x2116_80 = Material(er=gen_f350(4.32, 4.27, 4.26, 4.23, 4.17, 4.17),
+                         tand=gen_f350(0.014, 0.016, 0.018, 0.019, 0.022, 0.022),
+                         color="#1ea430", opacity=0.3, name='Isola 370HR 2x2116 8.0mil')
+
+IS370HR_2x3313_80 = Material(er=gen_f350(4.16, 4.12, 4.10, 4.05, 3.99, 3.99),   
+                             tand=gen_f350(0.016, 0.018, 0.020, 0.021, 0.024, 0.025),
+                         color="#1ea430", opacity=0.3, name='Isola 370HR 2x3313 8.0mil')
+
+IS370HR_1x7628_80 = Material(er=gen_f350(4.34, 4.30, 4.28, 4.25, 4.14, 4.14),   
+                             tand=gen_f350(0.014, 0.016, 0.018, 0.019, 0.022, 0.022),
+                         color="#1ea430", opacity=0.3, name='Isola 370HR 1x7628 8.0mil')
+
+IS370HR_2x2116_90 = Material(er=gen_f350(4.24, 4.19, 4.17, 4.14, 4.03, 4.03),
+                             tand=gen_f350(0.015, 0.017, 0.019, 0.020, 0.023, 0.023),
+                         color="#1ea430", opacity=0.3, name='Isola 370HR 2x2116 9.0mil')
+
+IS370HR_2x2116_100 = Material(er=gen_f350(4.18, 4.14, 4.11, 4.08, 3.96, 3.96),   
+                             tand=gen_f350(.016, 0.017, 0.020, 0.021, 0.024, 0.024),
+                         color="#1ea430", opacity=0.3, name='Isola 370HR 2x2116 10.0mil')
+
+IS370HR_2x1652_100 = Material(er=gen_f350(4.40, 4.36, 4.34, 4.32, 4.21, 4.21),   
+                             tand=gen_f350(0.014, 0.015, 0.017, 0.018, 0.021, 0.021),
+                         color="#1ea430", opacity=0.3, name='Isola 370HR 2x1652 10.0mil')
+
+IS370HR_2x1652_120 = Material(er=gen_f350(4.24, 4.19, 4.17, 4.14, 4.03, 4.03),   
+                             tand=gen_f350(0.015, 0.017,0.019, 0.020, 0.023, 0.023),
+                         color="#1ea430", opacity=0.3, name='Isola 370HR 2x1652 12.0mil')
+
+IS370HR_2x1080_1x7628_120 = Material(er=gen_f350(4.30, 4.25, 4.24, 4.21, 4.09, 4.09),
+                             tand=gen_f350(0.015, 0.016, 0.018, 0.019, 0.022, 0.022),
+                         color="#1ea430", opacity=0.3, name='Isola 370HR 2x1080/1x7623 12.0mil')
+
+IS370HR_2x7628_140 = Material(er=gen_f350(4.42, 4.38, 4.36, 4.34, 4.24, 4.24),
+                             tand=gen_f350(0.014, 0.015, 0.017, 0.018, 0.020, 0.020),
+                         color="#1ea430", opacity=0.3, name='Isola 370HR 2x7628 14.0mil')
+
+IS370HR_2x7628_160 = Material(er=gen_f350(4.34, 4.30, 4.28, 4.25, 4.14, 4.14),
+                             tand=gen_f350(0.014, 0.016, 0.018, 0.019, 0.022, 0.022),
+                         color="#1ea430", opacity=0.3, name='Isola 370HR 2x7628 16.0mil')
+
+IS370HR_1x1080_2x7628_180 = Material(er=gen_f350(4.44, 4.40, 4.39, 4.36, 4.26, 4.26),
+                             tand=gen_f350(0.013, 0.014, 0.017, 0.017, 0.020, 0.020),
+                         color="#1ea430", opacity=0.3, name='Isola 370HR 1x1080/2x7628 18.0mil')
+
+IS370HR_2x7628_1x2116_180 = Material(er=gen_f350(4.36, 4.32, 4.30, 4.27, 4.15, 4.15),
+                             tand=gen_f350(0.014, 0.016, 0.018, 0.019, 0.021, 0.021),
+                         color="#1ea430", opacity=0.3, name='Isola 370HR 2x7628/1x2116 18.0mil ')
+
+IS370HR_3x7628_210 = Material(er=gen_f350(4.42, 4.38, 4.36, 4.34, 4.24, 4.24),
+                             tand=gen_f350(0.014, 0.015, 0.017, 0.018, 0.020, 0.020),
+                         color="#1ea430", opacity=0.3, name='Isola 370HR 3x7628 21.0mil')
+
+IS370HR_3x7628_240 = Material(er=gen_f350(4.34, 4.30, 4.28, 4.25, 4.14, 4.14),
+                             tand=gen_f350(0.014, 0.016, 0.018, 0.019, 0.022, 0.022),
+                         color="#1ea430", opacity=0.3, name='Isola 370HR 3x7628 24.0mil')
+
+IS370HR_4x7628_280 = Material(er=gen_f350(4.42, 4.38, 4.36, 4.34, 4.24, 4.24),
+                             tand=gen_f350(0.014, 0.015, 0.017, 0.018, 0.020, 0.020),
+                         color="#1ea430", opacity=0.3, name='Isola 370HR 4x7628 28.0mil')
+
+IS370HR_4x7628_1x1080_310 = Material(er=gen_f350(4.38, 4.34, 4.32, 4.30, 4.19, 4.19),
+                             tand=gen_f350(0.014, 0.015, 0.017, 0.018, 0.021, 0.021),
+                         color="#1ea430", opacity=0.3, name='Isola 370HR 4x7628/1x1080 31.0mil')
+
+IS370HR_5x7628_350 = Material(er=gen_f350(4.42, 4.38, 4.36, 4.34, 4.24, 4.24),
+                             tand=gen_f350(0.014, 0.015, 0.017, 0.018, 0.020, 0.020),
+                         color="#1ea430", opacity=0.3, name='Isola 370HR 5x7628 35.0mil')
+
+IS370HR_5x7628_1x2116_390 = Material(er=gen_f350(4.40, 4.36, 4.34, 4.34, 4.24, 4.24),
+                             tand=gen_f350(0.014, 0.015, 0.017, 0.018, 0.020, 0.020),
+                         color="#1ea430", opacity=0.3, name='Isola 370HR 5x7628/1x2116 39.0mil')
+
+IS370HR_6x7628_420 = Material(er=gen_f350(4.42, 4.38, 4.36, 4.34, 4.24, 4.24),
+                             tand=gen_f350(0.014, 0.015, 0.017, 0.018, 0.020, 0.020),
+                         color="#1ea430", opacity=0.3, name='Isola 370HR 6x7628 42.0mil')
+
+############################################################
+#                       IS370 SHEETS                      #
+############################################################
+
+FS_420 = np.array([100e6, 1e9, 2e9, 10e9])
+
+def gen_f420(*vals) -> FreqDependent:
+    return FreqDependent(scalar=interp1d(FS_420, np.array(vals), bounds_error=False, fill_value=(vals[0], vals[-1])))
+
+IS420_1x106_20 = Material(er=gen_f420(4.3, 4.1, 3.95, 3.9), 
+                    tand=gen_f420(0.18, 0.18, 0.021, 0.024),
+                     color="#1ea430", opacity=0.3, name="Isola 420 1x106 2.0mil")
+IS420_1x1080_30 = Material(er=gen_f420(4.65, 4.26, 4.15, 4.1), 
+                    tand=gen_f420(0.018, 0.018, 0.021, 0.023),
+                     color="#1ea430", opacity=0.3, name="Isola 420 1x1080 3.0mil")
+IS420_1x2116_40 = Material(er=gen_f420(4.6, 4.52, 4.35, 4.25), 
+                    tand=gen_f420(0.016, 0.016, 0.017, 0.017),
+                     color="#1ea430", opacity=0.3, name="Isola 420 1x2116 4.0mil")
+IS420_1x2116_50 = Material(er=gen_f420(4.75, 4.37, 4.25, 4.2), 
+                    tand=gen_f420(0.016, 0.016, 0.017, 0.017),
+                     color="#1ea430", opacity=0.3, name="Isola 420 1x2116 5.0mil")
+IS420_1x1652_60 = Material(er=gen_f420(4.75, 4.4, 4.25, 4.2), 
+                    tand=gen_f420(0.017, 0.017, 0.018, 0.019),
+                     color="#1ea430", opacity=0.3, name="Isola 420 1x1652 6.0mil")
+IS420_1x7628_70 = Material(er=gen_f420(4.9, 4.58, 4.45, 4.35), 
+                    tand=gen_f420(0.016, 0.016, 0.017, 0.017),
+                     color="#1ea430", opacity=0.3, name="Isola 420 1x7628 7.0mil")
+IS420_1x7628_80 = Material(er=gen_f420(4.85, 4.5, 4.4, 4.35), 
+                    tand=gen_f420(0.016, 0.016, 0.017, 0.018),
+                     color="#1ea430", opacity=0.3, name="Isola 420 1x7628 8.0mil")
+IS420_2x2116_100 = Material(er=gen_f420(4.75, 4.37, 4.25, 4.2), 
+                    tand=gen_f420(0.016, 0.016, 0.017, 0.017),
+                     color="#1ea430", opacity=0.3, name="Isola 420 2x2116 10.0mil")
+IS420_2x1652_120 = Material(er=gen_f420(4.75, 4.4, 4.25, 4.2), 
+                    tand=gen_f420(0.017, 0.017, 0.018, 0.019),
+                     color="#1ea430", opacity=0.3, name="Isola 420 2x1652 12.0mil")
+IS420_2x7628_140 = Material(er=gen_f420(4.9, 4.57, 4.45, 4.4), 
+                    tand=gen_f420(0.016, 0.016, 0.017, 0.017),
+                     color="#1ea430", opacity=0.3, name="Isola 420 2x7628 14.0mil")
+IS420_2x7628_160 = Material(er=gen_f420(4.85, 4.5, 4.4, 4.35), 
+                    tand=gen_f420(0.016, 0.016, 0.017, 0.018),
+                     color="#1ea430", opacity=0.3, name="Isola 420 2x7628 16.0mil")
+IS420_3x1652_180 = Material(er=gen_f420(4.75, 4.4, 4.25, 4.2), 
+                    tand=gen_f420(0.017, 0.017, 0.018, 0.019),
+                     color="#1ea430", opacity=0.3, name="Isola 420 3x1652 18.0mil")
+IS420_3x7628_200 = Material(er=gen_f420(4.91, 4.6, 4.45, 4.35), 
+                    tand=gen_f420(0.016, 0.016, 0.017, 0.017),
+                     color="#1ea430", opacity=0.3, name="Isola 420 3x7628 20.0mil")
+IS420_3x7628_210 = Material(er=gen_f420(4.9, 4.57, 4.45, 4.4), 
+                    tand=gen_f420(0.016, 0.016, 0.017, 0.017),
+                     color="#1ea430", opacity=0.3, name="Isola 420 3x7628 21.0mil")
+IS420_3x7628_240 = Material(er=gen_f420(4.85, 4.5, 4.4, 4.35), 
+                    tand=gen_f420(0.016, 0.016, 0.017, 0.018),
+                     color="#1ea430", opacity=0.3, name="Isola 420 3x7628 24.0mil")
+IS420_4x7628_280 = Material(er=gen_f420(4.9, 4.57, 4.45, 4.4), 
+                    tand=gen_f420(0.016, 0.016, 0.017, 0.017),
+                     color="#1ea430", opacity=0.3, name="Isola 420 4x7628 28.0mil")
+IS420_4x7628_300 = Material(er=gen_f420(4.87, 4.53, 4.42, 4.37), 
+                    tand=gen_f420(0.016, 0.016, 0.017, 0.018),
+                     color="#1ea430", opacity=0.3, name="Isola 420 4x7628 30.0mil")
+IS420_5x7628_390 = Material(er=gen_f420(4.85, 4.5, 4.4, 4.35), 
+                    tand=gen_f420(0.016, 0.016, 0.017, 0.018),
+                     color="#1ea430", opacity=0.3, name="Isola 420 5x7628 39.0mil")
+IS420_6x7628_470 = Material(er=gen_f420(4.85, 4.5, 4.4, 4.35), 
+                    tand=gen_f420(0.016, 0.016, 0.017, 0.018),
+                     color="#1ea430", opacity=0.3, name="Isola 420 6x7628 47.0mil")
+IS420_8x7628_580 = Material(er=gen_f420(4.89, 4.55, 4.46, 4.36), 
+                    tand=gen_f420(0.016, 0.016, 0.017, 0.017),
+                     color="#1ea430", opacity=0.3, name="Isola 420 8x7628 58.0mil")
+IS420_106_20 = Material(er=gen_f420(4.3, 4.1, 3.95, 3.9), 
+                    tand=gen_f420(0.018, 0.019, 0.02, 0.024),
+                     color="#1ea430", opacity=0.3, name="Isola 420 106 2.0mil")
+IS420_106_23 = Material(er=gen_f420(4.28, 4.02, 3.87, 3.82), 
+                    tand=gen_f420(0.019, 0.02, 0.021, 0.025),
+                     color="#1ea430", opacity=0.3, name="Isola 420 106 2.3mil")
+IS420_1080_28 = Material(er=gen_f420(4.5, 4.3, 4.05, 4.0), 
+                    tand=gen_f420(0.017, 0.018, 0.019, 0.021),
+                     color="#1ea430", opacity=0.3, name="Isola 420 1080 2.8mil")
+IS420_1080_35 = Material(er=gen_f420(4.38, 4.14, 4.0, 3.94), 
+                    tand=gen_f420(0.018, 0.019, 0.02, 0.024),
+                     color="#1ea430", opacity=0.3, name="Isola 420 1080 3.5mil")
+IS420_2113_39 = Material(er=gen_f420(4.64, 4.4, 4.26, 4.2), 
+                    tand=gen_f420(0.017, 0.018, 0.018, 0.02),
+                     color="#1ea430", opacity=0.3, name="Isola 420 2113 3.9mil")
+IS420_2116_46 = Material(er=gen_f420(4.74, 4.5, 4.36, 4.3), 
+                    tand=gen_f420(0.017, 0.017, 0.018, 0.019),
+                     color="#1ea430", opacity=0.3, name="Isola 420 2116 4.6mil")
+IS420_2116_52 = Material(er=gen_f420(4.64, 4.4, 4.26, 4.2), 
+                    tand=gen_f420(0.017, 0.018, 0.018, 0.02),
+                     color="#1ea430", opacity=0.3, name="Isola 420 2116 5.2mil")
+IS420_7628_74 = Material(er=gen_f420(4.85, 4.64, 4.5, 4.34), 
+                    tand=gen_f420(0.016, 0.016, 0.017, 0.018),
+                     color="#1ea430", opacity=0.3, name="Isola 420 7628 7.4mil")
+IS420_7628_83 = Material(er=gen_f420(4.75, 4.54, 4.4, 4.24), 
+                    tand=gen_f420(0.017, 0.017, 0.017, 0.018),
+                     color="#1ea430", opacity=0.3, name="Isola 420 7628 8.3mil")

emerge/materials/rogers.py

@@ -0,0 +1,58 @@
+from .._emerge.material import Material, FreqDependent
+from scipy.interpolate import interp1d
+import numpy as np
+
+FS_300P= np.array([1e9, 3e9, 5e9, 10e9, 15e9, 20e9])
+
+def gen_f300p(*vals) -> FreqDependent:
+    return FreqDependent(scalar=interp1d(FS_300P, np.array(vals), bounds_error=False, fill_value=(vals[0], vals[-1])))
+
+
+
+############################################################
+#                        ROGERS 300P                       #
+############################################################
+
+RO300P_1x1035_20 = Material(er=gen_f300p(3.14, 3.14, 3.13, 3.12, 3.11, 3.10),
+                         tand=gen_f300p(0.0013, 0.0016, 0.0019, 0.0020, 0.0022, 0.0023),
+                         color="#1ea430", opacity=0.3, name='Rogers 300P 1x1035 2.0mil')
+
+RO300P_1x1035_25 = Material(er=gen_f300p(3.07, 3.07, 3.06, 3.05, 3.04, 3.03),
+                         tand=gen_f300p(0.0012, 0.0015, 0.0018, 0.0020, 0.0022, 0.0023),
+                         color="#1ea430", opacity=0.3, name='Rogers 300P 1x1035 2.5mil')
+
+RO300P_1x106_25 = Material(er=gen_f300p(3.02, 3.01, 3.01, 3.00, 2.99, 2.98),
+                           tand=gen_f300p(0.0011, 0.0014, 0.0017, 0.0019, 0.0021, 0.0022),
+                           color="#1ea430", opacity=0.3, name='Rogers 300P 1x106 2.5mil')
+
+RO300P_1x1078_30 = Material(er=gen_f300p(3.18, 3.18, 3.17, 3.16, 3.15, 3.14),
+                            tand=gen_f300p(0.0014, 0.0016, 0.0019, 0.0021, 0.0023, 0.0024),
+                            color="#1ea430", opacity=0.3, name='Rogers 300P 1x1078 3.0mil')
+
+RO300P_1x1035_30 = Material(er=gen_f300p(3.02, 3.01, 3.01, 3.00, 2.99, 2.99),
+                            tand=gen_f300p(0.0011, 0.0014, 0.0017, 0.0019, 0.0021, 0.0022),
+                            color="#1ea430", opacity=0.3, name='Rogers 300P 1x1035 3.0mil')
+
+RO300P_1x1078_35 = Material(er=gen_f300p(3.11, 3.11, 3.10, 3.09, 3.08, 3.07),
+                            tand=gen_f300p(0.0013, 0.0015, 0.0018, 0.0020, 0.0022, 0.0023),
+                            color="#1ea430", opacity=0.3, name='Rogers 300P 1x1078 3.5mil')
+
+RO300P_1x1080_35 = Material(er=gen_f300p(3.11, 3.11, 3.10, 3.09, 3.08, 3.07),
+                            tand=gen_f300p(0.0013, 0.0015, 0.0018, 0.0020, 0.0022, 0.0023),
+                            color="#1ea430", opacity=0.3, name='Rogers 300P 1x1080 3.5mil')
+
+RO300P_1x2113_40 = Material(er=gen_f300p(3.28, 3.27, 3.27, 3.26, 3.25, 3.24),
+                            tand=gen_f300p(0.0015, 0.0017, 0.0020, 0.0022, 0.0024, 0.0025),
+                            color="#1ea430", opacity=0.3, name='Rogers 300P 1x2113 4.0mil')
+
+RO300P_1x1080_40 = Material(er=gen_f300p(3.07, 3.07, 3.06, 3.05, 3.04, 3.03),
+                            tand=gen_f300p(0.0012, 0.0015, 0.0018, 0.0020, 0.0022, 0.0023),
+                            color="#1ea430", opacity=0.3, name='Rogers 300P 1x1080 4.0mil')
+
+RO300P_1x2116_50 = Material(er=gen_f300p(3.29, 3.29, 3.28, 3.27, 3.26, 3.25),
+                            tand=gen_f300p(0.0015, 0.0018, 0.0020, 0.0022, 0.0024, 0.0025),
+                            color="#1ea430", opacity=0.3, name='Rogers 300P 1x2116 5.0mil')
+
+RO300P_1x2116_55 = Material(er=gen_f300p(3.25, 3.25, 3.24, 3.23, 3.22, 3.21),
+                            tand=gen_f300p(0.0015, 0.0017, 0.0020, 0.0021, 0.0023, 0.0024),
+                            color="#1ea430", opacity=0.3, name='Rogers 300P 1x2116 5.5mil')

{emerge-1.0.0.dist-info → emerge-1.0.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: emerge
-Version: 1.0.0
+Version: 1.0.1
 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
@@ -20,6 +20,8 @@ Provides-Extra: cudss
 Requires-Dist: cupy-cuda12x; extra == 'cudss'
 Requires-Dist: nvidia-cudss-cu12; extra == 'cudss'
 Requires-Dist: nvmath-python[cu12]; extra == 'cudss'
+Provides-Extra: dxf
+Requires-Dist: ezdxf; extra == 'dxf'
 Provides-Extra: umfpack
 Requires-Dist: scikit-umfpack; (sys_platform != 'win32') and extra == 'umfpack'
 Description-Content-Type: text/markdown