[cmor] 09/22: Merge tag 'upstream/3.1.3' into debian/master

[Alastair McKinstry]

This is an automated email from the git hooks/post-receive script.

mckinstry pushed a commit to branch debian/master
in repository cmor.

commit f4c41c56042980d857e9ddf3f2bad4fa15d40bcb
Merge: 95506be db146cc
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Fri Nov 11 01:38:22 2016 +0000

    Merge tag 'upstream/3.1.3' into debian/master

 README.md                                          |    2 +-
 Src/_cmormodule.c                                  |  118 +-
 Src/_controlvocabulary.c                           |   86 +-
 Src/cmor.c                                         |  133 +-
 Src/cmor_CV.c                                      |   43 +-
 Src/cmor_cfortran_interface.c                      |  300 +-
 Src/cmor_grids.c                                   |    4 +-
 Src/cmor_md5.c                                     |    4 +-
 Tables                                             |    1 +
 Test/all_tests.py                                  |   14 +-
 Test/speed_test_table_A                            |   68 +-
 Test/test2.json                                    |    6 +-
 Test/test_cmor_grid_alejandro.f90                  |    6 +-
 Test/test_cmor_grid_time_varying.f90               |    4 +-
 Test/test_dimensionless.f90                        |   58 +-
 Test/test_python_has_cur_dataset_attribute.py      |   34 +
 Test/test_python_has_variable_attribute.py         |   60 +
 Test/test_python_jamie_10.py                       |    2 +-
 Test/test_python_polar_stereo.py                   |    4 +-
 Test/test_sophie.f90                               |    2 +-
 TestTables/CMIP6_3hr.json                          |  950 +--
 TestTables/CMIP6_6hrLev.json                       |  669 +-
 TestTables/CMIP6_6hrPlev.json                      |  744 ++-
 TestTables/CMIP6_6hrPlevpt.json                    |  890 +--
 TestTables/CMIP6_Amon.json                         | 2094 ++++---
 TestTables/CMIP6_AmonAdj.json                      |  632 +-
 TestTables/CMIP6_Amon_json_hfls                    | 1880 +++---
 TestTables/CMIP6_CV_minimal.json                   |    8 +
 .../{CMIP6_emDayZ.json => CMIP6_LIfxant.json}      |  685 +-
 .../{CMIP6_emDayZ.json => CMIP6_LIfxgre.json}      |  685 +-
 TestTables/CMIP6_LImon.json                        | 1138 ++--
 TestTables/{CMIP6_3hr.json => CMIP6_LImonant.json} | 1166 ++--
 TestTables/{CMIP6_3hr.json => CMIP6_LImongre.json} | 1194 ++--
 .../{CMIP6_Oclim.json => CMIP6_LIyrant.json}       | 1136 ++--
 .../{CMIP6_Oclim.json => CMIP6_LIyrgre.json}       | 1138 ++--
 TestTables/CMIP6_Lmon.json                         | 1577 ++---
 TestTables/CMIP6_Oclim.json                        |  990 +--
 TestTables/CMIP6_Oday.json                         |  638 +-
 TestTables/CMIP6_Ofx.json                          | 2542 +++++++-
 TestTables/CMIP6_Omon.json                         | 4786 +++++++-------
 TestTables/CMIP6_Oyr.json                          | 2356 +++----
 TestTables/CMIP6_SIday.json                        | 2540 +++++++-
 TestTables/CMIP6_SImon.json                        | 1982 +++---
 TestTables/CMIP6_aerannual.json                    | 2526 +-------
 TestTables/CMIP6_aerdaily.json                     |  843 +--
 TestTables/CMIP6_aerfixed.json                     |  591 +-
 TestTables/CMIP6_aerhourly.json                    |  622 +-
 TestTables/CMIP6_aermonthly.json                   | 3134 +++++-----
 TestTables/CMIP6_aero.json                         | 3789 +----------
 TestTables/CMIP6_cf3hr.json                        | 2594 +-------
 TestTables/CMIP6_cf3hr_0.json                      |  141 +
 TestTables/CMIP6_cf3hr_1.json                      |  142 +
 TestTables/CMIP6_cf3hr_2.json                      |  205 +
 TestTables/CMIP6_cfDay.json                        | 1182 ++--
 TestTables/CMIP6_cfMon.json                        | 2138 ++++---
 TestTables/CMIP6_cfSites.json                      | 5027 ++++++++-------
 TestTables/CMIP6_day.json                          | 1308 ++--
 TestTables/CMIP6_em.json                           |    1 -
 TestTables/CMIP6_em1hr.json                        | 2744 +++++++-
 TestTables/CMIP6_em3hr.json                        |  759 +--
 TestTables/CMIP6_em3hrpt.json                      |  729 +--
 TestTables/CMIP6_emDay.json                        | 2495 ++++----
 TestTables/CMIP6_emDayZ.json                       |  614 +-
 TestTables/CMIP6_emDaypt.json                      | 2506 +++++++-
 TestTables/CMIP6_emFx.json                         |  659 +-
 TestTables/CMIP6_emMon.json                        | 6550 +++++++++-----------
 TestTables/CMIP6_emMonZ.json                       | 1207 ++--
 TestTables/CMIP6_emMonclim.json                    |    1 -
 TestTables/CMIP6_emSubhr.json                      |  964 +--
 TestTables/CMIP6_emYr.json                         | 1159 ++--
 TestTables/CMIP6_fx.json                           |  774 +--
 TestTables/CMIP6_grids.json                        |   18 +-
 configure                                          |    2 +-
 configure.ac                                       |    2 +-
 include/cmor.h                                     |    4 +-
 include/cmor_func_def.h                            |    7 +-
 include/cmor_locale.h                              |    2 +-
 scripts/createCMIP6CV.py                           |   54 +
 78 files changed, 41618 insertions(+), 37244 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/cmor.git