Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/pyedb/dotnet/edb_core/materials.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@
"dc_conductivity",
"dc_permittivity",
]
PERMEABILITY_DEFAULT_VALUE = 1


def get_line_float_value(line):
Expand Down Expand Up @@ -507,6 +508,9 @@ def add_material(self, name: str, **kwargs):

material_def = self.__edb_definition.MaterialDef.Create(self.__edb.active_db, name)
material = Material(self.__edb, material_def)
# Apply default values to the material
if "permeability" not in kwargs:
kwargs["permeability"] = PERMEABILITY_DEFAULT_VALUE
attributes_input_dict = {key: val for (key, val) in kwargs.items() if key in ATTRIBUTES + DC_ATTRIBUTES}
if "loss_tangent" in kwargs: # pragma: no cover
warnings.warn(
Expand Down
31 changes: 24 additions & 7 deletions tests/legacy/system/test_edb_materials.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,12 @@

import pytest

from pyedb.dotnet.edb_core.materials import Material, MaterialProperties, Materials
from pyedb.dotnet.edb_core.materials import (
PERMEABILITY_DEFAULT_VALUE,
Material,
MaterialProperties,
Materials,
)
from tests.conftest import local_path

pytestmark = [pytest.mark.system, pytest.mark.legacy]
Expand Down Expand Up @@ -171,7 +176,9 @@ def test_materials_add_material(self):

material = materials.add_material(MATERIAL_NAME, permittivity=12)
assert material
material.name == materials[MATERIAL_NAME].name
assert material.name == materials[MATERIAL_NAME].name
# Check default values
assert material.permeability == PERMEABILITY_DEFAULT_VALUE
with pytest.raises(ValueError):
materials.add_material(MATERIAL_NAME, permittivity=12)

Expand All @@ -181,7 +188,9 @@ def test_materials_add_conductor_material(self):

material = materials.add_conductor_material(MATERIAL_NAME, 12, permittivity=12)
assert material
_ = materials[MATERIAL_NAME]
assert material.name == materials[MATERIAL_NAME].name
# Check default values
assert material.permeability == PERMEABILITY_DEFAULT_VALUE
with pytest.raises(ValueError):
materials.add_conductor_material(MATERIAL_NAME, 12, permittivity=12)

Expand All @@ -191,7 +200,9 @@ def test_materials_add_dielectric_material(self):

material = materials.add_dielectric_material(MATERIAL_NAME, 12, 12, conductivity=12)
assert material
_ = materials[MATERIAL_NAME]
assert material.name == materials[MATERIAL_NAME].name
# Check default values
assert material.permeability == PERMEABILITY_DEFAULT_VALUE
with pytest.raises(ValueError):
materials.add_dielectric_material(MATERIAL_NAME, 12, 12, conductivity=12)

Expand All @@ -203,7 +214,9 @@ def test_materials_add_djordjevicsarkar_dielectric(self):
MATERIAL_NAME, 4.3, 0.02, 9, dc_conductivity=1e-12, dc_permittivity=5, conductivity=0
)
assert material
_ = materials[MATERIAL_NAME]
assert material.name == materials[MATERIAL_NAME].name
# Check default values
assert material.permeability == PERMEABILITY_DEFAULT_VALUE
with pytest.raises(ValueError):
materials.add_djordjevicsarkar_dielectric(
MATERIAL_NAME, 4.3, 0.02, 9, dc_conductivity=1e-12, dc_permittivity=5, conductivity=0
Expand All @@ -215,7 +228,9 @@ def test_materials_add_debye_material(self):

material = materials.add_debye_material(MATERIAL_NAME, 6, 4, 0.02, 0.05, 1e9, 10e9, conductivity=0)
assert material
_ = materials[MATERIAL_NAME]
assert material.name == materials[MATERIAL_NAME].name
# Check default values
assert material.permeability == PERMEABILITY_DEFAULT_VALUE
with pytest.raises(ValueError):
materials.add_debye_material(MATERIAL_NAME, 6, 4, 0.02, 0.05, 1e9, 10e9, conductivity=0)

Expand All @@ -230,7 +245,9 @@ def test_materials_add_multipole_debye_material(self):
MATERIAL_NAME, frequencies, relative_permitivities, loss_tangents, conductivity=0
)
assert material
_ = materials[MATERIAL_NAME]
assert material.name == materials[MATERIAL_NAME].name
# Check default values
assert material.permeability == PERMEABILITY_DEFAULT_VALUE
with pytest.raises(ValueError):
materials.add_multipole_debye_material(
MATERIAL_NAME, frequencies, relative_permitivities, loss_tangents, conductivity=0
Expand Down
Loading