Skip to content

Commit 92abd74

Browse files
gituser789gituser789
committed
fix remaining tests/basic examples
1 parent 5519af7 commit 92abd74

4 files changed

Lines changed: 39 additions & 40 deletions

File tree

‎femmt/examples/basic_inductor_electrostatic.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ def basic_example_inductor_electrostatic(onelab_folder: str = None, show_visual_
5252
window_h=core_db["window_h"],
5353
core_h=core_db["core_h"])
5454

55-
5655
core_material = fmt.ImportedComplexCoreMaterial(material=fmt.Material.N49,
5756
temperature=45,
5857
permeability_datasource=fmt.DataSource.TDK_MDT,

‎femmt/examples/basic_transformer_electrostatic.py‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -55,17 +55,16 @@ def basic_example_transformer_electrostatic(onelab_folder: str = None, show_visu
5555
window_w=core_db["window_w"],
5656
window_h=core_db["window_h"],
5757
core_h=core_db["core_h"])
58-
core = fmt.Core(core_type=fmt.CoreType.Single,
58+
# core_material = fmt.ImportedComplexCoreMaterial(material=fmt.Material.N49,
59+
# temperature=45,
60+
# permeability_datasource=fmt.DataSource.TDK_MDT,
61+
# permittivity_datasource=fmt.DataSource.LEA_MTB,
62+
# mdb_verbosity=fmt.Verbosity.Silent)
63+
64+
core = fmt.Core(material=None,
65+
core_type=fmt.CoreType.Single,
5966
core_dimensions=core_dimensions,
60-
detailed_core_model=False,
61-
material=fmt.Material.N49, temperature=45, frequency=0,
62-
# permeability_datasource="manufacturer_datasheet",
63-
permeability_datasource=fmt.MaterialDataSource.Measurement,
64-
permeability_datatype=fmt.MeasurementDataType.ComplexPermeability,
65-
permeability_measurement_setup=fmt.MeasurementSetup.LEA_LK,
66-
permittivity_datasource=fmt.MaterialDataSource.Measurement,
67-
permittivity_datatype=fmt.MeasurementDataType.ComplexPermittivity,
68-
permittivity_measurement_setup=fmt.MeasurementSetup.LEA_LK, mdb_verbosity=fmt.Verbosity.Silent)
67+
detailed_core_model=False)
6968

7069
geo.set_core(core)
7170

@@ -104,7 +103,7 @@ def basic_example_transformer_electrostatic(onelab_folder: str = None, show_visu
104103
# vertical_split_factors=None)
105104

106105
# 6. create conductors and set parameters
107-
winding1 = fmt.Conductor(0, fmt.Conductivity.Copper)
106+
winding1 = fmt.Conductor(0, fmt.ConductorMaterial.Copper)
108107
# winding1.set_solid_round_conductor(1.1506e-3, fmt.ConductorArrangement.Square)
109108
# winding1.set_solid_round_conductor(0.35e-3, fmt.ConductorArrangement.Square)
110109
winding1.set_solid_round_conductor(1.1506e-3, fmt.ConductorArrangement.Square)
@@ -115,7 +114,7 @@ def basic_example_transformer_electrostatic(onelab_folder: str = None, show_visu
115114
# winding2 = fmt.Conductor(1, fmt.Conductivity.Copper)
116115
# winding2.set_solid_round_conductor(0.0011, fmt.ConductorArrangement.Square)
117116

118-
winding2 = fmt.Conductor(1, fmt.Conductivity.Copper)
117+
winding2 = fmt.Conductor(1, fmt.ConductorMaterial.Copper)
119118
# winding2.set_solid_round_conductor(1.1506e-3, fmt.ConductorArrangement.Square)
120119
winding2.set_solid_round_conductor(1.1506e-3, fmt.ConductorArrangement.Square)
121120
winding2.parallel = False

‎femmt/model.py‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -537,8 +537,8 @@ def update_core_material_pro_file(self, plot_interpolation: bool = False) -> Non
537537
:type plot_interpolation: bool
538538
"""
539539
self.material.update_core_material_pro_file(frequency=self.frequency,
540-
folder=self.file_data.electro_magnetic_folder_path,
541-
plot_interpolation=plot_interpolation)
540+
folder=self.file_data.electro_magnetic_folder_path,
541+
plot_interpolation=plot_interpolation)
542542

543543
def to_dict(self) -> Dict[str, Union[str, float, bool]]:
544544
"""Return combined dictionary of core geometry and material properties.
@@ -1236,7 +1236,8 @@ def __init__(self, core: Core, insulations: Insulation, stray_path: StrayPath =
12361236
else:
12371237
# top section
12381238
self.max_bot_bound_top_section = core.geometry.window_h_bot / 2 + core.geometry.core_thickness + insulations.top_section_core_cond[1]
1239-
self.max_top_bound_top_section = core.geometry.window_h_bot / 2 + core.geometry.window_h_top + core.geometry.core_thickness - insulations.top_section_core_cond[0]
1239+
self.max_top_bound_top_section = (core.geometry.window_h_bot / 2 + core.geometry.window_h_top + core.geometry.core_thickness - \
1240+
insulations.top_section_core_cond[0])
12401241
self.max_left_bound_top_section = core.geometry.core_inner_diameter / 2 + insulations.top_section_core_cond[2]
12411242
self.max_right_bound_top_section = core.geometry.r_inner - insulations.top_section_core_cond[3]
12421243

@@ -1248,7 +1249,8 @@ def __init__(self, core: Core, insulations: Insulation, stray_path: StrayPath =
12481249

12491250
# general
12501251
self.max_bot_bound = -core.geometry.window_h_bot / 2 + insulations.bot_section_core_cond[1]
1251-
self.max_top_bound = core.geometry.window_h_bot / 2 + core.geometry.window_h_top + core.geometry.core_thickness - insulations.top_section_core_cond[0]
1252+
self.max_top_bound = core.geometry.window_h_bot / 2 + core.geometry.window_h_top + core.geometry.core_thickness - \
1253+
insulations.top_section_core_cond[0]
12521254
self.max_left_bound = core.geometry.core_inner_diameter / 2 + insulations.top_section_core_cond[2]
12531255
self.max_right_bound = core.geometry.r_inner - insulations.top_section_core_cond[3]
12541256

‎tests/integration/test_femmt.py‎

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -2112,17 +2112,16 @@ def fixture_inductor_electrostatic(temp_folder: pytest.fixture):
21122112
window_w=core_db["window_w"],
21132113
window_h=core_db["window_h"],
21142114
core_h=core_db["core_h"])
2115-
core = fmt.Core(core_type=fmt.CoreType.Single,
2115+
core_material = fmt.ImportedComplexCoreMaterial(material=fmt.Material.N49,
2116+
temperature=45,
2117+
permeability_datasource=fmt.DataSource.TDK_MDT,
2118+
permittivity_datasource=fmt.DataSource.LEA_MTB,
2119+
mdb_verbosity=fmt.Verbosity.Silent)
2120+
2121+
core = fmt.Core(material=core_material,
2122+
core_type=fmt.CoreType.Single,
21162123
core_dimensions=core_dimensions,
2117-
detailed_core_model=False,
2118-
material=fmt.Material.N49, temperature=45, frequency=2700000,
2119-
# permeability_datasource="manufacturer_datasheet",
2120-
permeability_datasource=fmt.MaterialDataSource.Measurement,
2121-
permeability_datatype=fmt.MeasurementDataType.ComplexPermeability,
2122-
permeability_measurement_setup=fmt.MeasurementSetup.LEA_LK,
2123-
permittivity_datasource=fmt.MaterialDataSource.Measurement,
2124-
permittivity_datatype=fmt.MeasurementDataType.ComplexPermittivity,
2125-
permittivity_measurement_setup=fmt.MeasurementSetup.LEA_LK, mdb_verbosity=fmt.Verbosity.Silent)
2124+
detailed_core_model=False)
21262125

21272126
geo.set_core(core)
21282127

@@ -2156,7 +2155,7 @@ def fixture_inductor_electrostatic(temp_folder: pytest.fixture):
21562155
vww = winding_window.split_window(fmt.WindingWindowSplit.NoSplit)
21572156

21582157
# 6. create conductor and set parameters: use solid wires
2159-
winding = fmt.Conductor(0, fmt.Conductivity.Copper, winding_material_temperature=45)
2158+
winding = fmt.Conductor(0, fmt.ConductorMaterial.Copper, temperature=45)
21602159
winding.set_solid_round_conductor(conductor_radius=1.1506e-3, conductor_arrangement=fmt.ConductorArrangement.Square)
21612160
winding.parallel = False # set True to make the windings parallel, currently only for solid conductors
21622161
# 7. add conductor to vww and add winding window to MagneticComponent
@@ -2217,17 +2216,17 @@ def fixture_transformer_electrostatic(temp_folder: pytest.fixture):
22172216
window_w=core_db["window_w"],
22182217
window_h=core_db["window_h"],
22192218
core_h=core_db["core_h"])
2220-
core = fmt.Core(core_type=fmt.CoreType.Single,
2219+
2220+
core_material = fmt.ImportedComplexCoreMaterial(material=fmt.Material.N49,
2221+
temperature=45,
2222+
permeability_datasource=fmt.DataSource.TDK_MDT,
2223+
permittivity_datasource=fmt.DataSource.LEA_MTB,
2224+
mdb_verbosity=fmt.Verbosity.Silent)
2225+
2226+
core = fmt.Core(material=core_material,
2227+
core_type=fmt.CoreType.Single,
22212228
core_dimensions=core_dimensions,
2222-
detailed_core_model=False,
2223-
material=fmt.Material.N49, temperature=45, frequency=0,
2224-
# permeability_datasource="manufacturer_datasheet",
2225-
permeability_datasource=fmt.MaterialDataSource.Measurement,
2226-
permeability_datatype=fmt.MeasurementDataType.ComplexPermeability,
2227-
permeability_measurement_setup=fmt.MeasurementSetup.LEA_LK,
2228-
permittivity_datasource=fmt.MaterialDataSource.Measurement,
2229-
permittivity_datatype=fmt.MeasurementDataType.ComplexPermittivity,
2230-
permittivity_measurement_setup=fmt.MeasurementSetup.LEA_LK, mdb_verbosity=fmt.Verbosity.Silent)
2229+
detailed_core_model=False)
22312230

22322231
geo.set_core(core)
22332232

@@ -2260,10 +2259,10 @@ def fixture_transformer_electrostatic(temp_folder: pytest.fixture):
22602259
cells = winding_window.NHorizontalAndVerticalSplit(horizontal_split_factors=[0.29],
22612260
vertical_split_factors=None)
22622261
# 6. create conductors and set parameters
2263-
winding1 = fmt.Conductor(0, fmt.Conductivity.Copper)
2262+
winding1 = fmt.Conductor(0, fmt.ConductorMaterial.Copper)
22642263
winding1.set_solid_round_conductor(1.1506e-3, fmt.ConductorArrangement.Square)
22652264

2266-
winding2 = fmt.Conductor(1, fmt.Conductivity.Copper)
2265+
winding2 = fmt.Conductor(1, fmt.ConductorMaterial.Copper)
22672266
# winding2.set_solid_round_conductor(1.1506e-3, fmt.ConductorArrangement.Square)
22682267
winding2.set_solid_round_conductor(1.1506e-3, fmt.ConductorArrangement.Square)
22692268
winding2.parallel = False

0 commit comments

Comments
 (0)