Moved some repeated code to the base class and implemented check for empty intersection between blade and cutting cylinder

Author: DavideOberto

bladex/reversepropeller/basereversepropeller.py

@@ -183,6 +183,45 @@ def _build_cylinder(self, radius):
                 self.cylinder_lateral_faces_list.append(surface)
             faces_explorer.Next()
 
+    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()
+            # Checking if the intersection is null, i.e. no edes from the the section
+            if not edgeExplorer.More():
+                raise ValueError(
+                    "Cylinder radius too small/large: no intersection with blade." \
+                    "The radii must be in mm and not m"
+                )            
+            
+            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 _extract_parameters_and_transform_profile(self, radius):
         """
         Private method which extracts the parameters (pitch, rake, skew ,...) related

bladex/reversepropeller/reversepropeller.py

@@ -153,38 +153,37 @@ 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
-        self.total_section_length = 0.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 _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):

bladex/reversepropeller/reversepropellerbladex.py

@@ -111,46 +111,23 @@ def __init__(self, filename, radii_list, num_points_top_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()
+        super()._build_intersection_cylinder_blade()
         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
+        edgeExplorer = TopExp_Explorer(self.section, TopAbs_EDGE)
         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
+        # Top part of section
         wire_maker_top.Add(edgeList_top)
         self.wire_top = wire_maker_top.Wire()
         self.curve_adaptor_top = BRepAdaptor_CompCurve(
@@ -165,6 +142,61 @@ 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):
         """