[cmor] 20/22: Merge tag 'upstream/3.2.1' 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 5576377ee484865d2d3196b4a43a28cbbf8f4fc7
Merge: 6ed76ba 2d61f74
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Tue Dec 20 09:40:21 2016 +0000

    Merge tag 'upstream/3.2.1' into debian/master

 INSTALL                             |    4 +-
 LibCV/CMIP6Validator.py             |  267 -------
 LibCV/__init__.py                   |    2 +-
 LibCV/cmor_const.py                 |    2 +
 LibCV/pywrapper.py                  |   17 +
 Makefile.in                         |    2 +-
 README.md                           |    5 +-
 Src/_controlvocabulary.c            |   81 ++-
 Src/cmor_CV.c                       |    8 +-
 Src/cmor_variables.c                |    4 +-
 Test/ipcc_test_code.c               |    2 +-
 Test/test_cmor_grid_alejandro.f90   |    2 +-
 Test/test_doc.json                  |   63 +-
 TestTables/CMIP6_3hr.json           |    6 +-
 TestTables/CMIP6_6hrLev.json        |    4 +-
 TestTables/CMIP6_6hrPlev.json       |  105 ++-
 TestTables/CMIP6_6hrPlevpt.json     |   23 +-
 TestTables/CMIP6_Amon.json          |   22 +-
 TestTables/CMIP6_CV.json            |  637 ++++++++++++----
 TestTables/CMIP6_LIfxant.json       |   14 +-
 TestTables/CMIP6_LIfxgre.json       |   14 +-
 TestTables/CMIP6_LImon.json         |  239 +++---
 TestTables/CMIP6_LImonant.json      |   99 ++-
 TestTables/CMIP6_LImongre.json      |   99 ++-
 TestTables/CMIP6_LIyrant.json       |  116 +--
 TestTables/CMIP6_LIyrgre.json       |  116 +--
 TestTables/CMIP6_Lmon.json          |    6 +-
 TestTables/CMIP6_Oclim.json         |   96 +--
 TestTables/CMIP6_Oday.json          |   21 +-
 TestTables/CMIP6_Ofx.json           |   66 +-
 TestTables/CMIP6_Omon.json          |  337 ++++-----
 TestTables/CMIP6_Oyr.json           |  203 +++---
 TestTables/CMIP6_SIday.json         |   23 +-
 TestTables/CMIP6_SImon.json         |  111 +--
 TestTables/CMIP6_aerdaily.json      |   83 +--
 TestTables/CMIP6_aerfixed.json      |   21 +-
 TestTables/CMIP6_aerhourly.json     |    6 +-
 TestTables/CMIP6_aermonthly.json    |  219 +++---
 TestTables/CMIP6_cf3hr.json         |   24 +-
 TestTables/CMIP6_cfDay.json         |   25 +-
 TestTables/CMIP6_cfMon.json         |  719 +-----------------
 TestTables/CMIP6_cfOff.json         |    4 +-
 TestTables/CMIP6_cfSites.json       |   14 +-
 TestTables/CMIP6_coordinate.json    |   48 +-
 TestTables/CMIP6_day.json           |   21 +-
 TestTables/CMIP6_em1hr.json         |    6 +-
 TestTables/CMIP6_em1hrclimmon.json  |   14 +-
 TestTables/CMIP6_em3hr.json         |   83 ++-
 TestTables/CMIP6_em3hrpt.json       |   73 +-
 TestTables/CMIP6_emDay.json         |  155 +++-
 TestTables/CMIP6_emDayZ.json        |   24 +-
 TestTables/CMIP6_emDaypt.json       |    4 +-
 TestTables/CMIP6_emFx.json          |    8 +-
 TestTables/CMIP6_emMon.json         | 1371 ++++++++++++++++++++++-------------
 TestTables/CMIP6_emMonZ.json        |  128 +++-
 TestTables/CMIP6_emMonpt.json       |    4 +-
 TestTables/CMIP6_emSubhr.json       |   14 +-
 TestTables/CMIP6_emYr.json          |  208 ++++--
 TestTables/CMIP6_fx.json            |   53 +-
 TestTables/CMIP6_grids.json         |    2 +-
 configure                           |   28 +-
 configure.ac                        |    2 +-
 include/cmor.h                      |    3 +-
 scripts/{Pre-PARE.py => PrePARE.py} |   79 +-
 scripts/createCMIP6CV.py            |    4 +-
 setup.py.in                         |    2 +-
 66 files changed, 3307 insertions(+), 2958 deletions(-)

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