emerge 1.0.7__py3-none-any.whl → 1.1.0__py3-none-any.whl

emerge/_emerge/simulation_data.py

@@ -131,8 +131,8 @@ def generate_ndim(
 
 class DataEntry:
     
-    def __init__(self, vars: dict[str, float]):
-        self.vars: dict[str, float] = vars
+    def __init__(self, variables: dict[str, float]):
+        self.vars: dict[str, float] = variables
         self.data: dict[str, Any] = dict()
     
     def print(self) -> None:
@@ -172,25 +172,23 @@ class DataContainer:
     """The DataContainer class is a generalized class to store data for a set of parameter sweeps"""
     def __init__(self):
         self.entries: list[DataEntry] = []
-        self.stock: DataEntry = DataEntry({})
         
 
     def print(self) -> None:
         """ Print an overview of all data in the DataContainer"""
-        self.stock.print()
         for entry in self.entries:
             entry.print()
 
-    def new(self, **vars: float) -> DataEntry:
+    def new(self, **variables: float) -> DataEntry:
         """Create a new entry in the DataContainer for the given value setting"""
-        entry = DataEntry(vars)
+        entry = DataEntry(variables)
         self.entries.append(entry)
         return entry
     
     def iterate(self) -> Generator[tuple[dict[str, float], dict[str, Any]], None, None]:
         for entry in self.entries:
             yield entry.vars, entry.data
-
+    
     @property
     def first(self) -> DataEntry:
         """Returns the first added entry"""
@@ -201,14 +199,6 @@ class DataContainer:
         """Returns the last added entry"""
         return self.entries[-1]
     
-    @property
-    def default(self) -> DataEntry:
-        """Returns the default DataEntry which is either the last from the parameter sweep or the general one in case of no parameter sweep."""
-        if not self.entries:
-            return self.stock
-        else:
-            return self.last
-    
     def index(self, index: int) -> DataEntry:
         """Returns the last added entry"""
         return self.entries[index]
@@ -226,11 +216,11 @@ class DataContainer:
     
     def __getitem__(self, key: str) -> DataEntry:
         """Returns the requested item from the default DataEntry"""
-        return self.default[key]
+        return self.last[key]
         
     def __setitem__(self, key: str, value: Any) -> None:
         """Writes a value to the requested default DataEntry"""
-        self.default[key] = value
+        self.last[key] = value
     
 
 class BaseDataset(Generic[T,M]):
@@ -298,12 +288,10 @@ class BaseDataset(Generic[T,M]):
         Returns:
             T: The physics dataset
         """
-        index = next(
-            i
-            for i, var_map in enumerate(self._variables)
-            if all(var_map.get(k) == v for k, v in variables.items())
-        )
-        return self.get_entry(index)
+        for i, var_map in enumerate(self._variables):
+            if all(var_map.get(k) == v for k,v in variables.items()):
+                return self.get_entry(i)
+        
     
     def filter(self, **variables: float) -> list[T]:
         """Returns a list of all physics datasets that are valid for the given variable assignment

emerge/_emerge/solve_interfaces/cudss_interface.py

@@ -53,6 +53,21 @@ INDEX_BASE = cudss.IndexBase.ZERO
 def _c_pointer(arry) -> int:
     return int(arry.data.ptr)
 
+
+
+############################################################
+#                         FUNCTIONS                        #
+############################################################
+
+def is_complex_symmetric(A, rtol=1e-12, atol=0.0):
+    D = A-A.T
+    D.sum_duplicates()
+    if D.nnz == 0:
+        return True
+    max_diff = float(np.abs(D.data).max())
+    max_A = float(np.abs(A.data).max()) if A.nnz else 0.0
+    return (max_diff <= atol) if max_A == 0.0 else (max_diff <= atol + rtol * max_A)
+
 ############################################################
 #                         INTERFACE                        #
 ############################################################
@@ -152,6 +167,11 @@ class CuDSSInterface:
         """
         self.N = A.shape[0]
 
+        if is_complex_symmetric(A, rtol=1e-12, atol=1e-15):
+            self.MTYPE = cudss.MatrixType.SYMMETRIC
+        else:
+            self.MTYPE = cudss.MatrixType.GENERAL
+        
         if np.iscomplexobj(A):
             self._COMP = True
         else:
@@ -186,7 +206,6 @@ class CuDSSInterface:
         """Updates the currently defined matrix data into the existing memory.ALG_AMD
         """
         cudss.matrix_set_values(self.A_cobj, _c_pointer(self._VAL))
-
         
         self.b_cobj = cudss.matrix_create_dn(self.N, 1, self.N, _c_pointer(self.b_cu),
                                     int(self.VTYPE), int(cudss.Layout.COL_MAJOR))

emerge/_emerge/solver.py

@@ -805,7 +805,7 @@ class SmartARPACK_BMA(EigSolver):
                     energies.append(energy)
         
         #Sort solutions on mode energy
-        val, mode, energy = zip(*sorted(zip(tot_eigen_values,tot_eigen_modes,energies), key=lambda x: x[2], reverse=True))
+        val, mode, energy = zip(*sorted(zip(tot_eigen_values, tot_eigen_modes, energies), key=lambda x: x[2], reverse=True))
         eigen_values = np.array(val[:nmodes])
         eigen_modes = np.array(mode[:nmodes]).T
 

{emerge-1.0.7.dist-info → emerge-1.1.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: emerge
-Version: 1.0.7
+Version: 1.1.0
 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
@@ -18,8 +18,12 @@ Requires-Dist: pyvista>=0.45.2
 Requires-Dist: scipy>=1.14.0
 Provides-Extra: cudss
 Requires-Dist: cupy-cuda12x; extra == 'cudss'
-Requires-Dist: nvidia-cudss-cu12; extra == 'cudss'
-Requires-Dist: nvmath-python[cu12]; extra == 'cudss'
+Requires-Dist: nvidia-cudss-cu12==0.5.0.16; extra == 'cudss'
+Requires-Dist: nvmath-python[cu12]==0.5.0; extra == 'cudss'
+Provides-Extra: cudss12
+Requires-Dist: cupy-cuda12x; extra == 'cudss12'
+Requires-Dist: nvidia-cudss-cu12==0.5.0.16; extra == 'cudss12'
+Requires-Dist: nvmath-python[cu12]==0.5.0; extra == 'cudss12'
 Provides-Extra: dxf
 Requires-Dist: ezdxf; extra == 'dxf'
 Provides-Extra: umfpack

{emerge-1.0.7.dist-info → emerge-1.1.0.dist-info}/RECORD

@@ -1,4 +1,4 @@
-emerge/__init__.py,sha256=xexiF7GihNOUHqPZ2KViJFFaNNfRyc6l3Qz1PzWO_5w,3162
+emerge/__init__.py,sha256=Ctg9aiE6r8aoihr0uSluSZPwxJLRUuoaBOCAFDf2bMU,3494
 emerge/__main__.py,sha256=WVf16sfrOI910QWohrQDaChZdRifMNoS6VKzCT6f3ZA,92
 emerge/cli.py,sha256=NU1uhwuZ6i50680v3_I4kDZPTHqz74gOYK71UBhb8oE,666
 emerge/ext.py,sha256=IBoHH5PQFj5pYMfp6r-uMpNNgbSe8c0g9x8qjBzzVmU,223
@@ -14,19 +14,20 @@ emerge/_emerge/cs.py,sha256=gULfov6s0jODOdQkH6NmGBbG5wvny1-bJU8fdAlpCHo,19730
 emerge/_emerge/dataset.py,sha256=UcSAJ_siLrOjNBBWRWsS3GUZUpayp63EM6pP6ClwKDI,1534
 emerge/_emerge/emerge_update.py,sha256=0G91xr7k7Me5gOlk3pXbKWe-6ALXtoCJ5syTa1Y5Bhw,2042
 emerge/_emerge/geo2d.py,sha256=e_HkX1GQ2iYrdO0zeEgzVOzfGyU1WGJyjeGBAobOttE,3323
-emerge/_emerge/geometry.py,sha256=9WnZt2xtF4HEJfdPyT41i_q8gRMZRrG0C9PILaz1PvA,25523
+emerge/_emerge/geometry.py,sha256=1b3CWhUoEVwQCtosLQmXU0aBBC9Cqsn_5kRcZIidzJY,25747
 emerge/_emerge/howto.py,sha256=c4UxUNpA1tygr3OoR-LH-h0UZv-Tf9K8tpCiAU18BKE,8173
-emerge/_emerge/logsettings.py,sha256=OpsH_1dQAdZry_as8y0OQt4yKP_AMFfQG2d5Nz5yywg,4789
+emerge/_emerge/logsettings.py,sha256=S4aUkO2vhcssmYQIGOq0VkazMEX4TYJlCt0FZ74Mc8Y,5574
 emerge/_emerge/material.py,sha256=furDHD4rwkYCOjnh0GLz-Utjl5Z_NxDv0zWrk23Pygc,17459
-emerge/_emerge/mesh3d.py,sha256=zPKOo1whf6yBpJxfEt89p3LXO4k1j7LSSMAGCDSK318,36946
-emerge/_emerge/mesher.py,sha256=Ozks6t0LbdWEfDuh_06Hmm9nZz8vQLJl2FsYA7wzMMo,16854
+emerge/_emerge/mesh3d.py,sha256=YWd9xF-zrsxb3OSzmAY9TpewmY_kpoNi212Dhao_HPQ,37212
+emerge/_emerge/mesher.py,sha256=Lxtiy2Y4ZBFtpiWFjCzs0XIhPCJsutAskmITCsnovCE,18146
 emerge/_emerge/periodic.py,sha256=dUuWqjlDR8mHtQR3ecINP2FFjJJ0cKg0blOVZ0PCcAo,12087
 emerge/_emerge/plot.py,sha256=cf1I9mj7EIUJcq8vmANlUkqoV6QqVaJaP-zlC-T9E18,8041
 emerge/_emerge/selection.py,sha256=ltT8ubMFG3-sFrAh7K7iAgSoBt3r25B02ShzMlOGSXQ,21527
-emerge/_emerge/settings.py,sha256=wZFMzQSnMEEJptatu--67El1L0I_YEv9S8QjqI69bfs,265
-emerge/_emerge/simmodel.py,sha256=Iu971xxJ5ggeB-KkrtxmGyV_-zHQN76z8_w1nSwpWJY,29371
-emerge/_emerge/simulation_data.py,sha256=23o-xbm6Q6s9sYisyK9u1GTmuaXRl0WDGQwzPO7lkr0,15115
-emerge/_emerge/solver.py,sha256=3P-pcDWEpCEVnT2iFRRzC1hdYGUaz-xRzE68G3xvF1Q,52988
+emerge/_emerge/settings.py,sha256=4Mlo3T6UVGzhTB838833_dwvXYLGKNIEHQ4fr9hxHd8,5335
+emerge/_emerge/simmodel.py,sha256=3VTNpveoZw2PFQjgs3oMG2kOhAPSuY87sy7AQXAqXH0,32984
+emerge/_emerge/simstate.py,sha256=n_iOz3L9lZ0oD4CBb8cdHXOoaoyx96kcsFKwSQWVxlk,3630
+emerge/_emerge/simulation_data.py,sha256=W8wTSTqGNZIwnpBuk08I7e4GEXXAbnfoYEWHnhzHvyM,14723
+emerge/_emerge/solver.py,sha256=uzKWM9UhmpFhgxsKrfVlpHHBO_HoxoHjtkJp9-CFoZg,52990
 emerge/_emerge/system.py,sha256=p4HNz7d_LMRNE9Gk75vVdFecDH2iN_groAM9u-yQTpk,1618
 emerge/_emerge/elements/__init__.py,sha256=I3n9aic6lJW-oGeqTEZ-Fpxvyl2i-WqsHdnrM3v1oB8,799
 emerge/_emerge/elements/femdata.py,sha256=ZSB7dICyU3GOWbxpuowBc-Khh2mpXa02ZfMkHwdDol4,8377
@@ -38,10 +39,10 @@ emerge/_emerge/geo/__init__.py,sha256=yTeuT4Oexrsdkr7MxRLeTHEY5iP4IHsWeCvit57fK5
 emerge/_emerge/geo/horn.py,sha256=tI-w-O0Fm_siMaVhKpZ_k5URLfZkqcbEpURX94fhKDs,4645
 emerge/_emerge/geo/modeler.py,sha256=_PMz3lFSa7FmJHWdY-4U1Sqbed-Egy85S_AdjlCldC4,15572
 emerge/_emerge/geo/operations.py,sha256=WYWfOXWrT0voeKW9U26g-PhQfqJl3ovRQ8uDQXUr7Nc,12459
-emerge/_emerge/geo/pcb.py,sha256=oRx9CnFFzhnDNtwxnw2rcm_CtN1h2y3-0jXOaBqGZ_E,57544
+emerge/_emerge/geo/pcb.py,sha256=kZQFx-LdFusnHtegWTs7b4YVnhGBdFlDCd90IP7kwD8,60392
 emerge/_emerge/geo/pmlbox.py,sha256=gaIG_AoZNQnIyJ8C7x64U-Hw5dsmllWMiZDAH4iRoM0,8784
 emerge/_emerge/geo/polybased.py,sha256=D_Ef4anrwV2RArEFrvWppZ_c7oN_Hm5h7ltMi2U3v2o,32891
-emerge/_emerge/geo/shapes.py,sha256=bLZM8ey05yvpKGgZS_DXFDaTQRP5kpsc7Xgp6Xaxc_Q,26903
+emerge/_emerge/geo/shapes.py,sha256=k3WZeXZBkLzHaOShUsfyqWITHBNQfDEgqyemhLLgRRg,27080
 emerge/_emerge/geo/step.py,sha256=XcAiEN8W4umNmZdYmrGHX_aJUuiMgc6vgT-UIk8Gbqc,2689
 emerge/_emerge/geo/pcb_tools/calculator.py,sha256=VbMP2xC9i7OFwtqnnwfYgyJSEcJIjr2VIy_Ez1hYqlU,859
 emerge/_emerge/geo/pcb_tools/dxf.py,sha256=Xv7iP_bB0f2Y46sxZloa5KYGyj5dtApXoR-kgL7KHZA,11744
@@ -54,9 +55,9 @@ emerge/_emerge/mth/pairing.py,sha256=i8bBvTeMmzgF0JdiDNJiTXxx913x4f10777pzD6FJo0
 emerge/_emerge/physics/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 emerge/_emerge/physics/microwave/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 emerge/_emerge/physics/microwave/adaptive_freq.py,sha256=aWhijhCVAbnuwkru-I1AaRdY20uyozf6OWRIh9r2ijg,9786
-emerge/_emerge/physics/microwave/adaptive_mesh.py,sha256=bcPPbWoTaMsLK1QCIL6an5WaIIeKddCPPs2u7vKfAEs,22089
-emerge/_emerge/physics/microwave/microwave_3d.py,sha256=OxZ3uJI1hhyGuUPV6ofWXCQfCu23URkyK2UJnpa9CLI,49141
-emerge/_emerge/physics/microwave/microwave_bc.py,sha256=70zrxTZG_i9n2vBQAU1FOtK2Ia_KMi3qQeC9MU5aDHo,44872
+emerge/_emerge/physics/microwave/adaptive_mesh.py,sha256=LrlDMaYIps0uPkTh5KUu1jHqxdqOfxxNLVw8UeqggUc,25190
+emerge/_emerge/physics/microwave/microwave_3d.py,sha256=N06nZQ0XMhSU1z5lKrR6irJmkAlurG9Gg7J_DFzWLsI,51838
+emerge/_emerge/physics/microwave/microwave_bc.py,sha256=hsz9LkO2UgiBGld79ovxgtnZ2vKQHcVfO6fU8rp3WDs,50696
 emerge/_emerge/physics/microwave/microwave_data.py,sha256=eSWBrFmdYnOmCchf31jORwCriq2Ix1piGoGYHsvcF38,50551
 emerge/_emerge/physics/microwave/periodic.py,sha256=wYSUgLFVtCLqSG3EDKoCDRU93iPUzBdXzVRdHTRmbpI,3000
 emerge/_emerge/physics/microwave/port_functions.py,sha256=d-W1D-7P05MfXdOs7WlhPi_RqlSpC0HkYU6yl3GrxgE,2173
@@ -77,20 +78,20 @@ emerge/_emerge/plot/simple_plots.py,sha256=szIpmQmO8o6ubzB_E3zTJfEx16mJ3-OXrMYdD
 emerge/_emerge/plot/matplotlib/mpldisplay.py,sha256=e8V6EhGdCW7nRkSFvjHCcRO5uR-FcD0yHQ1nxPQCbp4,8674
 emerge/_emerge/plot/pyvista/__init__.py,sha256=CPclatEu6mFnJZzCQk09g6T6Fh20WTbiLAJGSwAnPXU,30
 emerge/_emerge/plot/pyvista/cmap_maker.py,sha256=_GVXYdtXpJwAO9O-Iekjzn6YcR0MVT8LNh12nqvF2IA,2498
-emerge/_emerge/plot/pyvista/display.py,sha256=nsiElERHYZPWX0uHwNoaocvfGtVTMsBdaO3hjTVDPvk,45429
+emerge/_emerge/plot/pyvista/display.py,sha256=PASOzQd_L0_uEbWcdN42draaXK_LpveW0cS6-1obtGk,45740
 emerge/_emerge/plot/pyvista/display_settings.py,sha256=gV5hjRGEAl3oQeBPobas6b6JzYfMFrXIGtVSaeml4N0,1074
 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=bHsZ4okxa9uu8qP4UOxSAeIQzuwpRtN0i71rg8wuqMA,473
 emerge/_emerge/projects/generate_project.py,sha256=TNw-0SpLc82MBq0bd9hB_yqvBZCgmuPonCBsHTp91uk,1450
-emerge/_emerge/solve_interfaces/cudss_interface.py,sha256=Iszyy7RuuCa_FgfROEyTSSWbmR2LzMUkEcR8klzIKOQ,9915
+emerge/_emerge/solve_interfaces/cudss_interface.py,sha256=D6GVQLgTzRw4ec2MkgNhsSWrkLYMhvqljCyE6qtNQ3o,10599
 emerge/_emerge/solve_interfaces/pardiso_interface.py,sha256=iVFxToMmIzhj3hcAP-O_MDHKz82ePFIHY1us11kzUBU,15305
 emerge/beta/dxf.py,sha256=Bw4lVk0TquOgCxTZV23BZN7PrgqxBrMZxbHV1waC5U0,50
 emerge/materials/__init__.py,sha256=Z9tu3m_nqj6F9I-FwoVoN0vCTYUlFesH3KxJ38wkZck,19
 emerge/materials/isola.py,sha256=kSDxHJZVn2CcanoUjlwRVKIPvadRbBybURTdIHWx728,18660
 emerge/materials/rogers.py,sha256=4u6ma_XQdXGKWE3WsFkaMTamCQNo9kTYSTU8S1gCAYU,3388
-emerge-1.0.7.dist-info/METADATA,sha256=tv3bFqll_HiWD6MDGr2K5tUC4Vy97vCO84EKQ2iGkQU,3400
-emerge-1.0.7.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-emerge-1.0.7.dist-info/entry_points.txt,sha256=8rFvAXticpKg4OTC8JEvAksnduW72KIEskCGG9XnFf8,43
-emerge-1.0.7.dist-info/licenses/LICENSE,sha256=VOCXWddrjMN5j7TvnSAOh1Dx7jkugdwq9Lqhycf5inc,17852
-emerge-1.0.7.dist-info/RECORD,,
+emerge-1.1.0.dist-info/METADATA,sha256=o2joAvpVrU6n6s2UXT27dEata6nv95RlAiKsShieUh4,3614
+emerge-1.1.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+emerge-1.1.0.dist-info/entry_points.txt,sha256=8rFvAXticpKg4OTC8JEvAksnduW72KIEskCGG9XnFf8,43
+emerge-1.1.0.dist-info/licenses/LICENSE,sha256=VOCXWddrjMN5j7TvnSAOh1Dx7jkugdwq9Lqhycf5inc,17852
+emerge-1.1.0.dist-info/RECORD,,