From bfde6dba9d0c96f8e054f6ff7001d5048eac01f2 Mon Sep 17 00:00:00 2001
From: tomrink <rink@ssec.wisc.edu>
Date: Mon, 30 Oct 2023 14:07:23 -0500
Subject: [PATCH] snapshot...
---
modules/util/util.py | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/modules/util/util.py b/modules/util/util.py
index a16ffc0f..c0807e79 100644
--- a/modules/util/util.py
+++ b/modules/util/util.py
@@ -1024,8 +1024,8 @@ def prepare_evaluate(h5f, name_list, satellite='GOES16', domain='FD', res_fac=1,
w_y = 16
i_0 = 0
j_0 = 0
- s_x = int(w_x / res_fac)
- s_y = int(w_y / res_fac)
+ s_x = w_x // res_fac
+ s_y = w_y // res_fac
geos, xlen, xmin, xmax, ylen, ymin, ymax = get_cartopy_crs(satellite, domain)
if satellite == 'H08':
@@ -1039,16 +1039,16 @@ def prepare_evaluate(h5f, name_list, satellite='GOES16', domain='FD', res_fac=1,
i_0 = taiwan_i0
j_0 = taiwan_j0
- n_x = int(xlen/s_x) - 1
- n_y = int(ylen/s_y) - 1
-
- r_x = xlen - (n_x * s_x)
- x_d = 0 if r_x >= w_x else int((w_x - r_x)/s_x)
- n_x -= x_d
+ n_x = (xlen // s_x)
+ n_y = (ylen // s_y)
- r_y = ylen - (n_y * s_y)
- y_d = 0 if r_y >= w_y else int((w_y - r_y)/s_y)
- n_y -= y_d
+ # r_x = xlen - (n_x * s_x)
+ # x_d = 0 if r_x >= w_x else int((w_x - r_x)/s_x)
+ # n_x -= x_d
+ #
+ # r_y = ylen - (n_y * s_y)
+ # y_d = 0 if r_y >= w_y else int((w_y - r_y)/s_y)
+ # n_y -= y_d
ll = [(offset+j_0) + j*s_y for j in range(n_y)]
cc = [(offset+i_0) + i*s_x for i in range(n_x)]
@@ -1069,8 +1069,8 @@ def prepare_evaluate(h5f, name_list, satellite='GOES16', domain='FD', res_fac=1,
solzen = get_grid_values(h5f, 'solar_zenith_angle', j_0, i_0, None, num_j=ylen, num_i=xlen)
satzen = get_grid_values(h5f, 'sensor_zenith_angle', j_0, i_0, None, num_j=ylen, num_i=xlen)
- solzen = solzen[0:(n_y-1)*s_y:s_y, 0:(n_x-1)*s_x:s_x]
- satzen = satzen[0:(n_y-1)*s_y:s_y, 0:(n_x-1)*s_x:s_x]
+ solzen = solzen[0:n_y*s_y:s_y, 0:n_x*s_x:s_x]
+ satzen = satzen[0:n_y*s_y:s_y, 0:n_x*s_x:s_x]
return grd_dct_n, solzen, satzen, ll, cc
--
GitLab