diff --git a/modules/aeolus/aeolus_amv.py b/modules/aeolus/aeolus_amv.py index 816494ab6156f34b1263fd273fc03b2cb2024934..989948423510a68b697b9dc4075a8e9a12880105 100644 --- a/modules/aeolus/aeolus_amv.py +++ b/modules/aeolus/aeolus_amv.py @@ -36,15 +36,6 @@ class AMVFiles: dto_end = dto + datetime.timedelta(minutes=file_time_span) self.ftimes.append((dto_start.timestamp(), dto_end.timestamp())) - self.elem_name = None - self.line_name = None - self.lat_name = None - self.lon_name = None - - self.params = None - self.out_params = None - self.meta_dict = None - def get_datetime(self, pathname): return None @@ -63,13 +54,13 @@ class AMVFiles: return self.flist[k], self.ftimes[k], k def get_parameters(self): - self.params + raise MyGenericException('must implement get_parameters in subclass') def get_out_parameters(self): - self.out_params + raise MyGenericException('must implement get_out_parameters in subclass') def get_meta_dict(self): - self.meta_dict + raise MyGenericException('must implement get_meta_dict in subclass') class Framework(AMVFiles): @@ -111,10 +102,10 @@ class CarrStereo(AMVFiles): def __init__(self, files_path, file_time_span, band='14'): super().__init__(files_path, file_time_span, 'tdw_qc_GOES*'+'ch_'+band+'.nc', band) - self.elem_name = 'Element' - self.line_name = 'Line' - self.lon_name = 'Lon' - self.lat_name = 'Lat' + # self.elem_name = 'Element' + # self.line_name = 'Line' + # self.lon_name = 'Lon' + # self.lat_name = 'Lat' self.out_params = ['Lon', 'Lat', 'Element', 'Line', 'V_3D_u', 'V_3D_v', 'H_3D', 'pres', 'Fcst_Spd', 'Fcst_Dir', 'SatZen', 'InversionFlag', 'CloudPhase', 'CloudType'] @@ -140,14 +131,14 @@ class CarrStereo(AMVFiles): return dto - # def get_parameters(self): - # return self.params - # - # def get_out_parameters(self): - # return self.out_params - # - # def get_meta_dict(self): - # return self.meta_dict + def get_parameters(self): + return self.params + + def get_out_parameters(self): + return self.out_params + + def get_meta_dict(self): + return self.meta_dict def get_datetime(pathname):