diff --git a/modules/util/util.py b/modules/util/util.py index bb2956ae1e824756b16baf623a29f3942634fe08..16d57fce9c1cead646bf7b3187e36568317f6541 100644 --- a/modules/util/util.py +++ b/modules/util/util.py @@ -750,6 +750,7 @@ def write_icing_file_nc4(clvrx_str_time, output_dir, preds_dct, probs_dct, x, y, dim_0_name = 'x' dim_1_name = 'y' + geo_coords = 'y x' dim_0 = rootgrp.createDimension(dim_0_name, size=x.shape[0]) dim_1 = rootgrp.createDimension(dim_1_name, size=y.shape[0]) @@ -759,16 +760,9 @@ def write_icing_file_nc4(clvrx_str_time, output_dir, preds_dct, probs_dct, x, y, flt_lvls = list(preds_dct.keys()) for flvl in flt_lvls: preds = preds_dct[flvl] - # pred_s.append(preds) - # icing_pred_ds = h5f_out.create_dataset('icing_prediction_level_'+flt_level_ranges_str[flvl], data=preds, dtype='i2') - # icing_pred_ds.attrs.create('coordinates', data='y x') - # icing_pred_ds.attrs.create('grid_mapping', data='Projection') - # icing_pred_ds.attrs.create('missing', data=-1) - # icing_pred_ds.dims[0].label = dim_0_name - # icing_pred_ds.dims[1].label = dim_1_name icing_pred_ds = rootgrp.createVariable('icing_prediction_level_'+flt_level_ranges_str[flvl], 'i2', [dim_1_name, dim_0_name]) - icing_pred_ds.setncattr('coordinates', [dim_1_name, dim_0_name]) + icing_pred_ds.setncattr('coordinates', geo_coords) icing_pred_ds.setncattr('grid_mapping', 'Projection') icing_pred_ds.setncattr('missing', -1) icing_pred_ds[:,] = preds @@ -776,15 +770,9 @@ def write_icing_file_nc4(clvrx_str_time, output_dir, preds_dct, probs_dct, x, y, for flvl in flt_lvls: probs = probs_dct[flvl] prob_s.append(probs) - # icing_prob_ds = h5f_out.create_dataset('icing_probability_level_'+flt_level_ranges_str[flvl], data=probs, dtype='f4') - # icing_prob_ds.attrs.create('coordinates', data='y x') - # icing_prob_ds.attrs.create('grid_mapping', data='Projection') - # icing_prob_ds.attrs.create('missing', data=-1.0) - # icing_prob_ds.dims[0].label = dim_0_name - # icing_prob_ds.dims[1].label = dim_1_name icing_prob_ds = rootgrp.createVariable('icing_probability_level_'+flt_level_ranges_str[flvl], 'f4', [dim_1_name, dim_0_name]) - icing_prob_ds.setncattr('coordinates', [dim_1_name, dim_0_name]) + icing_prob_ds.setncattr('coordinates', geo_coords) icing_prob_ds.setncattr('grid_mapping', 'Projection') icing_prob_ds.setncattr('missing', -1.0) icing_prob_ds[:,] = probs @@ -792,30 +780,16 @@ def write_icing_file_nc4(clvrx_str_time, output_dir, preds_dct, probs_dct, x, y, prob_s = np.stack(prob_s, axis=-1) max_prob = np.max(prob_s, axis=2) - # icing_prob_ds = h5f_out.create_dataset('max_icing_probability_column', data=max_prob, dtype='f4') - # icing_prob_ds.attrs.create('coordinates', data='y x') - # icing_prob_ds.attrs.create('grid_mapping', data='Projection') - # icing_prob_ds.attrs.create('missing', data=-1.0) - # icing_prob_ds.dims[0].label = dim_0_name - # icing_prob_ds.dims[1].label = dim_1_name - icing_prob_ds = rootgrp.createVariable('max_icing_probability_column', 'f4', [dim_1_name, dim_0_name]) - icing_prob_ds.setncattr('coordinates', [dim_1_name, dim_0_name]) + icing_prob_ds.setncattr('coordinates', geo_coords) icing_prob_ds.setncattr('grid_mapping', 'Projection') icing_prob_ds.setncattr('missing', -1.0) icing_prob_ds[:,] = max_prob max_lvl = np.argmax(prob_s, axis=2) - # icing_pred_ds = h5f_out.create_dataset('max_icing_probability_level', data=max_lvl, dtype='i2') - # icing_pred_ds.attrs.create('coordinates', data='y x') - # icing_pred_ds.attrs.create('grid_mapping', data='Projection') - # icing_pred_ds.attrs.create('missing', data=-1) - # icing_pred_ds.dims[0].label = dim_0_name - # icing_pred_ds.dims[1].label = dim_1_name - icing_pred_ds = rootgrp.createVariable('max_icing_probability_level', 'i2', [dim_1_name, dim_0_name]) - icing_pred_ds.setncattr('coordinates', [dim_1_name, dim_0_name]) + icing_pred_ds.setncattr('coordinates', geo_coords) icing_pred_ds.setncattr('grid_mapping', 'Projection') icing_pred_ds.setncattr('missing', -1) icing_pred_ds[:,] = max_lvl