snapshot...

modules/amv/caliop_clavrx_amv.py

@@ -73,7 +73,6 @@ 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 = get_parameters_caliop_clavrx()
     coords_a = {'num_calipso_clavrx_params': calipso_clavrx_params}
     dims_a = ['num_calipso_clavrx_params']
@@ -108,17 +107,11 @@ def match_calipso_clavrx_to_amvs(calipso_clavrx_path, calipso_clavrx_file, amv_f
 
         match_dict[nom_time].append((cc, ll, lon_s[idx], lat_s[idx], f_idx, data_da, amvs_da))
 
-    return match_dict
+    return match_dict, calipso_clavrx_params, all_params
 
 
-def create_file_new(match_dct, filename,
-                    amv_params=['lat', 'lon', 'time', 'wind_speed', 'wind_direction', 'pressure', 'temperature',
-                                'local_zenith_angle', 'DQF', 'seconds_between_images', 'target_box_size',
-                                'lag_size', 'nested_tracking_flag', 'target_type', 'band_id'],
-                    caliop_clavrx_params=get_parameters_caliop_clavrx()):
-    num_aparams = 7
+def create_file_new(match_dct, filename, amv_params, caliop_clavrx_params):
     num_aprofs = 0
-    max_num_alevels = 0
     max_num_amvs = 0
 
     alons = []