Merge pull request #181 from upb-lea/fit_conductivity

Fit conductivity

Author: gituser789

femmt/model.py

@@ -421,8 +421,7 @@ def __init__(self,
         if self.permittivity_datasource != DataSource.Datasheet:
             self.permittivity = self.database.get_complex_permittivity(material=material,
                                                                        data_source=permittivity_datasource)
-            self.permittivity.fit_permittivity_magnitude()
-            self.permittivity.fit_loss_angle()
+            self.permittivity.fit_sigma()
 
     def update_permittivity(self, frequency: float) -> None:
         """Update permittivity and calculate equivalent conductivity at a given frequency.

tests/integration/fixtures/log_inductor_core_material_measurement.json

@@ -4,85 +4,85 @@
       "f": 100000,
       "winding1": {
         "turn_losses": [
-          0.07945097577223559,
-          0.0764345360211902,
-          0.04918479250316746,
-          0.02064986832301939,
-          0.009381724754891135,
-          0.02065360895491418,
-          0.04939527910813583,
-          0.0773327509757728,
-          0.08176262863609238
+          0.07944991304085702,
+          0.07643346137467048,
+          0.04918413609615679,
+          0.0206497242752073,
+          0.009381798947673927,
+          0.02065347128718751,
+          0.04939462861297641,
+          0.0773316718820798,
+          0.08176153681247608
         ],
         "flux": [
-          9.22322500859072e-05,
-          -5.060535839834087e-07
+          9.223108443148515e-05,
+          -5.00790771197524e-07
         ],
         "flux_over_current": [
-          2.0496023681614326e-05,
-          -1.1592323537190992e-07
+          2.0495764642968676e-05,
+          -1.1475372301183605e-07
         ],
         "V": [
-          0.3277652261622774,
-          57.95114168336579
+          0.3244585078674559,
+          57.95040926885024
         ],
         "number_turns": 9,
         "I": [
           4.5,
           0.0
         ],
-        "winding_losses": 0.4642461650494175,
-        "P": 0.7374717588651241,
-        "Q": 130.39006878757303,
-        "S": 130.3921543001079
+        "winding_losses": 0.464240342329286,
+        "P": 0.7300316427017758,
+        "Q": 130.38842085491302,
+        "S": 130.39046452573618
       },
-      "core_eddy_losses": 0.01394884488552167,
-      "core_hyst_losses": 0.2600364721327584,
+      "core_eddy_losses": 0.006509052508868237,
+      "core_hyst_losses": 0.2600343060841858,
       "core_parts": {
         "core_part_1": {
-          "eddy_losses": 0.005748050493822775,
-          "hyst_losses": 0.1802238675929796,
-          "total_core_part_1": 0.18597191808680236
+          "eddy_losses": 0.002682569165754249,
+          "hyst_losses": 0.1802244049954136,
+          "total_core_part_1": 0.18290697416116783
         },
         "core_part_2": {
-          "eddy_losses": 0.008200794391698851,
-          "hyst_losses": 0.07981260453977895,
-          "total_core_part_2": 0.0880133989314778
+          "eddy_losses": 0.003826483343114005,
+          "hyst_losses": 0.07980990108877233,
+          "total_core_part_2": 0.08363638443188633
         }
       },
-      "all_winding_losses": 0.4642461650494175
+      "all_winding_losses": 0.464240342329286
     }
   ],
   "total_losses": {
     "winding1": {
-      "total": 0.46424616504941896,
+      "total": 0.46424034232928535,
       "turns": [
-        0.07945097577223559,
-        0.0764345360211902,
-        0.04918479250316746,
-        0.02064986832301939,
-        0.009381724754891135,
-        0.02065360895491418,
-        0.04939527910813583,
-        0.0773327509757728,
-        0.08176262863609238
+        0.07944991304085702,
+        0.07643346137467048,
+        0.04918413609615679,
+        0.0206497242752073,
+        0.009381798947673927,
+        0.02065347128718751,
+        0.04939462861297641,
+        0.0773316718820798,
+        0.08176153681247608
       ]
     },
-    "all_windings": 0.4642461650494175,
-    "eddy_core": 0.01394884488552167,
-    "hyst_core_fundamental_freq": 0.2600364721327584,
-    "total_core_part_1": 0.18597191808680236,
-    "total_eddy_core_part_1": 0.005748050493822775,
-    "total_hyst_core_part_1": 0.1802238675929796,
-    "total_core_part_2": 0.0880133989314778,
-    "total_eddy_core_part_2": 0.008200794391698851,
-    "total_hyst_core_part_2": 0.07981260453977895,
-    "core": 0.27398531701828005,
-    "total_losses": 0.7382314820676976
+    "all_windings": 0.464240342329286,
+    "eddy_core": 0.006509052508868237,
+    "hyst_core_fundamental_freq": 0.2600343060841858,
+    "total_core_part_1": 0.18290697416116783,
+    "total_eddy_core_part_1": 0.002682569165754249,
+    "total_hyst_core_part_1": 0.1802244049954136,
+    "total_core_part_2": 0.08363638443188633,
+    "total_eddy_core_part_2": 0.003826483343114005,
+    "total_hyst_core_part_2": 0.07980990108877233,
+    "core": 0.26654335859305406,
+    "total_losses": 0.7307837009223401
   },
   "simulation_settings": {
     "simulation_name": null,
-    "date": "2026-03-05 13:32:31",
+    "date": "2026-04-22 14:59:21",
     "component_type": "Inductor",
     "working_directory": "/home/nikolasf/Dokumente/01_git/30_Python/FEMMT/tests/integration/temp",
     "core": {