diff --git a/modules/amv/caliop_clavrx_amv.py b/modules/amv/caliop_clavrx_amv.py index 68a42d479603c92974e1f02e7720e19ec98a47c6..01ec8afe44d7c4507b0c6c299cfca3fabb392aca 100644 --- a/modules/amv/caliop_clavrx_amv.py +++ b/modules/amv/caliop_clavrx_amv.py @@ -1,7 +1,7 @@ import numpy as np import xarray as xr from netCDF4 import Dataset -from aeolus.datasource import get_datasource, CLAVRx_CALIPSO +from aeolus.datasource import get_datasource, CLAVRx_CALIPSO, get_parameters_caliop_clavrx amv_file_duration = 60 # minutes half_width = 30 # search box centered on CALIOP profile (FGF coordinates) @@ -73,7 +73,8 @@ def match_calipso_clavrx_to_amvs(calipso_clavrx_path, calipso_clavrx_file, amv_f amv_ds.close() - calipso_clavrx_params = ['closest_calipso_top_alt', 'closest_calipso_base_alt', 'cld_height_acha', 'cld_height_base_acha'] + #calipso_clavrx_params = ['closest_calipso_top_alt', 'closest_calipso_base_alt', 'cld_height_acha', 'cld_height_base_acha'] + calipso_clavrx_params = get_parameters_caliop_clavrx() coords_a = {'num_calipso_clavrx_params': calipso_clavrx_params} dims_a = ['num_calipso_clavrx_params'] calipso_clavrx_data = [] @@ -111,7 +112,7 @@ def match_calipso_clavrx_to_amvs(calipso_clavrx_path, calipso_clavrx_file, amv_f def create_file_new(match_dct, filename, amv_params=['pressure', 'wind_speed', 'wind_direction'], - caliop_clavrx_params=['closest_calipso_top_alt', 'closest_calipso_base_alt', 'cld_height_acha', 'cld_height_base_acha']): + caliop_clavrx_params=get_parameters_caliop_clavrx()): num_aparams = 7 num_aprofs = 0 max_num_alevels = 0