Merge remote-tracking branch 'origin/main'

Author: maxcapodi78

_unittest/test_08_Primitives3D.py

@@ -760,17 +760,17 @@ def test_50_remove_vertex_from_polyline(self):
     @pyaedt_unittest_check_desktop_error
     def test_51_remove_edges_from_polyline(self):
 
-        primitives = self.aedtapp.modeler
-        P = primitives.create_polyline([[0, 1, 2], [0, 2, 3], [2, 1, 4]])
+        modeler = self.aedtapp.modeler
+        P = modeler.create_polyline([[0, 1, 2], [0, 2, 3], [2, 1, 4]])
         P.remove_edges(edge_id=0)
         assert P.name in self.aedtapp.modeler.line_names
-        P = primitives.create_polyline([[0, 1, 2], [0, 2, 3], [2, 1, 4], [3, 1, 6]])
+        P = modeler.create_polyline([[0, 1, 2], [0, 2, 3], [2, 1, 4], [3, 1, 6]])
         P.remove_edges(edge_id=[0, 1])
         assert P.name in self.aedtapp.modeler.line_names
-        P = primitives.create_polyline([[0, 1, 2], [0, 2, 3], [2, 1, 4], [3, 1, 6]])
+        P = modeler.create_polyline([[0, 1, 2], [0, 2, 3], [2, 1, 4], [3, 1, 6]])
         P.remove_edges(edge_id=[1, 2])
         assert P.name in self.aedtapp.modeler.line_names
-        P = primitives.create_polyline([[0, 1, 2], [0, 2, 3], [2, 1, 4], [3, 1, 6]])
+        P = modeler.create_polyline([[0, 1, 2], [0, 2, 3], [2, 1, 4], [3, 1, 6]])
         P.remove_edges(edge_id=2)
         assert P.name in self.aedtapp.modeler.line_names
 

_unittest/test_27_Maxwell2D.py

@@ -189,18 +189,10 @@ def test_18_end_connection(self):
     def test_19_matrix(self):
         self.aedtapp.insert_design("Matrix")
         self.aedtapp.solution_type = SOLUTIONS.Maxwell2d.MagnetostaticXY
-        self.aedtapp.modeler.primitives.create_rectangle(
-            [0, 1.5, 0], [8, 3], is_covered=True, name="Coil_1", matname="vacuum"
-        )
-        self.aedtapp.modeler.primitives.create_rectangle(
-            [8.5, 1.5, 0], [8, 3], is_covered=True, name="Coil_2", matname="vacuum"
-        )
-        self.aedtapp.modeler.primitives.create_rectangle(
-            [16, 1.5, 0], [8, 3], is_covered=True, name="Coil_3", matname="vacuum"
-        )
-        self.aedtapp.modeler.primitives.create_rectangle(
-            [32, 1.5, 0], [8, 3], is_covered=True, name="Coil_4", matname="vacuum"
-        )
+        self.aedtapp.modeler.create_rectangle([0, 1.5, 0], [8, 3], is_covered=True, name="Coil_1", matname="vacuum")
+        self.aedtapp.modeler.create_rectangle([8.5, 1.5, 0], [8, 3], is_covered=True, name="Coil_2", matname="vacuum")
+        self.aedtapp.modeler.create_rectangle([16, 1.5, 0], [8, 3], is_covered=True, name="Coil_3", matname="vacuum")
+        self.aedtapp.modeler.create_rectangle([32, 1.5, 0], [8, 3], is_covered=True, name="Coil_4", matname="vacuum")
         self.aedtapp.assign_current("Coil_1", amplitude=1, swap_direction=False, name="Current1")
         self.aedtapp.assign_current("Coil_2", amplitude=1, swap_direction=True, name="Current2")
         self.aedtapp.assign_current("Coil_3", amplitude=1, swap_direction=True, name="Current3")

_unittest/test_28_Maxwell3D.py

