Merge pull request #30 from mahgadalla/dev

Blade setMaxDeg with tests. Readme acknowledge prelica

Author: mtezzele

README.md

@@ -105,7 +105,8 @@ Here we show a bottom-up parametrized construction of the [Potsdam Propeller Tes
 * [Mahmoud Gadalla](mailto:[email protected])
 * [Marco Tezzele](mailto:[email protected])
 
-under the supervision of [Dr. Andrea Mola](mailto:[email protected]) and [Prof. Gianluigi Rozza](mailto:[email protected]).
+under the supervision of [Dr. Andrea Mola](mailto:[email protected]) and [Prof. Gianluigi Rozza](mailto:[email protected]) in the framework of the project [PRELICA: Advanced Methodologies for Hydro-acoustic Design of Naval Propulsion](https://mathlab.sissa.it/project/prelica-metodologie-avanzate-la-progettazione-idro-acustica-dell%E2%80%99elica-navale-por-fesr-2017).
+
 
 Contact us by email for further information or questions about **BladeX**, or suggest pull requests. Contributions improving either the code or the documentation are welcome!
 

bladex/blade.py

@@ -486,6 +486,7 @@ def generate_iges(self,
                       upper_face=None,
                       lower_face=None,
                       tip=None,
+                      maxDeg=1,
                       display=False,
                       errors=None):
         """
@@ -504,6 +505,8 @@ def generate_iges(self,
             the blade tip using the BRepOffsetAPI_ThruSections algorithm
             in order to close the blade, then exports the generated CAD into
             .iges file holding the name <tip_string>.iges. Default value is None
+        :param int maxDeg: Define the maximal U degree of generated surface.
+            Default value is 1
         :param bool display: if True, then display the generated CAD. Default
             value is False
         :param string errors: if string is passed then the method writes out
@@ -527,13 +530,17 @@ def generate_iges(self,
         from OCC.BRepOffsetAPI import BRepOffsetAPI_ThruSections
         from OCC.BRepExtrema import BRepExtrema_DistShapeShape
 
+        if maxDeg <= 0:
+            raise ValueError('maxDeg argument must be a positive integer.')
+
         if upper_face:
             self._check_string(filename=upper_face)
             # Initializes ThruSections algorithm for building a shell passing
             # through a set of sections (wires). The generated faces between
             # the edges of every two consecutive wires are smoothed out with
             # a precision criterion = 1e-10
             generator = BRepOffsetAPI_ThruSections(False, False, 1e-10)
+            generator.SetMaxDegree(maxDeg)
             # Define upper edges (wires) for the face generation
             for i in range(self.n_sections):
                 npoints = len(self.blade_coordinates_up[i][0])
@@ -571,6 +578,7 @@ def generate_iges(self,
             # the edges of every two consecutive wires are smoothed out with
             # a precision criterion = 1e-10
             generator = BRepOffsetAPI_ThruSections(False, False, 1e-10)
+            generator.SetMaxDegree(maxDeg)
             # Define upper edges (wires) for the face generation
             for i in range(self.n_sections):
                 npoints = len(self.blade_coordinates_down[i][0])
@@ -604,8 +612,7 @@ def generate_iges(self,
         if tip:
             self._check_string(filename=tip)
             generator = BRepOffsetAPI_ThruSections(False, False, 1e-10)
-            generator.SetMaxDegree(1)
-
+            generator.SetMaxDegree(maxDeg)
             # npoints_up == npoints_down
             npoints = len(self.blade_coordinates_down[-1][0])
             vertices_1 = TColgp_HArray1OfPnt(1, npoints)

tests/test_blade.py

@@ -499,6 +499,18 @@ def test_iges_blade_tip_generate(self):
         self.assertTrue(os.path.isfile('tests/test_datasets/tip.iges'))
         self.addCleanup(os.remove, 'tests/test_datasets/tip.iges')
 
+    def test_iges_blade_maxDeg_exception(self):
+        blade = create_sample_blade_NACA()
+        blade.apply_transformations()
+        with self.assertRaises(ValueError):
+            blade.generate_iges(
+                upper_face=None,
+                lower_face=None,
+                tip=None,
+                maxDeg=-1,
+                display=False,
+                errors=None)
+
     def test_iges_errors_exception(self):
         blade = create_sample_blade_NACA()
         blade.apply_transformations()