Skip to content

Commit dc5587a

Browse files
ebranlardebranlard
committed
FAST: restore raw table name and more BEM_* channels
1 parent 649dc7b commit dc5587a

File tree

3 files changed

+50
-50
lines changed

3 files changed

+50
-50
lines changed

‎pydatview/Tables.py

Lines changed: 46 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -706,52 +706,52 @@ def applyFiltering(self, iCol, options, bAdd=True):
706706
return df_new, name_new
707707

708708

709-
def radialAvg(self, avgMethod, avgParam):
710-
# TODO make this a pluggin
711-
import pydatview.fast.postpro as fastlib
712-
import pydatview.fast.fastfarm as fastfarm
713-
df = self.data
714-
base,out_ext = os.path.splitext(self.filename)
715-
716-
# TODO use fast_output_file findDriverFile
717-
718-
# --- Detect if it's a FAST Farm file
719-
sCols = ''.join(df.columns)
720-
if sCols.find('WkDf')>1 or sCols.find('CtT')>0:
721-
# --- FAST FARM files
722-
Files=[base+ext for ext in ['.fstf','.FSTF','.Fstf','.fmas','.FMAS','.Fmas'] if os.path.exists(base+ext)]
723-
if len(Files)==0:
724-
fst_in=None
725-
#raise Exception('Error: No .fstf file found with name: '+base+'.fstf')
726-
else:
727-
fst_in=Files[0]
728-
729-
dfRad,_,dfDiam = fastfarm.spanwisePostProFF(fst_in,avgMethod=avgMethod,avgParam=avgParam,D=1,df=df)
730-
dfs_new = [dfRad,dfDiam]
731-
names_new=[self.raw_name+'_rad',self.raw_name+'_diam']
732-
else:
733-
# --- FAST files
734-
735-
# HACK for AD file to find the right .fst file
736-
iDotAD=base.lower().find('.ad')
737-
if iDotAD>1:
738-
base=base[:iDotAD]
739-
#
740-
Files=[base+ext for ext in ['.fst','.FST','.Fst','.dvr','.Dvr','.DVR'] if os.path.exists(base+ext)]
741-
if len(Files)==0:
742-
fst_in=None
743-
#raise Exception('Error: No .fst file found with name: '+base+'.fst')
744-
else:
745-
fst_in=Files[0]
746-
747-
out= fastlib.spanwisePostPro(fst_in, avgMethod=avgMethod, avgParam=avgParam, out_ext=out_ext, df = self.data)
748-
dfRadED=out['ED_bld']; dfRadAD = out['AD']; dfRadBD = out['BD']
749-
750-
dfs_new = [dfRadAD, dfRadED, dfRadBD]
751-
names_new=[self.raw_name+'_AD', self.raw_name+'_ED', self.raw_name+'_BD']
752-
if all(df is None for df in dfs_new):
753-
raise PyDatViewException('No OpenFAST radial data found for table: '+self.nickname)
754-
return dfs_new, names_new
709+
# def radialAvg(self, avgMethod, avgParam):
710+
# # TODO make this a pluggin
711+
# import pydatview.fast.postpro as fastlib
712+
# import pydatview.fast.fastfarm as fastfarm
713+
# df = self.data
714+
# base,out_ext = os.path.splitext(self.filename)
715+
#
716+
# # TODO use fast_output_file findDriverFile
717+
#
718+
# # --- Detect if it's a FAST Farm file
719+
# sCols = ''.join(df.columns)
720+
# if sCols.find('WkDf')>1 or sCols.find('CtT')>0:
721+
# # --- FAST FARM files
722+
# Files=[base+ext for ext in ['.fstf','.FSTF','.Fstf','.fmas','.FMAS','.Fmas'] if os.path.exists(base+ext)]
723+
# if len(Files)==0:
724+
# fst_in=None
725+
# #raise Exception('Error: No .fstf file found with name: '+base+'.fstf')
726+
# else:
727+
# fst_in=Files[0]
728+
#
729+
# dfRad,_,dfDiam = fastfarm.spanwisePostProFF(fst_in,avgMethod=avgMethod,avgParam=avgParam,D=1,df=df)
730+
# dfs_new = [dfRad,dfDiam]
731+
# names_new=[self.raw_name+'_rad',self.raw_name+'_diam']
732+
# else:
733+
# # --- FAST files
734+
#
735+
# # HACK for AD file to find the right .fst file
736+
# iDotAD=base.lower().find('.ad')
737+
# if iDotAD>1:
738+
# base=base[:iDotAD]
739+
# #
740+
# Files=[base+ext for ext in ['.fst','.FST','.Fst','.dvr','.Dvr','.DVR'] if os.path.exists(base+ext)]
741+
# if len(Files)==0:
742+
# fst_in=None
743+
# #raise Exception('Error: No .fst file found with name: '+base+'.fst')
744+
# else:
745+
# fst_in=Files[0]
746+
#
747+
# out= fastlib.spanwisePostPro(fst_in, avgMethod=avgMethod, avgParam=avgParam, out_ext=out_ext, df = self.data)
748+
# dfRadED=out['ED_bld']; dfRadAD = out['AD']; dfRadBD = out['BD']
749+
#
750+
# dfs_new = [dfRadAD, dfRadED, dfRadBD]
751+
# names_new=[self.raw_name+'_AD', self.raw_name+'_ED', self.raw_name+'_BD']
752+
# if all(df is None for df in dfs_new):
753+
# raise PyDatViewException('No OpenFAST radial data found for table: '+self.nickname)
754+
# return dfs_new, names_new
755755