@@ -342,15 +342,15 @@ def test_31_core_losses(self):
     def test_32_matrix(self):
         m3d = Maxwell3d(self.file_path, specified_version=desktop_version)
         m3d.solution_type = SOLUTIONS.Maxwell3d.ElectroStatic
-        m3d.modeler.primitives.create_box([0, 1.5, 0], [1, 2.5, 5], name="Coil_1", matname="aluminum")
-        m3d.modeler.primitives.create_box([8.5, 1.5, 0], [1, 2.5, 5], name="Coil_2", matname="aluminum")
-        m3d.modeler.primitives.create_box([16, 1.5, 0], [1, 2.5, 5], name="Coil_3", matname="aluminum")
-        m3d.modeler.primitives.create_box([32, 1.5, 0], [1, 2.5, 5], name="Coil_4", matname="aluminum")
-
-        rectangle1 = m3d.modeler.primitives.create_rectangle(0, [0.5, 1.5, 0], [2.5, 5], name="Sheet1")
-        rectangle2 = m3d.modeler.primitives.create_rectangle(0, [9, 1.5, 0], [2.5, 5], name="Sheet2")
-        rectangle3 = m3d.modeler.primitives.create_rectangle(0, [16.5, 1.5, 0], [2.5, 5], name="Sheet3")
-        rectangle4 = m3d.modeler.primitives.create_rectangle(0, [32.5, 1.5, 0], [2.5, 5], name="Sheet4")
+        m3d.modeler.create_box([0, 1.5, 0], [1, 2.5, 5], name="Coil_1", matname="aluminum")
+        m3d.modeler.create_box([8.5, 1.5, 0], [1, 2.5, 5], name="Coil_2", matname="aluminum")
+        m3d.modeler.create_box([16, 1.5, 0], [1, 2.5, 5], name="Coil_3", matname="aluminum")
+        m3d.modeler.create_box([32, 1.5, 0], [1, 2.5, 5], name="Coil_4", matname="aluminum")
+
+        rectangle1 = m3d.modeler.create_rectangle(0, [0.5, 1.5, 0], [2.5, 5], name="Sheet1")
+        rectangle2 = m3d.modeler.create_rectangle(0, [9, 1.5, 0], [2.5, 5], name="Sheet2")
+        rectangle3 = m3d.modeler.create_rectangle(0, [16.5, 1.5, 0], [2.5, 5], name="Sheet3")
+        rectangle4 = m3d.modeler.create_rectangle(0, [32.5, 1.5, 0], [2.5, 5], name="Sheet4")
 
         m3d.assign_voltage(rectangle1.faces[0], amplitude=1, name="Voltage1")
         m3d.assign_voltage(rectangle2.faces[0], amplitude=1, name="Voltage2")

examples/02-Maxwell/Maxwell3DTeam3.py

@@ -35,7 +35,7 @@
     new_desktop_session=True,
 )
 uom = M3D.modeler.model_units = "mm"
-primitives = M3D.modeler
+modeler = M3D.modeler
 
 ###############################################################################
 # Add the variable Coil Position, it will later be used to adjust position of the coil
@@ -83,8 +83,8 @@
 # Draw a line we will later use it to plot Bz on, (z-component of Flux Density)
 # A small diameter cylinder is also added to refine mesh locally around the line.
 Line_Points = [["0mm", "-55mm", "0.5mm"], ["0mm", "55mm", "0.5mm"]]
-P1 = primitives.create_polyline(Line_Points, name="Line_AB")
-P2 = primitives.create_polyline(Line_Points, name="Line_AB_MeshRefinement")
+P1 = modeler.create_polyline(Line_Points, name="Line_AB")
+P2 = modeler.create_polyline(Line_Points, name="Line_AB_MeshRefinement")
 P2.set_crosssection_properties(type="Circle", width="0.5mm")
 
 
@@ -193,7 +193,7 @@
 
 ###############################################################################
 # Create a plot Mag_J, the induced current density on the surface of the ladder plate
