Merge remote-tracking branch 'nrel/main' into f/ff

Author: rthedin

.github/workflows/development-pipeline.yml

@@ -21,14 +21,6 @@ jobs:
     strategy:
       matrix:
         include:
-          - os: ubuntu-latest
-            python-version: 3.7
-            python: xvfb-run python3
-            pip_arg: ""
-          - os: ubuntu-latest
-            python-version: 3.8
-            python: xvfb-run python3
-            pip_arg: ""
           - os: ubuntu-latest
             python-version: 3.9
             python: xvfb-run python3
@@ -41,11 +33,11 @@ jobs:
             python-version: 3.12
             python: xvfb-run python3
             pip_arg: ""
-          - os: macos-11
-            python-version: 3.11
+          - os: macos-13
+            python-version: 3.12
             python: python3
             pip_arg: ""
-          - os: windows-2019
+          - os: windows-2022
             python-version: 3.11
             python: python
             pip_arg: --user

__init__.py

@@ -1 +1 @@
-"""Initializes the package"""
+"""Initialize package"""

openfast_toolbox/airfoils/Polar.py

@@ -84,15 +84,18 @@ def __init__(self, filename=None, alpha=None, cl=None, cd=None, cm=None, Re=None
             cd    = df['Cd'].values
             cm    = df['Cm'].values
             if 'fs' in df.keys():
-                print('[INFO] Using separating function from input file.')
+                if verbose:
+                    print('[INFO] Using separating function from input file.')
                 self.fs = df['fs'].values
                 self._fs_lock = True
             if 'Cl_fs' in df.keys():
-                print('[INFO] Using Cl fully separated from input file.')
+                if verbose:
+                    print('[INFO] Using Cl fully separated from input file.')
                 self.cl_fs =df['Cl_fs'].values
                 self._cl_fs_lock = True
             if 'Cl_inv' in df.keys():
-                print('[INFO] Using Cl inviscid from input file.')
+                if verbose:
+                    print('[INFO] Using Cl inviscid from input file.')
                 self.cl_inv = df['Cl_inv'].values
                 self._cl_inv_lock = True
                 # TODO we need a trigger if cl_inv provided, we should get alpha0 and slope from it
@@ -667,7 +670,7 @@ def __getCM(self, i, cmCoef, alpha, cl_ext, cd_ext, alpha_low_deg, alpha_high_de
                 print("Angle encountered for which there is no CM table value " "(near +/-180 deg). Program will stop.")
         return cm_new
 
-    def unsteadyParams(self, window_offset=None, nMin=720):
+    def unsteadyParams(self, window_offset=None, nMin=720, verbose=False):
         """compute unsteady aero parameters used in AeroDyn input file
 
                 TODO Questions to solve:
@@ -737,7 +740,8 @@ def unsteadyParams(self, window_offset=None, nMin=720):
         try:
             alpha0cn = _find_alpha0(alpha, cn, window, direction='up', value_if_constant = 0.)
         except NoCrossingException:
-            print("[WARN] Polar: Cn unsteady, cannot find zero crossing with up direction, trying down direction")
+            if verbose:
+                print("[WARN] Polar: Cn unsteady, cannot find zero crossing with up direction, trying down direction")
             alpha0cn = _find_alpha0(alpha, cn, window, direction='down')
 
         # checks for inppropriate data (like cylinders)
@@ -751,7 +755,8 @@ def unsteadyParams(self, window_offset=None, nMin=720):
         try:
             a_MaxUpp, cn_MaxUpp, a_MaxLow, cn_MaxLow = _find_max_points(alpha, cn, alpha0, method="inflections")
         except NoStallDetectedException:
-            print('[WARN] Polar: Cn unsteady, cannot find stall based on inflections, using min and max')
+            if verbose:
+                print('[WARN] Polar: Cn unsteady, cannot find stall based on inflections, using min and max')
             a_MaxUpp, cn_MaxUpp, a_MaxLow, cn_MaxLow = _find_max_points(alpha, cn, alpha0, method="minmax")
 
         # --- cn slope
@@ -790,7 +795,8 @@ def unsteadyParams(self, window_offset=None, nMin=720):
             a_f07_Upp = xInter[2]
             a_f07_Low = xInter[0]
         else:
-            print('[WARN] Polar: Cn unsteady, cn_f does not intersect cn 3 times. Intersections:{}.'.format(xInter))
+            if verbose:
+                print('[WARN] Polar: Cn unsteady, cn_f does not intersect cn 3 times. Intersections:{}.'.format(xInter))
             a_f07_Upp =  abs(xInter[0]) 
             a_f07_Low = -abs(xInter[0])
 
@@ -1745,6 +1751,8 @@ def _find_linear_region(x, y, nMin, x0=None):
             iEnd = j + nMin
             if x0 is not None:
                 sl = np.linalg.lstsq(x[iStart:iEnd], y[iStart:iEnd], rcond=None)[0][0]
+                if not np.isscalar(sl):
+                    sl = sl[0]
                 slp[iStart, j] = sl
                 off[iStart, j] = x0
                 y_lin = x[iStart:iEnd] * sl

openfast_toolbox/airfoils/tests/test_run_Examples.py

@@ -19,14 +19,17 @@ def test_run_examples(self):
         # Add tests to class
         MyDir=os.path.dirname(__file__)
         files = glob.glob(os.path.join(MyDir,'../examples/[a-zA-Z]*.py'))
-        import matplotlib.pyplot as plt
         print('\n--------------------------------------------------------------')
+        import matplotlib.pyplot as plt
         for f in files:
-            print('Running example script: {}'.format(f))
+            print('Running: {}'.format(os.path.relpath(f, MyDir)))
             if hasattr(self,'subTest'):
                 with self.subTest(filename=os.path.basename(f)):
                     execfile(f, {'__name__': '__test__', 'print': lambda *_:None})
-                    plt.close('all')
+            try:
+                plt.close('all')
+            except:
+                pass
 
 
 if __name__ == '__main__':