Merge pull request #24 from ebranlard/misc_updates

Misc updates of IO/Tools/Postpro/Lin and Polar

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

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__':

openfast_toolbox/io/__init__.py

@@ -85,6 +85,7 @@ def fileFormats(userpath=None, ignoreErrors=False, verbose=False):
     from .hawcstab2_pwr_file      import HAWCStab2PwrFile
     from .hawcstab2_ind_file      import HAWCStab2IndFile
     from .hawcstab2_cmb_file      import HAWCStab2CmbFile
+    from .gnuplot_file            import GNUPlotFile 
     from .mannbox_file            import MannBoxFile 
     from .flex_blade_file         import FLEXBladeFile
     from .flex_profile_file       import FLEXProfileFile
@@ -141,6 +142,7 @@ def addFormat(priority, fmt):
     addFormat(60, FileFormat(NetCDFFile))
     addFormat(60, FileFormat(VTKFile))
     addFormat(60, FileFormat(TDMSFile))
+    addFormat(60, FileFormat(GNUPlotFile))
     addFormat(60, FileFormat(ParquetFile))
     addFormat(60, FileFormat(PickleFile))
     addFormat(70, FileFormat(CactusFile))

openfast_toolbox/io/bladed_out_file.py

@@ -72,12 +72,11 @@ def read_bladed_sensor_file(sensorfile):
             try:
                 # Combine the strings into one string
                 combined_string = ''.join(sensorLines)
-                
-                # Search everything betwee AXITICK and AXISLAB with a regex pattern
-                t_line = re.search(r'(?<=AXITICK).+?(?=AXISLAB)', combined_string, flags=re.DOTALL)
-                t_line=t_line.group(0)
+                # Search for a regex pattern that spans across multiple strings
+                line = re.search(r'(?<=AXITICK).+?(?=(AXISLAB|NVARS))', combined_string, flags=re.DOTALL)
+                line=line.group(0)
                 # Replace consecutive whitespace characters with a single space
-                t_line = re.sub(r'\s+', ' ', t_line)
+                t_line = re.sub(r'\s+', ' ', line)
             except:
                 pass
 
@@ -107,6 +106,7 @@ def read_bladed_sensor_file(sensorfile):
             except:
                 pass
             def repUnits(s):
+                s = s.replace('[[','[').replace(']]',']')
                 s = s.replace('TT','s^2').replace('T','s').replace('A','rad')
                 s = s.replace('P','W').replace('L','m').replace('F','N').replace('M','kg')
                 return s
@@ -184,6 +184,10 @@ def read_bladed_output(sensorFilename, readTimeFilesOnly=False):
             data = np.fromfile(fid_2, sensorInfo['Precision'])
 
         try:
+            if nMajor==0:
+                nMajor=int(np.floor(len(data)/nSections/nSensors))
+                data=data[0:nMajor*nSections*nSensors]
+                sensorInfo['nMajor']=nMajor
             if sensorInfo['NDIMENS'] == 3:
                 data = np.reshape(data,(nMajor, nSections, nSensors), order='C')
 

openfast_toolbox/io/csv_file.py

@@ -1,8 +1,12 @@
 import os
-
-from .file import File, WrongFormatError
 import pandas as pd
 
