Cleaned the code

Author: DavideOberto

bladex/reversepropeller/reversepropeller.py

@@ -153,39 +153,6 @@ def __init__(self, filename, radii_list, num_points_top_bottom):
             ind_sec = ind_sec + 1
 
 
-    # def _build_intersection_cylinder_blade(self):
-    #     """
-    #     Private method that constructs the section lines which are the intersections
-    #     between the cylinder at a fixed radius and the blade, and the camber points.
-    #     """
-    #     # Construction of the section lines between two shapes (in this case the
-    #     # blade and the lateral face of the cylinder)
-    #     section_builder = BRepAlgoAPI_Section(self.blade_solid,
-    #                                        self.cylinder_lateral_face, False)
-    #     # Define and build the parametric 2D curve (pcurve) for the section lines defined above
-    #     section_builder.ComputePCurveOn2(True)
-    #     section_builder.Build()
-    #     self.section = section_builder.Shape()
-    #     edgeExplorer = TopExp_Explorer(self.section, TopAbs_EDGE)
-    #     wire_maker = BRepBuilderAPI_MakeWire()
-
-    #     edgeCount = 0
-    #     edgeList = TopTools_ListOfShape()
-    #     while edgeExplorer.More():
-    #         edgeCount = edgeCount + 1 # Numbering from 1 in OCC
-    #         edge = topods.Edge(edgeExplorer.Current())
-    #         edgeList.Append(edge)
-    #         edgeExplorer.Next()
-    #     wire_maker.Add(edgeList)
-    #     self.wire = wire_maker.Wire()
-    #     self.section_wires_list.append(self.wire)
-    #     self.curve_adaptor = BRepAdaptor_CompCurve(
-    #         OCC.Core.TopoDS.topods.Wire(self.wire))
-    #     # Length of the curve section (ascissa curvilinea)
-    #     self.total_section_length = GCPnts_AbscissaPoint.Length(
-    #         self.curve_adaptor)
-
-
     def _camber_points(self, radius):
         """
         Private method which computes the single points of the camber curve and

bladex/reversepropeller/reversepropellerbladex.py

@@ -73,28 +73,7 @@ def __init__(self, filename, radii_list, num_points_top_bottom):
             self.trailing_edge_point_on_plane = []
             self.param_plane_points = []
             self.orig_param_plane_points = []
-            # points = []
             self._camber_curve(radius)
-            # for i in range(len(self.vor_us)):
-            #     x, y, z = self.vor_us[i], radius*np.sin(self.vor_vs[i]/radius), radius*np.cos(self.vor_vs[i]/radius)
-            #     pnt = gp_Pnt(float(x), float(y), float(z))
-            #     points.append(BRepBuilderAPI_MakeVertex(pnt).Vertex())
-            # self._camber_curve(radius)
-            if False:
-                display, start_display, add_menu, add_function_to_menu = init_display()
-                # display.DisplayShape(self.blade_solid, update=True)
-                display.DisplayShape(self.cylinder, update=True)
-                display.DisplayShape(self.wire_top, color="RED", update=True)
-                display.DisplayShape(self.wire_bottom, color="BLUE", update=True)
-                # display.DisplayShape(self.chord_wire, color="ORANGE", update=True)
-                display.DisplayShape(self.full_camber_wire, color="GREEN", update=True)
-                display.DisplayShape(self.leading_edge, color="BLACK", update=True)
-                display.DisplayShape(self.trailing_edge, color="MAGENTA", update=True)
-                # display.DisplayShape(self.chord_plane, update=True)
-                display.DisplayShape(self.chord_point, update=True)
-                display.DisplayShape(self.trimmed_edge, color="BLACK", update=True)
-                # display.DisplayShape(points, update=True)
-                start_display()
             self._initial_leading_trailing_edges_plane(radius)
             self._initial_camber_points_plane(radius)
             self._initial_airfoil_points_plane(radius)
@@ -142,62 +121,6 @@ def _build_intersection_cylinder_blade(self):
         self.total_section_bottom_length = GCPnts_AbscissaPoint.Length(
             self.curve_adaptor_bottom)
 
-    # def _build_intersection_cylinder_blade(self):
-    #     """
-    #     Private method that constructs the section lines which are the intersections
-    #     between the cylinder at a fixed radius and the blade, and the camber points.
-    #     """
-    #     # Construction of the section lines between two shapes (in this case the
-    #     # blade and the lateral face of the cylinder)
-    #     section_builder = BRepAlgoAPI_Section(self.blade_solid,
-    #                                        self.cylinder_lateral_face, False)
-    #     # Define and build the parametric 2D curve (pcurve) for the section lines defined above
-    #     section_builder.ComputePCurveOn2(True)
-    #     section_builder.Build()
-    #     self.section = section_builder.Shape()
-    #     wire_maker = BRepBuilderAPI_MakeWire()
-    #     wire_maker_top = BRepBuilderAPI_MakeWire()
-    #     wire_maker_bottom = BRepBuilderAPI_MakeWire()
-
-    #     edgeList = TopTools_ListOfShape()
-    #     edgeList_top = TopTools_ListOfShape()
-    #     edgeList_bottom = TopTools_ListOfShape()
-    #     edgeExplorer = TopExp_Explorer(self.section, TopAbs_EDGE)
-    #     edgeCount = 0
-    #     while edgeExplorer.More():
-    #         edgeCount = edgeCount + 1 # Numbering from 1 in OCC
-    #         edge = edgeExplorer.Current()
-    #         edgeList.Append(edge)
-    #         if edgeCount % 2 == 1:
-    #             edgeList_top.Append(edge)
-    #         else:
-    #             edgeList_bottom.Append(edge)
-    #         edgeExplorer.Next()
-        
-    #     # Total sectional curve
-    #     wire_maker.Add(edgeList)
-    #     self.wire = wire_maker.Wire()
-    #     self.section_wires_list.append(self.wire)
-    #     self.curve_adaptor = BRepAdaptor_CompCurve(
-    #         OCC.Core.TopoDS.topods.Wire(self.wire))
-    #     self.total_section_length = GCPnts_AbscissaPoint.Length(
-    #         self.curve_adaptor)
-    #     # Top part
-    #     wire_maker_top.Add(edgeList_top)
-    #     self.wire_top = wire_maker_top.Wire()
-    #     self.curve_adaptor_top = BRepAdaptor_CompCurve(
-    #         OCC.Core.TopoDS.topods.Wire(self.wire_top))
-    #     self.total_section_top_length = GCPnts_AbscissaPoint.Length(
-    #         self.curve_adaptor_top)
-    #     # Bottom part
-    #     wire_maker_bottom.Add(edgeList_bottom)
-    #     self.wire_bottom = wire_maker_bottom.Wire()
-    #     self.curve_adaptor_bottom = BRepAdaptor_CompCurve(
-    #         OCC.Core.TopoDS.topods.Wire(self.wire_bottom))
-    #     self.total_section_bottom_length = GCPnts_AbscissaPoint.Length(
-    #         self.curve_adaptor_bottom)
-
-
     def _camber_curve(self, radius):
         """
         Computation of the camber points. We get the chord, move along it and fint the intersection