Skip to content

Commit c0d67ff

Browse files
Spatial Modifier (#1196)
* - Spatial Modifier Method - Fix bug for thermal modifier. It material property was not defined in AEDT file, thermal modifier was not applied. - Fix bug with Auto TML - Add option to have thermal and spatial modifier in the same property * - Improve coverage * - Improve coverage * - Improve coverage * - Bug in Unittest
1 parent 0623855 commit c0d67ff

File tree

4 files changed

+381
-63
lines changed

4 files changed

+381
-63
lines changed

_unittest/example_models/ds_3d.tab

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
"X" "Y[GHz]" "Z" "Value[m_per_sec]"
1+
"X[mm]" "Y[mm]" "Z[mm]" "Value[m_per_sec]"
22
1 2 3 5
33
3 4 5 6
44
4 6 7 8

_unittest/test_03_Materials.py

Lines changed: 40 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,13 +101,51 @@ def test_02_create_material(self):
101101
except ValueError:
102102
assert True
103103

104-
def test_03_create_thermal_modifier(self):
104+
def test_03_create_modifiers(self):
105105
assert self.aedtapp.materials["new_copper2"].mass_density.add_thermal_modifier_free_form(
106106
"if(Temp > 1000cel, 1, if(Temp < -273.15cel, 1, 1))"
107107
)
108+
assert self.aedtapp.materials["new_copper2"].mass_density.add_thermal_modifier_closed_form()
109+
assert self.aedtapp.materials["new_copper2"].mass_density.add_thermal_modifier_closed_form(auto_calc=False)
108110
assert self.aedtapp.materials["new_copper2"].permittivity.add_thermal_modifier_closed_form()
109111
assert self.aedtapp.materials["new_copper2"].permeability.add_thermal_modifier_closed_form(auto_calc=False)
110-
assert self.aedtapp.materials["new_copper2"].permittivity.add_thermal_modifier_closed_form(auto_calc=True)
112+
assert self.aedtapp.materials["new_copper2"].permittivity.add_thermal_modifier_closed_form(auto_calc=False)
113+
filename = os.path.join(local_path, "example_models", "ds_1d.tab")
114+
ds1 = self.aedtapp.import_dataset1d(filename)
115+
assert self.aedtapp.materials["new_copper2"].permittivity.add_thermal_modifier_dataset(ds1.name)
116+
117+
assert self.aedtapp.materials["new_copper2"].mass_density.add_spatial_modifier_free_form(
118+
"if(X > 1mm, 1, if(X < 1mm, 2, 1))"
119+
)
120+
assert self.aedtapp.materials["new_copper2"].mass_density.add_spatial_modifier_free_form(
121+
"if(X > 1mm, 1, if(X < 1mm, 3, 1))"
122+
)
123+
exp = self.aedtapp.materials["new_copper2"].mass_density.spatialmodifier = "X+1"
124+
assert exp == "X+1"
125+
exp = self.aedtapp.materials["new_copper2"].mass_density.spatialmodifier = ["Y+1"]
126+
assert exp == ["Y+1"]
127+
filename = os.path.join(local_path, "example_models", "ds_3d.tab")
128+
ds2 = self.aedtapp.import_dataset3d(filename)
129+
assert self.aedtapp.materials["new_copper2"].permeability.add_spatial_modifier_dataset(ds2.name)
130+
mat1 = self.aedtapp.materials.add_material("new_mat")
131+
mat1.mass_density.value == MatProperties.get_defaultvalue(aedtname="mass_density")
132+
mat1.permittivity.value == MatProperties.get_defaultvalue(aedtname="permittivity")
133+
assert self.aedtapp.materials["new_mat"].mass_density.add_spatial_modifier_free_form(
134+
"if(X > 1mm, 1, if(X < 1mm, 3, 1))"
135+
)
136+
assert self.aedtapp.materials["new_mat"].mass_density.add_thermal_modifier_free_form(
137+
"if(Temp > 1000cel, 1, if(Temp < -273.15cel, 1, 1))"
138+
)
139+
assert self.aedtapp.materials["new_mat"].permittivity.add_thermal_modifier_free_form("X^2")
140+
mat1 = self.aedtapp.materials.add_material("new_mat2")
141+
mat1.mass_density.value == MatProperties.get_defaultvalue(aedtname="mass_density")
142+
assert self.aedtapp.materials["new_mat2"].mass_density.add_spatial_modifier_free_form(
143+
"if(X > 1mm, 1, if(X < 1mm, 3, 1))"
144+
)
145+
assert self.aedtapp.materials["new_mat2"].mass_density.add_thermal_modifier_closed_form()
146+
mat1 = self.aedtapp.materials.add_material("new_mat3")
147+
mat1.mass_density.value == MatProperties.get_defaultvalue(aedtname="mass_density")
148+
assert self.aedtapp.materials["new_mat3"].mass_density.add_thermal_modifier_closed_form()
111149

112150
def test_04_duplicate_material(self):
113151
assert self.aedtapp.materials.duplicate_material("new_copper2", "copper3")

0 commit comments

Comments
 (0)