Skip to content

Commit

Permalink
FIX: Errors in main unresolved conflicts solve_setup.py (#5789)
Browse files Browse the repository at this point in the history
  • Loading branch information
gmalinve authored Feb 18, 2025
1 parent 27b6420 commit 22f8f7b
Showing 1 changed file with 0 additions and 15 deletions.
15 changes: 0 additions & 15 deletions src/ansys/aedt/core/modules/solve_setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -2898,11 +2898,6 @@ def add_sweep(self, name=None, sweep_type="Interpolating", **props):
name = generate_unique_name("Sweep")
if self.setuptype <= 4:
sweep_n = SweepHFSS(self, name=name, sweep_type=sweep_type, props=props)
elif self.setuptype in [14, 30, 31]:
sweep_n = SweepMatrix(self, name=name, sweep_type=sweep_type) # TODO: add , props=props)
else:
self._app.logger.warning("This method only applies to HFSS, Q2D, and Q3D.")
return False
sweep_n.create()
self.sweeps.append(sweep_n)
for setup in self.p_app.setups:
Expand Down Expand Up @@ -4263,16 +4258,6 @@ def add_sweep(self, name=None, sweep_type="Interpolating", **props):
name = generate_unique_name("Sweep")
if self.setuptype in [14, 30, 31]:
sweep_n = SweepMatrix(self, name=name, sweep_type=sweep_type)
if self.setuptype == 7:
self._app.logger.warning("This method only applies to HFSS and Q3D. Use add_eddy_current_sweep method.")
return False
if self.setuptype <= 4:
sweep_n = SweepHFSS(self, name=name, sweep_type=sweep_type, props=props)
elif self.setuptype in [14, 30, 31]:
sweep_n = SweepMatrix(self, name=name, sweep_type=sweep_type, props=props)
else:
self._app.logger.warning("This method only applies to HFSS, Q2D, and Q3D.")
return False
sweep_n.create()
self.sweeps.append(sweep_n)
for setup in self.p_app.setups:
Expand Down

0 comments on commit 22f8f7b

Please sign in to comment.