More improvements to the wp data

wetb/hawc2/hawc2_simulation.py

@@ -625,11 +625,11 @@ class Hawc2_Simulation(object):
 
 if __name__ == '__main__':
 
-    from wpdata100 import WPData100
+    from wpdata import WPData
 
     source='./tests/test_files/hawc2_simulation/iea_10_198_rc1_winHawc.htc'
     wpdata_path='./tests/test_files/hawc2_simulation/control/wpdata.100'
-    wpdata_obj=WPData100(wpdata_path)
+    wpdata_obj=WPData(wpdata_path)
 
     # Create the object
     h2_sim = Hawc2_Simulation(source_file_in=source)

wetb/hawc2/wpdata100.py → wetb/hawc2/wpdata.py

@@ -6,10 +6,10 @@ March 21, 2019
 
 import numpy as np
 
-class WPData100(object):
+class WPData(object):
 
     def __init__(self, filename=None):
-        super(WPData100,self).__init__()
+        super(WPData,self).__init__()
 
         self.header = None
         self.speed = None
@@ -147,7 +147,7 @@ class WPData100(object):
 if __name__ == '__main__':
 
     file='tests/test_files/wpdata.100'
-    wpData=WPData100()
+    wpData=WPData()
     wpData.read_file(file)
     print(str(wpData))
     print(wpData['size'])
@@ -155,7 +155,7 @@ if __name__ == '__main__':
     print(wpData['pitch'])
     print(wpData['header'])
 
-    copy_wpData=WPData100()
+    copy_wpData=WPData()
     copy_wpData['size']=wpData['size']
     copy_wpData['header']=wpData['header']
     copy_wpData['wind_speed']=wpData['wind_speed']