[cmor] 02/10: Merge tag 'upstream/3.2.5' into debian/master
Alastair McKinstry
mckinstry at moszumanska.debian.org
Mon Jul 31 06:35:49 UTC 2017
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch debian/master
in repository cmor.
commit c97cd43ca2a231b188d4b91249b1259023fa3fc1
Merge: bbbaa81 cfc7394
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Sat Jul 29 10:59:57 2017 +0100
Merge tag 'upstream/3.2.5' into debian/master
INSTALL | 4 +-
LibCV/PrePARE/PrePARE.py | 27 +-
Makefile.in | 5 +-
README.md | 4 +-
RELEASE-NOTES | 1 +
Src/_controlvocabulary.c | 680 +++++++++++----------
Src/cmor.c | 452 ++++++++++----
Src/cmor_CV.c | 129 +++-
Src/cmor_axes.c | 111 ++--
Src/cmor_grids.c | 90 +--
Src/cmor_tables.c | 91 ++-
Src/cmor_variables.c | 226 ++++---
Test/climatology_test.c | 81 ++-
Test/cmor_speed_and_compression_03.py | 2 +-
Test/common_user_input.json | 2 +-
Test/common_user_input_NOID.json | 2 +-
Test/ipcc_test_code.c | 647 ++++++++++----------
Test/test_grid.c | 335 +++++-----
Test/test_lots_of_variables.c | 553 +++++++++--------
Test/test_python_CMIP6_CV_badgridgr.py | 2 +-
Test/test_python_CMIP6_CV_badgridlabel.py | 2 +-
Test/test_python_CMIP6_CV_badgridresolution.py | 2 +-
...est_python_CMIP6_CV_badinstitutionIDNotSet.json | 2 +-
Test/test_python_jamie_11.py | 154 +++++
Test/test_python_joerg_3.py | 5 +-
Test/test_python_joerg_4.py | 8 +-
Test/test_python_sos_psu_units.py | 106 ++++
Test/test_python_toomany_tables.py | 16 -
Test/test_unit_cat_unique.c | 262 ++++----
TestTables/CMIP6_3hr.json | 4 +-
TestTables/CMIP6_6hrLev.json | 10 +-
TestTables/CMIP6_6hrPlev.json | 4 +-
TestTables/CMIP6_6hrPlevPt.json | 6 +-
TestTables/CMIP6_AERday.json | 8 +-
TestTables/CMIP6_AERhr.json | 4 +-
TestTables/CMIP6_AERmon.json | 56 +-
TestTables/CMIP6_AERmonZ.json | 6 +-
TestTables/CMIP6_Amon.json | 4 +-
TestTables/CMIP6_CF3hr.json | 580 +++++++++++++++++-
TestTables/CMIP6_CFday.json | 4 +-
TestTables/CMIP6_CFmon.json | 10 +-
TestTables/CMIP6_CFsubhr.json | 8 +-
TestTables/CMIP6_CFsubhrOff.json | 24 +-
TestTables/CMIP6_CV.json | 163 +++--
TestTables/CMIP6_E1hr.json | 4 +-
TestTables/CMIP6_E1hrClimMon.json | 4 +-
TestTables/CMIP6_E3hr.json | 4 +-
TestTables/CMIP6_E3hrPt.json | 64 +-
TestTables/CMIP6_E6hrZ.json | 4 +-
TestTables/CMIP6_Eday.json | 30 +-
TestTables/CMIP6_EdayZ.json | 10 +-
TestTables/CMIP6_Efx.json | 4 +-
TestTables/CMIP6_Emon.json | 40 +-
TestTables/CMIP6_EmonZ.json | 8 +-
TestTables/CMIP6_Esubhr.json | 6 +-
TestTables/CMIP6_Eyr.json | 8 +-
TestTables/CMIP6_IfxAnt.json | 4 +-
TestTables/CMIP6_IfxGre.json | 4 +-
TestTables/CMIP6_ImonAnt.json | 4 +-
TestTables/CMIP6_ImonGre.json | 4 +-
TestTables/CMIP6_IyrAnt.json | 4 +-
TestTables/CMIP6_IyrGre.json | 4 +-
TestTables/CMIP6_LImon.json | 4 +-
TestTables/CMIP6_Lmon.json | 6 +-
TestTables/CMIP6_Oclim.json | 12 +-
TestTables/CMIP6_Oday.json | 8 +-
TestTables/CMIP6_Odec.json | 8 +-
TestTables/CMIP6_Ofx.json | 6 +-
TestTables/CMIP6_Omon.json | 10 +-
TestTables/CMIP6_Omonbad.json | 19 +
.../{CMIP6_Omonbad.json => CMIP6_Omonmissing.json} | 23 +-
TestTables/CMIP6_Oyr.json | 8 +-
TestTables/CMIP6_SIday.json | 4 +-
TestTables/CMIP6_SImon.json | 10 +-
TestTables/CMIP6_cf3hr_0.json | 2 +-
TestTables/CMIP6_cf3hr_1.json | 2 +-
TestTables/CMIP6_cf3hr_2.json | 2 +-
TestTables/CMIP6_chunking.json | 2 +-
TestTables/CMIP6_coordinate.json | 8 +-
TestTables/CMIP6_day.json | 4 +-
TestTables/CMIP6_formula_terms.json | 46 +-
TestTables/CMIP6_fx.json | 4 +-
TestTables/CMIP6_grids.json | 4 +-
TestTables/python_test_table_A | 2 +-
configure | 18 +-
configure.ac | 2 +-
include/cmor.h | 19 +-
include/cmor_func_def.h | 4 +
scripts/CMIP6_CV_cron_github.sh | 22 +
scripts/createCMIP6CV.py | 8 +-
setup.py.in | 9 +-
91 files changed, 3389 insertions(+), 1989 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/cmor.git
More information about the debian-science-commits
mailing list