You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@climate.apache.org by hu...@apache.org on 2017/03/08 17:55:29 UTC
[1/2] climate git commit: CLIMATE-902 - Debugging regrid_spatial_mask
Repository: climate
Updated Branches:
refs/heads/master 9557020cf -> 7a5a5aef7
CLIMATE-902 - Debugging regrid_spatial_mask
- Several bugs in ocw.utils have been fixed.
Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/82bc5229
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/82bc5229
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/82bc5229
Branch: refs/heads/master
Commit: 82bc52290224a05e26080caeb538e455ce940f5f
Parents: 9557020
Author: huikyole <hu...@argo.jpl.nasa.gov>
Authored: Wed Mar 8 09:53:48 2017 -0800
Committer: huikyole <hu...@argo.jpl.nasa.gov>
Committed: Wed Mar 8 09:53:48 2017 -0800
----------------------------------------------------------------------
ocw/utils.py | 17 +++++++----------
1 file changed, 7 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/climate/blob/82bc5229/ocw/utils.py
----------------------------------------------------------------------
diff --git a/ocw/utils.py b/ocw/utils.py
index 7128793..ed7f0cb 100755
--- a/ocw/utils.py
+++ b/ocw/utils.py
@@ -271,7 +271,7 @@ def reshape_monthly_to_annually(dataset):
values = dataset.values[:]
data_shape = values.shape
num_total_month = data_shape[0]
- num_year = num_total_month // 12
+ num_year = num_total_month/12
num_month = 12
year_month_shape = num_year, num_month
lat_lon_shape = data_shape[1:]
@@ -557,15 +557,12 @@ def regrid_spatial_mask(target_lon, target_lat, mask_lon, mask_lat, mask_var,
target_lons, target_lats = convert_lat_lon_2d_array(target_lon, target_lat)
mask_lons, mask_lats = convert_lat_lon_2d_array(mask_lon, mask_lat)
- if target_lons.all() != mask_lons.all() or target_lats.all() != mask_lats.all():
- mask_var_regridded = interpolate.griddata((mask_lons.flatten(), mask_lats.flatten()),
- mask_var.flatten(),
- (target_lons.flatten(),
- target_lats.flatten()),
- method='nearest',
- fill_value=-9999.).reshape(target_lons.shape)
- else:
- mask_var_regridded = mask_var
+ mask_var_regridded = interpolate.griddata((mask_lons.flatten(), mask_lats.flatten()),
+ mask_var.flatten(),
+ (target_lons.flatten(),
+ target_lats.flatten()),
+ method='nearest',
+ fill_value=-9999.).reshape(target_lons.shape)
mask_outside = ma.masked_equal(mask_var_regridded, -9999.).mask
values_original = ma.array(mask_var)
[2/2] climate git commit: Merge branch 'CLIMATE-902'
Posted by hu...@apache.org.
Merge branch 'CLIMATE-902'
Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/7a5a5aef
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/7a5a5aef
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/7a5a5aef
Branch: refs/heads/master
Commit: 7a5a5aef7dae4f0553fa46f90010f401997c8208
Parents: 9557020 82bc522
Author: huikyole <hu...@argo.jpl.nasa.gov>
Authored: Wed Mar 8 09:55:16 2017 -0800
Committer: huikyole <hu...@argo.jpl.nasa.gov>
Committed: Wed Mar 8 09:55:16 2017 -0800
----------------------------------------------------------------------
ocw/utils.py | 17 +++++++----------
1 file changed, 7 insertions(+), 10 deletions(-)
----------------------------------------------------------------------