FAST: restore raw table name and more BEM_* channels

ebranlard · Dec 15, 2024 · dc5587a · dc5587a
1 parent 649dc7b
commit dc5587a
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 50 deletions.
diff --git a/pydatview/Tables.py b/pydatview/Tables.py
@@ -706,52 +706,52 @@ def applyFiltering(self, iCol, options, bAdd=True):
         return df_new, name_new
 
 
-    def radialAvg(self, avgMethod, avgParam):
-        # TODO make this a pluggin
-        import pydatview.fast.postpro as fastlib
-        import pydatview.fast.fastfarm as fastfarm
-        df = self.data
-        base,out_ext = os.path.splitext(self.filename)
-
-        # TODO use fast_output_file  findDriverFile
-
-        # --- Detect if it's a FAST Farm file
-        sCols = ''.join(df.columns)
-        if sCols.find('WkDf')>1 or sCols.find('CtT')>0:
-            # --- FAST FARM files
-            Files=[base+ext for ext in ['.fstf','.FSTF','.Fstf','.fmas','.FMAS','.Fmas'] if os.path.exists(base+ext)]
-            if len(Files)==0:
-                fst_in=None
-                #raise Exception('Error: No .fstf file found with name: '+base+'.fstf')
-            else:
-                fst_in=Files[0]
-
-            dfRad,_,dfDiam =  fastfarm.spanwisePostProFF(fst_in,avgMethod=avgMethod,avgParam=avgParam,D=1,df=df)
-            dfs_new  = [dfRad,dfDiam]
-            names_new=[self.raw_name+'_rad',self.raw_name+'_diam']
-        else:
-            # --- FAST files
-
-            # HACK for AD file to find the right .fst file
-            iDotAD=base.lower().find('.ad')
-            if iDotAD>1:
-                base=base[:iDotAD]
-            #
-            Files=[base+ext for ext in ['.fst','.FST','.Fst','.dvr','.Dvr','.DVR'] if os.path.exists(base+ext)]
-            if len(Files)==0:
-                fst_in=None
-                #raise Exception('Error: No .fst file found with name: '+base+'.fst')
-            else:
-                fst_in=Files[0]
-
-            out= fastlib.spanwisePostPro(fst_in, avgMethod=avgMethod, avgParam=avgParam, out_ext=out_ext, df = self.data)
-            dfRadED=out['ED_bld']; dfRadAD = out['AD']; dfRadBD = out['BD']
-
-            dfs_new  = [dfRadAD, dfRadED, dfRadBD]
-            names_new=[self.raw_name+'_AD', self.raw_name+'_ED', self.raw_name+'_BD'] 
-        if all(df is None for df in dfs_new):
-            raise PyDatViewException('No OpenFAST radial data found for table: '+self.nickname)
-        return dfs_new, names_new
+#     def radialAvg(self, avgMethod, avgParam):
+#         # TODO make this a pluggin
+#         import pydatview.fast.postpro as fastlib
+#         import pydatview.fast.fastfarm as fastfarm
+#         df = self.data
+#         base,out_ext = os.path.splitext(self.filename)
+# 
+#         # TODO use fast_output_file  findDriverFile
+# 
+#         # --- Detect if it's a FAST Farm file
+#         sCols = ''.join(df.columns)
+#         if sCols.find('WkDf')>1 or sCols.find('CtT')>0:
+#             # --- FAST FARM files
+#             Files=[base+ext for ext in ['.fstf','.FSTF','.Fstf','.fmas','.FMAS','.Fmas'] if os.path.exists(base+ext)]
+#             if len(Files)==0:
+#                 fst_in=None
+#                 #raise Exception('Error: No .fstf file found with name: '+base+'.fstf')
+#             else:
+#                 fst_in=Files[0]
+# 
+#             dfRad,_,dfDiam =  fastfarm.spanwisePostProFF(fst_in,avgMethod=avgMethod,avgParam=avgParam,D=1,df=df)
+#             dfs_new  = [dfRad,dfDiam]
+#             names_new=[self.raw_name+'_rad',self.raw_name+'_diam']
+#         else:
+#             # --- FAST files
+# 
+#             # HACK for AD file to find the right .fst file
+#             iDotAD=base.lower().find('.ad')
+#             if iDotAD>1:
+#                 base=base[:iDotAD]
+#             #
+#             Files=[base+ext for ext in ['.fst','.FST','.Fst','.dvr','.Dvr','.DVR'] if os.path.exists(base+ext)]
+#             if len(Files)==0:
+#                 fst_in=None
+#                 #raise Exception('Error: No .fst file found with name: '+base+'.fst')
+#             else:
+#                 fst_in=Files[0]
+# 
+#             out= fastlib.spanwisePostPro(fst_in, avgMethod=avgMethod, avgParam=avgParam, out_ext=out_ext, df = self.data)
+#             dfRadED=out['ED_bld']; dfRadAD = out['AD']; dfRadBD = out['BD']
+# 
+#             dfs_new  = [dfRadAD, dfRadED, dfRadBD]
+#             names_new=[self.raw_name+'_AD', self.raw_name+'_ED', self.raw_name+'_BD'] 
+#         if all(df is None for df in dfs_new):
+#             raise PyDatViewException('No OpenFAST radial data found for table: '+self.nickname)
+#         return dfs_new, names_new
 
     def changeUnits(self, data=None):
         """ Change units of the table """

