Merge branch 'master' into CLIMATE-854v2
Project: http://git-wip-us.apache.org/repos/asf/climate/repo Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/bff23ffe Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/bff23ffe Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/bff23ffe Branch: refs/heads/master Commit: bff23ffe3a167ac7f6ff1e5c87fea74a841bd86e Parents: e050ad5 9f34827 Author: Lewis John McGibbney <lewis.mcgibb...@gmail.com> Authored: Wed Sep 14 21:21:30 2016 -0700 Committer: Lewis John McGibbney <lewis.mcgibb...@gmail.com> Committed: Wed Sep 14 21:21:30 2016 -0700 ---------------------------------------------------------------------- RCMES/cli_app.py | 10 +++++----- .../cordex-arctic_cloud_fraction_bias_to_SRB.yaml | 2 +- .../cordex-arctic_rlds_bias_to_SRB.yaml | 2 +- .../cordex-arctic_rlus_bias_to_SRB.yaml | 2 +- .../cordex-arctic_rsds_bias_to_SRB.yaml | 2 +- .../ESGF_example/ESGF-Example_local.yaml | 3 ++- .../NARCCAP_examples/Fig14_and_Fig15.yaml | 2 +- .../NARCCAP_examples/Fig16_summer.yaml | 2 +- .../NARCCAP_examples/Fig16_winter.yaml | 2 +- .../dscale_prmo-wus_local.yaml | 2 +- ocw/data_source/local.py | 7 +++++-- ocw/dataset_processor.py | 14 +++++++++----- ocw/tests/test_local.py | 2 +- 13 files changed, 30 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/climate/blob/bff23ffe/ocw/data_source/local.py ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/climate/blob/bff23ffe/ocw/dataset_processor.py ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/climate/blob/bff23ffe/ocw/tests/test_local.py ----------------------------------------------------------------------
