diff --git a/wetb/hawc2/hawc2_simulation.py b/wetb/hawc2/hawc2_simulation.py index f26ac6971691d1fd3f3da7a3f76b107c1776beb3..02a583dab05b86d7d54bfdfdc16e0975ac2a3a92 100644 --- a/wetb/hawc2/hawc2_simulation.py +++ b/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) diff --git a/wetb/hawc2/wpdata100.py b/wetb/hawc2/wpdata.py similarity index 97% rename from wetb/hawc2/wpdata100.py rename to wetb/hawc2/wpdata.py index 168d1ba481d75316d2bbfdf576e71197f8d68a97..313a2c39b4dd0b420ccaba29b4a2457c887f1a12 100644 --- a/wetb/hawc2/wpdata100.py +++ b/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']