-surflist = primitives.get_object_faces("LadderPlate")
+surflist = modeler.get_object_faces("LadderPlate")
 intrinsic_dict = {"Freq": "50Hz", "Phase": "0deg"}
 M3D.post.create_fieldplot_surface(surflist, "Mag_J", intrinsincDict=intrinsic_dict, plot_name="Mag_J")
 

examples/02-Maxwell/Maxwell3DTeam7.py

@@ -30,7 +30,7 @@
     projectname=Project_Name, designname=Design_Name, solution_type=Solver, specified_version=DesktopVersion, non_graphical=non_graphical
 )
 M3D.modeler.model_units = "mm"
-primitives = M3D.modeler.primitives
+modeler = M3D.modeler
 Plot = M3D.odesign.GetModule("ReportSetup")
 
 
@@ -112,9 +112,9 @@
 mat.conductivity = 3.526e7
 
 # Model the Aluminium plate with a hole in by subtracting two rectangular cuboids.
-plate = M3D.modeler.primitives.create_box([0, 0, 0], [294, 294, 19], name="Plate", matname="team7_aluminium")
+plate = M3D.modeler.create_box([0, 0, 0], [294, 294, 19], name="Plate", matname="team7_aluminium")
 M3D.modeler.fit_all()
-hole = M3D.modeler.primitives.create_box([18, 18, 0], [108, 108, 19], name="Hole")
+hole = M3D.modeler.create_box([18, 18, 0], [108, 108, 19], name="Hole")
 M3D.modeler.subtract("Plate", ["Hole"], keepOriginals=False)
 
 # Draw a background region, it will take default Air properties
@@ -149,13 +149,13 @@
 mesh_diameter = "2mm"
 
 line_points_1 = [["0mm", "72mm", "34mm"], ["288mm", "72mm", "34mm"]]
-polyline = primitives.create_polyline(line_points_1, name=lines[0])
-L1Mesh = primitives.create_polyline(line_points_1, name=lines[0] + "mesh")
+polyline = modeler.create_polyline(line_points_1, name=lines[0])
+L1Mesh = modeler.create_polyline(line_points_1, name=lines[0] + "mesh")
 L1Mesh.set_crosssection_properties(type="Circle", width=mesh_diameter)
 
 line_points_2 = [["0mm", "144mm", "34mm"], ["288mm", "144mm", "34mm"]]
-polyline2 = primitives.create_polyline(line_points_2, name=lines[1])
-polyline2_mesh = primitives.create_polyline(line_points_2, name=lines[1] + "mesh")
+polyline2 = modeler.create_polyline(line_points_2, name=lines[1])
+polyline2_mesh = modeler.create_polyline(line_points_2, name=lines[1] + "mesh")
 polyline2_mesh.set_crosssection_properties(type="Circle", width=mesh_diameter)
 
 ###############################################################################
@@ -348,7 +348,7 @@
 
 ###################################################################################################
 # Create two plots of Mag_J and Mag_B, the induced current and flux density on surface of the plate
-surflist = primitives.get_object_faces("Plate")
+surflist = modeler.get_object_faces("Plate")
 intrinsic_dict = {"Freq": "200Hz", "Phase": "0deg"}
 M3D.post.create_fieldplot_surface(surflist, "Mag_J", intrinsincDict=intrinsic_dict, plot_name="Mag_J")
 M3D.post.create_fieldplot_surface(surflist, "Mag_B", intrinsincDict=intrinsic_dict, plot_name="Mag_B")

pyaedt/maxwell.py

