Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor modeler #4512

Merged
merged 30 commits into from
Apr 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
d228419
refactored Modeler3d Modeler2d
Apr 16, 2024
db34789
refactored Modeler3d Modeler2d
Apr 16, 2024
dca7982
refactored Primitives and Object3d
Apr 16, 2024
92d54c4
refactored Primitives and Object3d
Apr 16, 2024
194e903
refactored Primitives and Object3d
Apr 16, 2024
9e8bee5
refactored Primitives and Object3d
Apr 16, 2024
e459a06
refactored Primitives and Object3d
Apr 16, 2024
19b9785
refactored Primitives and Object3d
Apr 16, 2024
c792745
refactored Primitives and Object3d
Apr 16, 2024
4623121
refactored Primitives and Object3d
Apr 16, 2024
6d72a5d
refactored Primitives and Object3d
Apr 17, 2024
392b8d8
refactored Primitives and Object3d
Apr 17, 2024
51632eb
refactored Primitives and Object3d
Apr 17, 2024
4a6cb0b
refactored Primitives and Object3d
Apr 17, 2024
77f7c72
refactored Primitives and Object3d
Apr 17, 2024
7205d1e
refactored Primitives and Object3d
Apr 17, 2024
53b22ba
corrected examples
Apr 17, 2024
97d9edd
corrected examples
Apr 17, 2024
aaf655e
merged main
Apr 17, 2024
8d41a9f
fixed minor issue
Apr 17, 2024
233bae8
fixing example and docstring
Apr 18, 2024
2142abf
fixing example and docstring
Apr 18, 2024
8b70f4e
fixing example and docstring
Apr 18, 2024
297dd1c
fixing example and docstring
Apr 18, 2024
e2a65bd
fixing example and docstring
Apr 18, 2024
8ad1d05
fixing example and docstring
Apr 18, 2024
2aeb68b
fixing example and docstring
Apr 18, 2024
d1cd5b6
minor documentation fix
Apr 18, 2024
fc31794
Fix Codacy
Samuelopez-ansys Apr 18, 2024
4acd49c
Merge branch 'main' into refactor_modeler
Samuelopez-ansys Apr 18, 2024
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
8 changes: 4 additions & 4 deletions _unittest/test_01_3dlayout_edb.py
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ def test_05_change_property(self):
def test_06_assign_spice_model(self):
model_path = os.path.join(local_path, "example_models", test_subfolder, "GRM32ER72A225KA35_25C_0V.sp")
assert self.aedtapp.modeler.set_spice_model(
component_name="C1", model_path=model_path, subcircuit_name="GRM32ER72A225KA35_25C_0V"
assignment="C1", input_file=model_path, subcircuit_name="GRM32ER72A225KA35_25C_0V"
)

def test_07_nets(self):
Expand Down Expand Up @@ -285,9 +285,9 @@ def test_14_set_solderball(self):

