emerge 0.6.8__py3-none-any.whl → 0.6.9__py3-none-any.whl

emerge/__init__.py

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

emerge/_emerge/geometry.py

@@ -61,8 +61,11 @@ class _GeometryManager:
         self.geometry_list[model].append(geo)
 
     def sign_in(self, modelname: str) -> None:
-        if modelname not in self.geometry_list:
-            self.geometry_list[modelname] = []
+        # if modelname not in self.geometry_list:
+        #     self.geometry_list[modelname] = []
+        if modelname is self.geometry_list:
+            logger.warning(f'{modelname} already exist, Geometries will be reset.')
+        self.geometry_list[modelname] = []
         self.active = modelname
 
     def reset(self, modelname: str) -> None:
@@ -242,6 +245,10 @@ class GeoObject:
     def opacity(self) -> float:
         return self.material.opacity
     
+    @property
+    def _metal(self) -> bool:
+        return self.material._metal
+    
     @property
     def select(self) -> Selection:
         '''Returns a corresponding Face/Domain or Edge Selection object'''

emerge/_emerge/material.py

@@ -289,7 +289,9 @@ class Material:
                  cond: float | MatProperty = 0.0,
                  _neff: float | None = None,
                  color: str ="#BEBEBE",
-                 opacity: float = 1.0):
+                 opacity: float = 1.0,
+                 _metal: bool = False,
+                 name: str = 'unnamed'):
         
         if not isinstance(er, MatProperty):
             er = MatProperty(er)
@@ -300,6 +302,7 @@ class Material:
         if not isinstance(cond, MatProperty):
             cond = MatProperty(cond)
         
+        self.name: str = name
         self.er: MatProperty = er
         self.ur: MatProperty = ur
         self.tand: MatProperty = tand
@@ -313,6 +316,10 @@ class Material:
             self._neff: Callable = lambda f: _neff
         hex_str = self.color.lstrip('#')
         self._color_rgb = tuple(int(hex_str[i:i+2], 16)/255.0 for i in (0, 2, 4))
+        self._metal: bool = _metal
+
+    def __str__(self) -> str:
+        return f'Material({self.name})'
     
     def initialize(self, xs: np.ndarray, ys: np.ndarray, zs: np.ndarray, ids: np.ndarray):
         """Initializes the Material properties to be evaluated at xyz-coordinates for
@@ -364,5 +371,5 @@ class Material:
     def color_rgb(self) -> tuple[float,float,float]:
         return self._color_rgb
      
-AIR = Material(color="#4496f3", opacity=0.05)
-COPPER = Material(cond=5.8e7, color="#62290c")
+AIR = Material(color="#4496f3", opacity=0.05, name='Air')
+COPPER = Material(cond=5.8e7, color="#62290c", _metal=True, name='Copper')

emerge/_emerge/physics/microwave/microwave_bc.py

@@ -354,7 +354,7 @@ class FloquetPort(PortBC):
         if cs is None:
             cs = GCS
         self.port_number: int= port_number
-        self.active: bool = True
+        self.active: bool = False
         self.power: float = power
         self.type: str = 'TEM'
         self.mode: tuple[int,int] = (1,0)
@@ -439,7 +439,6 @@ class ModalPort(PortBC):
     def __init__(self,
                  face: FaceSelection | GeoSurface,
                  port_number: int, 
-                 active: bool = False,
                  cs: CoordinateSystem | None = None,
                  power: float = 1,
                  TEM: bool = False,
@@ -457,7 +456,6 @@ class ModalPort(PortBC):
         Args:
             face (FaceSelection, GeoSurface): The port mode face
             port_number (int): The port number as an integer
-            active (bool, optional): Whether the port is set active. Defaults to False.
             cs (CoordinateSystem, optional): The local coordinate system of the port face. Defaults to None.
             power (float, optional): The radiated power. Defaults to 1.
             TEM (bool, optional): Wether the mode should be considered as a TEM mode. Defaults to False
@@ -467,7 +465,7 @@ class ModalPort(PortBC):
         super().__init__(face)
 
         self.port_number: int= port_number
-        self.active: bool = active
+        self.active: bool = False
         self.power: float = power
         self.alignment_vectors: list[Axis] = []
 
@@ -666,7 +664,7 @@ class RectangularWaveguide(PortBC):
     def __init__(self, 
                  face: FaceSelection | GeoSurface,
                  port_number: int, 
-                 active: bool = False,
+                 mode: tuple[int, int] = (1,0),
                  cs: CoordinateSystem | None = None,
                  dims: tuple[float, float] | None = None,
                  power: float = 1):
@@ -681,7 +679,7 @@ class RectangularWaveguide(PortBC):
         Args:
             face (FaceSelection, GeoSurface): The port boundary face selection
             port_number (int): The port number
-            active (bool, optional): Ther the port is active. Defaults to False.
+            mode: (tuple[int, int], optional): The TE mode number. Defaults to (1,0).
             cs (CoordinateSystem, optional): The local coordinate system. Defaults to None.
             dims (tuple[float, float], optional): The port face. Defaults to None.
             power (float): The port power. Default to 1.
@@ -689,10 +687,10 @@ class RectangularWaveguide(PortBC):
         super().__init__(face)
 
         self.port_number: int= port_number
-        self.active: bool = active
+        self.active: bool = False
         self.power: float = power
         self.type: str = 'TE'
-        self.mode: tuple[int,int] = (1,0)
+        self.mode: tuple[int,int] = mode
 
         if dims is None:
             logger.info("Determining port face based on selection")
@@ -701,13 +699,12 @@ class RectangularWaveguide(PortBC):
             self.dims = (width, height)
             logger.debug(f'Port CS: {self.cs}')
             logger.debug(f'Detected port {self.port_number} size = {width*1000:.1f} mm x {height*1000:.1f} mm')
-        
+        else:
+            self.dims = dims
+            self.cs = cs
         if self.cs is None:
             logger.info('Constructing coordinate system from normal port')
             self.cs = Axis(self.selection.normal).construct_cs()
-        else:
-            self.cs: CoordinateSystem = cs # type: ignore
-
     def get_basis(self) -> np.ndarray:
         return self.cs._basis
         
@@ -755,11 +752,12 @@ class RectangularWaveguide(PortBC):
 
         width = self.dims[0]
         height = self.dims[1]
-
-        E = self.get_amplitude(k0)*np.cos(np.pi*self.mode[0]*(x_local)/width)*np.cos(np.pi*self.mode[1]*(y_local)/height)
-        Ex = 0*E
-        Ey = E
-        Ez = 0*E
+        m, n= self.mode
+        Ev = self.get_amplitude(k0)*np.cos(np.pi*m*(x_local)/width)*np.cos(np.pi*n*(y_local)/height)
+        Eh = self.get_amplitude(k0)*np.sin(np.pi*m*(x_local)/width)*np.sin(np.pi*n*(y_local)/height)
+        Ex = Eh
+        Ey = Ev
+        Ez = 0*Eh
         Exyz =  self._qmode(k0) * np.array([Ex, Ey, Ez])
         return Exyz
 
@@ -787,7 +785,6 @@ class LumpedPort(PortBC):
                  width: float | None = None,
                  height: float | None = None,
                  direction: Axis | None = None,
-                 active: bool = False,
                  power: float = 1,
                  Z0: float = 50):
         """Generates a lumped power boundary condition.
@@ -804,7 +801,6 @@ class LumpedPort(PortBC):
             width (float): The port width (meters).
             height (float): The port height (meters).
             direction (Axis): The port direction as an Axis object (em.Axis(..) or em.ZAX)
-            active (bool, optional): Whether the port is active. Defaults to False.
             power (float, optional): The port output power. Defaults to 1.
             Z0 (float, optional): The port impedance. Defaults to 50.
         """
@@ -819,7 +815,7 @@ class LumpedPort(PortBC):
         
         logger.debug(f'Lumped port: width={1000*width:.1f}mm, height={1000*height:.1f}mm, direction={direction}') # type: ignore
         self.port_number: int= port_number
-        self.active: bool = active
+        self.active: bool = False
 
         self.power: float = power
         self.Z0: float = Z0

emerge/_emerge/physics/microwave/microwave_data.py

@@ -20,7 +20,7 @@ from ...simulation_data import BaseDataset, DataContainer
 from ...elements.femdata import FEMBasis
 from dataclasses import dataclass
 import numpy as np
-from typing import Literal
+from typing import Literal, Callable
 from loguru import logger
 from .adaptive_freq import SparamModel
 from ...cs import Axis, _parse_axis
@@ -1018,7 +1018,8 @@ class MWField:
         k0 = self.k0
         return vertices, triangles, E, H, origin, k0
     
-    def optycal_antenna(self, faces: FaceSelection | GeoSurface | None = None,
+    def optycal_antenna(self, 
+                        faces: FaceSelection | GeoSurface | None = None,
                         origin: tuple[float, float, float] | None = None,
                         syms: list[Literal['Ex','Ey','Ez', 'Hx','Hy','Hz']] | None = None) -> dict:
         """Export this models exterior to an Optical acceptable dataset
@@ -1036,6 +1037,32 @@ class MWField:
     
         return dict(freq=freq, ff_function=function)
 
+    # def surface_integral(self, faces: FaceSelection | GeoSurface, fieldfunction: Callable) -> float | complex:
+    #     """Computes a surface integral on the selected faces. 
+    
+    #     The fieldfunction argument must be a callable of a single argument x, which will
+    #     be of type EHField which is restuned by the field.interpolate(x,y,z) function. It has
+    #     fields like Ez, Ey, Sx etc that can be called. 
+
+    #     Args:
+    #         faces (FaceSelection | GeoSurface): _description_
+    #         fieldfunction (Callable): _description_
+
+    #     Returns:
+    #         float | complex: _description_
+    #     """
+    #     from ...mth.integrals import surface_integral
+        
+    #     def ff(x, y, z):
+    #         fieldobj = self.interpolate(x,y,z)
+    #         return fieldfunction(fieldobj)
+        
+    #     nodes = self.mesh.get_nodes(faces.tags)
+    #     triangles = self.mesh.get_triangles(faces.tags)
+        
+    #     return surface_integral(nodes, triangles, ff)
+        
+        
 class MWScalar:
     """The MWDataSet class stores solution data of FEM Time Harmonic simulations.
     """

emerge/_emerge/plot/pyvista/display.py

@@ -284,15 +284,16 @@ class PVDisplay(BaseDisplay):
         self._ruler.min_length = max(1e-3, min(self._mesh.edge_lengths))
         self._update_camera()
         self._add_aux_items()
+        # self._plot.renderer.enable_depth_peeling(20, 0.8)
+        # self._plot.enable_anti_aliasing(self.set.anti_aliassing)
         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()
     
     def set_mesh(self, mesh: Mesh3D):
@@ -440,8 +441,20 @@ class PVDisplay(BaseDisplay):
         opacity = obj.opacity
         line_width = 0.5
         color = obj.color_rgb
+        metal = obj._metal
         style='surface'
         
+        # Default render settings
+        metallic = 0.05
+        roughness = 0.5
+        pbr = False
+        
+        if metal:
+            pbr = True
+            metallic = 0.8
+            roughness = 0.3
+        
+        # Default keyword arguments when plotting Mesh mode.
         if mesh is True:
             show_edges = True
             opacity = 0.7
@@ -449,13 +462,28 @@ class PVDisplay(BaseDisplay):
             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)
+        # Defining the default keyword arguments for PyVista
+        kwargs = setdefault(kwargs, color=color, 
+                            opacity=opacity, 
+                            metallic=metallic, 
+                            pbr=pbr,
+                            roughness=roughness,
+                            line_width=line_width, 
+                            show_edges=show_edges, 
+                            pickable=True, 
+                            style=style)
         mesh_obj = self.mesh(obj)
         
         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)
+        
+        # Push 3D Geometries back to avoid Z-fighting with 2D geometries.
+        if obj.dim==3:
+            mapper = actor.GetMapper()
+            mapper.SetResolveCoincidentTopology(1)
+            mapper.SetRelativeCoincidentTopologyPolygonOffsetParameters(1,1)
+        
         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):

