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

CHORE: improve maxwell tests code cov #5746

Merged
merged 9 commits into from
Feb 8, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
61 changes: 43 additions & 18 deletions src/ansys/aedt/core/modules/solve_setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
self.setuptype = self.p_app.design_solutions._solution_options[solution_type]["default_setup"]
self._name = name
self._legacy_props = {}
self._sweeps = []
self._sweeps = None
self._is_new_setup = is_new_setup
# self._init_props(is_new_setup)
self.auto_update = True
Expand Down Expand Up @@ -103,9 +103,10 @@

@property
def sweeps(self):
if self._sweeps:
if self._sweeps is not None:
return self._sweeps
try:
self._sweeps = []
setups_data = self.p_app.design_properties["AnalysisSetup"]["SolveSetups"]
if self.name in setups_data:
setup_data = setups_data[self.name]
Expand Down Expand Up @@ -808,7 +809,7 @@
return True

@pyaedt_function_handler(setup_name="name")
def enable(self, name=None):
def enable(self):
"""Enable a setup.

Parameters
Expand All @@ -825,14 +826,11 @@
----------
>>> oModule.EditSetup
"""
if not name:
name = self.name

self.omodule.EditSetup(name, ["NAME:" + name, "IsEnabled:=", True])
self.props["Enabled"] = True
return True

@pyaedt_function_handler(setup_name="name")
def disable(self, name=None):
@pyaedt_function_handler()
def disable(self):
"""Disable a setup.

Parameters
Expand All @@ -849,10 +847,7 @@
----------
>>> oModule.EditSetup
"""
if not name:
name = self.name

self.omodule.EditSetup(name, ["NAME:" + name, "IsEnabled:", False])
self.props["Enabled"] = False
return True

@pyaedt_function_handler(
Expand Down Expand Up @@ -1808,9 +1803,10 @@

@property
def sweeps(self):
if self._sweeps:
if self._sweeps is not None:
return self._sweeps
try:
self._sweeps = []
setups_data = self._app.design_properties["Setup"]["Data"]
if self.name in setups_data:
setup_data = setups_data[self.name]
Expand Down Expand Up @@ -3669,21 +3665,40 @@
self.props["SaveAllFields"] = save_all_fields
if self.sweeps:
if clear:
self.props["SweepRanges"] = {"Subrange": [sweep.props]}
self.props["SweepRanges"] = {"Subrange": [SetupProps(self, sweep.props)]}
self.sweeps.clear()
else:
if isinstance(self.props["SweepRanges"]["Subrange"], dict):
temp = self.props["SweepRanges"]["Subrange"]
self.props["SweepRanges"].pop("Subrange", None)
self.props["SweepRanges"]["Subrange"] = [temp]
self.props["SweepRanges"]["Subrange"].append(sweep.props)
self.props["SweepRanges"]["Subrange"] = [SetupProps(self, temp)]
self.props["SweepRanges"]["Subrange"].append(SetupProps(self, sweep.props))
else:
self.props["HasSweepSetup"] = True
self.props["SweepRanges"] = {"Subrange": [sweep.props]}
self.props["SweepRanges"] = {"Subrange": [SetupProps(self, sweep.props)]}
sweep.create()
self.update()
self.auto_update = legacy_update
self.sweeps.append(sweep)
return sweep

@pyaedt_function_handler()
def delete_all_eddy_current_sweeps(self):
"""Delete all Maxwell Eddy Current sweeps.

Returns
-------
bool
``True`` when successful, ``False`` when failed.
"""
if self.setuptype not in [7, 60]:
self._app.logger.warning("This method only applies to Maxwell Eddy Current Solution.")
return False

Check warning on line 3696 in src/ansys/aedt/core/modules/solve_setup.py

View check run for this annotation

Codecov / codecov/patch

src/ansys/aedt/core/modules/solve_setup.py#L3695-L3696

Added lines #L3695 - L3696 were not covered by tests
self.props.pop("SweepRanges")
self._sweeps.clear()
self.update()
return True

@pyaedt_function_handler()
def enable_control_program(self, control_program_path, control_program_args=" ", call_after_last_step=False):
"""Enable control program option is solution setup.
Expand Down Expand Up @@ -3834,6 +3849,16 @@
self.props["Steps To"] = f"{stop}{units}"
self.update()
return True
elif range_type == "None":
if self.props["SaveFieldsType"] == "Custom":
self.props.pop("SweepRanges", None)
elif self.props["SaveFieldsType"] == "Every N Steps":
self.props.pop("N Steps", None)
self.props.pop("Steps From", None)
self.props.pop("Steps To", None)

Check warning on line 3858 in src/ansys/aedt/core/modules/solve_setup.py

View check run for this annotation

Codecov / codecov/patch

src/ansys/aedt/core/modules/solve_setup.py#L3855-L3858

Added lines #L3855 - L3858 were not covered by tests
self.props["SaveFieldsType"] = "None"
self.update()
return True
else:
self._app.logger.error("Invalid range type. It has to be either 'Custom' or 'Every N Steps'.")
return False
Expand Down
8 changes: 4 additions & 4 deletions src/ansys/aedt/core/modules/solve_sweeps.py
Original file line number Diff line number Diff line change
Expand Up @@ -951,15 +951,15 @@ def delete(self):
bool
``True`` when successful, ``False`` when failed.
"""
setup_sweeps = self._setup.props["SweepRanges"]["Subrange"]
if isinstance(setup_sweeps, list):
setup_sweeps = self._setup.props["SweepRanges"]["Subrange"].copy()
if isinstance(self._setup.props["SweepRanges"]["Subrange"], list):
for sweep in setup_sweeps:
if self.props == sweep:
self._setup.props["SweepRanges"]["Subrange"].remove(self.props)
[self._setup._sweeps.remove(s) for s in self._setup._sweeps if s.props == sweep]
else:
pass

self.oanalysis.EditSetup(self.setup_name, self._get_args(self._setup.props))
self._setup.update()
return True

@pyaedt_function_handler()
Expand Down
Loading