|
@@ -100,17 +100,20 @@ class WeatherModel:
|
|
|
self.MaximumAltitude = -1
|
|
|
self.WindDirectionModel = None
|
|
|
self.WindSpeedModel = None
|
|
|
+ self.Altitudes = None
|
|
|
+ self.Directions = None
|
|
|
+ self.Windspeeds = None
|
|
|
|
|
|
if None != self.Weather.Provider.WindData and self.Gafor in self.Weather.Provider.WindData:
|
|
|
- altitudes = []
|
|
|
- directions = []
|
|
|
- speeds = []
|
|
|
+ self.Altitudes = []
|
|
|
+ self.Directions = []
|
|
|
+ self.Windspeeds = []
|
|
|
|
|
|
# collect the data for the wind model
|
|
|
for level in self.Weather.Provider.WindData[self.Gafor]:
|
|
|
- altitudes.append(level[0])
|
|
|
- directions.append(level[1])
|
|
|
- speeds.append(level[2])
|
|
|
+ self.Altitudes.append(level[0])
|
|
|
+ self.Directions.append(level[1])
|
|
|
+ self.Windspeeds.append(level[2])
|
|
|
|
|
|
# define the thresholds for later boundary checks
|
|
|
if self.MinimumAltitude > level[0]:
|
|
@@ -119,9 +122,9 @@ class WeatherModel:
|
|
|
self.MaximumAltitude = level[0]
|
|
|
|
|
|
# calculate the models
|
|
|
- if 1 < len(altitudes):
|
|
|
- self.WindDirectionModel = scipy.interpolate.interp1d(altitudes, directions)
|
|
|
- self.WindSpeedModel = scipy.interpolate.interp1d(altitudes, speeds)
|
|
|
+ if 1 < len(self.Altitudes):
|
|
|
+ self.WindDirectionModel = scipy.interpolate.interp1d(self.Altitudes, self.Directions)
|
|
|
+ self.WindSpeedModel = scipy.interpolate.interp1d(self.Altitudes, self.Windspeeds)
|
|
|
self.LastWeatherUpdate = self.Weather.Provider.UpdateTime
|
|
|
else:
|
|
|
self.LastWeatherUpdate = None
|