@@ -202,10 +202,10 @@ def assign_matrix(
         Set matrix in a Maxwell analysis.
 
         >>> m2d = Maxwell2d(solution_type="MagnetostaticXY", close_on_exit=True, specified_version="2022.1")
-        >>> coil1 = m2d.modeler.primitives.create_rectangle([0, 1.5, 0], [8, 3], is_covered=True, name="Coil_1")
-        >>> coil2 = m2d.modeler.primitives.create_rectangle([8.5, 1.5, 0], [8, 3], is_covered=True, name="Coil_2")
-        >>> coil3 = m2d.modeler.primitives.create_rectangle([16, 1.5, 0], [8, 3], is_covered=True, name="Coil_3")
-        >>> coil4 = m2d.modeler.primitives.create_rectangle([32, 1.5, 0], [8, 3], is_covered=True, name="Coil_4")
+        >>> coil1 = m2d.modeler.create_rectangle([0, 1.5, 0], [8, 3], is_covered=True, name="Coil_1")
+        >>> coil2 = m2d.modeler.create_rectangle([8.5, 1.5, 0], [8, 3], is_covered=True, name="Coil_2")
+        >>> coil3 = m2d.modeler.create_rectangle([16, 1.5, 0], [8, 3], is_covered=True, name="Coil_3")
+        >>> coil4 = m2d.modeler.create_rectangle([32, 1.5, 0], [8, 3], is_covered=True, name="Coil_4")
         >>> current1 = m2d.assign_current("Coil_1", amplitude=1, swap_direction=False, name="Current1")
         >>> current2 = m2d.assign_current("Coil_2", amplitude=1, swap_direction=True, name="Current2")
         >>> current3 = m2d.assign_current("Coil_3", amplitude=1, swap_direction=True, name="Current3")

pyaedt/modeler/Primitives.py

@@ -520,7 +520,7 @@ def clone(self):
         Examples
         --------
         >>> primitives = self.aedtapp.modeler
-        >>> P1 = primitives.create_polyline([[0, 1, 2], [0, 2, 3], [2, 1, 4]])
+        >>> P1 = modeler.create_polyline([[0, 1, 2], [0, 2, 3], [2, 1, 4]])
         >>> P2 = P1.clone()
 
         """
@@ -569,18 +569,18 @@ def remove_vertex(self, position, abstol=1e-9):
         --------
         Use floating point values for the vertex positions.
 
-        >>> P = primitives.create_polyline([[0, 1, 2], [0, 2, 3], [2, 1, 4]])
+        >>> P = modeler.create_polyline([[0, 1, 2], [0, 2, 3], [2, 1, 4]])
         >>> P.remove_vertex([0, 1, 2])
 
         Use string expressions for the vertex position.
 
-        >>> P = primitives.create_polyline([[0, 1, 2], [0, 2, 3], [2, 1, 4]])
+        >>> P = modeler.create_polyline([[0, 1, 2], [0, 2, 3], [2, 1, 4]])
         >>> P.remove_vertex(["0mm", "1mm", "2mm"])
 
         Use string expressions for the vertex position and include an absolute
         tolerance when searching for the vertex to be removed.
 
-        >>> P = primitives.create_polyline([[0, 1, 2], [0, 2, 3], [2, 1, 4]])
+        >>> P = modeler.create_polyline([[0, 1, 2], [0, 2, 3], [2, 1, 4]])
         >>> P.remove_vertex(["0mm", "1mm", "2mm"], abstol=1e-6)
         """
         found_vertex = False
@@ -657,7 +657,7 @@ def remove_edges(self, edge_id):
 
         Examples
         --------
-        >>> P = primitives.create_polyline([[0, 1, 2], [0, 2, 3], [2, 1, 4]])
+        >>> P = modeler.create_polyline([[0, 1, 2], [0, 2, 3], [2, 1, 4]])
         >>> P.remove_edges(edge_id=0)
         """
         if isinstance(edge_id, int):
@@ -723,7 +723,7 @@ def set_crosssection_properties(
 
         Examples
         --------
-        >>> P = primitives.create_polyline([[0, 1, 2], [0, 2, 3], [2, 1, 4]])
+        >>> P = modeler.create_polyline([[0, 1, 2], [0, 2, 3], [2, 1, 4]])
         >>> P.set_crosssection_properties(type="Circle", width="1mm")
 
         """
@@ -1453,7 +1453,7 @@ def create_polyline(
         >>> desktop=Desktop(specified_version="2021.2", new_desktop_session=False)
         >>> aedtapp = Maxwell3D()
         >>> aedtapp.modeler.model_units = "mm"
-        >>> primitives = aedtapp.modeler
+        >>> modeler = aedtapp.modeler
 
         Define some test data points.
 
@@ -1463,24 +1463,24 @@ def create_polyline(
         The default behavior assumes that all points are to be
         connected by line segments.  Optionally specify the name.
 
-        >>> P1 = primitives.create_polyline(test_points, name="PL_line_segments")
+        >>> P1 = modeler.create_polyline(test_points, name="PL_line_segments")
 
         Specify that the first segment is a line and the last three
         points define a three-point arc.
 
-        >>> P2 = primitives.create_polyline(test_points, segment_type=["Line", "Arc"], name="PL_line_plus_arc")
+        >>> P2 = modeler.create_polyline(test_points, segment_type=["Line", "Arc"], name="PL_line_plus_arc")
 
         Redraw the 3-point arc alone from the last three points and
         additionally specify five segments using ``PolylineSegment``.
 
-        >>> P3 = primitives.create_polyline(test_points[1:],
+        >>> P3 = modeler.create_polyline(test_points[1:],
         ...                               segment_type=PolylineSegment(type="Arc", num_seg=7),
         ...                               name="PL_segmented_arc")
 
         Specify that the four points form a spline and add a circular
         cross-section with a diameter of 1 mm.
 
-        >>> P4 = primitives.create_polyline(test_points, segment_type="Spline", name="PL_spline",
+        >>> P4 = modeler.create_polyline(test_points, segment_type="Spline", name="PL_spline",
         ...                               xsection_type="Circle", xsection_width="1mm")
 
         Use the `PolylineSegment` object to specify more detail about
@@ -1491,14 +1491,14 @@ def create_polyline(
         >>> start_point = test_points[1]
         >>> center_point = test_points[0]
         >>> segment_def = PolylineSegment(type="AngularArc", arc_center=center_point, arc_angle="90deg", arc_plane="XY")
-        >>> primitives.create_polyline(start_point, segment_type=segment_def, name="PL_center_point_arc")
+        >>> modeler.create_polyline(start_point, segment_type=segment_def, name="PL_center_point_arc")
 
         Create a spline using a list of variables for the coordinates of the points.
 
         >>> x0, y0, z0 = "0", "0", "1"
         >>> x1, y1, z1 = "1", "3", "1"
         >>> x2, y2, z2 = "2", "2", "1"
-        >>> P5 = primitives.create_polyline(position_list = [[x0, y0, z0], [x1, y1, z1], [x2, y2, z2]],
+        >>> P5 = modeler.create_polyline(position_list = [[x0, y0, z0], [x1, y1, z1], [x2, y2, z2]],
         ...                                 segment_type="Spline", name="polyline_with_variables")
 
         """

pyaedt/modeler/Primitives3D.py

@@ -2008,7 +2008,7 @@ def _make_triple_linked_winding(
         list_positions = []
         for i in range(len(list_polyline)):
             list_positions = list_positions + self.get_vertices_of_line(list_polyline[i])
-        self.primitives.delete(list_polyline)
+        self.delete(list_polyline)
         true_polyline = self.create_polyline(position_list=list_positions, name=name, matname=material)
         return [true_polyline, list_positions]
 

pyaedt/modeler/object3dlayout.py

@@ -980,7 +980,7 @@ class Point(object):
 
     >>> from pyaedt import Hfss
     >>> aedtapp = Hfss()
-    >>> primitives = aedtapp.modeler.primitives
+    >>> primitives = aedtapp.modeler
 
     Create a point, to return an :class:`pyaedt.modeler.Object3d.Point`.
 
@@ -1083,7 +1083,7 @@ def set_color(self, color_value):
 
         Examples
         --------
-        >>> point = self.aedtapp.modeler.primitives.create_point([30, 30, 0], "demo_point")
+        >>> point = self.aedtapp.modeler.create_point([30, 30, 0], "demo_point")
         >>> point.set_color("(143 175 158)")
 
         """

pyaedt/modeler/stackup_3d.py

@@ -173,23 +173,23 @@ def __init__(
         if thickness:
             self._thickness = NamedVariable(self._app, self._thickness_variable, str(thickness) + "mm")
         if self._layer_type == "dielectric":
-            obj_3d = self._app.modeler.primitives.create_box(
+            obj_3d = self._app.modeler.create_box(
                 ["dielectric_x_position", "dielectric_y_position", layer_position],
                 ["dielectric_length", "dielectric_width", self._thickness_variable],
                 name=self._name,
                 matname=self._material_name,
             )
         elif self._layer_type == "ground":
             if thickness:
-                obj_3d = self._app.modeler.primitives.create_box(
+                obj_3d = self._app.modeler.create_box(
                     ["dielectric_x_position", "dielectric_y_position", layer_position],
                     ["dielectric_length", "dielectric_width", self._thickness_variable],
                     name=self._name,
                     matname=self._material_name,
                 )
 
             else:
-                obj_3d = self._app.modeler.primitives.create_rectangle(
+                obj_3d = self._app.modeler.create_rectangle(
                     "Z",
                     ["dielectric_x_position", "dielectric_y_position", layer_position],
                     ["dielectric_length", "dielectric_width"],
@@ -198,14 +198,14 @@ def __init__(
                 )
         elif self._layer_type == "signal":
             if thickness:
-                obj_3d = self._app.modeler.primitives.create_box(
+                obj_3d = self._app.modeler.create_box(
                     ["dielectric_x_position", "dielectric_y_position", layer_position],
                     ["dielectric_length", "dielectric_width", self._thickness_variable],
                     name=self._name,
                     matname=self._fill_material,
                 )
             else:
-                obj_3d = self._app.modeler.primitives.create_rectangle(
+                obj_3d = self._app.modeler.create_rectangle(
                     "Z",
                     ["dielectric_x_position", "dielectric_y_position", layer_position],
                     ["dielectric_length", "dielectric_width"],
@@ -1468,7 +1468,7 @@ def __init__(
 
             self._reference_system = patch_name + "_CS"
         if signal_layer.thickness:
-            self._aedt_object = application.modeler.primitives.create_box(
+            self._aedt_object = application.modeler.create_box(
                 position=start_point,
                 dimensions_list=[
                     "{}_length".format(patch_name),
@@ -1479,7 +1479,7 @@ def __init__(
                 matname=signal_layer.material_name,
             )
         else:
-            self._aedt_object = application.modeler.primitives.create_rectangle(
+            self._aedt_object = application.modeler.create_rectangle(
                 position=start_point,
                 dimension_list=[self.length.name, self.width.name],
                 name=patch_name,
@@ -1845,7 +1845,7 @@ def __init__(
                 start_point = ["-{0}_width/2".format(self._name), 0, 0]
             self._reference_system = line_name + "_CS"
         if signal_layer.thickness:
-            self._aedt_object = application.modeler.primitives.create_box(
+            self._aedt_object = application.modeler.create_box(
                 position=start_point,
                 dimensions_list=[
                     "{}_length".format(self._name),
@@ -1856,7 +1856,7 @@ def __init__(
                 matname=signal_layer.material_name,
             )
         else:
-            self._aedt_object = application.modeler.primitives.create_rectangle(
+            self._aedt_object = application.modeler.create_rectangle(
                 position=start_point,
                 dimension_list=["{}_length".format(self._name), "{}_width".format(self._name)],
                 name=line_name,