Skip to content

Commit 83e93ce

Browse files
committed
Merge branch 'main' into maxwell_refactoring
2 parents fd7c98c + dbf4a89 commit 83e93ce

21 files changed

+422
-382
lines changed

_unittest/test_01_3dlayout_edb.py

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -186,13 +186,24 @@ def test_03C_voids(self):
186186

187187
def test_04_add_mesh_operations(self):
188188
self.aedtapp.create_setup("HFSS")
189-
setup1 = self.aedtapp.mesh.assign_length_mesh("HFSS", "PWR", "GND")
190-
setup2 = self.aedtapp.mesh.assign_skin_depth("HFSS", "PWR", "GND")
189+
setup1 = self.aedtapp.mesh.assign_length_mesh(
190+
"HFSS",
191+
"PWR",
192+
"GND",
193+
)
194+
setup2 = self.aedtapp.mesh.assign_skin_depth(
195+
"HFSS",
196+
"PWR",
197+
"GND",
198+
)
191199
assert setup1
192200
assert setup2
193201
setup1.props["RestrictElem"] = False
194202
assert setup1.update()
195-
assert self.aedtapp.mesh.delete_mesh_operations("HFSS", setup1.name)
203+
assert self.aedtapp.mesh.delete_mesh_operations(
204+
"HFSS",
205+
setup1.name,
206+
)
196207

197208
def test_05_change_property(self):
198209
ports = self.aedtapp.create_ports_on_component_by_nets(

_unittest/test_01_Design.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ def test_01_designname(self):
4646
assert self.aedtapp.design_name == design_names[1]
4747
self.aedtapp.design_name = design_names[0] # Change current design back.
4848
assert len(self.aedtapp.design_list) == 2 # Make sure there are still 2 designs.
49-
assert self.aedtapp.design_list[0] == design_names[0] # Make sure the name is correct.
49+
assert self.aedtapp.design_list[0] in design_names # Make sure the name is correct.
5050
self.aedtapp.delete_design(design_names[1]) # Delete the 2nd design
5151
assert len(self.aedtapp.design_list) == 1
5252

_unittest/test_05_Mesh.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ def test_03_assign_surface_mesh_manual(self):
6161
udp = self.aedtapp.modeler.Position(20, 20, 0)
6262
coax_dimension = 200
6363
o = self.aedtapp.modeler.create_cylinder(self.aedtapp.PLANE.XY, udp, 3, coax_dimension, 0, "surface_manual")
64-
surface = self.aedtapp.mesh.assign_surface_mesh_manual(o.id, 1e-6, aspect_ratio=3, meshop_name="Surface_Manual")
64+
surface = self.aedtapp.mesh.assign_surface_mesh_manual(o.id, 1e-6, aspect_ratio=3, name="Surface_Manual")
6565
assert "Surface_Manual" in [i.name for i in self.aedtapp.mesh.meshoperations]
6666
assert surface.props["SurfDev"] == 1e-6
6767
surface.props["SurfDev"] = 1e-05
@@ -123,7 +123,7 @@ def test_06_curvature_extraction(self):
123123
def test_07_maxwell_mesh(self, add_app):
124124
m3d = add_app(application=Maxwell3d)
125125
o = m3d.modeler.create_box([0, 0, 0], [10, 10, 10], name="Box_Mesh")
126-
rot = m3d.mesh.assign_rotational_layer(o.name, meshop_name="Rotational", total_thickness="5mm")
126+
rot = m3d.mesh.assign_rotational_layer(o.name, total_thickness="5mm", name="Rotational")
127127
assert rot.props["Number of Layers"] == "3"
128128
rot.props["Number of Layers"] = 1
129129
assert str(rot.props["Number of Layers"]) == m3d.odesign.GetChildObject("Mesh").GetChildObject(
@@ -135,14 +135,14 @@ def test_07_maxwell_mesh(self, add_app):
135135
rot.name
136136
).GetPropValue("Total Layer Thickness")
137137

138-
edge_cut = m3d.mesh.assign_edge_cut(o.name, meshop_name="Edge")
138+
edge_cut = m3d.mesh.assign_edge_cut(o.name, name="Edge")
139139
assert edge_cut.props["Layer Thickness"] == "1mm"
140140
edge_cut.props["Layer Thickness"] = "2mm"
141141
assert edge_cut.props["Layer Thickness"] == m3d.odesign.GetChildObject("Mesh").GetChildObject(
142142
edge_cut.name
143143
).GetPropValue("Layer Thickness")
144144

145-
dens = m3d.mesh.assign_density_control(o.name, maxelementlength=10000, meshop_name="Density")
145+
dens = m3d.mesh.assign_density_control(o.name, maximum_element_length=10000, name="Density")
146146
assert dens.props["RestrictMaxElemLength"]
147147

148148
assert dens.props["MaxElemLength"] == 10000

_unittest/test_20_HFSS.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -830,6 +830,7 @@ def test_20_create_voltage_on_sheet(self):
830830

831831
def test_21_create_open_region(self):
832832
assert self.aedtapp.create_open_region("1GHz")
833+
assert len(self.aedtapp.field_setups) == 3
833834
assert self.aedtapp.create_open_region("1GHz", "FEBI")
834835
assert self.aedtapp.create_open_region("1GHz", "PML", True, "-z")
835836

_unittest/test_27_Maxwell2D.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -420,15 +420,15 @@ def test_31_cylindrical_gap(self):
420420
for x in self.aedtapp.mesh.meshoperations[:]
421421
if x.type == "Cylindrical Gap Based" or x.type == "CylindricalGap"
422422
]
423-
assert self.aedtapp.mesh.assign_cylindrical_gap("Band", meshop_name="cyl_gap_test")
423+
assert self.aedtapp.mesh.assign_cylindrical_gap("Band", name="cyl_gap_test")
424424
assert not self.aedtapp.mesh.assign_cylindrical_gap(["Band", "Region"])
425425
assert not self.aedtapp.mesh.assign_cylindrical_gap("Band")
426426
[
427427
x.delete()
428428
for x in self.aedtapp.mesh.meshoperations[:]
429429
if x.type == "Cylindrical Gap Based" or x.type == "CylindricalGap"
430430
]
431-
assert self.aedtapp.mesh.assign_cylindrical_gap("Band", meshop_name="cyl_gap_test", band_mapping_angle=2)
431+
assert self.aedtapp.mesh.assign_cylindrical_gap("Band", name="cyl_gap_test", band_mapping_angle=2)
432432