756756
def changeUnits(self, data=None):
757757
""" Change units of the table """

‎pydatview/fast/postpro.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -744,8 +744,9 @@ def spanwiseColAD(Cols):
744744
ADSpanMap['^[A]*'+sB+r'N(\d*)TnInd_\[-\]' ] =sB+'TnInd_[-]'
745745
ADSpanMap['^[A]*'+sB+r'N(\d*)AxInd_qs_\[-\]' ]=sB+'AxInd_qs_[-]'
746746
ADSpanMap['^[A]*'+sB+r'N(\d*)TnInd_qs_\[-\]' ]=sB+'TnInd_qs_[-]'
747-
ADSpanMap['^[A]*'+sB+r'N(\d*)BEM_kp_qs\[-\]' ]=sB+'BEM_kp_qs_[-]'
748-
ADSpanMap['^[A]*'+sB+r'N(\d*)BEM_F_qs\[-\]' ]=sB+'BEM_F_qs_[-]'
747+
ADSpanMap['^[A]*'+sB+r'N(\d*)BEM_k_qs_\[-\]' ]=sB+'BEM_k_qs_[-]'
748+
ADSpanMap['^[A]*'+sB+r'N(\d*)BEM_kp_qs_\[-\]' ]=sB+'BEM_kp_qs_[-]'
749+
ADSpanMap['^[A]*'+sB+r'N(\d*)BEM_F_qs_\[-\]' ]=sB+'BEM_F_qs_[-]'
749750
ADSpanMap['^[A]*'+sB+r'N(\d*)BEM_CT_qs_\[-\]' ]=sB+'BEM_CT_qs_[-]'
750751
ADSpanMap['^[A]*'+sB+r'N(\d*)Chi_\[deg\]' ]=sB+'Chi_[deg]'
751752
ADSpanMap['^[A]*'+sB+r'N(\d*)Cl_\[-\]' ] =sB+'Cl_[-]'
@@ -833,7 +834,6 @@ def spanwiseColAD(Cols):
833834
ADSpanMap['^[A]*'+sB+r'N(\d*)BEM_k_\[-\]' ] =sB+'BEM_k_qs_[-]'
834835
ADSpanMap['^[A]*'+sB+r'N(\d*)BEM_kp_\[-\]' ] =sB+'BEM_kp_qs_[-]'
835836
ADSpanMap['^[A]*'+sB+r'N(\d*)BEM_F_\[-\]' ] =sB+'BEM_F_qs_[-]'
836-
ADSpanMap['^[A]*'+sB+r'N(\d*)BEM_k_qs\[-\]'] =sB+'BEM_k_qs_[-]'
837837
ADSpanMap['^[A]*'+sB+r'N(\d*)AOA_\[deg\]' ] =sB+'Alpha_[deg]' # DBGOuts
838838
ADSpanMap['^[A]*'+sB+r'N(\d*)AIn_\[deg\]' ] =sB+'AxInd_[-]' # DBGOuts NOTE BUG Unit
839839
ADSpanMap['^[A]*'+sB+r'N(\d*)ApI_\[deg\]' ] =sB+'TnInd_[-]' # DBGOuts NOTE BUG Unit

‎pydatview/plugins/data_radialavg.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ def radialAvg(tab, data=None):
122122
""" NOTE: radial average may return several dataframe"""
123123
from pydatview.fast.postpro import radialAvg as radialAvgPostPro
124124
#print('>>> RadialAvg',data)
125-
dfs_new, names_new = radialAvgPostPro(filename=tab.filename, df=tab.data, avgMethod=data['avgMethod'],avgParam=data['avgParam'])
125+
dfs_new, names_new = radialAvgPostPro(filename=tab.filename, df=tab.data, raw_name=tab.raw_name, avgMethod=data['avgMethod'],avgParam=data['avgParam'])
126126
if all(df is None for df in dfs_new):
127127
raise PyDatViewException('No OpenFAST radial data found for table: '+tab.nickname)
128128

0 commit comments

Comments
 (0)