def test_15_3dplacement(self):
self.aedtapp.insert_design("placement_3d")
l1 = self.aedtapp.modeler.layers.add_layer("BOTTOM", "signal", thickness="5mil")
self.aedtapp.modeler.layers.add_layer("diel", "dielectric", thickness="121mil", material="FR4_epoxy")
self.aedtapp.modeler.layers.add_layer("TOP", "signal", thickness="5mil", isnegative=True)
l1 = self.aedtapp.modeler.layers.add_layer("BOTTOM", "signal")
self.aedtapp.modeler.layers.add_layer("diel", "dielectric")
self.aedtapp.modeler.layers.add_layer("TOP", "signal")
tol = 1e-12
encrypted_model_path = os.path.join(local_path, "example_models", test_subfolder, "SMA_RF_Jack.a3dcomp")
comp = self.aedtapp.modeler.place_3d_component(
Expand Down
4 changes: 3 additions & 1 deletion _unittest/test_01_Design.py
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,9 @@ def test_09_set_objects_deformation(self):
def test_09_set_objects_temperature(self):
ambient_temp = 22
objects = [o for o in self.aedtapp.modeler.solid_names if self.aedtapp.modeler[o].model]
assert self.aedtapp.modeler.set_objects_temperature(objects, ambient_temp=ambient_temp, create_project_var=True)
assert self.aedtapp.modeler.set_objects_temperature(
objects, ambient_temperature=ambient_temp, create_project_var=True
)

def test_10_change_material_override(self):
assert self.aedtapp.change_material_override(True)
Expand Down
26 changes: 12 additions & 14 deletions _unittest/test_02_2D_modeler.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@ def test_04_create_rectangle(self):
test_color = (220, 90, 0)
rect1 = self.aedtapp.modeler.create_rectangle([0, -2, -2], [3, 8])
rect2 = self.aedtapp.modeler.create_rectangle(
position=[10, -2, -2],
dimension_list=[3, 10],
origin=[10, -2, -2],
sizes=[3, 10],
name="MyRectangle",
material_name="Copper",
material="Copper",
color=test_color,
)
assert rect1.solve_inside
Expand All @@ -69,7 +69,7 @@ def test_05_create_rectangle_rz(self):
self.aedtapp.solution_type = "MagnetostaticZ"
rect1 = self.aedtapp.modeler.create_rectangle([1, 0, -2], [8, 3])
rect2 = self.aedtapp.modeler.create_rectangle(
position=[10, 0, -2], dimension_list=[10, 3], name="MyRectangle", matname="Copper"
origin=[10, 0, -2], sizes=[10, 3], name="MyRectangle", material="Copper"
)
list_of_pos = [ver.position for ver in rect1.vertices]
assert sorted(list_of_pos) == [[1.0, 0.0, -2.0], [1.0, 0.0, 6.0], [4.0, 0.0, -2.0], [4.0, 0.0, 6.0]]
Expand All @@ -86,7 +86,7 @@ def test_06_create_circle(self):
radius=3,
num_sides=6,
name="MyCircle",
matname="Copper",
material="Copper",
display_wireframe=True,
)
assert circle1.solve_inside
Expand Down Expand Up @@ -130,7 +130,7 @@ def test_06b_radial_split(self):
def test_07_create_ellipse(self):
ellipse1 = self.aedtapp.modeler.create_ellipse([0, -2, 0], 4.0, 3)
ellipse2 = self.aedtapp.modeler.create_ellipse(
position=[0, -2, 0], major_radius=4.0, ratio=3, name="MyEllipse", matname="Copper"
position=[0, -2, 0], major_radius=4.0, ratio=3, name="MyEllipse", material="Copper"
)
assert ellipse1.solve_inside
assert ellipse1.model
Expand All @@ -145,7 +145,7 @@ def test_07_create_ellipse(self):
def test_08_create_regular_polygon(self):
pg1 = self.aedtapp.modeler.create_regular_polygon([0, 0, 0], [0, 0, 2])
pg2 = self.aedtapp.modeler.create_regular_polygon(
position=[0, 0, 0], start_point=[0, 0, 2], num_sides=3, name="MyPolygon", matname="Copper"
position=[0, 0, 0], start_point=[0, 0, 2], num_sides=3, name="MyPolygon", material="Copper"
)
assert pg1.solve_inside
assert pg1.model
Expand All @@ -164,7 +164,7 @@ def test_09_plot(self):
self.aedtapp.solution_type = "MagnetostaticZ"
self.aedtapp.modeler.create_regular_polygon([0, 0, 0], [0, 0, 2])
self.aedtapp.modeler.create_regular_polygon(
position=[0, 0, 0], start_point=[0, 0, 2], num_sides=3, name="MyPolygon", matname="Copper"
position=[0, 0, 0], start_point=[0, 0, 2], num_sides=3, name="MyPolygon", material="Copper"
)
obj = self.aedtapp.plot(
show=False,
Expand Down Expand Up @@ -219,12 +219,10 @@ def test_13_set_variable(self):
def test_14_split(self):
self.aedtapp.insert_design("split_test")
rect1 = self.aedtapp.modeler.create_rectangle([0, -2, 0], [3, 8])
poly1 = self.aedtapp.modeler.create_polyline(
position_list=[[-2, 2, 0], [1, 5, 0], [5, 3, 0]], segment_type="Arc"
)
assert not self.aedtapp.modeler.split(objects=rect1)
split = self.aedtapp.modeler.split(objects=rect1, plane=self.aedtapp.PLANE.ZX)
poly1 = self.aedtapp.modeler.create_polyline(points=[[-2, 2, 0], [1, 5, 0], [5, 3, 0]], segment_type="Arc")
assert not self.aedtapp.modeler.split(assignment=rect1)
split = self.aedtapp.modeler.split(assignment=rect1, plane=self.aedtapp.PLANE.ZX)
assert isinstance(split, list)
assert isinstance(split[0], str)
obj_split = [obj for obj in self.aedtapp.modeler.object_list if obj.name == split[1]][0]
assert not self.aedtapp.modeler.split(objects=obj_split, tool=poly1.edges[0])
assert not self.aedtapp.modeler.split(assignment=obj_split, tool=poly1.edges[0])
Loading
Loading