diff --git a/pydatview/fast/postpro.py b/pydatview/fast/postpro.py
@@ -744,8 +744,9 @@ def spanwiseColAD(Cols):
         ADSpanMap['^[A]*'+sB+r'N(\d*)TnInd_\[-\]'  ]   =sB+'TnInd_[-]'  
         ADSpanMap['^[A]*'+sB+r'N(\d*)AxInd_qs_\[-\]'  ]=sB+'AxInd_qs_[-]'  
         ADSpanMap['^[A]*'+sB+r'N(\d*)TnInd_qs_\[-\]'  ]=sB+'TnInd_qs_[-]'  
-        ADSpanMap['^[A]*'+sB+r'N(\d*)BEM_kp_qs\[-\]'  ]=sB+'BEM_kp_qs_[-]'  
-        ADSpanMap['^[A]*'+sB+r'N(\d*)BEM_F_qs\[-\]'   ]=sB+'BEM_F_qs_[-]'  
+        ADSpanMap['^[A]*'+sB+r'N(\d*)BEM_k_qs_\[-\]'  ]=sB+'BEM_k_qs_[-]'  
+        ADSpanMap['^[A]*'+sB+r'N(\d*)BEM_kp_qs_\[-\]' ]=sB+'BEM_kp_qs_[-]'  
+        ADSpanMap['^[A]*'+sB+r'N(\d*)BEM_F_qs_\[-\]'  ]=sB+'BEM_F_qs_[-]'  
         ADSpanMap['^[A]*'+sB+r'N(\d*)BEM_CT_qs_\[-\]' ]=sB+'BEM_CT_qs_[-]'  
         ADSpanMap['^[A]*'+sB+r'N(\d*)Chi_\[deg\]'     ]=sB+'Chi_[deg]'   
         ADSpanMap['^[A]*'+sB+r'N(\d*)Cl_\[-\]'     ]   =sB+'Cl_[-]'   
@@ -833,7 +834,6 @@ def spanwiseColAD(Cols):
         ADSpanMap['^[A]*'+sB+r'N(\d*)BEM_k_\[-\]'  ]   =sB+'BEM_k_qs_[-]'  
         ADSpanMap['^[A]*'+sB+r'N(\d*)BEM_kp_\[-\]' ]   =sB+'BEM_kp_qs_[-]'  
         ADSpanMap['^[A]*'+sB+r'N(\d*)BEM_F_\[-\]'  ]   =sB+'BEM_F_qs_[-]'  
-        ADSpanMap['^[A]*'+sB+r'N(\d*)BEM_k_qs\[-\]']   =sB+'BEM_k_qs_[-]'  
         ADSpanMap['^[A]*'+sB+r'N(\d*)AOA_\[deg\]'  ]   =sB+'Alpha_[deg]' # DBGOuts
         ADSpanMap['^[A]*'+sB+r'N(\d*)AIn_\[deg\]'  ]   =sB+'AxInd_[-]'   # DBGOuts NOTE BUG Unit
         ADSpanMap['^[A]*'+sB+r'N(\d*)ApI_\[deg\]'  ]   =sB+'TnInd_[-]'   # DBGOuts NOTE BUG Unit

diff --git a/pydatview/plugins/data_radialavg.py b/pydatview/plugins/data_radialavg.py
@@ -122,7 +122,7 @@ def radialAvg(tab, data=None):
     """ NOTE: radial average may return several dataframe"""
     from pydatview.fast.postpro import radialAvg as radialAvgPostPro
     #print('>>> RadialAvg',data)
-    dfs_new, names_new = radialAvgPostPro(filename=tab.filename, df=tab.data, avgMethod=data['avgMethod'],avgParam=data['avgParam'])
+    dfs_new, names_new = radialAvgPostPro(filename=tab.filename, df=tab.data, raw_name=tab.raw_name, avgMethod=data['avgMethod'],avgParam=data['avgParam'])
     if all(df is None for df in dfs_new):
         raise PyDatViewException('No OpenFAST radial data found for table: '+tab.nickname)