Enhancement/q2d (#830)

* First Implementation of new methods for Q2D

* Added UnitTests

* Added UnitTests

* Added UnitTests

* Added UnitTests

* Added UnitTests

* Added UnitTests

Author: maxcapodi78

_unittest/test_30_Q2D.py

@@ -45,9 +45,21 @@ def test_06a_create_setup(self):
     def test_07_single_signal_line(self):
         udp = self.aedtapp.modeler.Position(0, 0, 0)
         o = self.aedtapp.modeler.primitives.create_rectangle(udp, [5, 3], name="Rectangle1")
-        self.aedtapp.assign_single_conductor(target_objects=o, solve_option="SolveOnBoundary")
+        assert self.aedtapp.assign_single_conductor(target_objects=o, solve_option="SolveOnBoundary")
 
     def test_08_assign_huray_finitecond_to_edges(self):
         o = self.aedtapp.create_rectangle([6, 6], [5, 3], name="Rectangle1", matname="Copper")
         self.aedtapp.assign_single_conductor(target_objects=o, solve_option="SolveOnBoundary")
         assert self.aedtapp.assign_huray_finitecond_to_edges(o.edges, radius=0.5, ratio=2.9)
+
+    def test_09_auto_assign(self):
+        self.aedtapp.insert_design("test_auto")
+        o = self.aedtapp.create_rectangle([6, 6], [5, 3], name="Rectangle1", matname="Copper")
+        o = self.aedtapp.create_rectangle([0, 0], [5, 3], name="Rectangle2", matname="Copper")
+        assert self.aedtapp.auto_assign_conductors()
+        assert len(self.aedtapp.boundaries) == 2
+
+    def test_10_toggle_condcutor(self):
+        assert self.aedtapp.toggle_conductor_type("Rectangle1", "ReferenceGround")
+        assert not self.aedtapp.toggle_conductor_type("Rectangle3", "ReferenceGround")
+        assert not self.aedtapp.toggle_conductor_type("Rectangle2", "ReferenceggGround")

_unittest/test_98_Icepak.py

@@ -373,9 +373,7 @@ def test_39_import_idf(self):
     def test_40_create_fan(self):
         fan = self.aedtapp.create_fan(origin=[5, 21, 1])
         assert fan
-        assert (
-            self.aedtapp.modeler.oeditor.Get3DComponentInstanceNames(fan.component_name)[0] == fan.component_name + "1"
-        )
+        assert fan.component_name in self.aedtapp.modeler.oeditor.Get3DComponentInstanceNames(fan.component_name)[0]
 
     def test_88_create_heat_sink(self):
         self.aedtapp.insert_design("HS")

pyaedt/application/Analysis.py

@@ -592,6 +592,8 @@ def export_results(self, analyze=False, export_folder=None):
         setups = self.oanalysis.GetSetups()
         if self.solution_type == "HFSS3DLayout" or self.solution_type == "HFSS 3D Layout Design":
             excitations = len(self.oexcitation.GetAllPortsList())
+        elif self.design_type == "2D Extractor":
+            excitations = self.oboundary.GetNumExcitations("SignalLine")
         else:
             excitations = self.oboundary.GetNumExcitations()
         reportnames = self.post.oreportsetup.GetAllReportNames()

pyaedt/modules/Boundary.py

@@ -383,6 +383,10 @@ def create(self):
             self._app.oboundary.AssignGroundNet(self._get_args())
         elif self.type == "FloatingNet":
             self._app.oboundary.AssignFloatingNet(self._get_args())
+        elif self.type == "SignalLine":
+            self._app.oboundary.AssignSingleSignalLine(self._get_args())
+        elif self.type == "ReferenceGround":
+            self._app.oboundary.AssignSingleReferenceGround(self._get_args())
         elif self.type == "CircuitPort":
             self._app.oboundary.AssignCircuitPort(self._get_args())
         elif self.type == "LumpedPort":

pyaedt/q3d.py

@@ -6,7 +6,6 @@
 from pyaedt.generic.general_methods import aedt_exception_handler, generate_unique_name
 from collections import OrderedDict
 from pyaedt.modules.Boundary import BoundaryObject
-from pyaedt.generic.DataHandlers import _dict2arg
 import os
 import warnings
 
@@ -718,6 +717,7 @@ def __init__(
             student_version,
         )
 
+    @aedt_exception_handler
     def create_rectangle(self, position, dimension_list, name="", matname=""):
         """
         Create a rectangle.
@@ -748,6 +748,7 @@ def create_rectangle(self, position, dimension_list, name="", matname=""):
             position, dimension_list=dimension_list, name=name, matname=matname
         )
 
+    @aedt_exception_handler
     def assign_single_signal_line(self, target_objects, name="", solve_option="SolveInside", thickness=None, unit="um"):
         """Assign conductor type to sheets.
 
@@ -779,6 +780,7 @@ def assign_single_signal_line(self, target_objects, name="", solve_option="Solve
         )
         self.assign_single_conductor(target_objects, name, "SignalLine", solve_option, thickness, unit)
 
+    @aedt_exception_handler
     def assign_single_conductor(
         self,
         target_objects,
@@ -808,10 +810,11 @@ def assign_single_conductor(
             thickness is used.
         unit : str, optional
             Thickness unit. The default is ``"um"``.
+
         Returns
         -------
-        bool
-            ``True`` when successful, ``False`` when failed.
+        :class:`pyaedt.modules.Boundary.BoundaryObject`
+            Source object.
 
         References
         ----------
@@ -840,17 +843,13 @@ def assign_single_conductor(
 
         props = OrderedDict({"Objects": obj_names, "SolveOption": solve_option, "Thickness": str(thickness) + unit})
 
-        arg = ["NAME:" + name]
-        _dict2arg(props, arg)
-        if conductor_type == "SignalLine":
-            self.oboundary.AssignSingleSignalLine(arg)
-        elif conductor_type == "ReferenceGround":
-            self.oboundary.AssignSingleReferenceGround(arg)
-        else:
-            return False
-
-        return True
+        bound = BoundaryObject(self, name, props, conductor_type)
+        if bound.create():
+            self.boundaries.append(bound)
+            return bound
+        return False
 
+    @aedt_exception_handler
     def assign_huray_finitecond_to_edges(self, edges, radius, ratio, unit="um", name=""):
         """
         Assign Huray surface roughness model to edges.
@@ -891,3 +890,55 @@ def assign_huray_finitecond_to_edges(self, edges, radius, ratio, unit="um", name
             self.boundaries.append(bound)
             return bound
         return False
+
+    @aedt_exception_handler
+    def auto_assign_conductors(self):
+        """Auto Assign Conductors to Signal Lines.
+
+        Returns
+        -------
+        bool
+        """
+        original_nets = list(self.oboundary.GetExcitations())
+        self.oboundary.AutoAssignSignals()
+        new_nets = [i for i in list(self.oboundary.GetExcitations()) if i not in original_nets]
+        i = 0
+        while i < len(new_nets):
+            objects = self.modeler.convert_to_selections(
+                [int(k) for k in list(self.oboundary.GetExcitationAssignment(new_nets[i]))], True
+            )
+            props = OrderedDict({"Objects": objects})
+            bound = BoundaryObject(self, new_nets[i], props, new_nets[i + 1])
+            self.boundaries.append(bound)
+            i += 2
+        if new_nets:
+            self.logger.info("{} Nets have been identified: {}".format(len(new_nets), ", ".join(new_nets)))
+        else:
+            self.logger.info("No new nets identified")
+        return True
+
+    @aedt_exception_handler
+    def toggle_conductor_type(self, conductor_name, new_type):
+        """Change the conductor type.
+
+        Parameters
+        ----------
+        conductor_name : str
+            Name of the conductor to update.
+        new_type : str
+            New conductor type.
+
+        Returns
+        -------
+        bool
+        """
+        try:
+            self.oboundary.ToggleConductor(conductor_name, new_type)
+            for bound in self.boundaries:
+                if bound.name == conductor_name:
+                    bound.type = new_type
+            self.logger.info("Conductor type correctly updated")
+            return True
+        except:
+            self.logger.error("Error in updating conductor type")
+            return False