code landscape improvement
Project: http://git-wip-us.apache.org/repos/asf/climate/repo Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/c40abcba Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/c40abcba Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/c40abcba Branch: refs/heads/master Commit: c40abcba8c51382ba5f2cecf57dda796ad5a20c8 Parents: 5622ff8 Author: huikyole <[email protected]> Authored: Wed Aug 10 16:31:39 2016 -0700 Committer: huikyole <[email protected]> Committed: Wed Aug 10 16:31:39 2016 -0700 ---------------------------------------------------------------------- ocw/dataset_processor.py | 5 ++--- ocw/utils.py | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/climate/blob/c40abcba/ocw/dataset_processor.py ---------------------------------------------------------------------- diff --git a/ocw/dataset_processor.py b/ocw/dataset_processor.py index 79a7196..d5e28fb 100755 --- a/ocw/dataset_processor.py +++ b/ocw/dataset_processor.py @@ -395,9 +395,8 @@ def subset(target_dataset, subregion, subregion_name=None, extract=True, user_ma subregion_name = target_dataset.name if hasattr(subregion, 'lat_min'): - # If boundary_type is 'rectangular' or 'CORDEX ***', ensure that the subregion information is well formed - # this boundary check may not be necessary with the updated Bounds and subset - #_are_bounds_contained_by_dataset(target_dataset, subregion) # this boundary check is not necessary with the updated Bounds and subset + #_are_bounds_contained_by_dataset(target_dataset, subregion) + # this boundary check is not necessary with the updated Bounds and subset if target_dataset.lats.ndim == 2 and target_dataset.lons.ndim == 2: start_time_index = np.where( http://git-wip-us.apache.org/repos/asf/climate/blob/c40abcba/ocw/utils.py ---------------------------------------------------------------------- diff --git a/ocw/utils.py b/ocw/utils.py index 3de1776..5226509 100755 --- a/ocw/utils.py +++ b/ocw/utils.py @@ -510,9 +510,9 @@ def CORDEX_boundary(domain_name): elif domain_name =='southeastasia': return -15.14, 27.26, 89.26, 146.96 else: - err ="Invalid CORDEX domain name" + err = "Invalid CORDEX domain name" raise ValueError(err) - + def mask_using_shapefile_info(lons, lats, masked_regions, extract = True): if lons.ndim == 2 and lats.ndim == 2: lons_2d = lons
