Resolve merge conflict with CLIMATE-827
Project: http://git-wip-us.apache.org/repos/asf/climate/repo Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/9797d971 Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/9797d971 Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/9797d971 Branch: refs/heads/master Commit: 9797d97152a2cc8bcd46a0d05ff5c56645026bda Parents: 711f86b 91ec7f3 Author: Alex Goodman <ago...@users.noreply.github.com> Authored: Thu Aug 4 16:28:50 2016 -0700 Committer: Alex Goodman <ago...@users.noreply.github.com> Committed: Thu Aug 4 16:28:50 2016 -0700 ---------------------------------------------------------------------- MANIFEST.in | 1 + RCMES/cli_app.py | 2 +- RCMES/run_RCMES.py | 2 +- RCMES/test/test.py | 2 +- examples/knmi_to_cru31_full_bias.py | 2 +- examples/model_ensemble_to_rcmed.py | 2 +- examples/multi_model_evaluation.py | 2 +- examples/multi_model_taylor_diagram.py | 2 +- examples/taylor_diagram_example.py | 2 +- examples/time_series_with_regions.py | 2 +- ocw/data_source/local.py | 2 +- ocw/dataset.py | 196 +++++++++++++-------- ocw/dataset_loader.py | 170 ++++++++---------- ocw/dataset_processor.py | 113 ++++++------ ocw/shape/countries.dbf | Bin 0 -> 208900 bytes ocw/shape/countries.prj | 1 + ocw/shape/countries.shp | Bin 0 -> 31413360 bytes ocw/shape/countries.shx | Bin 0 -> 2220 bytes ocw/shape/us_states.dbf | Bin 0 -> 12962 bytes ocw/shape/us_states.shp | Bin 0 -> 222344 bytes ocw/shape/us_states.shx | Bin 0 -> 508 bytes ocw/tests/test_dap.py | 9 + ocw/tests/test_dataset.py | 126 ++++--------- ocw/tests/test_dataset_loader.py | 72 ++------ ocw/tests/test_dataset_processor.py | 62 +++---- ocw/tests/test_evaluation.py | 18 +- ocw_config_runner/tests/test_config_writer.py | 4 +- setup.py | 14 +- 28 files changed, 372 insertions(+), 434 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/climate/blob/9797d971/RCMES/run_RCMES.py ---------------------------------------------------------------------- diff --cc RCMES/run_RCMES.py index 93fd2b5,d500027..c4424e7 --- a/RCMES/run_RCMES.py +++ b/RCMES/run_RCMES.py @@@ -136,16 -140,16 +136,16 @@@ if time_info['maximum_overlap_period'] if temporal_resolution == 'monthly' and end_time.day !=1: end_time = end_time.replace(day=1) -if ref_data_info['data_source'] == 'rcmed': - min_lat = np.max([min_lat, ref_dataset.lats.min()]) - max_lat = np.min([max_lat, ref_dataset.lats.max()]) - min_lon = np.max([min_lon, ref_dataset.lons.min()]) - max_lon = np.min([max_lon, ref_dataset.lons.max()]) +if obs_data_info['loader_name'] == 'rcmed': + min_lat = np.max([min_lat, obs_dataset.lats.min()]) + max_lat = np.min([max_lat, obs_dataset.lats.max()]) + min_lon = np.max([min_lon, obs_dataset.lons.min()]) + max_lon = np.min([max_lon, obs_dataset.lons.max()]) - bounds = Bounds(min_lat, max_lat, min_lon, max_lon, start_time, end_time) + bounds = Bounds(lat_min=min_lat, lat_max=max_lat, lon_min=min_lon, lon_max=max_lon, start=start_time, end=end_time) -ref_dataset = dsp.subset(ref_dataset, bounds) -if ref_dataset.temporal_resolution() != temporal_resolution: - ref_dataset = dsp.temporal_rebin(ref_dataset, temporal_resolution) +obs_dataset = dsp.subset(obs_dataset, bounds) +if obs_dataset.temporal_resolution() != temporal_resolution: + obs_dataset = dsp.temporal_rebin(obs_dataset, temporal_resolution) for idata,dataset in enumerate(model_datasets): model_datasets[idata] = dsp.subset(dataset, bounds) if dataset.temporal_resolution() != temporal_resolution:
