From 9001c1825d276cfdf7a1477cf1d04df017363daf Mon Sep 17 00:00:00 2001
From: tomrink <rink@ssec.wisc.edu>
Date: Tue, 14 Jun 2022 12:20:30 -0500
Subject: [PATCH] snapshot...
---
modules/util/util.py | 54 ++++++++++++++++++++++++--------------------
1 file changed, 30 insertions(+), 24 deletions(-)
diff --git a/modules/util/util.py b/modules/util/util.py
index bc6ab86d..0d9374ce 100644
--- a/modules/util/util.py
+++ b/modules/util/util.py
@@ -499,46 +499,52 @@ def get_grid_values(h5f, grid_name, j_c, i_c, half_width, num_j=None, num_i=None
i_r = i_c + num_i + 1
grd_vals = hfds[j_l:j_r, i_l:i_r]
+
if fill_value is not None:
grd_vals = np.where(grd_vals == fill_value, np.nan, grd_vals)
if scale_factor_name is not None:
attr = attrs.get(scale_factor_name)
- if attr is None:
- raise GenericException('Attribute: '+scale_factor_name+' not found for dataset: '+grid_name)
- if np.isscalar(attr):
- scale_factor = attr
+ if attr is not None:
+ if np.isscalar(attr):
+ scale_factor = attr
+ else:
+ scale_factor = attr[0]
+ grd_vals = grd_vals * scale_factor
else:
- scale_factor = attr[0]
- grd_vals = grd_vals * scale_factor
+ print('Attribute: ' + scale_factor_name + ' not found for dataset: ' + grid_name)
if add_offset_name is not None:
attr = attrs.get(add_offset_name)
- if attr is None:
- raise GenericException('Attribute: '+add_offset_name+' not found for dataset: '+grid_name)
- if np.isscalar(attr):
- add_offset = attr
+ if attr is not None:
+ if np.isscalar(attr):
+ add_offset = attr
+ else:
+ add_offset = attr[0]
+ grd_vals = grd_vals + add_offset
else:
- add_offset = attr[0]
- grd_vals = grd_vals + add_offset
+ print('Attribute: '+add_offset_name+' not found for dataset: '+grid_name)
if range_name is not None:
attr = attrs.get(range_name)
- if attr is None:
- raise GenericException('Attribute: '+range_name+' not found for dataset: '+grid_name)
- low = attr[0]
- high = attr[1]
- grd_vals = np.where(grd_vals < low, np.nan, grd_vals)
- grd_vals = np.where(grd_vals > high, np.nan, grd_vals)
+ if attr is not None:
+ low = attr[0]
+ high = attr[1]
+ grd_vals = np.where(grd_vals < low, np.nan, grd_vals)
+ grd_vals = np.where(grd_vals > high, np.nan, grd_vals)
+ else:
+ print('Attribute: '+range_name+' not found for dataset: '+grid_name)
+
elif fill_value_name is not None:
attr = attrs.get(fill_value_name)
- if attr is None:
- raise GenericException('Attribute: '+fill_value_name+' not found for dataset: '+grid_name)
- if np.isscalar(attr):
- fill_value = attr
+ if attr is not None:
+ if np.isscalar(attr):
+ fill_value = attr
+ else:
+ fill_value = attr[0]
+ grd_vals = np.where(grd_vals == fill_value, np.nan, grd_vals)
else:
- fill_value = attr[0]
- grd_vals = np.where(grd_vals == fill_value, np.nan, grd_vals)
+ print('Attribute: '+fill_value_name+' not found for dataset: '+grid_name)
return grd_vals
--
GitLab