Merge pull request #151 from upb-lea/electrostatic_solver

gituser789 · web-flow · commit 7e0e0963cac6 · 2025-07-17T13:13:20.000+02:00
removing the flags of turns and layer insulations. Correcting a mista…
diff --git a/femmt/component.py b/femmt/component.py
@@ -3609,7 +3609,8 @@ def write_electro_magnetic_parameter_pro(self):
 
             # relative permittivity
             # Turn insulation is not implemented yet for RectangularSolid
-            if self.windings[winding_number].conductor_type == ConductorType.RectangularSolid:
+            # Or if the turn insulation is not drawn
+            if self.windings[winding_number].conductor_type == ConductorType.RectangularSolid or not self.insulation.turn_ins:
                 text_file.write(f"er_turns_insulation_{winding_number + 1} = 1.0;\n")
             else:
                 text_file.write(f"er_turns_insulation_{winding_number + 1} = {self.insulation.er_turn_insulation[winding_number]};\n")
diff --git a/femmt/drawing.py b/femmt/drawing.py
diff --git a/femmt/examples/advanced_inductor_air_gap_sweep.py b/femmt/examples/advanced_inductor_air_gap_sweep.py
@@ -65,8 +65,6 @@ def basic_example_sweep(onelab_folder: str | None = None, show_visual_outputs: b
         insulation = fmt.Insulation()
         insulation.add_core_insulations(0.001, 0.001, 0.004, 0.001)
         insulation.add_winding_insulations([[0.0005]], per_layer_of_turns=False)
-        insulation.add_turn_insulation([0.25e-5], add_turn_insulations=False)
-        insulation.add_insulation_between_layers(add_insulation_material=False, thickness=0.0005)
         geo.set_insulation(insulation)
 
         winding_window = fmt.WindingWindow(core, insulation)
diff --git a/femmt/examples/advanced_inductor_sweep.py b/femmt/examples/advanced_inductor_sweep.py
@@ -64,8 +64,6 @@ def advanced_example_inductor_sweep(onelab_folder: str = None, show_visual_outpu
     insulation = fmt.Insulation(flag_insulation=False)
     insulation.add_core_insulations(0.001, 0.014, 0.006, 0.001)
     insulation.add_winding_insulations([[0.0005]], per_layer_of_turns=False)
-    insulation.add_turn_insulation([0.25e-5], add_turn_insulations=False)
-    insulation.add_insulation_between_layers(add_insulation_material=False, thickness=0.0005)
     geo.set_insulation(insulation)
 
     # 5. create winding window and virtual winding windows (vww)
diff --git a/femmt/examples/basic_inductor.py b/femmt/examples/basic_inductor.py
@@ -149,11 +149,6 @@ def example_thermal_simulation(show_thermal_visual_outputs: bool = True, flag_in
     insulation = fmt.Insulation(flag_insulation=True)
     insulation.add_core_insulations(0.001, 0.001, 0.003, 0.001)
     insulation.add_winding_insulations([[0.0005, 0.0005]], per_layer_of_turns=False)
-    # When "add_turn_insulation" is false, this function has no effect
-    insulation.add_turn_insulation([0.25e-5], add_turn_insulations=False)
-    # When "add_insulation_material" is false, the material will be air by default. For now this function makes difference when the winding scheme is square and
-    # litz wire.
-    insulation.add_insulation_between_layers(add_insulation_material=False, thickness=0.0005)
     geo.set_insulation(insulation)
 
     # 5. create winding window and virtual winding windows (vww)
diff --git a/femmt/examples/basic_inductor_electrostatic.py b/femmt/examples/basic_inductor_electrostatic.py
@@ -82,12 +82,12 @@ def basic_example_inductor_electrostatic(onelab_folder: str = None, show_visual_
     insulation.add_core_insulations(0.2e-3, 0.2e-3, 0.2e-3, 0.2e-3, dielectric_constant=bobbin_material["dielectric_constant"])
     # This is the insulation of the turn itself
     turn_insulation_material = fmt.insulation_materials_database()["wire_insulation"]["plastic_insulation"]["Plenum Polyvinyl Chloride (Plenum PVC)"]
-    insulation.add_turn_insulation([0.2e-3], dielectric_constant=[turn_insulation_material["dielectric_constant"]], add_turn_insulations=True)
+    insulation.add_turn_insulation([0.2e-3], dielectric_constant=[turn_insulation_material["dielectric_constant"]])
     # This is an air between turns if needed
     insulation.add_winding_insulations([[1e-3, 1e-3]], per_layer_of_turns=True)
     # Kapton material is added between every layer of turns
     layer_insulation = fmt.insulation_materials_database()["film_insulation"]["Kapton"]
-    insulation.add_insulation_between_layers(add_insulation_material=True, thickness=0.6e-3, dielectric_constant=layer_insulation["dielectric_constant"])
+    insulation.add_insulation_between_layers(thickness=0.6e-3, dielectric_constant=layer_insulation["dielectric_constant"])
     geo.set_insulation(insulation)
 
     # 5. create winding window and virtual winding windows (vww)
@@ -96,7 +96,7 @@ def basic_example_inductor_electrostatic(onelab_folder: str = None, show_visual_
 
     # 6. create conductor and set parameters: use solid wires
     winding = fmt.Conductor(0, fmt.Conductivity.Copper, winding_material_temperature=45)
-    winding.set_solid_round_conductor(conductor_radius=1.1506e-3, conductor_arrangement=fmt.ConductorArrangement.Square)
+    winding.set_solid_round_conductor(conductor_radius=1.1506e-3, conductor_arrangement=fmt.ConductorArrangement.Hexagonal)
     winding.parallel = False  # set True to make the windings parallel, currently only for solid conductors
     # 7. add conductor to vww and add winding window to MagneticComponent
     vww.set_winding(winding, 7, None, fmt.Align.ToEdges, placing_strategy=fmt.ConductorDistribution.VerticalUpward_HorizontalRightward,
diff --git a/femmt/examples/basic_inductor_excitation_sweep.py b/femmt/examples/basic_inductor_excitation_sweep.py
@@ -80,8 +80,6 @@ def basic_example_inductor_excitation_sweep(onelab_folder: str = None, show_visu
     insulation = fmt.Insulation()
     insulation.add_core_insulations(0.001, 0.001, 0.004, 0.001)
     insulation.add_winding_insulations([[0.0005]], per_layer_of_turns=False)
-    insulation.add_turn_insulation([0.25e-5], add_turn_insulations=False)
-    insulation.add_insulation_between_layers(add_insulation_material=False, thickness=0.0005)
     geo.set_insulation(insulation)
 
     # 5. create winding window and virtual winding windows (vww)
diff --git a/femmt/examples/basic_split_windings.py b/femmt/examples/basic_split_windings.py
@@ -74,8 +74,6 @@ def setup_simulation(working_directory, horizontal_split_factors, vertical_split
              [iso_against, iso_against, iso_against, iso_against, iso_self, iso_against, iso_against],
              [iso_against, iso_against, iso_against, iso_against, iso_against, iso_self, iso_against],
              [iso_against, iso_against, iso_against, iso_against, iso_against, iso_against, iso_self]], per_layer_of_turns=False)
-        insulation.add_turn_insulation([0.25e-5, 0.25e-5, 0.25e-5, 0.25e-5, 0.25e-5, 0.25e-5, 0.25e-5], add_turn_insulations=False)
-        insulation.add_insulation_between_layers(add_insulation_material=False, thickness=0.0001)
         geo.set_insulation(insulation)
 
         winding_window = fmt.WindingWindow(core, insulation)
diff --git a/femmt/examples/basic_transformer.py b/femmt/examples/basic_transformer.py
@@ -126,10 +126,8 @@ def example_thermal_simulation(show_thermal_visual_outputs: bool = True, flag_in
     # 4. set insulation
     insulation = fmt.Insulation(flag_insulation=True)
     insulation.add_core_insulations(0.001, 0.001, 0.002, 0.001)
-    insulation.add_turn_insulation([0.25e-5, 0.25e-5], add_turn_insulations=False)
     insulation.add_winding_insulations([[0.0002, 0.001],
                                         [0.001, 0.0002]], per_layer_of_turns=False)
-    insulation.add_insulation_between_layers(add_insulation_material=False, thickness=0.0002)
     geo.set_insulation(insulation)
 
     # 5. create winding window and virtual winding windows (vww)
diff --git a/femmt/examples/basic_transformer_5_windings.py b/femmt/examples/basic_transformer_5_windings.py
@@ -139,8 +139,6 @@ def example_thermal_simulation(show_thermal_visual_outputs: bool = True, flag_in
          [iso_against, iso_against, iso_self, iso_against, iso_against],
          [iso_against, iso_against, iso_self, iso_against, iso_against],
          [iso_against, iso_against, iso_against, iso_against, iso_self]], per_layer_of_turns=False)
-    insulation.add_turn_insulation([0.25e-5, 0.25e-5, 0.25e-5, 0.25e-5, 0.25e-5, 0.25e-5], add_turn_insulations=False)
-    insulation.add_insulation_between_layers(add_insulation_material=False, thickness=0.0001)
     geo.set_insulation(insulation)
 
     # 5. create winding window and virtual winding windows (vww)
diff --git a/femmt/examples/basic_transformer_6_windings.py b/femmt/examples/basic_transformer_6_windings.py
@@ -140,8 +140,6 @@ def example_thermal_simulation(show_thermal_visual_outputs: bool = True, flag_in
          [iso_against, iso_against, iso_against, iso_self, iso_against, iso_against],
          [iso_against, iso_against, iso_against, iso_against, iso_self, iso_against],
          [iso_against, iso_against, iso_against, iso_against, iso_against, iso_self]], per_layer_of_turns=False)
-    insulation.add_turn_insulation([0.25e-5, 0.25e-5, 0.25e-5, 0.25e-5, 0.25e-5, 0.25e-5, 0.25e-5], add_turn_insulations=False)
-    insulation.add_insulation_between_layers(add_insulation_material=False, thickness=0.0001)
 
     geo.set_insulation(insulation)
 
diff --git a/femmt/examples/basic_transformer_center_tapped.py b/femmt/examples/basic_transformer_center_tapped.py
@@ -143,9 +143,6 @@ def example_thermal_simulation(show_thermal_visual_outputs: bool = True, flag_in
         wrap_para_type=fmt.WrapParaType.FixedThickness,
         foil_horizontal_placing_strategy=fmt.FoilHorizontalDistribution.VerticalUpward)
 
-    insulation.add_turn_insulation([0.25e-5, 0.25e-5, 0.25e-5], add_turn_insulations=False)
-    insulation.add_insulation_between_layers(add_insulation_material=False, thickness=1e-4)
-
     geo.set_insulation(insulation)
     geo.set_winding_windows([winding_window])
 
diff --git a/femmt/examples/basic_transformer_electrostatic.py b/femmt/examples/basic_transformer_electrostatic.py
@@ -89,10 +89,9 @@ def basic_example_transformer_electrostatic(onelab_folder: str = None, show_visu
                                         [0.095e-3, 0.0002]], per_layer_of_turns=True)
     turn_insulation_material = fmt.insulation_materials_database()["wire_insulation"]["plastic_insulation"]["Plenum Polyvinyl Chloride (Plenum PVC)"]
     insulation.add_turn_insulation([0.25e-5, 0.25e-5],
-                                   dielectric_constant=[turn_insulation_material["dielectric_constant"], turn_insulation_material["dielectric_constant"]],
-                                   add_turn_insulations=False)
+                                   dielectric_constant=[turn_insulation_material["dielectric_constant"], turn_insulation_material["dielectric_constant"]])
     layer_insulation = fmt.insulation_materials_database()["film_insulation"]["Kapton"]
-    insulation.add_insulation_between_layers(add_insulation_material=True, thickness=0.5e-3, dielectric_constant=layer_insulation["dielectric_constant"])
+    insulation.add_insulation_between_layers(thickness=0.5e-3, dielectric_constant=layer_insulation["dielectric_constant"])
     geo.set_insulation(insulation)
 
     # 5. create winding window and virtual winding windows (vww)
diff --git a/femmt/examples/basic_transformer_excitation_sweep.py b/femmt/examples/basic_transformer_excitation_sweep.py
@@ -71,8 +71,6 @@ def basic_example_transformer_excitation_sweep(onelab_folder: str = None, show_v
     insulation.add_core_insulations(0.001, 0.001, 0.002, 0.001)
     insulation.add_winding_insulations([[0.0002, 0.0002],
                                         [0.0002, 0.0002]], per_layer_of_turns=False)
-    insulation.add_turn_insulation([0.25e-5, 0.25e-5], add_turn_insulations=False)
-    insulation.add_insulation_between_layers(add_insulation_material=False, thickness=0.0002)
     geo.set_insulation(insulation)
 
     # 5. create winding window and virtual winding windows (vww)
diff --git a/femmt/examples/basic_transformer_integrated.py b/femmt/examples/basic_transformer_integrated.py
@@ -131,10 +131,8 @@ def example_thermal_simulation(show_thermal_visual_outputs: bool = True, flag_in
     # 4. set insulations
     insulation = fmt.Insulation(flag_insulation=False)
     insulation.add_core_insulations(0.001, 0.001, 0.002, 0.001)
-    insulation.add_turn_insulation([0.25e-5, 0.25e-5], add_turn_insulations=False)
     insulation.add_winding_insulations([[0.0002, 0.001],
                                         [0.001, 0.0002]], per_layer_of_turns=False)
-    insulation.add_insulation_between_layers(add_insulation_material=False, thickness=0.1e-3)
     geo.set_insulation(insulation)
 
     # 5. create winding window and virtual winding windows (vww)
diff --git a/femmt/examples/basic_transformer_interleaved.py b/femmt/examples/basic_transformer_interleaved.py
@@ -127,8 +127,6 @@ def example_thermal_simulation(show_thermal_visual_outputs: bool = True, flag_in
     insulation.add_core_insulations(0.001, 0.001, 0.002, 0.001)
     insulation.add_winding_insulations([[0.0002, 0.001],
                                         [0.001, 0.0002]], per_layer_of_turns=False)
-    insulation.add_turn_insulation([0.25e-5, 0.25e-5], add_turn_insulations=False)
-    insulation.add_insulation_between_layers(add_insulation_material=False, thickness=0.0002)
     geo.set_insulation(insulation)
 
     # 5. create winding window and virtual winding windows (vww)
diff --git a/femmt/examples/basic_transformer_n_winding.py b/femmt/examples/basic_transformer_n_winding.py
@@ -137,9 +137,6 @@ def example_thermal_simulation(show_thermal_visual_outputs: bool = True, flag_in
          [0.0002, 0.0004, 0.0004, 0.0002, 0.0002, 0.0004, 0.0002, 0.0002, 0.0002, 0.0004, 0.0002, 0.0004],
          [0.0004, 0.0002, 0.0004, 0.0002, 0.0002, 0.0004, 0.0002, 0.0002, 0.0002, 0.0004, 0.0002, 0.0004],
          [0.0004, 0.0002, 0.0004, 0.0002, 0.0002, 0.0004, 0.0002, 0.0002, 0.0002, 0.0004, 0.0002, 0.0004]], per_layer_of_turns=False)
-    insulation.add_turn_insulation([0.25e-5, 0.25e-5, 0.25e-5, 0.25e-5, 0.25e-5, 0.25e-5, 0.25e-5, 0.25e-5, 0.25e-5, 0.25e-5, 0.25e-5, 0.25e-5],
-                                   add_turn_insulations=False)
-    insulation.add_insulation_between_layers(add_insulation_material=False, thickness=0.0002)
     geo.set_insulation(insulation)
 
     # 5. create winding window and virtual winding windows (vww)
diff --git a/femmt/examples/basic_transformer_stacked.py b/femmt/examples/basic_transformer_stacked.py
@@ -128,8 +128,6 @@ def example_thermal_simulation(show_thermal_visual_outputs: bool = True, flag_in
     insulation.add_core_insulations(0.001, 0.001, 0.001, 0.001)  # [bot, top, left, right]
     insulation.add_winding_insulations([[0.0002, 0.001],
                                         [0.001, 0.0002]], per_layer_of_turns=False)
-    insulation.add_turn_insulation([0.25e-5, 0.25e-5], add_turn_insulations=False)
-    insulation.add_insulation_between_layers(add_insulation_material=False, thickness=0.0005)
     geo.set_insulation(insulation)
 
     winding_window_top, winding_window_bot = fmt.create_stacked_winding_windows(core, insulation)
diff --git a/femmt/examples/basic_transformer_stacked_center_tapped.py b/femmt/examples/basic_transformer_stacked_center_tapped.py
@@ -146,9 +146,6 @@ def example_thermal_simulation(show_thermal_visual_outputs: bool = True, flag_in
         wrap_para_type=fmt.WrapParaType.FixedThickness,
         foil_horizontal_placing_strategy=fmt.FoilHorizontalDistribution.VerticalUpward)
 
-    insulation.add_turn_insulation([0.25e-5, 0.25e-5], add_turn_insulations=False)
-    insulation.add_insulation_between_layers(add_insulation_material=False, thickness=0.0005)
-
     geo.set_insulation(insulation)
     geo.set_winding_windows([coil_window, transformer_window])
 
diff --git a/femmt/examples/basic_transformer_three_winding.py b/femmt/examples/basic_transformer_three_winding.py
@@ -128,8 +128,6 @@ def example_thermal_simulation(show_thermal_visual_outputs: bool = True, flag_in
     insulation.add_winding_insulations([[0.0002, 0.0004, 0.0004],
                                         [0.0004, 0.0002, 0.0004],
                                         [0.0004, 0.0004, 0.0002]], per_layer_of_turns=False)
-    insulation.add_turn_insulation([0.25e-5, 0.25e-5, 0.25e-5], add_turn_insulations=False)
-    insulation.add_insulation_between_layers(add_insulation_material=False, thickness=0.0005)
     geo.set_insulation(insulation)
 
     # 5. create winding window and virtual winding windows (vww)
diff --git a/femmt/examples/component_study/transformer_component_study.py b/femmt/examples/component_study/transformer_component_study.py
@@ -61,8 +61,6 @@ def transformer_component_study(onelab_folder: str | None = None, show_visual_ou
     insulation.add_core_insulations(0.001, 0.001, 0.002, 0.001)
     insulation.add_winding_insulations([[0.0002, 0.001],
                                         [0.001, 0.0002]], per_layer_of_turns=False)
-    insulation.add_turn_insulation([0.25e-5, 0.25e-5], add_turn_insulations=False)
-    insulation.add_insulation_between_layers(add_insulation_material=False, thickness=0.0002)
     geo.set_insulation(insulation)
 
     # 5. create winding window and virtual winding windows (vww)
diff --git a/femmt/examples/experimental_inductor_time_domain.py b/femmt/examples/experimental_inductor_time_domain.py
@@ -80,8 +80,6 @@ def basic_example_inductor_time_domain(onelab_folder: str = None, show_visual_ou
     insulation = fmt.Insulation(flag_insulation=True)
     insulation.add_core_insulations(0.001, 0.001, 0.004, 0.001)
     insulation.add_winding_insulations([[0.0005]], per_layer_of_turns=False)
-    insulation.add_turn_insulation([0.25e-5], add_turn_insulations=False)
-    insulation.add_insulation_between_layers(add_insulation_material=False, thickness=0.0005)
     geo.set_insulation(insulation)
 
     # 5. create winding window and virtual winding windows (vww)
diff --git a/femmt/examples/experimental_transformer_three_winding_time_domain.py b/femmt/examples/experimental_transformer_three_winding_time_domain.py
@@ -64,8 +64,6 @@ def basic_example_transformer_three_windings_time_domain(onelab_folder: str = No
     insulation.add_winding_insulations([[0.0002, 0.0004, 0.0004],
                                         [0.0004, 0.0002, 0.0004],
                                         [0.0004, 0.0004, 0.0002]], per_layer_of_turns=False)
-    insulation.add_turn_insulation([0.25e-5, 0.25e-5, 0.25e-5], add_turn_insulations=False)
-    insulation.add_insulation_between_layers(add_insulation_material=False, thickness=0.0005)
     geo.set_insulation(insulation)
 
     # 5. create winding window and virtual winding windows (vww)
diff --git a/femmt/examples/experimental_transformer_time_domain.py b/femmt/examples/experimental_transformer_time_domain.py
@@ -63,8 +63,6 @@ def basic_example_transformer_time_domain(onelab_folder: str = None, show_visual
     insulation.add_core_insulations(0.001, 0.001, 0.002, 0.001)
     insulation.add_winding_insulations([[0.0002, 0.001],
                                         [0.001, 0.0002]], per_layer_of_turns=False)
-    insulation.add_turn_insulation([0.25e-5, 0.25e-5], add_turn_insulations=False)
-    insulation.add_insulation_between_layers(add_insulation_material=False, thickness=0.0005)
     geo.set_insulation(insulation)
 
     # 5. create winding window and virtual winding windows (vww)
diff --git a/femmt/mesh.py b/femmt/mesh.py
@@ -862,8 +862,8 @@ def conductor_insulation(self, p_iso_cond: list, l_iso_cond: list, curve_loop_is
         :param curve_loop_iso_cond: List of insulation curve loops
         :type curve_loop_iso_cond: list
         """
-        if not self.insulation.add_turn_insulations:
-            logger.info("Turn insulation drawing skipped.")
+        if not self.insulation.turn_ins:
+            logger.info("Turn insulation is not drawn.")
             return []
         p_iso_cond_center = []
         # points of conductor insulation
diff --git a/femmt/model.py b/femmt/model.py
diff --git a/tests/integration/test_femmt.py b/tests/integration/test_femmt.py
