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.

Sign up for GitHub

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

Jump to bottom

fix to read mesh operation and mesh region properly for 2024R1 #4015

Merged
merged 3 commits into from
Jan 3, 2024
Merged

fix to read mesh operation and mesh region properly for 2024R1 #4015

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e4ce97f
mesh operation and mesh region fix to accommodate changes in 2024R1 f…
siva-krishnaswamy Dec 21, 2023
55b6144
Merge branch 'main' into fix/issue_3908
siva-krishnaswamy Dec 28, 2023
653ec62
Merge branch 'main' into fix/issue_3908
Devin-Crawford Jan 3, 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
79 changes: 54 additions & 25 deletions pyaedt/modules/MeshIcepak.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -438,18 +438,32 @@
"""Retrieve design mesh operations."""
meshops = []
try:
for ds in self._app.design_properties["MeshRegion"]["MeshSetup"]["MeshOperations"]:
if isinstance(
self._app.design_properties["MeshRegion"]["MeshSetup"]["MeshOperations"][ds], (OrderedDict, dict)
):
meshops.append(
MeshOperation(
self,
ds,
self._app.design_properties["MeshRegion"]["MeshSetup"]["MeshOperations"][ds],
"Icepak",
if settings.aedt_version > "2023.2":
for ds in self._app.design_properties["MeshRegion"]["MeshSetup"]:
if isinstance(self._app.design_properties["MeshRegion"]["MeshSetup"][ds], (OrderedDict, dict)):
if self._app.design_properties["MeshRegion"]["MeshSetup"][ds]["DType"] == "OpT":
meshops.append(

Check warning on line 445 in pyaedt/modules/MeshIcepak.py

View check run for this annotation

Codecov / codecov/patch

pyaedt/modules/MeshIcepak.py#L442-L445 

Added lines #L442 - L445 were not covered by tests
MeshOperation(
self,
ds,
self._app.design_properties["MeshRegion"]["MeshSetup"][ds],
"Icepak",
)
)
else:
for ds in self._app.design_properties["MeshRegion"]["MeshSetup"]["MeshOperations"]:
if isinstance(
self._app.design_properties["MeshRegion"]["MeshSetup"]["MeshOperations"][ds],
(OrderedDict, dict),
):
meshops.append(
MeshOperation(
self,
ds,
self._app.design_properties["MeshRegion"]["MeshSetup"]["MeshOperations"][ds],
"Icepak",
)
)
)
except:
pass
return meshops
Expand All @@ -459,20 +473,35 @@
"""Retrieve design mesh regions."""
meshops = []
try:
for ds in self._app.design_properties["MeshRegion"]["MeshSetup"]["MeshRegions"]:
if isinstance(
self._app.design_properties["MeshRegion"]["MeshSetup"]["MeshRegions"][ds], (OrderedDict, dict)
):
dict_prop = self._app.design_properties["MeshRegion"]["MeshSetup"]["MeshRegions"][ds]
if ds == "Global":
ds = "Settings"
meshop = self.MeshRegion(
self.omeshmodule, self.boundingdimension, self.modeler.model_units, self._app, ds
)
for el in dict_prop:
if el in meshop.__dict__:
meshop.__dict__[el] = dict_prop[el]
meshops.append(meshop)
if settings.aedt_version > "2023.2":
for ds in self._app.design_properties["MeshRegion"]["MeshSetup"]:
if isinstance(self._app.design_properties["MeshRegion"]["MeshSetup"][ds], (OrderedDict, dict)):
if self._app.design_properties["MeshRegion"]["MeshSetup"][ds]["DType"] == "RegionT":
dict_prop = self._app.design_properties["MeshRegion"]["MeshSetup"][ds]
if ds == "Global":
ds = "Settings"
meshop = self.MeshRegion(

Check warning on line 483 in pyaedt/modules/MeshIcepak.py

View check run for this annotation

Codecov / codecov/patch

pyaedt/modules/MeshIcepak.py#L477-L483 

Added lines #L477 - L483 were not covered by tests
self.omeshmodule, self.boundingdimension, self.modeler.model_units, self._app, ds
)
for el in dict_prop:
if el in meshop.__dict__:
meshop.__dict__[el] = dict_prop[el]
meshops.append(meshop)

Check warning on line 489 in pyaedt/modules/MeshIcepak.py

View check run for this annotation

Codecov / codecov/patch

pyaedt/modules/MeshIcepak.py#L486-L489 

Added lines #L486 - L489 were not covered by tests
else:
for ds in self._app.design_properties["MeshRegion"]["MeshSetup"]["MeshRegions"]:
if isinstance(
self._app.design_properties["MeshRegion"]["MeshSetup"]["MeshRegions"][ds], (OrderedDict, dict)
):
dict_prop = self._app.design_properties["MeshRegion"]["MeshSetup"]["MeshRegions"][ds]
if ds == "Global":
ds = "Settings"
meshop = self.MeshRegion(
self.omeshmodule, self.boundingdimension, self.modeler.model_units, self._app, ds
)
for el in dict_prop:
if el in meshop.__dict__:
meshop.__dict__[el] = dict_prop[el]
meshops.append(meshop)
except:
pass
return meshops
Expand Down
Loading