diff --git a/modules/aeolus/datasource.py b/modules/aeolus/datasource.py
index 5795c9be1fcc00116a69ef98fd612edcda51e1d0..2e856466ba6f9b3dd81812fcce0fb458adf01d49 100644
--- a/modules/aeolus/datasource.py
+++ b/modules/aeolus/datasource.py
@@ -331,7 +331,7 @@ class AMVFiles:
class Framework(AMVFiles):
- def __init__(self, files_path, file_time_span, band='14'):
+ def __init__(self, files_path, file_time_span, band='14', pattern='*WINDS_AMV_EN-'+'14'+'*.nc'):
elem_name = 'Element'
line_name = 'Line'
lon_name = 'Longitude'
@@ -355,7 +355,7 @@ class Framework(AMVFiles):
#qc_param = 'QI'
qc_param = 'Flag'
- super().__init__(files_path, file_time_span, '*WINDS_AMV_EN-'+band+'*.nc', band=band, elem_name=elem_name, params=params,
+ super().__init__(files_path, file_time_span, pattern, band=band, elem_name=elem_name, params=params,
line_name=line_name, lat_name=lat_name, lon_name=lon_name, out_params=out_params, meta_dict=meta_dict, qc_params=qc_param)
def get_navigation(self):
@@ -378,7 +378,7 @@ class Framework(AMVFiles):
class FrameworkCloudHeight(AMVFiles):
- def __init__(self, files_path, file_time_span):
+ def __init__(self, files_path, file_time_span, pattern='*_CLOUD_HEIGHT_EN'+'*.nc'):
elem_name = 'Element'
line_name = 'Line'
lon_name = 'Longitude'
@@ -388,7 +388,7 @@ class FrameworkCloudHeight(AMVFiles):
params = ['CldTopPres', 'CldTopHght', 'CldOptDpth']
meta_dict = {'CldTopPres': ('hPa', 'f4'), 'CldTopHght': ('km', 'f4'), 'CldOptDpth': ('km', 'f4')}
- super().__init__(files_path, file_time_span, '*_CLOUD_HEIGHT_EN'+'*.nc', band=None, elem_name=elem_name, params=params,
+ super().__init__(files_path, file_time_span, pattern, band=None, elem_name=elem_name, params=params,
line_name=line_name, lat_name=lat_name, lon_name=lon_name, out_params=out_params, meta_dict=meta_dict)
def get_navigation(self):
@@ -406,7 +406,7 @@ class FrameworkCloudHeight(AMVFiles):
class FrameworkCloudPhase(AMVFiles):
- def __init__(self, files_path, file_time_span):
+ def __init__(self, files_path, file_time_span, pattern='*_CLOUD_PHASE_EN'+'*.nc'):
elem_name = 'Element'
line_name = 'Line'
lon_name = 'Longitude'
@@ -416,7 +416,7 @@ class FrameworkCloudPhase(AMVFiles):
params = ['CloudPhase', 'CloudType']
meta_dict = {'CloudPhase': (None, 'i1'), 'CloudType': (None, 'i1')}
- super().__init__(files_path, file_time_span, '*_CLOUD_PHASE_EN'+'*.nc', band=None, elem_name=elem_name, params=params,
+ super().__init__(files_path, file_time_span, pattern, band=None, elem_name=elem_name, params=params,
line_name=line_name, lat_name=lat_name, lon_name=lon_name, out_params=out_params, meta_dict=meta_dict)
def get_navigation(self):
@@ -434,7 +434,7 @@ class FrameworkCloudPhase(AMVFiles):
class OpsCloudPhase(AMVFiles):
- def __init__(self, files_path, file_time_span):
+ def __init__(self, files_path, file_time_span, pattern='OR_ABI-L2-ACTPF'+'*.nc'):
elem_name = None
line_name = None
lon_name = None
@@ -444,7 +444,7 @@ class OpsCloudPhase(AMVFiles):
params = ['Phase']
meta_dict = {'Phase': (None, 'i1')}
- super().__init__(files_path, file_time_span, 'OR_ABI-L2-ACTPF'+'*.nc', band=None, elem_name=elem_name, params=params,
+ super().__init__(files_path, file_time_span, pattern, band=None, elem_name=elem_name, params=params,
line_name=line_name, lat_name=lat_name, lon_name=lon_name, out_params=out_params, meta_dict=meta_dict)
def get_navigation(self):
@@ -460,7 +460,7 @@ class OpsCloudPhase(AMVFiles):
class OPS(AMVFiles):
- def __init__(self, files_path, file_time_span, band='14'):
+ def __init__(self, files_path, file_time_span, band='14', pattern='OR_ABI-L2-DMWF*'+'C'+'14'+'*.nc'):
elem_name = None
line_name = None
lon_name = 'lon'
@@ -471,7 +471,7 @@ class OPS(AMVFiles):
meta_dict = {'Lon': ('degrees east', 'f4'), 'Lat': ('degrees north', 'f4'), 'Element': (None, 'i4'), 'Line': (None, 'i4'),
'pressure': ('hPa', 'f4'), 'wind_speed': ('m s-1', 'f4'), 'wind_direction': ('degrees', 'f4')}
- super().__init__(files_path, file_time_span, 'OR_ABI-L2-DMWF*'+'C'+band+'*.nc', band=band, elem_name=elem_name, params=params,
+ super().__init__(files_path, file_time_span, pattern, band=band, elem_name=elem_name, params=params,
line_name=line_name, lat_name=lat_name, lon_name=lon_name, out_params=out_params, meta_dict=meta_dict)
def get_navigation(self):
@@ -489,7 +489,7 @@ class OPS(AMVFiles):
class AMV_Intercompare(AMVFiles):
- def __init__(self, files_path, file_time_span, band='14'):
+ def __init__(self, files_path, file_time_span, band='14', pattern='ASCII_AMV*.CT'):
elem_name = None
line_name = None
lon_name = 'lon'
@@ -501,7 +501,7 @@ class AMV_Intercompare(AMVFiles):
meta_dict = {'Lon': ('degrees east', 'f4'), 'Lat': ('degrees north', 'f4'), 'Element': (None, 'i4'), 'Line': (None, 'i4'),
'pressure': ('hPa', 'f4'), 'wind_speed': ('m s-1', 'f4'), 'wind_direction': ('degrees', 'f4')}
- super().__init__(files_path, file_time_span, 'ASCII_AMV*.CT', band=band, elem_name=elem_name, params=params,
+ super().__init__(files_path, file_time_span, pattern, band=band, elem_name=elem_name, params=params,
line_name=line_name, lat_name=lat_name, lon_name=lon_name, press_name=press_name, out_params=out_params, meta_dict=meta_dict)
def get_navigation(self):
@@ -517,7 +517,7 @@ class AMV_Intercompare(AMVFiles):
class CarrStereo(AMVFiles):
- def __init__(self, files_path, file_time_span, band='14'):
+ def __init__(self, files_path, file_time_span, band='14', pattern='tdw_qc_GOES*'+'ch_'+'14'+'.nc'):
elem_name = 'Element'
line_name = 'Line'
lon_name = 'Lon'
@@ -536,7 +536,7 @@ class CarrStereo(AMVFiles):
'V_3D_u': ('m s-1', 'f4'), 'V_3D_v': ('m s-1', 'f4'), 'Lon': ('degrees east', 'f4'),
'Lat': ('degrees north', 'f4'), 'Element': (None, 'i4'), 'Line': (None, 'i4')}
- super().__init__(files_path, file_time_span, 'tdw_qc_GOES*'+'ch_'+band+'.nc', band=band, elem_name=elem_name, params=params,
+ super().__init__(files_path, file_time_span, pattern, band=band, elem_name=elem_name, params=params,
line_name=line_name, lat_name=lat_name, lon_name=lon_name, out_params=out_params, meta_dict=meta_dict)
def get_navigation(self):