[cdo] 12/16: Merge upstream 1.7.2

Alastair McKinstry mckinstry at moszumanska.debian.org
Thu Aug 11 11:15:25 UTC 2016


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

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

commit f6b9506c8968651fc0229680da1e227052ff3ccf
Merge: d2a82e6 03c5fa6
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Sun Jul 3 12:24:30 2016 +0100

    Merge upstream 1.7.2

 ChangeLog                              |  108 ++
 Makefile.in                            |    2 -
 NEWS                                   |   22 +
 OPERATORS                              |   15 +-
 cdo.settings.in                        |    8 +-
 cdo.spec                               |    2 +-
 config/default                         |  140 +-
 configure                              |  818 ++++------
 configure.ac                           |    7 +-
 contrib/Makefile.am                    |   20 +-
 contrib/Makefile.in                    |   22 +-
 contrib/cdoCompletion.bash             |  783 +++++++++-
 contrib/cdoCompletion.tcsh             |  783 +++++++++-
 contrib/cdoCompletion.zsh              |  783 +++++++++-
 contrib/makecompl.rb                   |   15 +-
 libcdi/ChangeLog                       |   40 +
 libcdi/Makefile.am                     |    6 +
 libcdi/Makefile.in                     |   12 +-
 libcdi/app/Makefile.am                 |    5 +
 libcdi/app/Makefile.in                 |   15 +-
 libcdi/app/cdi.c                       |   15 +-
 libcdi/app/printinfo.h                 |  168 ++-
 libcdi/cdi.settings.in                 |    8 -
 libcdi/config/config.guess             |  325 ++--
 libcdi/config/config.sub               |   79 +-
 libcdi/config/default                  |   53 +-
 libcdi/configure                       |  771 +++-------
 libcdi/configure.ac                    |    2 +-
 libcdi/examples/Makefile.am            |    6 +-
 libcdi/examples/Makefile.in            |   17 +-
 libcdi/examples/pio/Makefile.am        |    5 +
 libcdi/examples/pio/Makefile.in        |   17 +-
 libcdi/interfaces/Makefile.am          |    6 +-
 libcdi/interfaces/Makefile.in          |   12 +-
 libcdi/m4/acx_options.m4               |  133 +-
 libcdi/src/Makefile.am                 |    2 +
 libcdi/src/Makefile.in                 |   10 +-
 libcdi/src/binary.h                    |    2 -
 libcdi/src/calendar.c                  |   91 +-
 libcdi/src/cdf.c                       |   30 +-
 libcdi/src/cdf_read.c                  |   50 +-
 libcdi/src/cdi.h                       |   32 +
 libcdi/src/cdi.inc                     |   66 +-
 libcdi/src/cdiFortran.c                |   10 +
 libcdi/src/cdi_int.c                   |    2 +-
 libcdi/src/cdilib.c                    | 2573 ++++++++++++++++++--------------
 libcdi/src/cdipio.inc                  |    4 +-
 libcdi/src/cgribexlib.c                |  271 ++--
 libcdi/src/config.h.in                 |   27 +-
 libcdi/src/dtypes.h                    |    6 +-
 libcdi/src/grb_write.c                 |    3 +-
 libcdi/src/gribapi_utilities.c         |   38 +-
 libcdi/src/grid.c                      |  624 ++++----
 libcdi/src/grid.h                      |   14 +-
 libcdi/src/mo_cdi.f90                  |  152 ++
 libcdi/src/pio_client.c                |    2 +-
 libcdi/src/pio_comm.c                  |   21 +-
 libcdi/src/pio_comm.h                  |    2 +-
 libcdi/src/pio_interface.c             |    9 +-
 libcdi/src/pio_mpi_fw_at_reblock.c     |   10 +-
 libcdi/src/pio_posixnonb.c             |   64 +-
 libcdi/src/pio_rpc.c                   |    6 +-
 libcdi/src/pio_rpc.h                   |   28 +-
 libcdi/src/pio_server.c                |   60 +-
 libcdi/src/pio_util.c                  |    4 +-
 libcdi/src/pio_util.h                  |    4 +
 libcdi/src/pkgconfig/cdi.pc.in         |    7 +-
 libcdi/src/pkgconfig/cdipio.pc.in      |    7 +-
 libcdi/src/stream.c                    |   97 +-
 libcdi/src/stream_cdf.c                | 1638 ++++++++++----------
 libcdi/src/stream_cgribex.c            |  326 ++--
 libcdi/src/stream_grb.c                |   40 +-
 libcdi/src/stream_gribapi.c            |  510 ++++---
 libcdi/src/subtype.h                   |    6 +-
 libcdi/src/timebase.c                  |   70 +-
 libcdi/src/util.c                      |    8 +
 libcdi/src/vlist_var.c                 |   27 +-
 libcdi/src/zaxis.c                     |  138 +-
 libcdi/src/zaxis.h                     |    2 +
 libcdi/tests/Makefile.am               |    5 +
 libcdi/tests/Makefile.in               |   31 +-
 m4/acx_options.m4                      |  141 +-
 src/Afterburner.c                      |  166 ++-
 src/Arith.c                            |    2 +
 src/Arithdays.c                        |    4 +-
 src/CDItest.c                          |   49 +-
 src/CMOR.c                             |  479 +++---
 src/Cat.c                              |    3 +-
 src/Collgrid.c                         |   50 +-
 src/Copy.c                             |    5 +-
 src/Deltime.c                          |   37 +-
 src/Derivepar.c                        |  132 +-
 src/Diff.c                             |   54 +-
 src/Distgrid.c                         |   56 +-
 src/Duplicate.c                        |   44 +-
 src/EOFs.c                             |    4 +-
 src/EcaIndices.c                       |  145 +-
 src/Enlarge.c                          |   43 +-
 src/Enlargegrid.c                      |   43 +-
 src/Ensstat.c                          |    6 +-
 src/Ensstat3.c                         |   12 +-
 src/Ensval.c                           |   10 +-
 src/Exprf.c                            |    8 +-
 src/FC.c                               |   45 +-
 src/Filedes.c                          |   27 +-
 src/Fillmiss.c                         |    5 +-
 src/Filter.c                           |   27 +-
 src/Gradsdes.c                         |    5 +-
 src/Harmonic.c                         |    2 +-
 src/Importcmsaf.c                      |    2 +-
 src/Info.c                             |   10 +-
 src/Input.c                            |   73 +-
 src/Intgrid.c                          |   55 +-
 src/Intlevel.c                         |   81 +-
 src/Intlevel3d.c                       |  116 +-
 src/Invertlev.c                        |    9 +-
 src/Isosurface.c                       |    2 +-
 src/Kvl.c                              |    6 +-
 src/Maggraph.c                         |    2 +-
 src/Magplot.c                          |   26 +-
 src/Magvector.c                        |   17 +-
 src/Makefile.am                        |   12 +-
 src/Makefile.in                        |  179 +--
 src/MapReduce.c                        |  220 +++
 src/Math.c                             |   46 +-
 src/Merge.c                            |    9 +-
 src/Mergetime.c                        |   13 +-
 src/Monarith.c                         |    2 +-
 src/Mrotuvb.c                          |  111 +-
 src/Ninfo.c                            |   35 +-
 src/Output.c                           |   39 +-
 src/Outputgmt.c                        |    2 +-
 src/Pressure.c                         |  139 +-
 src/Remap.c                            |  120 +-
 src/Remapeta.c                         |  215 ++-
 src/SSOpar.c                           |  993 ------------
 src/Select.c                           |  911 +++--------
 src/Seloperator.c                      |   31 +-
 src/Seltime.c                          |  100 +-
 src/Selvar.c                           |   91 +-
 src/Setgrid.c                          |   83 +-
 src/Setpartab.c                        |   80 +-
 src/Setrcaname.c                       |   28 +-
 src/Settime.c                          |   63 +-
 src/Sinfo.c                            |    6 +-
 src/Smooth.c                           |  516 +++++++
 src/Smooth9.c                          |  311 ----
 src/Spectral.c                         |   52 +-
 src/Split.c                            |    5 +-
 src/Splitrec.c                         |   26 +-
 src/Splitsel.c                         |   26 +-
 src/Splittime.c                        |    3 +-
 src/Splityear.c                        |    9 +-
 src/Tee.c                              |   36 +-
 src/Templates.c                        |   11 +-
 src/Timedt.c                           |    4 +-
 src/Timstat.c                          |    2 +-
 src/Vargen.c                           |   89 +-
 src/Verifygrid.c                       | 1478 +++++++-----------
 src/Vertintap.c                        |  247 ++-
 src/Vertintml.c                        |  162 +-
 src/Wind.c                             |   49 +-
 src/XTimstat.c                         |    2 +-
 src/YAR.c                              |   46 +-
 src/Ydrunpctl.c                        |    4 +-
 src/Ydrunstat.c                        |    2 +-
 src/after_vertint.c                    |  179 +--
 src/after_vertint.h                    |    6 +-
 src/afterburnerlib.c                   |  230 +--
 src/cdo.c                              |   54 +-
 src/cdo_history.c                      |    4 +-
 src/cdo_int.h                          |   23 +-
 src/cdo_vlist.c                        |  207 ++-
 src/clipping/geometry.h                |    8 +
 src/clipping/intersection.c            |   24 +-
 src/commandline.c                      |   68 +-
 src/config.h.in                        |   18 +-
 src/datetime.c                         |  124 +-
 src/datetime.h                         |   22 +-
 src/exception.c                        |   64 +-
 src/expr.c                             |  103 +-
 src/features.c                         |   19 +-
 src/field.h                            |    4 +-
 src/fieldc.c                           |    2 +-
 src/gradsdeslib.c                      |   63 +-
 src/grid.c                             |  140 +-
 src/grid.h                             |    8 +-
 src/grid_gme.c                         |  111 +-
 src/grid_search.c                      |  214 ++-
 src/grid_search.h                      |   20 +-
 src/griddes.c                          |  164 +-
 src/interpol.c                         |  169 ++-
 src/job.c                              |   31 +-
 src/juldate.c                          |   16 +-
 src/kdtreelib/kdtree_cartesian.c       |  115 +-
 src/merge_sort2.c                      |   10 +-
 src/modules.c                          |   30 +-
 src/namelist.c                         |    4 +
 src/operator_help.h                    |  257 +++-
 src/percentiles.c                      |    2 +-
 src/pmlist.c                           |  366 +++++
 src/pmlist.h                           |   88 ++
 src/printinfo.h                        |  161 +-
 src/process.c                          |    2 +-
 src/pstream.c                          |  666 +++++----
 src/pthread_debug.c                    |   11 +-
 src/readline.c                         |    9 +-
 src/remap.h                            |   17 +-
 src/remap_conserv.c                    |   22 +-
 src/remap_conserv_scrip.c              |    8 +-
 src/remap_distwgt.c                    |   83 +-
 src/remap_scrip_io.c                   |    8 +-
 src/remaplib.c                         |   41 +-
 src/remapsort.c                        |    8 +-
 src/userlog.c                          |   43 +-
 src/uthash.h                           |  966 ++++++++++++
 src/util.c                             |  123 +-
 src/util.h                             |    6 +
 src/zaxis.c                            |   21 +-
 test/Afterburner.test.in               |    4 +-
 test/Arith.test.in                     |   84 +-
 test/{Arith.test.in => Arithc.test.in} |    4 +-
 test/Cat.test.in                       |    4 +-
 test/Collgrid.test.in                  |    4 +-
 test/Copy_netcdf.test.in               |    4 +-
 test/Detrend.test.in                   |    4 +-
 test/Enspctl.test.in                   |   12 +-
 test/Ensstat.test.in                   |   12 +-
 test/Expr.test.in                      |    4 +-
 test/File.test.in                      |   66 +-
 test/Fldpctl.test.in                   |    4 +-
 test/Fldstat.test.in                   |    4 +-
 test/Genweights.test.in                |   46 +-
 test/Gradsdes.test.in                  |    4 +-
 test/Gridarea.test.in                  |   22 +-
 test/Makefile.am                       |    8 +-
 test/Makefile.in                       |   32 +-
 test/MapReduce.test.in                 |   50 +
 test/Ninfo.test.in                     |   61 +
 test/Read_grib.test.in                 |    8 +-
 test/Read_netcdf.test.in               |    4 +-
 test/Remap.test.in                     |   38 +-
 test/Select.test.in                    |    4 +-
 test/Spectral.test.in                  |    4 +-
 test/Timstat.test.in                   |    4 +-
 test/Vertint.test.in                   |    4 +-
 test/Ymonstat.test.in                  |    4 +-
 test/data/Makefile.am                  |   12 +-
 test/data/Makefile.in                  |   14 +-
 test/data/arith1.srv                   |  Bin 0 -> 5184 bytes
 test/data/arithadd_ref                 |  Bin 0 -> 5184 bytes
 test/data/arithdiv_ref                 |  Bin 0 -> 5184 bytes
 test/data/arithmask.srv                |  Bin 0 -> 864 bytes
 test/data/arithmul_ref                 |  Bin 0 -> 5184 bytes
 test/data/arithsub_ref                 |  Bin 0 -> 5184 bytes
 test/data/expr1.srv                    |  Bin 0 -> 6048 bytes
 test/data/grib_testfile03.grb          |  Bin 0 -> 71864 bytes
 test/data/grib_testfile03_info_ref     |    2 +
 test/data/grib_testfile03_sinfo_ref    |   12 +
 test/data/griddes.icon_cell            |  174 +++
 test/data/griddes.r18x9                |  199 +++
 test/data/icon_cell_grid               |  Bin 0 -> 7636 bytes
 test/data/r18x9_grid                   |  Bin 0 -> 408 bytes
 test/data/tsformat1_ref                |  Bin 0 -> 312 bytes
 test/threads.test.in                   |   10 +-
 test/tsformat.test.in                  |   94 ++
 test/wildcard.test.in                  |    4 +-
 267 files changed, 15257 insertions(+), 11892 deletions(-)

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



More information about the debian-science-commits mailing list