[cmor] 02/04: Merge tag 'upstream/3.2.4' into debian/master
Alastair McKinstry
mckinstry at moszumanska.debian.org
Sat Jul 29 10:18:21 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 f282329e5e8515a422f0d4e84a1043dcda1ab539
Merge: 09ed937 7721a3a
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Tue Jul 4 12:50:06 2017 +0100
Merge tag 'upstream/3.2.4' into debian/master
INSTALL | 4 +-
Lib/__init__.py | 4 +-
Lib/cmor_const.py | 6 +-
Lib/convertCSVFile.py | 29 +-
Lib/git2svn.py | 31 +-
Lib/pywrapper.py | 728 ++--
LibCV/PrePARE/PrePARE.py | 131 +-
LibCV/__init__.py | 1 -
LibCV/pywrapper.py | 77 +-
Makefile.in | 7 +-
README.md | 5 +-
RELEASE-NOTES | 2 +
Src/_cmormodule.c | 1005 +++---
Src/cmor.c | 5316 ++++++++++++++--------------
Src/cmor_CV.c | 1607 +++++----
Src/cmor_axes.c | 2777 +++++++--------
Src/cmor_cfortran_interface.c | 801 +++--
Src/cmor_grids.c | 1330 +++----
Src/cmor_md5.c | 374 +-
Src/cmor_tables.c | 852 +++--
Src/cmor_variables.c | 4579 ++++++++++++------------
Test/check_results.py | 2 +-
Test/cmor_speed_and_compression.py | 2 +-
Test/cmor_speed_and_compression_01.py | 3 +-
Test/cmor_speed_and_compression_02.py | 131 +-
Test/common_user_input.json | 2 +-
Test/speed_test_table_A | 92 +-
Test/test_python_CMIP6_CV_forcenoparent.py | 4 +-
Test/test_python_filename_time_range.py | 543 +++
Test/test_python_forecast_time.py | 102 +
Test/test_python_joerg_4.py | 4 +-
Test/test_python_user_interface_03.py | 2 +-
Test/test_sophie.f90 | 11 +-
TestTables/CMIP6_3hr.json | 70 +-
TestTables/CMIP6_6hrLev.json | 25 +-
TestTables/CMIP6_6hrPlev.json | 116 +-
TestTables/CMIP6_6hrPlevPt.json | 210 +-
TestTables/CMIP6_AERday.json | 22 +-
TestTables/CMIP6_AERfx.json | 3 +-
TestTables/CMIP6_AERhr.json | 24 +-
TestTables/CMIP6_AERmon.json | 337 +-
TestTables/CMIP6_AERmonZ.json | 24 +-
TestTables/CMIP6_Amon.json | 230 +-
TestTables/CMIP6_Amon_json_hfls | 400 +++
TestTables/CMIP6_CF3hr.json | 116 +-
TestTables/CMIP6_CFday.json | 115 +-
TestTables/CMIP6_CFmon.json | 185 +-
TestTables/CMIP6_CFsubhr.json | 214 +-
TestTables/CMIP6_CFsubhrOff.json | 14 +-
TestTables/CMIP6_CV.json | 500 ++-
TestTables/CMIP6_E1hr.json | 69 +-
TestTables/CMIP6_E1hrClimMon.json | 10 +-
TestTables/CMIP6_E3hr.json | 70 +-
TestTables/CMIP6_E3hrPt.json | 359 +-
TestTables/CMIP6_E6hrZ.json | 29 +-
TestTables/CMIP6_Eday.json | 502 ++-
TestTables/CMIP6_EdayZ.json | 36 +-
TestTables/CMIP6_Efx.json | 83 +-
TestTables/CMIP6_Emon.json | 1531 ++++----
TestTables/CMIP6_EmonZ.json | 74 +-
TestTables/CMIP6_Esubhr.json | 125 +-
TestTables/CMIP6_Eyr.json | 101 +-
TestTables/CMIP6_IfxAnt.json | 19 +-
TestTables/CMIP6_IfxGre.json | 19 +-
TestTables/CMIP6_ImonAnt.json | 55 +-
TestTables/CMIP6_ImonGre.json | 55 +-
TestTables/CMIP6_IyrAnt.json | 56 +-
TestTables/CMIP6_IyrGre.json | 56 +-
TestTables/CMIP6_LImon.json | 72 +-
TestTables/CMIP6_Lmon.json | 105 +-
TestTables/CMIP6_Oclim.json | 127 +-
TestTables/CMIP6_Oday.json | 34 +-
TestTables/CMIP6_Odec.json | 69 +-
TestTables/CMIP6_Ofx.json | 38 +-
TestTables/CMIP6_Omon.json | 1033 ++++--
TestTables/CMIP6_Omonbad.json | 1 +
TestTables/CMIP6_Oyr.json | 566 +--
TestTables/CMIP6_SIday.json | 56 +-
TestTables/CMIP6_SImon.json | 231 +-
TestTables/CMIP6_cf3hr_0.json | 5 +
TestTables/CMIP6_cf3hr_1.json | 6 +-
TestTables/CMIP6_cf3hr_2.json | 7 +
TestTables/CMIP6_chunking.json | 2 +-
TestTables/CMIP6_coordinate.json | 808 +++--
TestTables/CMIP6_day.json | 136 +-
TestTables/CMIP6_fx.json | 35 +-
TestTables/CMIP6_grids.json | 14 +-
TestTables/python_test_table_A | 3 +-
configure | 20 +-
configure.ac | 4 +-
include/cmor.h | 11 +-
include/cmor_func_def.h | 2 +
scripts/createCMIP6CV.py | 1 -
93 files changed, 16693 insertions(+), 13111 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