433433
def test_32_control_program(self):
434434
user_ctl_path = "user.ctl"

_unittest/test_28_Maxwell3D.py

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ def test_24_create_edge_cut(self):
267267
assert self.aedtapp.mesh.assign_edge_cut(["Coil"])
268268

269269
def test_24_density_control(self):
270-
assert self.aedtapp.mesh.assign_density_control(["Coil"], maxelementlength="2mm", layerNum="3")
270+
assert self.aedtapp.mesh.assign_density_control(["Coil"], maximum_element_length="2mm", layers_number="3")
271271

272272
def test_24_density_control(self):
273273
assert self.aedtapp.mesh.assign_rotational_layer(["Coil"])
@@ -776,37 +776,35 @@ def test_49_cylindrical_gap(self, cyl_gap):
776776
for x in cyl_gap.mesh.meshoperations[:]
777777
if x.type == "Cylindrical Gap Based" or x.type == "CylindricalGap"
778778
]
779-
assert cyl_gap.mesh.assign_cylindrical_gap("Band", meshop_name="cyl_gap_test")
779+
assert cyl_gap.mesh.assign_cylindrical_gap("Band", name="cyl_gap_test")
780780
assert not cyl_gap.mesh.assign_cylindrical_gap(["Band", "Inner_Band"])
781781
assert not cyl_gap.mesh.assign_cylindrical_gap("Band")
782782
[
783783
x.delete()
784784
for x in cyl_gap.mesh.meshoperations[:]
785785
if x.type == "Cylindrical Gap Based" or x.type == "CylindricalGap"
786786
]
787-
assert cyl_gap.mesh.assign_cylindrical_gap(
788-
"Band", meshop_name="cyl_gap_test", clone_mesh=True, band_mapping_angle=1
789-
)
787+
assert cyl_gap.mesh.assign_cylindrical_gap("Band", name="cyl_gap_test", band_mapping_angle=1, clone_mesh=True)
790788
[
791789
x.delete()
792790
for x in cyl_gap.mesh.meshoperations[:]
793791
if x.type == "Cylindrical Gap Based" or x.type == "CylindricalGap"
794792
]
795-
assert cyl_gap.mesh.assign_cylindrical_gap("Band", meshop_name="cyl_gap_test", clone_mesh=False)
793+
assert cyl_gap.mesh.assign_cylindrical_gap("Band", name="cyl_gap_test", clone_mesh=False)
796794
[
797795
x.delete()
798796
for x in cyl_gap.mesh.meshoperations[:]
799797
if x.type == "Cylindrical Gap Based" or x.type == "CylindricalGap"
800798
]
801799
assert cyl_gap.mesh.assign_cylindrical_gap("Band")
802800
assert not cyl_gap.mesh.assign_cylindrical_gap(
803-
"Band", meshop_name="cyl_gap_test", clone_mesh=True, band_mapping_angle=7
801+
"Band", name="cyl_gap_test", band_mapping_angle=7, clone_mesh=True
804802
)
805803
assert not cyl_gap.mesh.assign_cylindrical_gap(
806-
"Band", meshop_name="cyl_gap_test", clone_mesh=True, band_mapping_angle=2, moving_side_layers=0
804+
"Band", name="cyl_gap_test", band_mapping_angle=2, clone_mesh=True, moving_side_layers=0
807805
)
808806
assert not cyl_gap.mesh.assign_cylindrical_gap(
809-
"Band", meshop_name="cyl_gap_test", clone_mesh=True, band_mapping_angle=2, static_side_layers=0
807+
"Band", name="cyl_gap_test", band_mapping_angle=2, clone_mesh=True, static_side_layers=0
810808
)
811809

