HAWC2: update of readers

Author: ebranlard

Diff for: pyFAST/input_output/hawc2_ae_file.py

@@ -2,6 +2,7 @@
 Hawc2 AE file
 """
 import os
+import numpy as np
 import pandas as pd
 
 try:
@@ -65,7 +66,26 @@ def toDataFrame(self):
                 dfs[name] = pd.DataFrame(data=self.data.ae_sets[iset+1], columns=cols)
             return dfs
 
+    @property
+    def sets(self):
+        # Returns a list of ae_sets, otherwise not easy to iterate
+        sets=[]
+        for iset,aeset in enumerate(self.data.ae_sets):
+            sets.append(self.data.ae_sets[iset+1])
+        return sets
+
     # --- Convenient utils
     def add_set(self, **kwargs):
         self.data.add_set(**kwargs)
 
+    def __repr__(self):
+        cols=['radius_[m]','chord_[m]','thickness_[%]','pc_set_[#]']
+        nRows =  [np.asarray(s).shape[0] for s in self.sets]
+        s='<{} object>\n'.format(type(self).__name__)
+        s+='| Attributes:\n'
+        s+='| - filename: {}\n'.format(self.filename)
+        s+='| - data: AEFile, with attributes `ae_sets`\n'
+        s+='| Derived attributes:\n'
+        s+='| * sets: list of {} arrays, length: {}, 4 columns: {}\n'.format(len(self.data.ae_sets), nRows, cols)
+        s+='| Methods: add_set, toDataFrame\n'
+        return s

Diff for: pyFAST/input_output/hawc2_htc_file.py

@@ -23,26 +23,41 @@ def formatName():
 
     def _read(self):
         self.data = HTCFile(self.filename)
-        self.data.contents # trigger read
 
     def _write(self):
         self.data.save(self.filename)
 
     def __repr__(self):
-        s='<{} object> with attribute `data`\n'.format(type(self).__name__)
+        s='<{} object>\n'.format(type(self).__name__)
+        s+='| Attributes:\n'
+        s+='| - data: HTCFile with keys: {}`\n'.format(list(self.data.keys()))
+        s+='| Derived attributes:\n'
+        s+='| * bodyNames: {}\n'.format(self.bodyNames)
+        s+='| * bodyDict: dict with keys bodyNames\n'
+        s+='| Methods: bodyByName, bodyC2, setBodyC2\n'
         return s
 
-    def bodyByName(self, bodyname):
-        """ return body inputs given a body name"""
+    @property
+    def bodyNames(self):
+        return list(self.bodyDict.keys())
+
+    @property
+    def bodyDict(self):
         struct = self.data.new_htc_structure
         bodyKeys = [k for k in struct.keys() if k.startswith('main_body')]
-        bdies = [struct[k] for k in bodyKeys if struct[k].name[0]==bodyname]
-        if len(bdies)==1:
-            return bdies[0]
-        elif len(bdies)==0:
+        #print('>>> keys', struct.keys())
+        bdDict={}
+        for k in bodyKeys:
+            bodyName = struct[k].name[0]
+            bdDict[bodyName] = struct[k]
+        return bdDict
+
+    def bodyByName(self, bodyname):
+        """ return body inputs given a body name"""
+        bodyDict= self.bodyDict
+        if bodyname not in bodyDict.keys():
             raise Exception('No body found with name {} in file {}'.format(bodyname,self.filename))
-        else:
-            raise Exception('Several bodies found with name {} in file {}'.format(bodyname,self.filename))
+        return bodyDict[bodyname]
 
     def bodyC2(self, bdy):
         """ return body C2_def given body inputs"""

Diff for: pyFAST/input_output/hawc2_pc_file.py

@@ -75,3 +75,23 @@ def add_set(self, set_label, thicknesses, profiles):
         """
         self.data.pc_sets[set_label] = (np.array(thicknesses), profiles) 
 
+    @property
+    def sets(self):
+        return self.pc_sets
+
+    def __repr__(self):
+        cols=['Alpha_[deg]','Cl_[-]','Cd_[-]','Cm_[-]']
+        #nRows = 0
+        s='<{} object>\n'.format(type(self).__name__)
+        s+='| Attributes:\n'
+        s+='| - filename: {}\n'.format(self.filename)
+        s+='| - data: PCFile, with attributes `pc_sets`\n'
+        s+='| Derived attributes:\n'
+        s+='| * sets: dict of length: {}:\n'.format(len(self.data.pc_sets))
+        for iset in self.data.pc_sets.keys():
+            vt, vpolar = self.data.pc_sets[iset]
+            nRows =  [np.asarray(s).shape[0] for s in vpolar]
+            s+='|   key: {}, len: {}, thicknesses: {}, rows: {}\n'.format(iset, len(vt), vt, nRows)
+        s+='| Methods: add_set, toDataFrame\n'
+        return s
+