emerge/_emerge/plot/pyvista/display_settings.py

@@ -1,3 +1,4 @@
+from typing import Literal
 
 class PVDisplaySettings:
 
@@ -22,4 +23,6 @@ class PVDisplaySettings:
         self.background_bottom: str = "#c0d2e8"
         self.background_top: str = "#ffffff"
         self.grid_line_color: str = "#8e8e8e"
-        self.z_boost: float = 1e-6
+        self.z_boost: float = 0#1e-9
+        self.depth_peeling: bool = True
+        self.anti_aliassing: Literal["msaa","ssaa",'fxaa'] = "msaa"

emerge/_emerge/plot/simple_plots.py

@@ -406,21 +406,21 @@ and sparse frequency annotations (e.g., labeled by frequency).
     plt.tight_layout()
     plt.show()
 
-def plot_sp(f: np.ndarray, S: list[np.ndarray] | np.ndarray, 
-                      dblim=[-40, 5], 
-                    xunit="GHz", 
-                    levelindicator: int | float | None = None, 
-                    noise_floor=-150, 
-                    fill_areas: list[tuple] | None = None, 
-                    spec_area: list[tuple[float,...]] | None = None,
-                    unwrap_phase=False, 
-                    logx: bool = False,
-                    labels: list[str] | None = None,
-                    linestyles: list[str] | None = None,
-                    colorcycle: list[int] | None = None,
-                    filename: str | None = None,
-                    show_plot: bool = True,
-                    figdata: tuple | None = None) -> tuple[plt.Figure, plt.Axes, plt.Axes]:
+def plot_sp(f: np.ndarray | list[np.ndarray], S: list[np.ndarray] | np.ndarray, 
+            dblim=[-40, 5], 
+            xunit="GHz", 
+            levelindicator: int | float | None = None, 
+            noise_floor=-150, 
+            fill_areas: list[tuple] | None = None, 
+            spec_area: list[tuple[float,...]] | None = None,
+            unwrap_phase=False, 
+            logx: bool = False,
+            labels: list[str] | None = None,
+            linestyles: list[str] | None = None,
+            colorcycle: list[int] | None = None,
+            filename: str | None = None,
+            show_plot: bool = True,
+            figdata: tuple | None = None) -> tuple[plt.Figure, plt.Axes, plt.Axes]:
     """Plot S-parameters in dB and phase
 
     Args:
@@ -444,7 +444,12 @@ def plot_sp(f: np.ndarray, S: list[np.ndarray] | np.ndarray,
         Ss = [S]
     else:
         Ss = S
-
+        
+    if not isinstance(f, list):
+        fs = [f for _ in Ss]
+    else:
+        fs = f
+    
     if linestyles is None:
         linestyles = ['-' for _ in S]
 
@@ -452,7 +457,8 @@ def plot_sp(f: np.ndarray, S: list[np.ndarray] | np.ndarray,
         colorcycle = [i for i, S in enumerate(S)]
 
     unitdivider: dict[str, float] = {"MHz": 1e6, "GHz": 1e9, "kHz": 1e3}
-    fnew = f / unitdivider[xunit]
+    
+    fs = [f / unitdivider[xunit] for f in fs]
 
     if figdata is None:
         # Create two subplots: one for magnitude and one for phase
@@ -463,10 +469,10 @@ def plot_sp(f: np.ndarray, S: list[np.ndarray] | np.ndarray,
     minphase, maxphase = -180, 180
 
     maxy = 0
-    for s, ls, cid in zip(Ss, linestyles, colorcycle):
+    for f, s, ls, cid in zip(fs, Ss, linestyles, colorcycle):
         # Calculate and plot magnitude in dB
         SdB = 20 * np.log10(np.abs(s) + 10**(noise_floor/20) * np.random.rand(*s.shape) + 10**((noise_floor-30)/20))
-        ax_mag.plot(fnew, SdB, label="Magnitude (dB)", linestyle=ls, color=EMERGE_COLORS[cid % len(EMERGE_COLORS)])
+        ax_mag.plot(f, SdB, label="Magnitude (dB)", linestyle=ls, color=EMERGE_COLORS[cid % len(EMERGE_COLORS)])
         if np.max(SdB) > maxy:
             maxy = np.max(SdB)
         # Calculate and plot phase in degrees
@@ -475,12 +481,12 @@ def plot_sp(f: np.ndarray, S: list[np.ndarray] | np.ndarray,
             phase = np.unwrap(phase, period=360)
             minphase = min(np.min(phase), minphase)
             maxphase = max(np.max(phase), maxphase)
-        ax_phase.plot(fnew, phase, label="Phase (degrees)", linestyle=ls, color=EMERGE_COLORS[cid % len(EMERGE_COLORS)])
+        ax_phase.plot(f, phase, label="Phase (degrees)", linestyle=ls, color=EMERGE_COLORS[cid % len(EMERGE_COLORS)])
 
         # Annotate level indicators if specified
         if isinstance(levelindicator, (int, float)) and levelindicator is not None:
             lvl = levelindicator
-            fcross = hintersections(fnew, SdB, lvl)
+            fcross = hintersections(f, SdB, lvl)
             for fs in fcross:
                 ax_mag.annotate(
                     f"{str(fs)[:4]}{xunit}",
@@ -500,16 +506,18 @@ def plot_sp(f: np.ndarray, S: list[np.ndarray] | np.ndarray,
             f2 = fmax / unitdivider[xunit]
             ax_mag.fill_between([f1, f2], vmin,vmax, color='red', alpha=0.2)
     # Configure magnitude plot (ax_mag)
+    fmin = min([min(f) for f in fs])
+    fmax = max([max(f) for f in fs])
     ax_mag.set_ylabel("Magnitude (dB)")
     ax_mag.set_xlabel(f"Frequency ({xunit})")
-    ax_mag.axis([min(fnew), max(fnew), dblim[0], max(maxy*1.1,dblim[1])]) # type: ignore
+    ax_mag.axis([fmin, fmax, dblim[0], max(maxy*1.1,dblim[1])]) # type: ignore
     ax_mag.axhline(y=0, color="k", linewidth=1)
     ax_mag.xaxis.set_minor_locator(tck.AutoMinorLocator(2))
     ax_mag.yaxis.set_minor_locator(tck.AutoMinorLocator(2))
     # Configure phase plot (ax_phase)
     ax_phase.set_ylabel("Phase (degrees)")
     ax_phase.set_xlabel(f"Frequency ({xunit})")
-    ax_phase.axis([min(fnew), max(fnew), minphase, maxphase]) # type: ignore
+    ax_phase.axis([fmin, fmax, minphase, maxphase]) # type: ignore
     ax_phase.xaxis.set_minor_locator(tck.AutoMinorLocator(2))
     ax_phase.yaxis.set_minor_locator(tck.AutoMinorLocator(2))
     if logx:
@@ -612,6 +620,8 @@ def plot_ff(
 def plot_ff_polar(
     theta: np.ndarray,
     E: Union[np.ndarray, Sequence[np.ndarray]],
+    dB: bool = False,
+    dBfloor: float = -30,
     labels: Optional[List[str]] = None,
     linestyles: Union[str, List[str]] = "-",
     linewidth: float = 2.0,
@@ -649,6 +659,8 @@ def plot_ff_polar(
         E_list = list(E)
     n_series = len(E_list)
 
+    if dB:
+        E_list = [20*np.log10(np.clip(np.abs(e), a_min=10**(dBfloor/20), a_max = 1e9)) for e in E_list]
     # Style broadcasting
     def _broadcast(param, default):
         if isinstance(param, list):
@@ -665,11 +677,15 @@ def plot_ff_polar(
     ax.set_theta_zero_location(zero_location) # type: ignore
     ax.set_theta_direction(-1 if clockwise else 1) # type: ignore
     ax.set_rlabel_position(rlabel_angle) # type: ignore
+    ymin = min([min(E) for E in E_list])
+    ymax = max([max(E) for E in E_list])
+    yrange = ymax-ymin
 
+    ax.set_ylim(ymin-0.05*yrange, ymax+0.05*yrange)
     for i, Ei in enumerate(E_list):
-        mag = np.abs(Ei)
+        
         ax.plot(
-            theta, mag,
+            theta, Ei,
             linestyle=linestyles[i],
             linewidth=linewidth,
             marker=markers[i],

emerge/_emerge/projects/_load_base.txt

@@ -17,8 +17,7 @@ with em.Simulation("myfile", load_file=True) as m:
     S11 = data.S(1,1)
     S21 = data.S(2,1)
     plt.plot_sp(f/1e9, [S11, S21])
-
-    m.set_mesh(m.data.mw.field[0].mesh)
+    
     m.display.add_object(m['box'])
     m.display.add_surf(*m.data.mw.field[0].cutplane(1*mm, z=5*mm).scalar('Ez','real'))
     m.display.show()

emerge/_emerge/selection.py

@@ -205,6 +205,10 @@ class Selection:
     def centers(self) -> list[tuple[float, float, float],]:
         return [gmsh.model.occ.get_center_of_mass(self.dim, tag) for tag in self.tags]
     
+    @property
+    def _metal(self) -> bool:
+        return False
+    
     @property
     def opacity(self) -> float:
         return 0.6

emerge/_emerge/simmodel.py

@@ -31,7 +31,7 @@ from typing import Literal, Generator, Any
 from loguru import logger
 import numpy as np
 import gmsh # type: ignore
-import joblib # type: ignore
+import cloudpickle
 import os
 import inspect
 from pathlib import Path
@@ -181,7 +181,10 @@ class Simulation:
 
             # Restier the Exit GMSH function on proper program abortion
             register(self._exit_gmsh)
-
+        else:
+            gmsh.finalize()
+            gmsh.initialize()
+            
         # Create a new GMSH model or load it
         if not self.load_file:
             gmsh.model.add(self.modelname)
@@ -283,7 +286,8 @@ class Simulation:
         # Pack and save data
         dataset = dict(simdata=self.data, mesh=self.mesh)
         data_path = self.modelpath / 'simdata.emerge'
-        joblib.dump(dataset, str(data_path))
+        with open(str(data_path), "wb") as f_out:
+            cloudpickle.dump(dataset, f_out)
         logger.info(f"Saved simulation data to: {data_path}")
 
     def load(self) -> None:
@@ -304,7 +308,8 @@ class Simulation:
         #self.mesh.update([])
 
         # Load data
-        datapack = joblib.load(str(data_path))
+        with open(str(data_path), "rb") as f_in:
+            datapack= cloudpickle.load(f_in)
         self.data = datapack['simdata']
         self._set_mesh(datapack['mesh'])
         logger.info(f"Loaded simulation data from: {data_path}")

emerge/lib.py

@@ -26,55 +26,57 @@ VACUUM = Material(color="#2d8cd5", opacity=0.05)
 ############################################################
 
 GREY = "#bfbfbf"
-MET_ALUMINUM         = Material(cond=3.77e7,  color=GREY, opacity=0.5)
-MET_CARBON           = Material(cond=3.33e4,  color=GREY, opacity=0.5)
-MET_CHROMIUM         = Material(cond=5.56e6,  color=GREY, opacity=0.5)
-MET_COPPER           = Material(cond=5.8e7,   color="#62290c", opacity=1.0)
-MET_GOLD             = Material(cond=4.10e7,  color="#d4af37", opacity=0.5)
-MET_INDIUM           = Material(cond=6.44e6,  color=GREY, opacity=0.5)
-MET_IRIDIUM          = Material(cond=2.13e7,  color=GREY, opacity=0.5)
-MET_IRON             = Material(cond=1.04e7,  color="#aaaaaa", opacity=0.5)
-MET_LEAD             = Material(cond=4.84e6,  color=GREY, opacity=0.5)
-MET_MAGNESIUM        = Material(cond=2.38e7,  color=GREY, opacity=0.5)
-MET_NICKEL           = Material(cond=1.14e7,  color=GREY, opacity=0.5)
-MET_NICHROME         = Material(cond=9.09e5,  color=GREY, opacity=0.5)
-MET_PALLADIUM        = Material(cond=9.42e6,  color=GREY, opacity=0.5)
-MET_PLATINUM         = Material(cond=9.42e6,  color=GREY, opacity=0.5)
-MET_RHODIUM          = Material(cond=2.22e7,  color=GREY, opacity=0.5)
-MET_SILVER           = Material(cond=6.29e7,  color=GREY, opacity=0.5)
-MET_TANTALUM         = Material(cond=6.44e6,  color=GREY, opacity=0.5)
-MET_TANTALUM_NITRIDE = Material(cond=3.97e5,  color=GREY, opacity=0.5)
-MET_TIN              = Material(cond=8.66e6,  color=GREY, opacity=0.5)
-MET_TITANIUM         = Material(cond=1.82e6,  color=GREY, opacity=0.5)
-MET_TUNGSTEN         = Material(cond=1.79e7,  color=GREY, opacity=0.5)
-MET_ZINC             = Material(cond=1.76e7,  color=GREY, opacity=0.5)
-MET_ZIRCONIUM        = Material(cond=2.44e7,  color=GREY, opacity=0.5)
+MET_ALUMINUM         = Material(cond=3.77e7,  color=GREY,     opacity=0.5, _metal=True, name="Aluminum")
+MET_CARBON           = Material(cond=3.33e4,  color=GREY,     opacity=0.5, _metal=True, name="Carbon")
+MET_CHROMIUM         = Material(cond=5.56e6,  color=GREY,     opacity=0.5, _metal=True, name="Chromium")
+MET_COPPER           = Material(cond=5.8e7,   color="#62290c", opacity=1.0, _metal=True, name="Copper")
+MET_GOLD             = Material(cond=4.10e7,  color="#d4af37", opacity=0.5, _metal=True, name="Gold")
+MET_INDIUM           = Material(cond=6.44e6,  color=GREY,     opacity=0.5, _metal=True, name="Indium")
+MET_IRIDIUM          = Material(cond=2.13e7,  color=GREY,     opacity=0.5, _metal=True, name="Iridium")
+MET_IRON             = Material(cond=1.04e7,  color="#aaaaaa", opacity=0.5, _metal=True, name="Iron")
+MET_LEAD             = Material(cond=4.84e6,  color=GREY,     opacity=0.5, _metal=True, name="Lead")
+MET_MAGNESIUM        = Material(cond=2.38e7,  color=GREY,     opacity=0.5, _metal=True, name="Magnesium")
+MET_NICKEL           = Material(cond=1.14e7,  color=GREY,     opacity=0.5, _metal=True, name="Nickel")
+MET_NICHROME         = Material(cond=9.09e5,  color=GREY,     opacity=0.5, _metal=True, name="Nichrome")
+MET_PALLADIUM        = Material(cond=9.42e6,  color=GREY,     opacity=0.5, _metal=True, name="Palladium")
+MET_PLATINUM         = Material(cond=9.42e6,  color=GREY,     opacity=0.5, _metal=True, name="Platinum")
+MET_RHODIUM          = Material(cond=2.22e7,  color=GREY,     opacity=0.5, _metal=True, name="Rhodium")
+MET_SILVER           = Material(cond=6.29e7,  color=GREY,     opacity=0.5, _metal=True, name="Silver")
+MET_TANTALUM         = Material(cond=6.44e6,  color=GREY,     opacity=0.5, _metal=True, name="Tantalum")
+MET_TANTALUM_NITRIDE = Material(cond=3.97e5,  color=GREY,     opacity=0.5, _metal=True, name="Tantalum Nitride")
+MET_TIN              = Material(cond=8.66e6,  color=GREY,     opacity=0.5, _metal=True, name="Tin")
+MET_TITANIUM         = Material(cond=1.82e6,  color=GREY,     opacity=0.5, _metal=True, name="Titanium")
+MET_TUNGSTEN         = Material(cond=1.79e7,  color=GREY,     opacity=0.5, _metal=True, name="Tungsten")
+MET_ZINC             = Material(cond=1.76e7,  color=GREY,     opacity=0.5, _metal=True, name="Zinc")
+MET_ZIRCONIUM        = Material(cond=2.44e7,  color=GREY,     opacity=0.5, _metal=True, name="Zirconium")
+
 
 
 ############################################################
 #                       SEMICONDUCTORS                     #
 ############################################################
 
-SEMI_SILICON       = Material(er=11.7,  tand=0.005,     color="#b4b4b4", opacity=0.5) #  Crystalline Si
-SEMI_SILICON_N     = Material(er=7.5,   tand=0.0003,    color="#a0a0a0", opacity=0.5) #  Silicon Nitride (Si₃N₄)
-SEMI_SILICON_OXIDE = Material(er=3.9,   tand=0.0001,    color="#e0e0e0", opacity=0.5) #  Silicon Dioxide (SiO₂)
-SEMI_GERMANIUM     = Material(er=16.0,  tand=0.001,     color="#787878", opacity=0.5)
-SEMI_GAAS          = Material(er=13.1,  tand=0.0016,    color="#aa8888", opacity=0.5) #  Gallium Arsenide
-SEMI_GA_N          = Material(er=8.9,   tand=0.002,     color="#8888cc", opacity=0.5) #  Gallium Nitride
-SEMI_INP           = Material(er=12.5,  tand=0.0015,    color="#cc99aa", opacity=0.5) #  Indium Phosphide
-SEMI_ALN           = Material(er=8.6,   tand=0.0003,    color="#ccccee", opacity=0.5) #  Aluminum Nitride
-SEMI_AL2O3         = Material(er=9.8,   tand=0.0002,    color="#eaeaea", opacity=0.5) #  Alumina
-SEMI_SAPPHIRE      = Material(er=9.4,   tand=0.0001,    color="#ddddff", opacity=0.5)
-SEMI_DIAMOND       = Material(er=5.5,   tand=0.00005,   color="#cceeff", opacity=0.5) #  Synthetic CVD diamond
-SEMI_HBN           = Material(er=4.0,   tand=0.0001,    color="#eeeeff", opacity=0.5) #  Hexagonal Boron Nitride
-SEMI_SIOXNY        = Material(er=5.0,   tand=0.002,     color="#ddddee", opacity=0.5) #  Silicon Oxynitride (SiOxNy)
+SEMI_SILICON       = Material(er=11.7,  tand=0.005,   color="#b4b4b4", opacity=0.5, _metal=True, name="Silicon")              # Crystalline Si
+SEMI_SILICON_N     = Material(er=7.5,   tand=0.0003,  color="#a0a0a0", opacity=0.5, _metal=True, name="Silicon Nitride")      # Si₃N₄
+SEMI_SILICON_OXIDE = Material(er=3.9,   tand=0.0001,  color="#e0e0e0", opacity=0.5, _metal=True, name="Silicon Dioxide")      # SiO₂
+SEMI_GERMANIUM     = Material(er=16.0,  tand=0.001,   color="#787878", opacity=0.5, _metal=True, name="Germanium")
+SEMI_GAAS          = Material(er=13.1,  tand=0.0016,  color="#aa8888", opacity=0.5, _metal=True, name="Gallium Arsenide")
+SEMI_GA_N          = Material(er=8.9,   tand=0.002,   color="#8888cc", opacity=0.5, _metal=True, name="Gallium Nitride")
+SEMI_INP           = Material(er=12.5,  tand=0.0015,  color="#cc99aa", opacity=0.5, _metal=True, name="Indium Phosphide")
+SEMI_ALN           = Material(er=8.6,   tand=0.0003,  color="#ccccee", opacity=0.5, _metal=True, name="Aluminum Nitride")
+SEMI_AL2O3         = Material(er=9.8,   tand=0.0002,  color="#eaeaea", opacity=0.5, _metal=True, name="Alumina")              # Al₂O₃
+SEMI_SAPPHIRE      = Material(er=9.4,   tand=0.0001,  color="#ddddff", opacity=0.5, _metal=True, name="Sapphire")
+SEMI_DIAMOND       = Material(er=5.5,   tand=0.00005, color="#cceeff", opacity=0.5, _metal=True, name="Diamond")              # Synthetic CVD diamond
+SEMI_HBN           = Material(er=4.0,   tand=0.0001,  color="#eeeeff", opacity=0.5, _metal=True, name="Hexagonal Boron Nitride")
+SEMI_SIOXNY        = Material(er=5.0,   tand=0.002,   color="#ddddee", opacity=0.5, _metal=True, name="Silicon Oxynitride")   # SiOxNy
+
 
 ############################################################
 #                          LIQUIDS                         #
 ############################################################
 
-LIQ_WATER     = Material(er=80.1,    cond=0.0,  color="#0080ff", opacity=0.3)
-LIQ_FERRITE   = Material(er=12.0,    ur=2000, tand=0.02, color="#994d4d", opacity=0.3)
+LIQ_WATER     = Material(er=80.1,    cond=0.0,  color="#0080ff", opacity=0.3, _metal=True, name='Water')
+LIQ_FERRITE   = Material(er=12.0,    ur=2000, tand=0.02, color="#994d4d", opacity=0.3, name='Ferrite')
 
 ############################################################
 #                        DIELECTRICS                       #
@@ -84,224 +86,228 @@ LIQ_FERRITE   = Material(er=12.0,    ur=2000, tand=0.02, color="#994d4d", opacit
 #  respective owners.  Use of them here does not imply any affiliation with or
 #  endorsement by those owners.
 
-DIEL_PTFE           = Material(er=2.1, tand=0.0002, color="#21912b", opacity=0.3)
-DIEL_POLYIMIDE      = Material(er=3.4, tand=0.02, color="#b8b8b8")
-DIEL_CERAMIC        = Material(er=6.0, tand=0.001, color="#efead1")
-DIEL_AD10           = Material(er=10.2, tand=0.0078, color="#21912b", opacity=0.3)
-DIEL_AD1000         = Material(er=10.2, tand=0.0023, color="#21912b", opacity=0.3)
-DIEL_AD250          = Material(er=2.5, tand=0.0018, color="#21912b", opacity=0.3)
-DIEL_AD250_PIM      = Material(er=2.5, tand=0.0018, color="#21912b", opacity=0.3)
-DIEL_AD250A         = Material(er=2.50, tand=0.0015, color="#21912b", opacity=0.3)
-DIEL_AD250C         = Material(er=2.50, tand=0.0014, color="#21912b", opacity=0.3)
-DIEL_AD255          = Material(er=2.55, tand=0.0018, color="#21912b", opacity=0.3)
-DIEL_AD255A         = Material(er=2.55, tand=0.0015, color="#21912b", opacity=0.3)
-DIEL_AD255C         = Material(er=2.55, tand=0.0014, color="#21912b", opacity=0.3)
-DIEL_AD260A         = Material(er=2.60, tand=0.0017, color="#21912b", opacity=0.3)
-DIEL_AD270          = Material(er=2.7, tand=0.0023, color="#21912b", opacity=0.3)
-DIEL_AD300          = Material(er=3, tand=0.003, color="#21912b", opacity=0.3)
-DIEL_AD300_PIM      = Material(er=3, tand=0.003, color="#21912b", opacity=0.3)
-DIEL_AD300A         = Material(er=3.00, tand=0.002, color="#21912b", opacity=0.3)
-DIEL_AD300C         = Material(er=2.97, tand=0.002, color="#21912b", opacity=0.3)
-DIEL_AD320          = Material(er=3.2, tand=0.0038, color="#21912b", opacity=0.3)
-DIEL_AD320_PIM      = Material(er=3.2, tand=0.003, color="#21912b", opacity=0.3)
-DIEL_AD320A         = Material(er=3.20, tand=0.0032, color="#21912b", opacity=0.3)
-DIEL_AD350          = Material(er=3.5, tand=0.003, color="#21912b", opacity=0.3)
-DIEL_AD350_PIM      = Material(er=3.5, tand=0.003, color="#21912b", opacity=0.3)
-DIEL_AD350A         = Material(er=3.50, tand=0.003, color="#21912b", opacity=0.3)
-DIEL_AD410          = Material(er=4.1, tand=0.003, color="#21912b", opacity=0.3)
-DIEL_AD430          = Material(er=4.3, tand=0.003, color="#21912b", opacity=0.3)
-DIEL_AD450          = Material(er=4.5, tand=0.0035, color="#21912b", opacity=0.3)
-DIEL_AD450A         = Material(er=4.5, tand=0.0035, color="#21912b", opacity=0.3)
-DIEL_AD5            = Material(er=5.1, tand=0.003, color="#21912b", opacity=0.3)
-DIEL_AD600          = Material(er=5.90, tand=0.003, color="#21912b", opacity=0.3)
-DIEL_AR1000         = Material(er=9.8, tand=0.003, color="#21912b", opacity=0.3)
-DIEL_CER_10         = Material(er=10.00, tand=0.0035, color="#21912b", opacity=0.3)
-DIEL_CLTE           = Material(er=2.96, tand=0.0023, color="#21912b", opacity=0.3)
-DIEL_CLTE_AT        = Material(er=3.00, tand=0.0013, color="#21912b", opacity=0.3)
-DIEL_CLTE_LC        = Material(er=2.94, tand=0.0025, color="#21912b", opacity=0.3)
-DIEL_CLTE_XT        = Material(er=2.94, tand=0.0012, color="#21912b", opacity=0.3)
-DIEL_COMCLAD_HF_ER2 = Material(er=2, tand=0.0025, color="#21912b", opacity=0.3)
-DIEL_COMCLAD_HF_ER3 = Material(er=3, tand=0.0025, color="#21912b", opacity=0.3)
-DIEL_COMCLAD_HF_ER4 = Material(er=4, tand=0.0025, color="#21912b", opacity=0.3)
-DIEL_COMCLAD_HF_ER5 = Material(er=5, tand=0.0025, color="#21912b", opacity=0.3)
-DIEL_COMCLAD_HF_ER6 = Material(er=6, tand=0.0025, color="#21912b", opacity=0.3)
-DIEL_COPPER_CLAD_ULTEM = Material(er=3.05, tand=0.003, color="#21912b", opacity=0.3)
-DIEL_CUCLAD_217LX   = Material(er=2.17, tand=0.0009, color="#21912b", opacity=0.3)
-DIEL_CUCLAD_233LX   = Material(er=2.33, tand=0.0013, color="#21912b", opacity=0.3)
-DIEL_CUCLAD_250GT   = Material(er=2.5, tand=0.0018, color="#21912b", opacity=0.3)
-DIEL_CUCLAD_250GX   = Material(er=2.4, tand=0.0018, color="#21912b", opacity=0.3)
-DIEL_CUFLON         = Material(er=2.05, tand=0.00045, color="#21912b", opacity=0.3)
-DIEL_DICLAD_522     = Material(er=2.4, tand=0.0018, color="#21912b", opacity=0.3)
-DIEL_DICLAD_527     = Material(er=2.4, tand=0.0018, color="#21912b", opacity=0.3)
-DIEL_DICLAD_870     = Material(er=2.33, tand=0.0013, color="#21912b", opacity=0.3)
-DIEL_DICLAD_880     = Material(er=2.17, tand=0.0009, color="#21912b", opacity=0.3)
-DIEL_DICLAD_880_PIM = Material(er=2.17, tand=0.0009, color="#21912b", opacity=0.3)
-DIEL_GETEK          = Material(er=3.5, tand=0.01, color="#21912b", opacity=0.3)
-DIEL_GETEK          = Material(er=3.8, tand=0.01, color="#21912b", opacity=0.3)
-DIEL_IS6802_80      = Material(er=2.80, tand=0.003, color="#21912b", opacity=0.3)
-DIEL_IS6803_00      = Material(er=3.00, tand=0.003, color="#21912b", opacity=0.3)
-DIEL_IS6803_20      = Material(er=3.20, tand=0.003, color="#21912b", opacity=0.3)
-DIEL_IS6803_33      = Material(er=3.33, tand=0.003, color="#21912b", opacity=0.3)
-DIEL_IS6803_38      = Material(er=3.38, tand=0.0032, color="#21912b", opacity=0.3)
-DIEL_IS6803_45      = Material(er=3.45, tand=0.0035, color="#21912b", opacity=0.3)
-DIEL_ISOCLAD_917    = Material(er=2.17, tand=0.0013, color="#21912b", opacity=0.3)
-DIEL_ISOCLAD_933    = Material(er=2.33, tand=0.0016, color="#21912b", opacity=0.3)
-DIEL_ISOLA_I_TERA_MT = Material(er=3.45, tand=0.0030,      color="#3c9747")
-DIEL_ISOLA_NELCO_4000_13 = Material(er=3.77, tand=0.008,  color="#3c9747")
-DIEL_MAT_25N        = Material(er=3.38, tand=0.0025, color="#21912b", opacity=0.3)
-DIEL_MAT25FR        = Material(er=3.58, tand=0.0035, color="#21912b", opacity=0.3)
-DIEL_MEGTRON6R5775  = Material(er=3.61, tand=0.004, color="#21912b", opacity=0.3)
-DIEL_MERCURYWAVE_9350 = Material(er=3.5, tand=0.004, color="#21912b", opacity=0.3)
-DIEL_MULTICLAD_HF   = Material(er=3.7, tand=0.0045, color="#21912b", opacity=0.3)
-DIEL_N_8000         = Material(er=3.5, tand=0.011, color="#21912b", opacity=0.3)
-DIEL_N4350_13RF     = Material(er=3.5, tand=0.0065, color="#21912b", opacity=0.3)
-DIEL_N4380_13RF     = Material(er=3.8, tand=0.007, color="#21912b", opacity=0.3)
-DIEL_N8000Q         = Material(er=3.2, tand=0.006, color="#21912b", opacity=0.3)
-DIEL_N9300_13RF     = Material(er=3, tand=0.004, color="#21912b", opacity=0.3)
-DIEL_N9320_13RF     = Material(er=3.2, tand=0.0045, color="#21912b", opacity=0.3)
-DIEL_N9338_13RF     = Material(er=3.38, tand=0.0046, color="#21912b", opacity=0.3)
-DIEL_N9350_13RF     = Material(er=3.48, tand=0.0055, color="#21912b", opacity=0.3)
-DIEL_NH9294         = Material(er=2.94, tand=0.0022, color="#21912b", opacity=0.3)
-DIEL_NH9300         = Material(er=3.00, tand=0.0023, color="#21912b", opacity=0.3)
-DIEL_NH9320         = Material(er=3.20, tand=0.0024, color="#21912b", opacity=0.3)
-DIEL_NH9338         = Material(er=3.38, tand=0.0025, color="#21912b", opacity=0.3)
-DIEL_NH9348         = Material(er=3.48, tand=0.003, color="#21912b", opacity=0.3)
-DIEL_NH9350         = Material(er=3.50, tand=0.003, color="#21912b", opacity=0.3)
-DIEL_NH9410         = Material(er=4.10, tand=0.003, color="#21912b", opacity=0.3)
-DIEL_NH9450         = Material(er=4.50, tand=0.003, color="#21912b", opacity=0.3)
-DIEL_NORCLAD        = Material(er=2.55, tand=0.0011, color="#21912b", opacity=0.3)
-DIEL_NX9240         = Material(er=2.40, tand=0.0016, color="#21912b", opacity=0.3)
-DIEL_NX9245         = Material(er=2.45, tand=0.0016, color="#21912b", opacity=0.3)
-DIEL_NX9250         = Material(er=2.50, tand=0.0017, color="#21912b", opacity=0.3)
-DIEL_NX9255         = Material(er=2.55, tand=0.0018, color="#21912b", opacity=0.3)
-DIEL_NX9260         = Material(er=2.60, tand=0.0019, color="#21912b", opacity=0.3)
-DIEL_NX9270         = Material(er=2.70, tand=0.002, color="#21912b", opacity=0.3)
-DIEL_NX9294         = Material(er=2.94, tand=0.0022, color="#21912b", opacity=0.3)
-DIEL_NX9300         = Material(er=3.00, tand=0.0023, color="#21912b", opacity=0.3)
-DIEL_NX9320         = Material(er=3.20, tand=0.0024, color="#21912b", opacity=0.3)
-DIEL_NY9208         = Material(er=2.08, tand=0.0006, color="#21912b", opacity=0.3)
-DIEL_NY9217         = Material(er=2.17, tand=0.0008, color="#21912b", opacity=0.3)
-DIEL_NY9220         = Material(er=2.20, tand=0.0009, color="#21912b", opacity=0.3)
-DIEL_NY9233         = Material(er=2.33, tand=0.0011, color="#21912b", opacity=0.3)
-DIEL_POLYGUIDE      = Material(er=2.320, tand=0.0005, color="#21912b", opacity=0.3)
-DIEL_RF_30          = Material(er=3.00, tand=0.0019, color="#21912b", opacity=0.3)
-DIEL_RF_301         = Material(er=2.97, tand=0.0018, color="#21912b", opacity=0.3)
-DIEL_RF_35          = Material(er=3.50, tand=0.0025, color="#21912b", opacity=0.3)
-DIEL_RF_35A2        = Material(er=3.50, tand=0.0015, color="#21912b", opacity=0.3)
-DIEL_RF_35P         = Material(er=3.50, tand=0.0034, color="#21912b", opacity=0.3)
-DIEL_RF_35TC        = Material(er=3.50, tand=0.0011, color="#21912b", opacity=0.3)
-DIEL_RF_41          = Material(er=4.10, tand=0.0038, color="#21912b", opacity=0.3)
-DIEL_RF_43          = Material(er=4.30, tand=0.0033, color="#21912b", opacity=0.3)
-DIEL_RF_45          = Material(er=4.50, tand=0.0037, color="#21912b", opacity=0.3)
-DIEL_RF_60A         = Material(er=6.15, tand=0.0038, color="#21912b", opacity=0.3)
-DIEL_RO3003         = Material(er=3.00, tand=0.0011, color="#21912b", opacity=0.3)
-DIEL_RO3006         = Material(er=6.15, tand=0.002, color="#21912b", opacity=0.3)
-DIEL_RO3010         = Material(er=10.2, tand=0.0022, color="#21912b", opacity=0.3)
-DIEL_RO3035         = Material(er=3.50, tand=0.0017, color="#21912b", opacity=0.3)
-DIEL_RO3203         = Material(er=3.02, tand=0.0016, color="#21912b", opacity=0.3)
-DIEL_RO3206         = Material(er=6.15, tand=0.0027, color="#21912b", opacity=0.3)
-DIEL_RO3210         = Material(er=10.2, tand=0.0027, color="#21912b", opacity=0.3)
-DIEL_RO3730         = Material(er=3.00, tand=0.0016, color="#21912b", opacity=0.3)
-DIEL_RO4003C        = Material(er=3.38, tand=0.0029, color="#21912b", opacity=0.3)
-DIEL_RO4350B        = Material(er=3.48, tand=0.0037, color="#21912b", opacity=0.3)
-DIEL_RO4350B_TX     = Material(er=3.48, tand=0.0034, color="#21912b", opacity=0.3)
-DIEL_RO4360         = Material(er=6.15, tand=0.0038, color="#21912b", opacity=0.3)
-DIEL_RO4533         = Material(er=3.30, tand=0.0025, color="#21912b", opacity=0.3)
-DIEL_RO4534         = Material(er=3.40, tand=0.0027, color="#21912b", opacity=0.3)
-DIEL_RO4535         = Material(er=3.50, tand=0.0037, color="#21912b", opacity=0.3)
-DIEL_RO4730         = Material(er=3.00, tand=0.0033, color="#21912b", opacity=0.3)
-DIEL_RT_Duroid_5870 = Material(er=2.33, tand=0.0012, color="#21912b", opacity=0.3)
-DIEL_RT_Duroid_5880 = Material(er=2.20, tand=0.0009, color="#21912b", opacity=0.3)
-DIEL_RT_Duroid_5880LZ = Material(er=1.96, tand=0.0019, color="#21912b", opacity=0.3)
-DIEL_RT_Duroid_6002 = Material(er=2.94, tand=0.0012, color="#21912b", opacity=0.3)
-DIEL_RT_Duroid_6006 = Material(er=6.15, tand=0.0027, color="#21912b", opacity=0.3)
-DIEL_RT_Duroid_6010_2LM = Material(er=10.2, tand=0.0023, color="#21912b", opacity=0.3)
-DIEL_RT_Duroid_6035HTC = Material(er=3.50, tand=0.0013, color="#21912b", opacity=0.3)
-DIEL_RT_Duroid_6202 = Material(er=2.94, tand=0.0015, color="#21912b", opacity=0.3)
-DIEL_RT_Duroid_6202PR = Material(er=2.90, tand=0.002, color="#21912b", opacity=0.3)
-DIEL_SYRON_70000_002IN_Thick = Material(er=3.4, tand=0.0045, color="#21912b", opacity=0.3)
-DIEL_SYRON_71000_004IN_THICK = Material(er=3.39, tand=0.005, color="#21912b", opacity=0.3)
-DIEL_SYRON_71000INCH = Material(er=3.61, tand=0.006, color="#21912b", opacity=0.3)
-DIEL_TACLAMPLUS= Material(er=2.10, tand=0.0004, color="#21912b", opacity=0.3)
-DIEL_TC350          = Material(er=3.50, tand=0.002, color="#21912b", opacity=0.3)
-DIEL_TC600          = Material(er=6.15, tand=0.002, color="#21912b", opacity=0.3)
-DIEL_THETA          = Material(er=3.85, tand=0.0123, color="#21912b", opacity=0.3)
-DIEL_TLA_6          = Material(er=2.62, tand=0.0017, color="#21912b", opacity=0.3)
-DIEL_TLC_27         = Material(er=2.75, tand=0.003, color="#21912b", opacity=0.3)
-DIEL_TLC_30         = Material(er=3.00, tand=0.003, color="#21912b", opacity=0.3)
-DIEL_TLC_32         = Material(er=3.20, tand=0.003, color="#21912b", opacity=0.3)
-DIEL_TLC_338        = Material(er=3.38, tand=0.0034, color="#21912b", opacity=0.3)
-DIEL_TLC_35         = Material(er=3.50, tand=0.0037, color="#21912b", opacity=0.3)
-DIEL_TLE_95         = Material(er=2.95, tand=0.0028, color="#21912b", opacity=0.3)
-DIEL_TLF_34         = Material(er=3.40, tand=0.002, color="#21912b", opacity=0.3)
-DIEL_TLF_35         = Material(er=3.50, tand=0.002, color="#21912b", opacity=0.3)
-DIEL_TLG_29         = Material(er=2.87, tand=0.0027, color="#21912b", opacity=0.3)
-DIEL_TLG_30         = Material(er=3,    tand=0.0038, color="#21912b", opacity=0.3)
-DIEL_TLP_3          = Material(er=2.33, tand=0.0009, color="#21912b", opacity=0.3)
-DIEL_TLP_5          = Material(er=2.20, tand=0.0009, color="#21912b", opacity=0.3)
-DIEL_TLP_5A         = Material(er=2.17, tand=0.0009, color="#21912b", opacity=0.3)
-DIEL_TLT_0          = Material(er=2.45, tand=0.0019, color="#21912b", opacity=0.3)
-DIEL_TLT_6          = Material(er=2.65, tand=0.0019, color="#21912b", opacity=0.3)
-DIEL_TLT_7          = Material(er=2.60, tand=0.0019, color="#21912b", opacity=0.3)
-DIEL_TLT_8          = Material(er=2.55, tand=0.0019, color="#21912b", opacity=0.3)
-DIEL_TLT_9          = Material(er=2.50, tand=0.0019, color="#21912b", opacity=0.3)
-DIEL_TLX_0          = Material(er=2.45, tand=0.0019, color="#21912b", opacity=0.3)
-DIEL_TLX_6          = Material(er=2.65, tand=0.0019, color="#21912b", opacity=0.3)
-DIEL_TLX_7          = Material(er=2.60, tand=0.0019, color="#21912b", opacity=0.3)
-DIEL_TLX_8          = Material(er=2.55, tand=0.0019, color="#21912b", opacity=0.3)
-DIEL_TLX_9          = Material(er=2.50, tand=0.0019, color="#21912b", opacity=0.3)
-DIEL_TLY_3          = Material(er=2.33, tand=0.0012, color="#21912b", opacity=0.3)
-DIEL_TLY_3F         = Material(er=2.33, tand=0.0012, color="#21912b", opacity=0.3)
-DIEL_TLY_5 = Material(er=2.20, tand=0.0009, color="#21912b", opacity=0.3)
-DIEL_TLY_5_L = Material(er=2.20, tand=0.0009, color="#21912b", opacity=0.3)
-DIEL_TLY_5A = Material(er=2.17, tand=0.0009, color="#21912b", opacity=0.3)
-DIEL_TLY_5AL = Material(er=2.17, tand=0.0009, color="#21912b", opacity=0.3)
-DIEL_TMM_10 = Material(er=9.20, tand=0.0022, color="#21912b", opacity=0.3)
-DIEL_TMM_10i = Material(er=9.80, tand=0.002, color="#21912b", opacity=0.3)
-DIEL_TMM_3 = Material(er=3.27, tand=0.002, color="#21912b", opacity=0.3)
-DIEL_TMM_4 = Material(er=4.50, tand=0.002, color="#21912b", opacity=0.3)
-DIEL_TMM_6 = Material(er=6.00, tand=0.0023, color="#21912b", opacity=0.3)
-DIEL_TRF_41 = Material(er=4.10, tand=0.0035, color="#21912b", opacity=0.3)
-DIEL_TRF_43 = Material(er=4.30, tand=0.0035, color="#21912b", opacity=0.3)
-DIEL_TRF_45 = Material(er=4.50, tand=0.0035, color="#21912b", opacity=0.3)
-DIEL_TSM_26 = Material(er=2.60, tand=0.0014, color="#21912b", opacity=0.3)
-DIEL_TSM_29 = Material(er=2.94, tand=0.0013, color="#21912b", opacity=0.3)
-DIEL_TSM_30 = Material(er=3.00, tand=0.0013, color="#21912b", opacity=0.3)
-DIEL_TSM_DS = Material(er=2.85, tand=0.001, color="#21912b", opacity=0.3)
-DIEL_TSM_DS3 = Material(er=3.00, tand=0.0011, color="#21912b", opacity=0.3)
-DIEL_ULTRALAM_2000 = Material(er=2.4, tand=0.0019, color="#21912b", opacity=0.3)
-DIEL_ULTRALAM_3850 = Material(er=2.9, tand=0.0025, color="#21912b", opacity=0.3)
-DIEL_XT_Duroid_80000_002IN_Thick = Material(er=3.23, tand=0.0035, color="#21912b", opacity=0.3)
-DIEL_XT_Duroid_8100 = Material(er=3.54, tand=0.0049, color="#21912b", opacity=0.3)
-DIEL_XT_Duroid_81000_004IN_Thick = Material(er=3.32, tand=0.0038, color="#21912b", opacity=0.3)
-DIEL_TEFLON = Material(er=2.1, tand=0.0003, color='#eeeeee', opacity=0.3)
+DIEL_PTFE           = Material(er=2.1, tand=0.0002, color="#21912b", opacity=0.3, name='Teflon')
+DIEL_POLYIMIDE      = Material(er=3.4, tand=0.02, color="#b8b8b8", name='Polyimide')
+DIEL_CERAMIC        = Material(er=6.0, tand=0.001, color="#efead1", name='Ceramic')
+DIEL_AD10           = Material(er=10.2, tand=0.0078, color="#21912b", opacity=0.3, name='AD10')
+DIEL_AD1000         = Material(er=10.2, tand=0.0023, color="#21912b", opacity=0.3, name='AD1000')
+DIEL_AD250          = Material(er=2.5, tand=0.0018, color="#21912b", opacity=0.3, name='AD250')
+DIEL_AD250_PIM      = Material(er=2.5, tand=0.0018, color="#21912b", opacity=0.3, name='AD250 PIM')
+DIEL_AD250A         = Material(er=2.50, tand=0.0015, color="#21912b", opacity=0.3, name='AD250A')
+DIEL_AD250C         = Material(er=2.50, tand=0.0014, color="#21912b", opacity=0.3, name='AD250C')
+DIEL_AD255          = Material(er=2.55, tand=0.0018, color="#21912b", opacity=0.3, name='AD255')
+DIEL_AD255A         = Material(er=2.55, tand=0.0015, color="#21912b", opacity=0.3, name='AD255A')
+DIEL_AD255C         = Material(er=2.55, tand=0.0014, color="#21912b", opacity=0.3, name='AD255C')
+DIEL_AD260A         = Material(er=2.60, tand=0.0017, color="#21912b", opacity=0.3, name='AD260A')
+DIEL_AD270          = Material(er=2.7, tand=0.0023, color="#21912b", opacity=0.3, name='AD270')
+DIEL_AD300          = Material(er=3, tand=0.003, color="#21912b", opacity=0.3, name='AD300')
+DIEL_AD300_PIM      = Material(er=3, tand=0.003, color="#21912b", opacity=0.3, name='AD300 PIM')
+DIEL_AD300A         = Material(er=3.00, tand=0.002, color="#21912b", opacity=0.3, name='AD300A')
+DIEL_AD300C         = Material(er=2.97, tand=0.002, color="#21912b", opacity=0.3, name='AD300C')
+DIEL_AD320          = Material(er=3.2, tand=0.0038, color="#21912b", opacity=0.3, name='AD320')
+DIEL_AD320_PIM      = Material(er=3.2, tand=0.003, color="#21912b", opacity=0.3, name='AD320 PIM')
+DIEL_AD320A         = Material(er=3.20, tand=0.0032, color="#21912b", opacity=0.3, name='AD320A')
+DIEL_AD350          = Material(er=3.5, tand=0.003, color="#21912b", opacity=0.3, name='AD350')
+DIEL_AD350_PIM      = Material(er=3.5, tand=0.003, color="#21912b", opacity=0.3, name='AD350 PIM')
+DIEL_AD350A         = Material(er=3.50, tand=0.003, color="#21912b", opacity=0.3, name='AD350A')
+DIEL_AD410          = Material(er=4.1, tand=0.003, color="#21912b", opacity=0.3, name='AD410')
+DIEL_AD430          = Material(er=4.3, tand=0.003, color="#21912b", opacity=0.3, name='AD430')
+DIEL_AD450          = Material(er=4.5, tand=0.0035, color="#21912b", opacity=0.3, name='AD450')
+DIEL_AD450A         = Material(er=4.5, tand=0.0035, color="#21912b", opacity=0.3, name='AD450 A')
+DIEL_AD5            = Material(er=5.1, tand=0.003, color="#21912b", opacity=0.3, name='AD5')
+DIEL_AD600          = Material(er=5.90, tand=0.003, color="#21912b", opacity=0.3, name='AD600')
+DIEL_AR1000         = Material(er=9.8, tand=0.003, color="#21912b", opacity=0.3, name='AR1000')
+DIEL_CER_10         = Material(er=10.00, tand=0.0035, color="#21912b", opacity=0.3, name='CER 10')
+DIEL_CLTE           = Material(er=2.96, tand=0.0023, color="#21912b", opacity=0.3, name='CLTE')
+DIEL_CLTE_AT        = Material(er=3.00, tand=0.0013, color="#21912b", opacity=0.3, name='CLTE-AT')
+DIEL_CLTE_LC        = Material(er=2.94, tand=0.0025, color="#21912b", opacity=0.3, name='CLTE LC')
+DIEL_CLTE_XT        = Material(er=2.94, tand=0.0012, color="#21912b", opacity=0.3, name='CLTE XT')
+DIEL_COMCLAD_HF_ER2 = Material(er=2, tand=0.0025, color="#21912b", opacity=0.3, name='Comclad HF ER2')
+DIEL_COMCLAD_HF_ER3 = Material(er=3, tand=0.0025, color="#21912b", opacity=0.3, name='Comclad HF ER3')
+DIEL_COMCLAD_HF_ER4 = Material(er=4, tand=0.0025, color="#21912b", opacity=0.3, name='Comclad HF ER4')
+DIEL_COMCLAD_HF_ER5 = Material(er=5, tand=0.0025, color="#21912b", opacity=0.3, name='Comclad HF ER5')
+DIEL_COMCLAD_HF_ER6 = Material(er=6, tand=0.0025, color="#21912b", opacity=0.3, name='Comclad HF ER6')
+DIEL_COPPER_CLAD_ULTEM = Material(er=3.05, tand=0.003, color="#21912b", opacity=0.3, name='Copper clad ULTEM')
+DIEL_CUCLAD_217LX   = Material(er=2.17, tand=0.0009, color="#21912b", opacity=0.3, name='Copper Clad 217LX')
+DIEL_CUCLAD_233LX   = Material(er=2.33, tand=0.0013, color="#21912b", opacity=0.3, name='Cpper Clad 233LX')
+DIEL_CUCLAD_250GT   = Material(er=2.5, tand=0.0018, color="#21912b", opacity=0.3, name='Copper Clad 250GT')
+DIEL_CUCLAD_250GX   = Material(er=2.4, tand=0.0018, color="#21912b", opacity=0.3, name='Copper Clad 250GX')
+DIEL_CUFLON         = Material(er=2.05, tand=0.00045, color="#21912b", opacity=0.3, name='CUFLON')
+DIEL_DICLAD_522     = Material(er=2.4, tand=0.0018, color="#21912b", opacity=0.3, name='DICLAD 522')
+DIEL_DICLAD_527     = Material(er=2.4, tand=0.0018, color="#21912b", opacity=0.3, name='DICLAD 527')
+DIEL_DICLAD_870     = Material(er=2.33, tand=0.0013, color="#21912b", opacity=0.3, name='DICLAD 870')
+DIEL_DICLAD_880     = Material(er=2.17, tand=0.0009, color="#21912b", opacity=0.3, name='DICLAD 880')
+DIEL_DICLAD_880_PIM = Material(er=2.17, tand=0.0009, color="#21912b", opacity=0.3, name='DICLAD 880 PIM')
+DIEL_GETEK_3p5          = Material(er=3.5, tand=0.01, color="#21912b", opacity=0.3, name='GETEK(3.5)')
+DIEL_GETEK_3p8         = Material(er=3.8, tand=0.01, color="#21912b", opacity=0.3, name='GETEK(3.8)')
+DIEL_IS6802_80      = Material(er=2.80, tand=0.003,  color="#21912b", opacity=0.3, name="IS6802 80")
+DIEL_IS6803_00      = Material(er=3.00, tand=0.003,  color="#21912b", opacity=0.3, name="IS6803 00")
+DIEL_IS6803_20      = Material(er=3.20, tand=0.003,  color="#21912b", opacity=0.3, name="IS6803 20")
+DIEL_IS6803_33      = Material(er=3.33, tand=0.003,  color="#21912b", opacity=0.3, name="IS6803 33")
+DIEL_IS6803_38      = Material(er=3.38, tand=0.0032, color="#21912b", opacity=0.3, name="IS6803 38")
+DIEL_IS6803_45      = Material(er=3.45, tand=0.0035, color="#21912b", opacity=0.3, name="IS6803 45")
+DIEL_ISOCLAD_917    = Material(er=2.17, tand=0.0013, color="#21912b", opacity=0.3, name="Isoclad 917")
+DIEL_ISOCLAD_933    = Material(er=2.33, tand=0.0016, color="#21912b", opacity=0.3, name="Isoclad 933")
+DIEL_ISOLA_I_TERA_MT    = Material(er=3.45, tand=0.0030, color="#3c9747",            name="Isola I Tera Mt")
+DIEL_ISOLA_NELCO_4000_13 = Material(er=3.77, tand=0.008, color="#3c9747",           name="Isola Nelco 4000 13")
+DIEL_MAT_25N        = Material(er=3.38, tand=0.0025, color="#21912b", opacity=0.3, name="Mat 25n")
+DIEL_MAT25FR        = Material(er=3.58, tand=0.0035, color="#21912b", opacity=0.3, name="Mat25fr")
+DIEL_MEGTRON6R5775  = Material(er=3.61, tand=0.004,  color="#21912b", opacity=0.3, name="Megtron6r5775")
+DIEL_MERCURYWAVE_9350 = Material(er=3.5, tand=0.004, color="#21912b", opacity=0.3, name="Mercurywave 9350")
+DIEL_MULTICLAD_HF   = Material(er=3.7,  tand=0.0045, color="#21912b", opacity=0.3, name="Multiclad HF")
+DIEL_N_8000         = Material(er=3.5,  tand=0.011,  color="#21912b", opacity=0.3, name="Nelco N8000")
+DIEL_N4350_13RF     = Material(er=3.5,  tand=0.0065, color="#21912b", opacity=0.3, name="Nelco N4350 13RF")
+DIEL_N4380_13RF     = Material(er=3.8,  tand=0.007,  color="#21912b", opacity=0.3, name="Nelco N4380 13RF")
+DIEL_N8000Q         = Material(er=3.2,  tand=0.006,  color="#21912b", opacity=0.3, name="Nelco N8000Q")
+DIEL_N9300_13RF     = Material(er=3.0,  tand=0.004,  color="#21912b", opacity=0.3, name="Nelco N9300 13RF")
+DIEL_N9320_13RF     = Material(er=3.2,  tand=0.0045, color="#21912b", opacity=0.3, name="Nelco N9320 13RF")
+DIEL_N9338_13RF     = Material(er=3.38, tand=0.0046, color="#21912b", opacity=0.3, name="Nelco N9338 13RF")
+DIEL_N9350_13RF     = Material(er=3.48, tand=0.0055, color="#21912b", opacity=0.3, name="Nelco N9350 13RF")
+DIEL_NH9294         = Material(er=2.94, tand=0.0022, color="#21912b", opacity=0.3, name="Nelco NH9294")
+DIEL_NH9300         = Material(er=3.00, tand=0.0023, color="#21912b", opacity=0.3, name="Nelco NH9300")
+DIEL_NH9320         = Material(er=3.20, tand=0.0024, color="#21912b", opacity=0.3, name="Nelco NH9320")
+DIEL_NH9338         = Material(er=3.38, tand=0.0025, color="#21912b", opacity=0.3, name="Nelco NH9338")
+DIEL_NH9348         = Material(er=3.48, tand=0.003,  color="#21912b", opacity=0.3, name="Nelco NH9348")
+DIEL_NH9350         = Material(er=3.50, tand=0.003,  color="#21912b", opacity=0.3, name="Nelco NH9350")
+DIEL_NH9410         = Material(er=4.10, tand=0.003,  color="#21912b", opacity=0.3, name="Nelco NH9410")
+DIEL_NH9450         = Material(er=4.50, tand=0.003,  color="#21912b", opacity=0.3, name="Nelco NH9450")
+DIEL_NORCLAD        = Material(er=2.55, tand=0.0011, color="#21912b", opacity=0.3, name="Norclad")
+DIEL_NX9240         = Material(er=2.40, tand=0.0016, color="#21912b", opacity=0.3, name="Nelco NX9240")
+DIEL_NX9245         = Material(er=2.45, tand=0.0016, color="#21912b", opacity=0.3, name="Nelco NX9245")
+DIEL_NX9250         = Material(er=2.50, tand=0.0017, color="#21912b", opacity=0.3, name="Nelco NX9250")
+DIEL_NX9255         = Material(er=2.55, tand=0.0018, color="#21912b", opacity=0.3, name="Nelco NX9255")
+DIEL_NX9260         = Material(er=2.60, tand=0.0019, color="#21912b", opacity=0.3, name="Nelco NX9260")
+DIEL_NX9270         = Material(er=2.70, tand=0.002,  color="#21912b", opacity=0.3, name="Nelco NX9270")
+DIEL_NX9294         = Material(er=2.94, tand=0.0022, color="#21912b", opacity=0.3, name="Nelco NX9294")
+DIEL_NX9300         = Material(er=3.00, tand=0.0023, color="#21912b", opacity=0.3, name="Nelco NX9300")
+DIEL_NX9320         = Material(er=3.20, tand=0.0024, color="#21912b", opacity=0.3, name="Nelco NX9320")
+DIEL_NY9208         = Material(er=2.08, tand=0.0006, color="#21912b", opacity=0.3, name="Nelco NY9208")
+DIEL_NY9217         = Material(er=2.17, tand=0.0008, color="#21912b", opacity=0.3, name="Nelco NY9217")
+DIEL_NY9220         = Material(er=2.20, tand=0.0009, color="#21912b", opacity=0.3, name="Nelco NY9220")
+DIEL_NY9233         = Material(er=2.33, tand=0.0011, color="#21912b", opacity=0.3, name="Nelco NY9233")
+DIEL_POLYGUIDE      = Material(er=2.320,tand=0.0005, color="#21912b", opacity=0.3, name="Polyguide")
+DIEL_RF_30          = Material(er=3.00, tand=0.0019, color="#21912b", opacity=0.3, name="Rogers RF-30")
+DIEL_RF_301         = Material(er=2.97, tand=0.0018, color="#21912b", opacity=0.3, name="Rogers RF-301")
+DIEL_RF_35          = Material(er=3.50, tand=0.0025, color="#21912b", opacity=0.3, name="Rogers RF-35")
+DIEL_RF_35A2        = Material(er=3.50, tand=0.0015, color="#21912b", opacity=0.3, name="Rogers RF-35A2")
+DIEL_RF_35P         = Material(er=3.50, tand=0.0034, color="#21912b", opacity=0.3, name="Rogers RF-35P")
+DIEL_RF_35TC        = Material(er=3.50, tand=0.0011, color="#21912b", opacity=0.3, name="Rogers RF-35TC")
+DIEL_RF_41          = Material(er=4.10, tand=0.0038, color="#21912b", opacity=0.3, name="Rogers RF-41")
+DIEL_RF_43          = Material(er=4.30, tand=0.0033, color="#21912b", opacity=0.3, name="Rogers RF-43")
+DIEL_RF_45          = Material(er=4.50, tand=0.0037, color="#21912b", opacity=0.3, name="Rogers RF-45")
+DIEL_RF_60A         = Material(er=6.15, tand=0.0038, color="#21912b", opacity=0.3, name="Rogers RF-60A")
+DIEL_RO3003         = Material(er=3.00, tand=0.0011, color="#21912b", opacity=0.3, name="Rogers RO3003")
+DIEL_RO3006         = Material(er=6.15, tand=0.002,  color="#21912b", opacity=0.3, name="Rogers RO3006")
+DIEL_RO3010         = Material(er=10.2, tand=0.0022, color="#21912b", opacity=0.3, name="Rogers RO3010")
+DIEL_RO3035         = Material(er=3.50, tand=0.0017, color="#21912b", opacity=0.3, name="Rogers RO3035")
+DIEL_RO3203         = Material(er=3.02, tand=0.0016, color="#21912b", opacity=0.3, name="Rogers RO3203")
+DIEL_RO3206         = Material(er=6.15, tand=0.0027, color="#21912b", opacity=0.3, name="Rogers RO3206")
+DIEL_RO3210         = Material(er=10.2, tand=0.0027, color="#21912b", opacity=0.3, name="Rogers RO3210")
+DIEL_RO3730         = Material(er=3.00, tand=0.0016, color="#21912b", opacity=0.3, name="Rogers RO3730")
+DIEL_RO4003C        = Material(er=3.38, tand=0.0029, color="#21912b", opacity=0.3, name="Rogers RO4003C")
+DIEL_RO4350B        = Material(er=3.48, tand=0.0037, color="#21912b", opacity=0.3, name="Rogers RO4350B")
+DIEL_RO4350B_TX     = Material(er=3.48, tand=0.0034, color="#21912b", opacity=0.3, name="Rogers RO4350B TX")
+DIEL_RO4360         = Material(er=6.15, tand=0.0038, color="#21912b", opacity=0.3, name="Rogers RO4360")
+DIEL_RO4533         = Material(er=3.30, tand=0.0025, color="#21912b", opacity=0.3, name="Rogers RO4533")
+DIEL_RO4534         = Material(er=3.40, tand=0.0027, color="#21912b", opacity=0.3, name="Rogers RO4534")
+DIEL_RO4535         = Material(er=3.50, tand=0.0037, color="#21912b", opacity=0.3, name="Rogers RO4535")
+DIEL_RO4730         = Material(er=3.00, tand=0.0033, color="#21912b", opacity=0.3, name="Rogers RO4730")
+DIEL_RT_Duroid_5870    = Material(er=2.33, tand=0.0012, color="#21912b", opacity=0.3, name="Rogers RT/duroid 5870")
+DIEL_RT_Duroid_5880    = Material(er=2.20, tand=0.0009, color="#21912b", opacity=0.3, name="Rogers RT/duroid 5880")
+DIEL_RT_Duroid_5880LZ  = Material(er=1.96, tand=0.0019, color="#21912b", opacity=0.3, name="Rogers RT/duroid 5880LZ")
+DIEL_RT_Duroid_6002    = Material(er=2.94, tand=0.0012, color="#21912b", opacity=0.3, name="Rogers RT/duroid 6002")
+DIEL_RT_Duroid_6006    = Material(er=6.15, tand=0.0027, color="#21912b", opacity=0.3, name="Rogers RT/duroid 6006")
+DIEL_RT_Duroid_6010_2LM= Material(er=10.2, tand=0.0023, color="#21912b", opacity=0.3, name="Rogers RT/duroid 6010 2LM")
+DIEL_RT_Duroid_6035HTC = Material(er=3.50, tand=0.0013, color="#21912b", opacity=0.3, name="Rogers RT/duroid 6035HTC")
+DIEL_RT_Duroid_6202     = Material(er=2.94, tand=0.0015, color="#21912b", opacity=0.3, name="Rogers RT/duroid 6202")
+DIEL_RT_Duroid_6202PR   = Material(er=2.90, tand=0.002,  color="#21912b", opacity=0.3, name="Rogers RT/duroid 6202PR")
+DIEL_SYRON_70000_002IN_Thick = Material(er=3.4,  tand=0.0045, color="#21912b", opacity=0.3, name="Syron 70000 0.002in")
+DIEL_SYRON_71000_004IN_THICK = Material(er=3.39, tand=0.005,  color="#21912b", opacity=0.3, name="Syron 71000 0.004in")
+DIEL_SYRON_71000INCH         = Material(er=3.61, tand=0.006,  color="#21912b", opacity=0.3, name="Syron 71000 Inch")
+DIEL_TACLAMPLUS  = Material(er=2.10, tand=0.0004, color="#21912b", opacity=0.3, name="TacLam Plus")
+DIEL_TC350       = Material(er=3.50, tand=0.002,  color="#21912b", opacity=0.3, name="Rogers TC350")
+DIEL_TC600       = Material(er=6.15, tand=0.002,  color="#21912b", opacity=0.3, name="Rogers TC600")
+DIEL_THETA       = Material(er=3.85, tand=0.0123, color="#21912b", opacity=0.3, name="Theta")
+DIEL_TLA_6       = Material(er=2.62, tand=0.0017, color="#21912b", opacity=0.3, name="TLA-6")
+DIEL_TLC_27      = Material(er=2.75, tand=0.003,  color="#21912b", opacity=0.3, name="TLC-27")
+DIEL_TLC_30      = Material(er=3.00, tand=0.003,  color="#21912b", opacity=0.3, name="TLC-30")
+DIEL_TLC_32      = Material(er=3.20, tand=0.003,  color="#21912b", opacity=0.3, name="TLC-32")
+DIEL_TLC_338     = Material(er=3.38, tand=0.0034, color="#21912b", opacity=0.3, name="TLC-338")
+DIEL_TLC_35      = Material(er=3.50, tand=0.0037, color="#21912b", opacity=0.3, name="TLC-35")
+DIEL_TLE_95      = Material(er=2.95, tand=0.0028, color="#21912b", opacity=0.3, name="TLE-95")
+DIEL_TLF_34      = Material(er=3.40, tand=0.002,  color="#21912b", opacity=0.3, name="TLF-34")
+DIEL_TLF_35      = Material(er=3.50, tand=0.002,  color="#21912b", opacity=0.3, name="TLF-35")
+DIEL_TLG_29      = Material(er=2.87, tand=0.0027, color="#21912b", opacity=0.3, name="TLG-29")
+DIEL_TLG_30      = Material(er=3.00, tand=0.0038, color="#21912b", opacity=0.3, name="TLG-30")
+DIEL_TLP_3       = Material(er=2.33, tand=0.0009, color="#21912b", opacity=0.3, name="TLP-3")
+DIEL_TLP_5       = Material(er=2.20, tand=0.0009, color="#21912b", opacity=0.3, name="TLP-5")
+DIEL_TLP_5A      = Material(er=2.17, tand=0.0009, color="#21912b", opacity=0.3, name="TLP-5A")
+DIEL_TLT_0       = Material(er=2.45, tand=0.0019, color="#21912b", opacity=0.3, name="TLT-0")
+DIEL_TLT_6       = Material(er=2.65, tand=0.0019, color="#21912b", opacity=0.3, name="TLT-6")
+DIEL_TLT_7       = Material(er=2.60, tand=0.0019, color="#21912b", opacity=0.3, name="TLT-7")
+DIEL_TLT_8       = Material(er=2.55, tand=0.0019, color="#21912b", opacity=0.3, name="TLT-8")
+DIEL_TLT_9       = Material(er=2.50, tand=0.0019, color="#21912b", opacity=0.3, name="TLT-9")
+DIEL_TLX_0       = Material(er=2.45, tand=0.0019, color="#21912b", opacity=0.3, name="TLX-0")
+DIEL_TLX_6       = Material(er=2.65, tand=0.0019, color="#21912b", opacity=0.3, name="TLX-6")
+DIEL_TLX_7       = Material(er=2.60, tand=0.0019, color="#21912b", opacity=0.3, name="TLX-7")
+DIEL_TLX_8       = Material(er=2.55, tand=0.0019, color="#21912b", opacity=0.3, name="TLX-8")
+DIEL_TLX_9       = Material(er=2.50, tand=0.0019, color="#21912b", opacity=0.3, name="TLX-9")
+DIEL_TLY_3       = Material(er=2.33, tand=0.0012, color="#21912b", opacity=0.3, name="TLY-3")
+DIEL_TLY_3F      = Material(er=2.33, tand=0.0012, color="#21912b", opacity=0.3, name="TLY-3F")
+DIEL_TLY_5       = Material(er=2.20, tand=0.0009, color="#21912b", opacity=0.3, name="TLY-5")
+DIEL_TLY_5_L     = Material(er=2.20, tand=0.0009, color="#21912b", opacity=0.3, name="TLY-5L")
+DIEL_TLY_5A      = Material(er=2.17, tand=0.0009, color="#21912b", opacity=0.3, name="TLY-5A")
+DIEL_TLY_5AL     = Material(er=2.17, tand=0.0009, color="#21912b", opacity=0.3, name="TLY-5AL")
+DIEL_TMM_10      = Material(er=9.20, tand=0.0022, color="#21912b", opacity=0.3, name="Rogers TMM10")
+DIEL_TMM_10i     = Material(er=9.80, tand=0.002,  color="#21912b", opacity=0.3, name="Rogers TMM10i")
+DIEL_TMM_3       = Material(er=3.27, tand=0.002,  color="#21912b", opacity=0.3, name="Rogers TMM3")
+DIEL_TMM_4       = Material(er=4.50, tand=0.002,  color="#21912b", opacity=0.3, name="Rogers TMM4")
+DIEL_TMM_6       = Material(er=6.00, tand=0.0023, color="#21912b", opacity=0.3, name="Rogers TMM6")
+
+DIEL_TRF_41      = Material(er=4.10, tand=0.0035, color="#21912b", opacity=0.3, name="TRF-41")
+DIEL_TRF_43      = Material(er=4.30, tand=0.0035, color="#21912b", opacity=0.3, name="TRF-43")
+DIEL_TRF_45      = Material(er=4.50, tand=0.0035, color="#21912b", opacity=0.3, name="TRF-45")
+
+DIEL_TSM_26      = Material(er=2.60, tand=0.0014, color="#21912b", opacity=0.3, name="TSM-26")
+DIEL_TSM_29      = Material(er=2.94, tand=0.0013, color="#21912b", opacity=0.3, name="TSM-29")
+DIEL_TSM_30      = Material(er=3.00, tand=0.0013, color="#21912b", opacity=0.3, name="TSM-30")
+DIEL_TSM_DS      = Material(er=2.85, tand=0.001,  color="#21912b", opacity=0.3, name="TSM-DS")
+DIEL_TSM_DS3     = Material(er=3.00, tand=0.0011, color="#21912b", opacity=0.3, name="TSM-DS3")
+DIEL_ULTRALAM_2000 = Material(er=2.4, tand=0.0019, color="#21912b", opacity=0.3, name="Arlon Ultralam 2000")
+DIEL_ULTRALAM_3850 = Material(er=2.9, tand=0.0025, color="#21912b", opacity=0.3, name="Arlon Ultralam 3850")
+DIEL_XT_Duroid_80000_002IN_Thick = Material(er=3.23, tand=0.0035, color="#21912b", opacity=0.3, name="Rogers XT/duroid 80000 0.002in")
+DIEL_XT_Duroid_8100              = Material(er=3.54, tand=0.0049, color="#21912b", opacity=0.3, name="Rogers XT/duroid 8100")
+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")
+
 
 # Legacy FR Materials
-DIEL_FR1 = Material(er=4.8,  tand=0.025, color="#3c9747", opacity=0.3) # Paper + phenolic resin
-DIEL_FR2 = Material(er=4.8,  tand=0.02,  color="#3c9747", opacity=0.3) # Paper + phenolic resin
-DIEL_FR3 = Material(er=4.5,  tand=0.02,  color="#2b7a4b", opacity=0.3) # Paper + epoxy resin
-DIEL_FR4 = Material(er=4.4,  tand=0.015, color="#1e8449", opacity=0.3) # Woven glass + epoxy resin (industry standard)
-DIEL_FR5 = Material(er=4.2,  tand=0.012, color="#156e38", opacity=0.3) # Woven glass + high-temp epoxy resin
-DIEL_FR6 = Material(er=5.2,  tand=0.030, color="#145a32", opacity=0.3) # Paper + unknown resin, poor thermal performance
+DIEL_FR1 = Material(er=4.8,  tand=0.025, color="#3c9747", opacity=0.3, name="FR-1 (Paper Phenolic)")
+DIEL_FR2 = Material(er=4.8,  tand=0.02,  color="#3c9747", opacity=0.3, name="FR-2 (Paper Phenolic)")
+DIEL_FR3 = Material(er=4.5,  tand=0.02,  color="#2b7a4b", opacity=0.3, name="FR-3 (Paper Epoxy)")
+DIEL_FR4 = Material(er=4.4,  tand=0.015, color="#1e8449", opacity=0.3, name="FR-4 (Glass Epoxy)")
+DIEL_FR5 = Material(er=4.2,  tand=0.012, color="#156e38", opacity=0.3, name="FR-5 (High-temp Glass Epoxy)")
+DIEL_FR6 = Material(er=5.2,  tand=0.030, color="#145a32", opacity=0.3, name="FR-6 (Paper Resin, Low Thermal)")
 
 # Magnetic Materials
-MU_METAL  = Material(cond=1.0e6, ur=200000, color="#666680", opacity=0.3)
-
+MU_METAL = Material(cond=1.0e6, ur=200000, color="#666680", opacity=0.3, name="Mu-metal")
 
 ############################################################
 #                           FOAMS                          #
 ############################################################
 
-FOAM_ROHACELL_31  = Material(er=1.05,  tand=0.0005,  color="#f0e1a1", opacity=0.15) # PMI-based structural foam
-FOAM_ROHACELL_51  = Material(er=1.07,  tand=0.0006,  color="#f0dea0", opacity=0.15) # denser version
-FOAM_ROHACELL_71  = Material(er=1.10,  tand=0.0007,  color="#e5d199", opacity=0.15)
-FOAM_PEI          = Material(er=1.15,  tand=0.0035,  color="#e0b56f", opacity=0.15) # polyetherimide-based foam
-FOAM_PMI          = Material(er=1.10,  tand=0.0008,  color="#d9c690", opacity=0.15) # polymethacrylimide
-FOAM_PVC          = Material(er=1.20,  tand=0.0040,  color="#cccccc", opacity=0.15)
-FOAM_EPS          = Material(er=1.03,  tand=0.0050,  color="#f7f7f7", opacity=0.15) # expanded polystyrene
-FOAM_XPS          = Material(er=1.05,  tand=0.0030,  color="#e0e0e0", opacity=0.15) # extruded polystyrene
-FOAM_PU           = Material(er=1.10,  tand=0.0080,  color="#d0d0d0", opacity=0.15) # polyurethane foam
-FOAM_GLAS         = Material(er=3.10,  tand=0.0050,  color="#888888", opacity=0.15) # cellular glass, denser
-FOAM_AIREX_C70    = Material(er=1.10,  tand=0.0010,  color="#f7e7a3", opacity=0.15) # PET closed cell
-FOAM_AIREX_T92    = Material(er=1.10,  tand=0.0020,  color="#f6d08a", opacity=0.15) # higher strength PET
-FOAM_PVC_CORECELL = Material(er=1.56,  tand=0.0025,  color="#aaaaaa", opacity=0.15) # structural core PVC
+FOAM_ROHACELL_31  = Material(er=1.05, tand=0.0005, color="#f0e1a1", opacity=0.15, name="Rohacell 31 (PMI Foam)")
+FOAM_ROHACELL_51  = Material(er=1.07, tand=0.0006, color="#f0dea0", opacity=0.15, name="Rohacell 51 (PMI Foam)")
+FOAM_ROHACELL_71  = Material(er=1.10, tand=0.0007, color="#e5d199", opacity=0.15, name="Rohacell 71 (PMI Foam)")
+
+FOAM_PEI          = Material(er=1.15, tand=0.0035, color="#e0b56f", opacity=0.15, name="PEI Foam")
+FOAM_PMI          = Material(er=1.10, tand=0.0008, color="#d9c690", opacity=0.15, name="PMI Foam")
+FOAM_PVC          = Material(er=1.20, tand=0.0040, color="#cccccc", opacity=0.15, name="PVC Foam")
+FOAM_EPS          = Material(er=1.03, tand=0.0050, color="#f7f7f7", opacity=0.15, name="EPS Foam (Expanded Polystyrene)")
+FOAM_XPS          = Material(er=1.05, tand=0.0030, color="#e0e0e0", opacity=0.15, name="XPS Foam (Extruded Polystyrene)")
+FOAM_PU           = Material(er=1.10, tand=0.0080, color="#d0d0d0", opacity=0.15, name="PU Foam (Polyurethane)")
+FOAM_GLAS         = Material(er=3.10, tand=0.0050, color="#888888", opacity=0.15, name="Cellular Glass")
+
+FOAM_AIREX_C70    = Material(er=1.10, tand=0.0010, color="#f7e7a3", opacity=0.15, name="Airex C70 (PET Foam)")
+FOAM_AIREX_T92    = Material(er=1.10, tand=0.0020, color="#f6d08a", opacity=0.15, name="Airex T92 (PET Foam)")
+FOAM_PVC_CORECELL = Material(er=1.56, tand=0.0025, color="#aaaaaa", opacity=0.15, name="Corecell PVC Foam")

{emerge-0.6.8.dist-info → emerge-0.6.9.dist-info}/METADATA

@@ -1,11 +1,12 @@
 Metadata-Version: 2.4
 Name: emerge
-Version: 0.6.8
+Version: 0.6.9
 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
 License-File: LICENSE
 Requires-Python: <4.0,>=3.10
+Requires-Dist: cloudpickle>=3.1.1
 Requires-Dist: gmsh<4.14.0,>=4.13.0
 Requires-Dist: joblib>=1.5.1
 Requires-Dist: loguru>=0.7.3

{emerge-0.6.8.dist-info → emerge-0.6.9.dist-info}/RECORD

@@ -1,8 +1,8 @@
-emerge/__init__.py,sha256=d0irj6Zl58a3DO_ilpI77vqIe9_S1-UspMjSHbXCbr8,2693
+emerge/__init__.py,sha256=CADecqlZ97GZvSCPedEzhmI3N_1o0qeCaaxgjlUccio,2693
 emerge/__main__.py,sha256=WVf16sfrOI910QWohrQDaChZdRifMNoS6VKzCT6f3ZA,92
 emerge/cli.py,sha256=NU1uhwuZ6i50680v3_I4kDZPTHqz74gOYK71UBhb8oE,666
 emerge/ext.py,sha256=IBoHH5PQFj5pYMfp6r-uMpNNgbSe8c0g9x8qjBzzVmU,223
-emerge/lib.py,sha256=kUb4n7VGK4ncR5IHdjvVVd8klSiqZ427ckmEFet16M0,23465
+emerge/lib.py,sha256=DTg6Js9CTQZv0zGVI9F1SaJzSIrJW3RBniHia4pWnEE,28527
 emerge/plot.py,sha256=AH2D9rKeWUXlSOlh-pUUfLt0oxVLcqF_piki-BmPEg0,83
 emerge/pyvista.py,sha256=-Ht2YcZYsh8-dici5ZPNAWwsis6uz5wNj8n8mxv5fog,42
 emerge/_emerge/__init__.py,sha256=aidfiILy33dt3VyiZ2mgtA87mq-WQ5pXItZUE5wR5ws,703
@@ -13,16 +13,16 @@ emerge/_emerge/coord.py,sha256=BKvyrcnHY-_bgHqysnByy5k9_DK4VVfr9KKkRaawG2E,4371
 emerge/_emerge/cs.py,sha256=YNT2Nn6Dh8fYPUMlT6w0msHnQpZREbbl_ZXTGNppCVs,18392
 emerge/_emerge/dataset.py,sha256=UcSAJ_siLrOjNBBWRWsS3GUZUpayp63EM6pP6ClwKDI,1534
 emerge/_emerge/geo2d.py,sha256=e_HkX1GQ2iYrdO0zeEgzVOzfGyU1WGJyjeGBAobOttE,3323
-emerge/_emerge/geometry.py,sha256=_hBZMRcYImO3rXRex0wcNWPDmdlrQoMJ6NZh4H_CUPo,19277
+emerge/_emerge/geometry.py,sha256=z6MxW7Q2i1pu12pPaAvIf5PsP84ea3GY2MOG_daLx_8,19537
 emerge/_emerge/howto.py,sha256=c4UxUNpA1tygr3OoR-LH-h0UZv-Tf9K8tpCiAU18BKE,8173
 emerge/_emerge/logsettings.py,sha256=DcUWIUUhdLe9ev5XC1bd5ZUrJz00MjABkY8rnekFrPY,3373
-emerge/_emerge/material.py,sha256=jMAe7W7qT1fcgbah_5DncaPDa7kVGF2GEdnNZ0aoh6k,14973
+emerge/_emerge/material.py,sha256=FITj4pGlJw6AwsxC275lMbbCJ38mIjwGpA9omblq6ck,15228
 emerge/_emerge/mesh3d.py,sha256=2expfu7YR6KbtaEeR7JELxXkTul0cFECRwwO5bpdgqE,34697
 emerge/_emerge/mesher.py,sha256=fKgPb6oZe_bqp0XYfZ6UNgBfRaAS3-tjUtZX8NalJe8,13199
 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=OVAO1HdtLb7NdgPVWK3G1bRyINPjyC8jpawLDEK6rR8,20280
+emerge/_emerge/selection.py,sha256=Clx3YopcYwaN61rX4wdDsEJo_0F-DWGe3AP8rPjvTzY,21368
+emerge/_emerge/simmodel.py,sha256=lzrWtPQlhKHs4QHTj-icg2tycCn_zhq4PITHhAhC9I0,20451
 emerge/_emerge/simulation_data.py,sha256=r9-9lpLeA1Z5HU3jDVOXV1H80GVawnXL5K81_dvmlE4,14506
 emerge/_emerge/solver.py,sha256=kZr_lNnLbHe2LBO9ujyHdfh47jc_qqnFgrlPwhZZMHE,49348
 emerge/_emerge/system.py,sha256=p4HNz7d_LMRNE9Gk75vVdFecDH2iN_groAM9u-yQTpk,1618
@@ -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=lKHaMcL8kztwUF4V9zUycT7Ec7aTZS9SAiZh6auzCYc,42379
-emerge/_emerge/physics/microwave/microwave_bc.py,sha256=5BJfxgQWmgUt_Kd0ofVW4YUgzZxXv2wb8gvcJmBfhCA,42443
-emerge/_emerge/physics/microwave/microwave_data.py,sha256=0SQInYEVdp7rlDIUt51Hb6lQNg2GYnt3zqmTbMArVIk,49302
+emerge/_emerge/physics/microwave/microwave_bc.py,sha256=dU2vi8amEewM1ZLgtOk4oYXknH_gzt2c6J9BH4aIJiw,42294
+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
 emerge/_emerge/physics/microwave/sc.py,sha256=WZvoPhmHkfEv619RhmN09sXDBV0ryTqybwErA8Rc7lU,4735
@@ -67,19 +67,19 @@ emerge/_emerge/physics/microwave/assembly/periodicbc.py,sha256=Zg1kgQMccDQA2oVEr
 emerge/_emerge/physics/microwave/assembly/robinbc.py,sha256=syJ-NuHHA0WDQECuaPdeW-OfzIGHmxxqalKiokSyJFI,17742
 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=oFJXSNI--HwydgOUt88NdRsxqldxfy5mb38eZTx9qHs,24430
+emerge/_emerge/plot/simple_plots.py,sha256=qMQoMdSdTMQX5LvjI1n_dpZ6e51LzRCUOZuu5uHPd3w,24806
 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=5pi1LSHHVCutspQT2lcwWaF-eWoR_VE1OmkKtpizQhI,37321
-emerge/_emerge/plot/pyvista/display_settings.py,sha256=K2OhzKqeFzMXlEfZ5F4CQ9sN3l7nOgVjLplZBuMPjvE,899
+emerge/_emerge/plot/pyvista/display.py,sha256=GJ_fmU1AWLzPWwl3CQd50LOOmjEQ0JWaNFOk17Ux60M,38348
+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
-emerge/_emerge/projects/_load_base.txt,sha256=94o0eSWoDKlNR336EmhpG_S5syQHIUPHQxna-bVRhXo,509
+emerge/_emerge/projects/_load_base.txt,sha256=bHsZ4okxa9uu8qP4UOxSAeIQzuwpRtN0i71rg8wuqMA,473
 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.8.dist-info/METADATA,sha256=Yi_WDwKLxyKakod3QDuaRgz7RvnxAAk0CJVuVnPii1M,3304
-emerge-0.6.8.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-emerge-0.6.8.dist-info/entry_points.txt,sha256=8rFvAXticpKg4OTC8JEvAksnduW72KIEskCGG9XnFf8,43
-emerge-0.6.8.dist-info/licenses/LICENSE,sha256=VOCXWddrjMN5j7TvnSAOh1Dx7jkugdwq9Lqhycf5inc,17852
-emerge-0.6.8.dist-info/RECORD,,
+emerge-0.6.9.dist-info/METADATA,sha256=yAvC6lujrzubYu_H2qBafFx1k3c_kuoO3gD83cldhtA,3338
+emerge-0.6.9.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+emerge-0.6.9.dist-info/entry_points.txt,sha256=8rFvAXticpKg4OTC8JEvAksnduW72KIEskCGG9XnFf8,43
+emerge-0.6.9.dist-info/licenses/LICENSE,sha256=VOCXWddrjMN5j7TvnSAOh1Dx7jkugdwq9Lqhycf5inc,17852
+emerge-0.6.9.dist-info/RECORD,,