|
5 | 5 | __license__ = "MIT"
|
6 | 6 |
|
7 | 7 | import bisect
|
8 |
| -import warnings |
9 | 8 | import json
|
| 9 | +import warnings |
10 | 10 | from collections import defaultdict
|
11 | 11 |
|
12 | 12 | import ipywidgets as widgets
|
@@ -127,6 +127,7 @@ def __init__(
|
127 | 127 | self.__find_preferred_timezone()
|
128 | 128 | self.__localize_input_dates()
|
129 | 129 |
|
| 130 | + # Parse data files, surface goes first to calculate elevation |
130 | 131 | self.surfaceDataDict = {}
|
131 | 132 | self.parseSurfaceData()
|
132 | 133 | self.pressureLevelDataDict = {}
|
@@ -589,7 +590,7 @@ def parsePressureLevelData(self):
|
589 | 590 | variablePointsArray = np.array([heightAboveSeaLevelArray, valueArray]).T
|
590 | 591 | variableFunction = Function(
|
591 | 592 | variablePointsArray,
|
592 |
| - inputs="Height Above Ground Level (m)", # TODO: Check if it is really AGL or ASL here |
| 593 | + inputs="Height Above Ground Level (m)", # TODO: Check if it is really AGL or ASL here, see 3 lines above |
593 | 594 | outputs=key,
|
594 | 595 | extrapolation="constant",
|
595 | 596 | )
|
@@ -856,8 +857,8 @@ def process_data(self):
|
856 | 857 | self.calculate_record_max_surface_100m_wind_speed()
|
857 | 858 | self.calculate_record_min_surface_100m_wind_speed()
|
858 | 859 | self.calculate_percentage_of_days_with_precipitation()
|
859 |
| - self.calculate_average_cloud_base_height() # Having problems with masks! |
860 |
| - self.calculate_min_cloud_base_height() # Having problems with masks! |
| 860 | + self.calculate_average_cloud_base_height() |
| 861 | + self.calculate_min_cloud_base_height() |
861 | 862 | self.calculate_percentage_of_days_with_no_cloud_coverage()
|
862 | 863 |
|
863 | 864 | @property
|
@@ -2748,8 +2749,6 @@ def exportMeanProfiles(self, filename="export_env_analysis"):
|
2748 | 2749 | # "maxExpectedHeight": 80000, # TODO: Implement this parameter at EnvAnalysis Class
|
2749 | 2750 | "surfaceDataFile": self.surfaceDataFile,
|
2750 | 2751 | "pressureLevelDataFile": self.pressureLevelDataFile,
|
2751 |
| - # "surfaceDataDict": self.surfaceDataDict, # TODO: Too large, make it optional |
2752 |
| - # "pressureLevelDataDict": self.pressureLevelDataDict, # TODO: Too large, make it optional |
2753 | 2752 | "atmosphericModelPressureProfile": organized_pressure_dict,
|
2754 | 2753 | "atmosphericModelTemperatureProfile": organized_temperature_dict,
|
2755 | 2754 | "atmosphericModelWindVelocityXProfile": organized_windX_dict,
|
|
0 commit comments