Merge branch 'master' of https://github.com/apache/climate
Project: http://git-wip-us.apache.org/repos/asf/climate/repo Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/ca73376b Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/ca73376b Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/ca73376b Branch: refs/heads/master Commit: ca73376bf1965a13b1f28d7700b6473a34a9bb0d Parents: 16ed9d0 d73c3c2 Author: huikyole <huiky...@argo.jpl.nasa.gov> Authored: Wed Aug 3 08:45:10 2016 -0700 Committer: huikyole <huiky...@argo.jpl.nasa.gov> Committed: Wed Aug 3 08:45:10 2016 -0700 ---------------------------------------------------------------------- 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/dataset.py | 196 +++++++++++++-------- 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/usa_states.dbf | Bin 0 -> 12962 bytes ocw/shape/usa_states.shp | Bin 0 -> 222344 bytes ocw/shape/usa_states.shx | Bin 0 -> 508 bytes ocw/tests/test_dap.py | 9 + ocw/tests/test_dataset.py | 126 ++++--------- ocw/tests/test_dataset_processor.py | 62 +++---- ocw/tests/test_evaluation.py | 18 +- ocw_config_runner/tests/test_config_writer.py | 4 +- 23 files changed, 271 insertions(+), 276 deletions(-) ----------------------------------------------------------------------
