This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch master
in repository cdo.
commit e4919b742c6604ec520c6a6bbefa4e82c4969e60
Merge: f8866de 2ea9ed4
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Wed Apr 29 12:57:44 2015 +0100
Merge upstream_1.6.9 into dfsg
ChangeLog | 179 +-
Makefile.in | 6 +-
NEWS | 48 +-
OPERATORS | 30 +-
README | 2 +-
aclocal.m4 | 60 +
cdo.spec | 2 +-
config/ar-lib | 270 +
config/default | 51 +-
configure | 641 +-
configure.ac | 19 +-
contrib/Makefile.in | 1 +
contrib/cdoCompletion.bash | 13 +
contrib/cdoCompletion.tcsh | 13 +
contrib/cdoCompletion.zsh | 13 +
libcdi/AUTHORS | 2 +-
libcdi/ChangeLog | 66 +
libcdi/Makefile.in | 25 +-
libcdi/NEWS | 8 +
libcdi/README | 2 +-
libcdi/acinclude.m4 | 3 +
libcdi/aclocal.m4 | 6 +
libcdi/app/Makefile.in | 25 +-
libcdi/app/cdi.c | 26 +-
libcdi/app/printinfo.h | 26 +-
libcdi/cdi.settings.in | 129 +-
libcdi/config/default | 8 +-
libcdi/configure | 792 +-
libcdi/configure.ac | 70 +-
libcdi/doc/cdi_cman.pdf | Bin 0 -> 332301 bytes
libcdi/doc/cdi_fman.pdf | Bin 0 -> 360652 bytes
libcdi/examples/Makefile.in | 25 +-
libcdi/examples/cdi_read_f2003.f90 | 2 +-
libcdi/examples/pio/Makefile.am | 14 +-
libcdi/examples/pio/Makefile.in | 44 +-
libcdi/examples/pio/compareResourcesArray.c | 19 +-
libcdi/interfaces/Makefile.in | 25 +-
libcdi/interfaces/cdi.hpp | 3 +-
libcdi/interfaces/f2003/bindGen.rb | 1234 +-
libcdi/interfaces/python/CdiObj.py | 704 +-
libcdi/interfaces/python/cdiobj_wrap.cpp | 21705 ++--
libcdi/interfaces/python/testObj.py | 42 +-
libcdi/m4/ac_lang_program_fortran.m4 | 57 +
libcdi/m4/acx_c_package.m4 | 66 +
libcdi/m4/acx_fortran_package.m4 | 144 +
...od_path_flag.m4 => acx_lang_c_check_include.m4} | 62 +-
libcdi/m4/acx_lang_check_include.m4 | 123 +
...h_flag.m4 => acx_lang_fortran_check_include.m4} | 66 +-
libcdi/m4/acx_lang_package.m4 | 134 +
libcdi/m4/acx_option_search_libs.m4 | 128 +
libcdi/m4/acx_options.m4 | 1 +
libcdi/m4/acx_sl_fc_mod_path_flag.m4 | 20 +-
libcdi/m4/acx_sl_mod_suffix.m4 | 11 +-
.../{acx_sl_fc_mod_path_flag.m4 => asx_tr_arg.m4} | 67 +-
libcdi/m4/libtool.m4 | 2 +
libcdi/m4/starlink_fpp.m4 | 135 +-
libcdi/src/Makefile.am | 28 +-
libcdi/src/Makefile.in | 775 +-
libcdi/src/cdf.c | 2 +-
libcdi/src/cdf_int.c | 3 +-
libcdi/src/cdf_int.h | 2 +-
libcdi/src/cdi.h | 88 +-
libcdi/src/cdi.inc | 47 +-
libcdi/src/cdiFortran.c | 19 +-
libcdi/src/cdi_int.c | 6 -
libcdi/src/cdi_int.h | 14 +-
libcdi/src/cdilib.c | 103742 +++++++++---------
libcdi/src/cfortran.h | 2 +-
libcdi/src/cgribexlib.c | 291 +-
libcdi/src/config.h.in | 14 +
libcdi/{tests => src}/create_uuid.h | 0
libcdi/src/dmemory.c | 51 +-
libcdi/src/dmemory.h | 4 +
libcdi/src/error.h | 2 +-
libcdi/src/gribapi.h | 15 +-
libcdi/src/gribapi_utilities.c | 711 +
libcdi/src/gribapi_utilities.h | 37 +
libcdi/src/grid.c | 76 +-
libcdi/src/grid.h | 9 +-
libcdi/src/input_file.c | 141 +
libcdi/src/input_file.h | 27 +
libcdi/src/institution.c | 8 +-
libcdi/src/iterator.c | 965 +
libcdi/src/iterator.h | 48 +
libcdi/src/iterator_fallback.c | 285 +
libcdi/src/iterator_fallback.h | 41 +
libcdi/src/iterator_grib.c | 815 +
libcdi/src/iterator_grib.h | 48 +
libcdi/src/mo_cdi.f90 | 11646 +-
libcdi/src/model.c | 5 -
libcdi/src/namespace.c | 25 +-
libcdi/src/pio_interface.c | 44 +-
libcdi/src/pio_server.c | 26 +-
libcdi/src/pio_util.c | 2 +-
libcdi/src/proprietarySystemWorkarounds.c | 45 +
libcdi/src/proprietarySystemWorkarounds.h | 8 +
libcdi/src/referenceCounting.c | 28 +
libcdi/src/referenceCounting.h | 38 +
libcdi/src/resource_handle.c | 25 +-
libcdi/src/resource_handle.h | 4 +-
libcdi/src/serialize.h | 4 +
libcdi/src/servicelib.c | 3 +
libcdi/src/stream.c | 16 +-
libcdi/src/stream_cdf.c | 312 +-
libcdi/src/stream_cgribex.c | 34 +-
libcdi/src/stream_fcommon.h | 2 +
libcdi/src/stream_gribapi.c | 1393 +-
libcdi/src/stream_gribapi.h | 4 +
libcdi/src/stream_record.c | 64 +-
libcdi/src/stream_srv.c | 39 +-
libcdi/src/table.c | 108 +-
libcdi/src/taxis.c | 20 +-
libcdi/src/util.c | 136 +
libcdi/src/varscan.c | 228 +-
libcdi/src/vlist.c | 424 +-
libcdi/src/vlist.h | 7 +-
libcdi/src/vlist_var.c | 59 +-
libcdi/src/zaxis.c | 55 +-
libcdi/src/zaxis.h | 10 +
libcdi/tests/Makefile.am | 23 +-
libcdi/tests/Makefile.in | 81 +-
libcdi/tests/create_uuid.c | 91 -
libcdi/util/sunf95preproc-wrapper | 6 +-
m4/._ax_pthread.m4 | Bin 0 -> 197 bytes
m4/acx_options.m4 | 23 +-
src/Adisit.c | 17 +-
src/Afterburner.c | 2414 +
src/Arith.c | 2 +-
src/Arithc.c | 4 +-
src/Arithdays.c | 2 +-
src/Arithlat.c | 15 +-
src/CDIread.c | 5 +-
src/CDItest.c | 4 +-
src/CDIwrite.c | 11 +-
src/Cat.c | 9 +-
src/Change.c | 18 +-
src/Change_e5slm.c | 2 +-
src/Cloudlayer.c | 35 +-
src/Collgrid.c | 2 +-
src/Command.c | 2 +-
src/Comp.c | 2 +-
src/Compc.c | 4 +-
src/Complextorect.c | 2 +-
src/Cond.c | 2 +-
src/Cond2.c | 2 +-
src/Condc.c | 4 +-
src/Consecstat.c | 4 +-
src/Copy.c | 2 +-
src/Deltime.c | 2 +-
src/Derivepar.c | 199 +-
src/Detrend.c | 36 +-
src/Diff.c | 4 +-
src/Distgrid.c | 12 +-
src/Duplicate.c | 4 +-
src/EOFs.c | 963 +-
src/EcaIndices.c | 42 +-
src/Echam5ini.c | 2 +-
src/Enlarge.c | 2 +-
src/Enlargegrid.c | 2 +-
src/Ensstat.c | 123 +-
src/Ensstat3.c | 4 +-
src/Ensval.c | 4 +-
src/Eof3d.c | 404 +-
src/Eofcoeff.c | 2 +-
src/Eofcoeff3d.c | 2 +-
src/Exprf.c | 54 +-
src/FC.c | 2 +-
src/Filedes.c | 6 +-
src/Fillmiss.c | 2 +-
src/Filter.c | 88 +-
src/Fldrms.c | 2 +-
src/Fldstat.c | 93 +-
src/Fldstat2.c | 2 +-
src/Fourier.c | 4 +-
src/Gengrid.c | 2 +-
src/Gradsdes.c | 137 +-
src/Gridboxstat.c | 357 +-
src/Gridcell.c | 24 +-
src/Gridsearch.c | 2 +-
src/Harmonic.c | 6 +-
src/Hi.c | 0
src/Histogram.c | 2 +-
src/Importamsr.c | 5 +-
src/Importbinary.c | 10 +-
src/Importcmsaf.c | 2 +-
src/Importobs.c | 5 +-
src/Info.c | 39 +-
src/Input.c | 6 +-
src/Intgrid.c | 10 +-
src/Intgridtraj.c | 2 +-
src/Intlevel.c | 48 +-
src/Intlevel3d.c | 209 +-
src/Intntime.c | 4 +-
src/Inttime.c | 2 +-
src/Intyear.c | 2 +-
src/Invert.c | 55 +-
src/Invertlev.c | 53 +-
src/Isosurface.c | 4 +-
src/Kvl.c | 2 +-
src/Log.c | 17 +-
src/Makefile.am | 294 +-
src/Makefile.in | 2299 +-
src/Maskbox.c | 2 +-
src/Mastrfu.c | 63 +-
src/Math.c | 4 +-
src/Merge.c | 53 +-
src/Mergegrid.c | 5 +-
src/Mergetime.c | 2 +-
src/Merstat.c | 4 +-
src/Monarith.c | 2 +-
src/Mrotuv.c | 2 +-
src/Mrotuvb.c | 2 +-
src/Ninfo.c | 2 +-
src/Nmltest.c | 2 +-
src/Output.c | 10 +-
src/Outputgmt.c | 4 +-
src/Pack.c | 33 +-
src/Pinfo.c | 4 +-
src/Pressure.c | 69 +-
src/Regres.c | 2 +-
src/Remap.c | 85 +-
src/Remapeta.c | 143 +-
src/Replace.c | 2 +-
src/Replacevalues.c | 28 +-
src/Rhopot.c | 24 +-
src/Rotuv.c | 4 +-
src/Runpctl.c | 71 +-
src/Runstat.c | 209 +-
src/SSOpar.c | 76 +-
src/Seaspctl.c | 76 +-
src/Seasstat.c | 74 +-
src/Selbox.c | 26 +-
src/Select.c | 179 +-
src/Seloperator.c | 8 +-
src/Selrec.c | 2 +-
src/Seltime.c | 156 +-
src/Selvar.c | 218 +-
src/Set.c | 8 +-
src/Setbox.c | 4 +-
src/Setgatt.c | 2 +-
src/Setgrid.c | 18 +-
src/Sethalo.c | 6 +-
src/Setmiss.c | 67 +-
src/Setpartab.c | 201 +-
src/Setrcaname.c | 2 +-
src/Settime.c | 77 +-
src/Setzaxis.c | 108 +-
src/Showinfo.c | 9 +-
src/Sinfo.c | 15 +-
src/Smooth9.c | 5 +-
src/Sort.c | 4 +-
src/Sorttimestamp.c | 2 +-
src/Specinfo.c | 4 +-
src/Spectral.c | 4 +-
src/Spectrum.c | 10 +-
src/Split.c | 96 +-
src/Splitrec.c | 2 +-
src/Splitsel.c | 14 +-
src/Splittime.c | 51 +-
src/Splityear.c | 105 +-
src/Subtrend.c | 2 +-
src/Tee.c | 2 +-
src/Templates.c | 2 +-
src/Test.c | 2 +-
src/Tests.c | 12 +-
src/Timpctl.c | 80 +-
src/Timselpctl.c | 125 +-
src/Timselstat.c | 98 +-
src/Timsort.c | 2 +-
src/Timstat.c | 142 +-
src/Timstat2.c | 58 +-
src/Timstat3.c | 44 +-
src/Tinfo.c | 2 +-
src/Tocomplex.c | 2 +-
src/Transpose.c | 2 +-
src/Trend.c | 2 +-
src/Trms.c | 2 +-
src/Tstepcount.c | 4 +-
src/Vardup.c | 4 +-
src/Vargen.c | 19 +-
src/Varrms.c | 2 +-
src/Vertintap.c | 464 +
src/{Vertint.c => Vertintml.c} | 191 +-
src/Vertstat.c | 281 +-
src/Vertwind.c | 35 +-
src/Wct.c | 0
src/Wind.c | 2 +-
src/Writegrid.c | 2 +-
src/Writerandom.c | 2 +-
src/YAR.c | 43 +-
src/Ydayarith.c | 2 +-
src/Ydaypctl.c | 2 +-
src/Ydaystat.c | 2 +-
src/Ydrunpctl.c | 86 +-
src/Ydrunstat.c | 57 +-
src/Yearmonstat.c | 78 +-
src/Yhourarith.c | 2 +-
src/Yhourstat.c | 2 +-
src/Ymonarith.c | 112 +-
src/Ymonpctl.c | 2 +-
src/Ymonstat.c | 2 +-
src/Yseaspctl.c | 2 +-
src/Yseasstat.c | 2 +-
src/Zonstat.c | 8 +-
src/after_dvtrans.c | 256 +
src/{fouriertrans.c => after_fctrans.c} | 188 +-
src/after_namelist.c | 141 +
src/{legendre.c => after_sptrans.c} | 230 +-
src/after_vertint.c | 665 +
src/{vinterp.h => after_vertint.h} | 10 +-
src/afterburner.h | 260 +
src/afterburnerlib.c | 2946 +
src/cdo.c | 1328 +-
src/cdo.h | 62 +-
src/cdo_getopt.c | 10 +-
src/cdo_getopt.h | 2 +-
src/{history.c => cdo_history.c} | 7 +-
src/cdo_int.h | 81 +-
src/cdo_pthread.c | 2 +-
src/cdo_vlist.c | 36 +-
src/clipping/area.c | 158 +-
src/clipping/area.h | 44 +-
src/clipping/clipping.c | 138 +-
src/clipping/clipping.h | 40 +-
src/clipping/dep_list.h | 54 +-
src/clipping/ensure_array_size.c | 4 +-
src/clipping/ensure_array_size.h | 8 +-
src/clipping/geometry.h | 156 +-
src/clipping/geometry_tools.c | 39 -
src/clipping/grid.h | 156 +-
src/clipping/grid_cell.c | 113 +-
src/clipping/grid_cell.h | 22 +-
src/clipping/intersection.c | 135 +-
src/clipping/points.h | 24 +-
src/clipping/utils.c | 12 +-
src/clipping/utils.h | 20 +-
src/commandline.c | 2 +-
src/compare.h | 53 +
src/config.h.in | 32 +
src/constants.c | 5 +
src/constants.h | 39 +
src/datetime.c | 258 +
src/datetime.h | 63 +
src/ecacore.c | 3 +-
src/ecautil.c | 0
src/expr.c | 637 +-
src/expr_lex.c | 223 +-
src/expr_yacc.c | 369 +-
src/expr_yacc.h | 14 +-
src/features.c | 11 +
src/field.c | 2 +-
src/field.h | 2 +-
src/field2.c | 2 +-
src/fieldc.c | 2 +-
src/fieldmer.c | 2 +-
src/fieldzon.c | 2 +-
src/gradsdeslib.c | 1480 +-
src/gradsdeslib.h | 18 +-
src/grid.c | 10 +-
src/grid_area.c | 33 +-
src/griddes.c | 176 +-
src/gridreference.c | 3 +-
src/institution.c | 4 +-
src/interpol.c | 4 +-
src/kvlist.c | 2 +-
src/kvlist.h | 2 +-
src/list.c | 12 +-
src/list.h | 2 +-
src/modules.c | 29 +-
src/modules.h | 2 +-
src/namelist.c | 2 +-
src/namelist.h | 2 +-
src/operator_help.h | 589 +-
src/pipe.c | 2 +-
src/pipe.h | 2 +-
src/printinfo.h | 30 +-
src/process.c | 380 +-
src/process.h | 2 +-
src/pstream.c | 23 +-
src/pstream.h | 18 +-
src/pstream_int.h | 2 +-
src/pstream_write.h | 45 +
src/readline.c | 2 +-
src/remap.h | 8 +-
src/remap_bicubic_scrip.c | 230 +-
src/remap_bilinear_scrip.c | 168 +-
src/remap_conserv.c | 255 +-
src/remap_conserv_scrip.c | 218 +-
src/remap_distwgt_scrip.c | 163 +-
src/remap_scrip_io.c | 34 +-
src/remap_search_latbins.c | 38 +-
src/remap_store_link.c | 425 +-
src/remap_store_link.h | 53 +-
...remap_store_link.c => remap_store_link_cnsrv.c} | 24 +-
...remap_store_link.h => remap_store_link_cnsrv.h} | 6 +-
src/remaplib.c | 70 +-
src/specspace.c | 549 +-
src/specspace.h | 16 +-
src/statistic.c | 162 +-
src/statistic.h | 5 +-
src/stdnametable.c | 2 +
src/stdnametable.h | 4 +-
src/table.c | 2 +-
src/timer.c | 2 +-
src/util.c | 364 +-
src/util.h | 94 +-
src/vct_l191.h | 388 +
src/vinterp.c | 427 -
src/zaxis.c | 66 +-
test/Afterburner.test.in | 142 +
test/Arith.test.in | 2 +-
test/File.test.in | 2 +-
test/Genweights.test.in | 16 +-
test/Gradsdes.test.in | 52 +
test/Makefile.am | 24 +-
test/Makefile.in | 38 +-
test/Remap.test.in | 16 +-
test/Select.test.in | 2 +-
test/Spectral.test.in | 4 +
test/data/._netcdf_testfile01.nc | Bin 0 -> 197 bytes
test/data/Makefile.am | 7 +-
test/data/Makefile.in | 8 +-
test/data/grib_testfile01.grb | Bin 63264 -> 63264 bytes
test/data/grib_testfile01_info_ref | 24 +-
test/data/grib_testfile01_sinfo_ref | 7 +-
test/data/n16_dis_ref | Bin 0 -> 8240 bytes
test/data/n32_dis_ref | Bin 0 -> 32816 bytes
test/data/pl_data.ctl | 16 +
test/data/pl_data.gmp | Bin 0 -> 793 bytes
test/wildcard.test.in | 69 +
430 files changed, 100033 insertions(+), 79505 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/cdo.git