812810
def test_50_objects_segmentation(self, cyl_gap):

_unittest/test_98_Icepak.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -397,7 +397,7 @@ def test_31_automatic_mesh_pcb(self):
397397

398398
def test_32_automatic_mesh_3d(self):
399399
self.aedtapp.set_active_design("IcepakDesign1")
400-
assert self.aedtapp.mesh.automatic_mesh_3D(accuracy2=1)
400+
assert self.aedtapp.mesh.automatic_mesh_3D(accuracy=1)
401401

402402
def test_33_create_source(self):
403403
self.aedtapp.modeler.create_box([0, 0, 0], [20, 20, 20], name="boxSource")
@@ -1039,9 +1039,9 @@ def test_56_mesh_priority(self):
10391039
custom_x_resolution=400,
10401040
custom_y_resolution=500,
10411041
)
1042-
assert self.aedtapp.mesh.add_priority(entity_type=1, obj_list=self.aedtapp.modeler.object_names, priority=2)
1042+
assert self.aedtapp.mesh.add_priority(entity_type=1, objects=self.aedtapp.modeler.object_names, priority=2)
10431043
assert self.aedtapp.mesh.add_priority(
1044-
entity_type=2, comp_name=self.aedtapp.modeler.user_defined_component_names[0], priority=1
1044+
entity_type=2, component=self.aedtapp.modeler.user_defined_component_names[0], priority=1
10451045
)
10461046

10471047
def test_57_update_source(self):
@@ -1354,11 +1354,11 @@ def test_68_mesh_priority_3d_comp(self, add_app):
13541354
design_name="IcepakDesign1",
13551355
subfolder=test_subfolder,
13561356
)
1357-
assert app.mesh.add_priority(entity_type=2, comp_name="IcepakDesign1_1", priority=3)
1357+
assert app.mesh.add_priority(entity_type=2, component="IcepakDesign1_1", priority=3)
13581358

1359-
assert app.mesh.add_priority(entity_type=2, comp_name="all_2d_objects1", priority=2)
1359+
assert app.mesh.add_priority(entity_type=2, component="all_2d_objects1", priority=2)
13601360

1361-
assert app.mesh.add_priority(entity_type=2, comp_name="all_3d_objects1", priority=2)
1361+
assert app.mesh.add_priority(entity_type=2, component="all_3d_objects1", priority=2)
13621362

13631363
app.close_project(name="3d_comp_mesh_prio_test", save_project=False)
13641364

examples/02-HFSS/HFSS_Choke.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@
180180
mesh_operation_cylinder = hfss.modeler.create_cylinder(
181181
"XY", cylinder_position, ground_radius, cylinder_height, numSides=36, name="mesh_cylinder"
182182
)
183-
hfss.mesh.assign_length_mesh([mesh_operation_cylinder], maxlength=15, maxel=None, meshop_name="choke_mesh")
183+
hfss.mesh.assign_length_mesh([mesh_operation_cylinder], maximum_length=15, maximum_elements=None, name="choke_mesh")
184184

185185

186186
###############################################################################

examples/03-Maxwell/Maxwell2D_DCConduction.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999
# ~~~~~~~~~~~~~~~~~~~~~
100100
# 3mm on the conductor
101101

102-
m2d.mesh.assign_length_mesh(["ANSYS_LOGO_2D_3"], meshop_name="conductor", maxlength=3, maxel=None)
102+
m2d.mesh.assign_length_mesh(["ANSYS_LOGO_2D_3"], maximum_length=3, maximum_elements=None, name="conductor")
103103

104104
##################################################################################
105105
# Create simulation setup and enable expression cache

examples/03-Maxwell/Maxwell2D_Electrostatic.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@
137137
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
138138
# Assign a surface mesh to the rectangle.
139139

140-
M2D.mesh.assign_surface_mesh_manual(names=['Ground'], surf_dev=0.001)
140+
M2D.mesh.assign_surface_mesh_manual(objects=['Ground'], surface_deviation=0.001)
141141

142142
##################################################################################
143143
# Create, validate and analyze the setup

0 commit comments

Comments
 (0)