Merge branch 'master' of https://github.com/apache/climate into CLIMATE-771


Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/26ee67a5
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/26ee67a5
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/26ee67a5

Branch: refs/heads/master
Commit: 26ee67a5ecef8a12846f2e3b8b0f8eabc7ff7631
Parents: 0f3e4f2 212441d
Author: huikyole <[email protected]>
Authored: Thu Mar 3 22:48:28 2016 -0800
Committer: huikyole <[email protected]>
Committed: Thu Mar 3 22:48:28 2016 -0800

----------------------------------------------------------------------
 MANIFEST.in                                     |   3 +-
 RCMES/cli_app.py                                |  12 +-
 .../CORDEX-Africa_examples/Fig10a_cru.yaml      |  93 ++++++
 .../CORDEX-Africa_examples/Fig10b_cru.yaml      |  90 ++++++
 .../CORDEX-Africa_examples/Fig1_2_4a_5.yaml     | 107 +++++++
 .../CORDEX-Africa_examples/Fig3a_summer.yaml    |  90 ++++++
 .../CORDEX-Africa_examples/Fig3a_winter.yaml    |  90 ++++++
 .../CORDEX-Africa_examples/Fig3b_summer.yaml    |  90 ++++++
 .../CORDEX-Africa_examples/Fig3b_winter.yaml    |  90 ++++++
 .../CORDEX-Africa_examples/Fig4d_7d_8ad.yaml    | 101 +++++++
 .../CORDEX-Africa_examples/Fig4f_9bcd.yaml      | 104 +++++++
 .../CORDEX-Africa_examples/Fig7e_8be.yaml       |  95 ++++++
 .../CORDEX-Africa_examples/Fig7f_8cf.yaml       |  97 ++++++
 ...ordex-arctic_cloud_fraction_bias_to_SRB.yaml |   4 +-
 .../cordex-arctic_rlds_bias_to_SRB.yaml         |   4 +-
 .../cordex-arctic_rlus_bias_to_SRB.yaml         |   4 +-
 .../cordex-arctic_rsds_bias_to_SRB.yaml         |   4 +-
 .../NARCCAP_examples/Fig10_and_Fig11.yaml       |   2 +-
 .../NARCCAP_examples/Fig12_summer.yaml          |   2 +-
 .../NARCCAP_examples/Fig12_winter.yaml          |   2 +-
 .../NARCCAP_examples/Fig14_and_Fig15.yaml       |   4 +-
 .../NARCCAP_examples/Fig16_summer.yaml          |   4 +-
 .../NARCCAP_examples/Fig16_winter.yaml          |   4 +-
 .../NARCCAP_examples/Fig5_and_Fig6.yaml         |   4 +-
 .../NARCCAP_examples/Fig7_summer.yaml           |   2 +-
 .../NARCCAP_examples/Fig7_winter.yaml           |   2 +-
 .../NARCCAP_examples/Fig8_and_Fig9.yaml         |   2 +-
 .../dscale_prmo-eus_rcmed.yaml                  |  83 ++++++
 .../dscale_prmo-wus_local.yaml                  |  82 +++++
 .../dscale_prmo-wus_rcmed.yaml                  |  83 ++++++
 .../dscale_wus_prec_trmm_vs_nldas.yaml          |  82 +++++
 ...prec_subregion_annual_cycle_time_series.yaml |  90 ++++++
 RCMES/metrics_and_plots.py                      |  18 +-
 RCMES/run_RCMES.py                              |  48 ++-
 RCMES/statistical_downscaling/MPI_tas_JJA.yaml  |   6 +-
 RCMES/test/test.py                              |   6 +-
 examples/knmi_to_cru31_full_bias.py             |   6 +-
 examples/model_ensemble_to_rcmed.py             |   8 +-
 examples/multi_model_taylor_diagram.py          |   4 +-
 examples/simple_model_to_model_bias.py          |   4 +-
 examples/taylor_diagram_example.py              |   4 +-
 ocw-ui/backend/run_webservices.py               |   6 +-
 ocw-ui/frontend/app/img/globe.png               | Bin 0 -> 25857 bytes
 .../app/img/ocw-logo-variant-sm-01-01.png       | Bin 0 -> 5776 bytes
 ocw-ui/frontend/app/index.html                  |  25 +-
 ocw-ui/frontend/app/scripts/app.js              |   4 +
 .../scripts/controllers/observationselect.js    |  14 +-
 ocw-ui/frontend/app/styles/main.css             |   7 +-
 ocw-ui/frontend/app/views/demo.html             |  22 ++
 .../frontend/app/views/selectobservation.html   |   8 +
 ocw-ui/frontend/app/views/selectrcmed.html      |   2 +-
 ocw-ui/frontend/package.json                    |  10 +-
 ocw/data_source/dap.py                          |  22 +-
 ocw/data_source/local.py                        |   7 +-
 ocw/data_source/rcmed.py                        |   2 +
 ocw/dataset_processor.py                        | 297 +++++++++++++------
 ocw/tests/test_dap.py                           |  20 +-
 ocw/tests/test_dataset_processor.py             |  32 +-
 ocw/tests/test_local.py                         | 202 +++++++------
 ocw/utils.py                                    |   6 +-
 setup.cfg                                       |   4 -
 setup.py                                        |   3 +-
 62 files changed, 2008 insertions(+), 315 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/climate/blob/26ee67a5/ocw/data_source/local.py
----------------------------------------------------------------------

Reply via email to