+try:
+    from .file import File, WrongFormatError
+except:
+    File=dict
+    WrongFormatError  = type('WrongFormatError', (Exception,),{})
+
 class CSVFile(File):
     """ 
     Read/write a CSV file. 
@@ -51,7 +55,23 @@ def __init__(self, filename=None, sep=None, colNames=None, commentChar=None, com
             raise Exception('Provide either `commentChar` or `commentLines` for CSV file types')
         if (len(self.colNames)>0) and (self.colNamesLine is not None):
             raise Exception('Provide either `colNames` or `colNamesLine` for CSV file types')
-        super(CSVFile, self).__init__(filename=filename,**kwargs)
+        if filename:
+            self.read(filename, **kwargs)
+        else:
+            self.filename = None
+
+    def read(self, filename=None, **kwargs):
+        if filename:
+            self.filename = filename
+        if not self.filename:
+            raise Exception('No filename provided')
+        if not os.path.isfile(self.filename):
+            raise OSError(2,'File not found:',self.filename)
+        if os.stat(self.filename).st_size == 0:
+            raise EmptyFileError('File is empty:',self.filename)
+        # Calling children function
+        self._read(**kwargs)
+
 
     def _read(self):
         COMMENT_CHAR=['#','!',';']
@@ -283,3 +303,47 @@ def __repr__(self):
     def _toDataFrame(self):
         return self.data
 
+    def to2DFields(self, **kwargs):
+        import xarray as xr
+        if len(kwargs.keys())>0:
+            print('[WARN] CSVFile: to2DFields: ignored keys: ',kwargs.keys())
+        if len(self.data)==0:
+            return None
+        M = self.data.values
+        if self.data.columns[0].lower()=='index':
+            M = M[:,1:]
+        s1 = 'rows'
+        s2 = 'columns'
+        ds = xr.Dataset(coords={s1: range(M.shape[0]), s2: range(M.shape[1])})
+        ds['data'] = ([s1, s2], M)
+        return ds
+
+    # --------------------------------------------------------------------------------
+    # --- Properties NOTE: copy pasted from file.py to make this file standalone..
+    # --------------------------------------------------------------------------------
+    @property
+    def size(self):
+        return os.path.getsize(self.filename)
+    @property
+    def encoding(self):	
+        import codecs
+        import chardet 
+        """  Detects encoding"""
+        try:
+            byts = min(32, self.size)
+        except TypeError:
+            return None
+        with open(self.filename, 'rb') as f:
+            raw = f.read(byts)
+        if raw.startswith(codecs.BOM_UTF8):
+            return 'utf-8-sig'
+        else:
+            result = chardet.detect(raw)
+            return result['encoding']
+
+if __name__ == '__main__':
+    f = CSVFile('C:/Work/Courses/440/project_solution/data/CFD_u.dat')
+    print(f)
+    ds = f.to2DFields()
+    print(ds)
+

openfast_toolbox/io/fast_input_file.py

@@ -551,6 +551,21 @@ def _read(self, IComment=None):
                 i+=1;
                 self.readBeamDynProps(lines,i)
                 return
+            elif line.upper().find('GLBDCM')>0:
+                # BeamDyn DCM has no label.....
+                self.addComment(lines[i]); i+=1
+                self.addComment(lines[i]); i+=1
+                d = getDict()
+                d['label'] = 'GlbDCM'
+                d['tabType'] = TABTYPE_NUM_NO_HEADER
+                nTabLines = 3
+                nHeaders = 0
+                d['value'], d['tabColumnNames'], d['tabUnits'] = parseFASTNumTable(self.filename, lines[i:i+nTabLines],nTabLines, i, nHeaders, tableType='num', nOffset=0)
+                i=i+3
+                self.data.append(d)
+                continue
+
+                #---The following 3 by 3 matrix is the direction cosine matirx ,GlbDCM(3,3),
             elif line.upper().find('OUTPUTS')>0:
                 if 'Points' in self.keys() and 'dtM' in self.keys():
                     OutList,i = parseFASTOutList(lines,i+1) 
@@ -902,6 +917,9 @@ def mat_tostring(M,fmt='24.16e'):
                 if np.size(d['value'],0) > 0 :
                     s+='\n'
                     s+='\n'.join('\t'.join('{:15.0f}'.format(x) for x in y) for y in data)
+            elif d['tabType']==TABTYPE_NUM_NO_HEADER:
+                data = d['value']
+                s+='\n'.join('\t'.join( ('{:15.0f}'.format(x) if int(x)==x else '{:15.8e}'.format(x) )  for x in y) for y in d['value'])
             else:
                 raise Exception('Unknown table type for variable {}'.format(d))
             if i<len(self.data)-1:
@@ -1325,6 +1343,7 @@ def parseFASTNumTable(filename,lines,n,iStart,nHeaders=2,tableType='num',nOffset
     Units = None
 
 
+    i = 0
     if len(lines)!=n+nHeaders+nOffset:
         raise BrokenFormatError('Not enough lines in table: {} lines instead of {}\nFile:{}'.format(len(lines)-nHeaders,n,filename))
     try:

openfast_toolbox/io/fast_input_file_graph.py

@@ -134,7 +134,7 @@ def subdynToGraph(sd, propToNodes=False, propToElem=False):
 # --------------------------------------------------------------------------------}
 # --- HydroDyn
 # --------------------------------------------------------------------------------{
-def hydrodynToGraph(hd, propToNodes=False, propToElem=False):
+def hydrodynToGraph(hd, propToNodes=False, propToElem=False, verbose=False):
     """
      hd: dict-like object as returned by weio
 
@@ -196,7 +196,8 @@ def type2Color(Pot):
     if 'FillGroups' in hd.keys():
         # Filled members
         Graph.addMiscPropertySet('FillGroups')
-        print('>>> TODO Filled Groups')
+        if verbose:
+            print('>>> TODO Filled Groups')
         #for ip,P in enumerate(hd['FillGroups']):
         #    #                       FillNumM FillMList             FillFSLoc     FillDens
         #    raise NotImplementedError('hydroDynToGraph, Fill List might not be properly set, verify below')