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

FIX: eddy current sweep Maxwell #5492

Merged
merged 5 commits into from
Nov 29, 2024
Merged
Show file tree
Hide file tree
Changes from 3 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
30 changes: 13 additions & 17 deletions src/ansys/aedt/core/modules/solve_setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -181,10 +181,7 @@
setups_data = self.p_app.design_properties["AnalysisSetup"]["SolveSetups"]
if self.name in setups_data:
setup_data = setups_data[self.name]
if "Sweeps" in setup_data and self.setuptype not in [
0,
7,
]: # 0 and 7 represent setup HFSSDrivenAuto
if "Sweeps" in setup_data and self.setuptype != 0: # 0 and 7 represent setup HFSSDrivenAuto
gmalinve marked this conversation as resolved.
Show resolved Hide resolved
if self.setuptype <= 4:
app = setup_data["Sweeps"]
app.pop("NextUniqueID", None)
Expand Down Expand Up @@ -3539,26 +3536,25 @@
return False
legacy_update = self.auto_update
self.auto_update = False
props = {}
props["RangeType"] = range_type
props["RangeStart"] = f"{start}{units}"
sweep_props = {"RangeType": range_type, "RangeStart": f"{start}{units}"}
gmalinve marked this conversation as resolved.
Show resolved Hide resolved
self.props["HasSweepSetup"] = True
if range_type == "LinearStep":
props["RangeEnd"] = f"{end}{units}"
props["RangeStep"] = f"{count}{units}"
sweep_props["RangeEnd"] = f"{end}{units}"
sweep_props["RangeStep"] = f"{count}{units}"
elif range_type == "LinearCount":
props["RangeEnd"] = f"{end}{units}"
props["RangeCount"] = count
sweep_props["RangeEnd"] = f"{end}{units}"
sweep_props["RangeCount"] = count
elif range_type == "LogScale":
props["RangeEnd"] = f"{end}{units}"
props["RangeSamples"] = count
sweep_props["RangeEnd"] = f"{end}{units}"
sweep_props["RangeSamples"] = count

Check warning on line 3549 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#L3548-L3549

Added lines #L3548 - L3549 were not covered by tests
elif range_type == "SinglePoints":
props["RangeEnd"] = f"{start}{units}"
sweep_props["RangeEnd"] = f"{start}{units}"
if clear:
self.props["SweepRanges"]["Subrange"] = props
self.props["SweepRanges"]["Subrange"] = sweep_props
elif isinstance(self.props["SweepRanges"]["Subrange"], list):
self.props["SweepRanges"]["Subrange"].append(props)
self.props["SweepRanges"]["Subrange"].append(sweep_props)
else:
self.props["SweepRanges"]["Subrange"] = [self.props["SweepRanges"]["Subrange"], props]
self.props["SweepRanges"]["Subrange"] = [self.props["SweepRanges"]["Subrange"], sweep_props]
self.props["SaveAllFields"] = save_all_fields
self.update()
self.auto_update = legacy_update
Expand Down
34 changes: 17 additions & 17 deletions tests/system/general/test_28_Maxwell3D.py
Original file line number Diff line number Diff line change
Expand Up @@ -234,26 +234,26 @@ def test_06_eddycurrent(self):

def test_07a_setup(self):
adaptive_frequency = "200Hz"
Setup = self.aedtapp.create_setup()
Setup.props["MaximumPasses"] = 12
Setup.props["MinimumPasses"] = 2
Setup.props["MinimumConvergedPasses"] = 1
Setup.props["PercentRefinement"] = 30
Setup.props["Frequency"] = adaptive_frequency
setup = self.aedtapp.create_setup()
setup.props["MaximumPasses"] = 12
setup.props["MinimumPasses"] = 2
setup.props["MinimumConvergedPasses"] = 1
setup.props["PercentRefinement"] = 30
setup.props["Frequency"] = adaptive_frequency
dc_freq = 0.1
stop_freq = 10
count = 1
assert Setup.add_eddy_current_sweep("LinearStep", dc_freq, stop_freq, count, clear=True)
assert isinstance(Setup.props["SweepRanges"]["Subrange"], dict)
assert Setup.props["SaveAllFields"]
assert Setup.add_eddy_current_sweep("LinearCount", dc_freq, stop_freq, count, clear=False)
assert isinstance(Setup.props["SweepRanges"]["Subrange"], list)

assert Setup.update()
assert Setup.enable_expression_cache(["CoreLoss"], "Fields", "Phase='0deg' ", True)
assert Setup.props["UseCacheFor"] == ["Pass", "Freq"]
assert Setup.disable()
assert Setup.enable()
assert setup.add_eddy_current_sweep("LinearStep", dc_freq, stop_freq, count, clear=True)
gmalinve marked this conversation as resolved.
Show resolved Hide resolved
assert isinstance(setup.props["SweepRanges"]["Subrange"], dict)
assert setup.props["SaveAllFields"]
assert setup.add_eddy_current_sweep("LinearCount", dc_freq, stop_freq, count, clear=False)
assert isinstance(setup.props["SweepRanges"]["Subrange"], list)
assert setup.add_eddy_current_sweep("SinglePoints", start=0.01, clear=False)
assert setup.update()
assert setup.enable_expression_cache(["CoreLoss"], "Fields", "Phase='0deg' ", True)
assert setup.props["UseCacheFor"] == ["Pass", "Freq"]
assert setup.disable()
assert setup.enable()

def test_07b_create_parametrics(self):
self.aedtapp["w1"] = "10mm"
Expand Down
Loading