Merge branch 'master' of https://github.com/apache/climate into CLIMATE-717
Project: http://git-wip-us.apache.org/repos/asf/climate/repo Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/cee5b627 Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/cee5b627 Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/cee5b627 Branch: refs/heads/master Commit: cee5b6273f73d9119535fa8b7610be536111c755 Parents: a40b8e4 bb415ad Author: huikyole <[email protected]> Authored: Fri Jan 15 15:55:47 2016 -0800 Committer: huikyole <[email protected]> Committed: Fri Jan 15 15:55:47 2016 -0800 ---------------------------------------------------------------------- easy-ocw/conda-install.sh | 45 +++++++++++ easy-ocw/conda_environment.txt | 54 +++++++++++++ easy-ocw/install-osx.sh | 50 ++++++++---- easy-ocw/install-ubuntu.sh | 17 +++- easy-ocw/ocw-conda-dependencies.txt | 1 + .../NARCCAP_paper/Fig10_and_Fig11.yaml | 81 +++++++++++++++++++ .../NARCCAP_paper/Fig12_summer.yaml | 75 ++++++++++++++++++ .../NARCCAP_paper/Fig12_winter.yaml | 75 ++++++++++++++++++ .../NARCCAP_paper/Fig14_and_Fig15.yaml | 82 ++++++++++++++++++++ .../NARCCAP_paper/Fig16_summer.yaml | 75 ++++++++++++++++++ .../NARCCAP_paper/Fig16_winter.yaml | 75 ++++++++++++++++++ .../NARCCAP_paper/Fig5_and_Fig6.yaml | 50 ++++++++++++ .../NARCCAP_paper/Fig7_summer.yaml | 75 ++++++++++++++++++ .../NARCCAP_paper/Fig7_winter.yaml | 75 ++++++++++++++++++ .../NARCCAP_paper/Fig8_and_Fig9.yaml | 50 ++++++++++++ ...ordex-AF_tasmax_annual_mean_bias_to_cru.yaml | 2 +- ...ordex-arctic_cloud_fraction_bias_to_SRB.yaml | 65 ++++++++++++++++ .../cordex-arctic_rlds_bias_to_SRB.yaml | 65 ++++++++++++++++ .../cordex-arctic_rlus_bias_to_SRB.yaml | 65 ++++++++++++++++ .../cordex-arctic_rsds_bias_to_SRB.yaml | 65 ++++++++++++++++ .../metrics_and_plots.py | 32 ++++++-- .../configuration_file_examples/run_RCMES.py | 19 +++++ ocw-vm/Vagrantfile | 2 +- ocw-vm/init-ocw-vm.sh | 23 ++++-- ocw/dataset_processor.py | 64 +++++++++++---- 25 files changed, 1233 insertions(+), 49 deletions(-) ----------------------------------------------------------------------
