Skip to content

Commit f966967

Browse files
maxcapodi78maxcapodi78
authored andcommitted
Fixed UT
1 parent ca3c5b4 commit f966967

File tree

2 files changed

+8
-48
lines changed

2 files changed

+8
-48
lines changed

pyaedt/modeler/Model2D.py

Lines changed: 5 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -128,54 +128,14 @@ def radial_split_2D(self, radius, name):
128128
bool
129129
``True`` when successful, ``False`` when failed.
130130
"""
131-
self.oeditor.CreateCircle(
132-
[
133-
"NAME:CircleParameters",
134-
"IsCovered:=",
135-
True,
136-
"XCenter:=",
137-
"0mm",
138-
"YCenter:=",
139-
"0mm",
140-
"ZCenter:=",
141-
"0mm",
142-
"Radius:=",
143-
radius,
144-
"WhichAxis:=",
145-
"Z",
146-
"NumSegments:=",
147-
"0",
148-
],
149-
[
150-
"NAME:Attributes",
151-
"Name:=",
152-
name + "_split",
153-
"Flags:=",
154-
"",
155-
"Color:=",
156-
"(132 132 193)",
157-
"Transparency:=",
158-
0,
159-
"PartCoordinateSystem:=",
160-
"Global",
161-
"UDMId:=",
162-
"",
163-
"Materiaobjidue:=",
164-
'"vacuum"',
165-
"SolveInside:=",
166-
True,
167-
],
168-
)
169131

132+
cir = self.modeler.create_circle([0, 0, 0], 3, name=name + "_split", matname="vacuum")
170133
self.oeditor.Copy(["NAME:Selections", "Selections:=", name])
171-
134+
objects = [i for i in self.modeler.object_names]
172135
self.oeditor.Paste()
173-
self.oeditor.Intersect(
174-
["NAME:Selections", "Selections:=", "{0}1,{0}_split".format(name)],
175-
["NAME:IntersectParameters", "KeepOriginals:=", False],
176-
)
177-
178-
self.subtract(name, name + "1")
136+
name1 = [i for i in self.modeler.object_names if i not in objects]
137+
self.intersect([name1[0], cir.name], keeporiginal=False)
138+
self.subtract(name, name1[0])
179139
return True
180140

181141
@pyaedt_function_handler()

pyaedt/modeler/Primitives.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -931,17 +931,17 @@ def _modeler(self):
931931
@property
932932
def solid_objects(self):
933933
"""List of all solid objects."""
934-
return [self[name] for name in self.solid_names]
934+
return [self[name] for name in self.solid_names if self[name]]
935935

936936
@property
937937
def sheet_objects(self):
938938
"""List of all sheet objects."""
939-
return [self[name] for name in self.sheet_names]
939+
return [self[name] for name in self.sheet_names if self[name]]
940940

941941
@property
942942
def line_objects(self):
943943
"""List of all line objects."""
944-
return [self[name] for name in self.line_names]
944+
return [self[name] for name in self.line_names if self[name]]
945945

946946
@property
947947
def points(self):

0 commit comments

Comments
 (0)