Merge branch 'main' into fix/issue_3260

ansys · Oct 23, 2023 · d6f86dd · d6f86dd
2 parents 3d1b81c + 54efbab
commit d6f86dd
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/pyaedt/modeler/cad/Primitives2D.py b/pyaedt/modeler/cad/Primitives2D.py
@@ -283,13 +283,13 @@ def create_region(self, pad_percent=300, is_percentage=True):
         >>> oEditor.CreateRegion
         """
         if not isinstance(pad_percent, list):
-            if self._app.xy_plane:
+            if self._app.design_type == "2D Extractor" or self._app.xy_plane:
                 pad_percent = [pad_percent, pad_percent, 0, pad_percent, pad_percent, 0]
             else:
                 pad_percent = [pad_percent, 0, pad_percent, pad_percent, 0, pad_percent]
 
         else:
-            if self._app.xy_plane:
+            if self._app.design_type == "2D Extractor" or self._app.xy_plane:
                 pad_percent = [pad_percent[0], pad_percent[1], 0, pad_percent[2], pad_percent[3], 0]
 
             else:

diff --git a/pyaedt/modeler/circuits/PrimitivesMaxwellCircuit.py b/pyaedt/modeler/circuits/PrimitivesMaxwellCircuit.py
@@ -95,7 +95,7 @@ def create_resistor(self, compname=None, value=50, location=None, angle=0, use_i
         )
 
         id.set_property("R", value)
-
+        id.set_property("Name", compname)
         return id
 
     @pyaedt_function_handler()
@@ -138,6 +138,7 @@ def create_inductor(self, compname=None, value=50, location=None, angle=0, use_i
         )
 
         id.set_property("L", value)
+        id.set_property("Name", compname)
         return id
 
     @pyaedt_function_handler()
@@ -177,6 +178,7 @@ def create_capacitor(self, compname=None, value=50, location=[], angle=0, use_in
         )
 
         id.set_property("C", value)
+        id.set_property("Name", compname)
         return id
 
     @pyaedt_function_handler()
@@ -215,6 +217,8 @@ def create_diode(self, compname=None, location=None, angle=0, use_instance_id_ne
             angle=angle,
             use_instance_id_netlist=use_instance_id_netlist,
         )
+
+        id.set_property("Name", compname)
         return id
 
     @pyaedt_function_handler()
@@ -250,4 +254,5 @@ def create_winding(self, compname=None, location=[], angle=0, use_instance_id_ne
             angle=angle,
             use_instance_id_netlist=use_instance_id_netlist,
         )
+        id.set_property("Name", compname)
         return id