[cdo] 02/14: Merge tag 'upstream/1.9.2rc2' into debian/master

Alastair McKinstry mckinstry at moszumanska.debian.org
Tue Dec 12 12:46:27 UTC 2017


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

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

commit 6575b4fdd0f282f54a27d5274bb75287b43ef715
Merge: 286a4de fceba17
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Mon Nov 20 16:12:17 2017 +0000

    Merge tag 'upstream/1.9.2rc2' into debian/master

 ChangeLog                          |    4 +
 Makefile.am                        |   11 -
 Makefile.in                        |   80 +-
 aclocal.m4                         |  111 +-
 cdo.spec                           |    2 +-
 config/default                     |    2 +-
 configure                          |  373 ++++---
 configure.ac                       |    2 +-
 contrib/Makefile.in                |   24 +-
 contrib/cdoCompletion.bash         |    1 +
 contrib/cdoCompletion.tcsh         |    1 +
 contrib/cdoCompletion.zsh          |    1 +
 doc/cdo_cmor.pdf                   |  Bin 261888 -> 0 bytes
 libcdi/ChangeLog                   |   14 +-
 libcdi/Makefile.in                 |   72 +-
 libcdi/aclocal.m4                  |   71 +-
 libcdi/app/Makefile.in             |   25 +-
 libcdi/app/cdi.c                   |    5 -
 libcdi/cdi.settings.in             |   18 +-
 libcdi/configure                   |  373 ++++---
 libcdi/examples/Makefile.in        |   25 +-
 libcdi/examples/pio/Makefile.in    |   25 +-
 libcdi/interfaces/Makefile.in      |   25 +-
 libcdi/src/Makefile.in             |   27 +-
 libcdi/src/cdf_util.c              |    6 +-
 libcdi/src/cdf_write.c             |   10 +-
 libcdi/src/cdi.h                   |    7 +-
 libcdi/src/cdi.inc                 |    2 +-
 libcdi/src/cdilib.c                | 1747 ++++++++++++++-----------------
 libcdi/src/config.h.in             |    5 -
 libcdi/src/grb_write.c             |    6 +-
 libcdi/src/grid.c                  |   61 +-
 libcdi/src/mo_cdi.f90              |   54 +-
 libcdi/src/stream_cgribex.c        |    2 +-
 libcdi/src/stream_gribapi.c        |  176 ++--
 libcdi/tests/Makefile.in           |   54 +-
 src/._getMemorySize.c              |  Bin 0 -> 561 bytes
 src/Afterburner.cc                 |    2 +-
 src/CMOR.cc                        |  451 +++++---
 src/Enlarge.cc                     |    4 +-
 src/Enlargegrid.cc                 |    5 +-
 src/Intgrid.cc                     |    5 +-
 src/Makefile.am                    |    1 +
 src/Makefile.in                    |   38 +-
 src/MapReduce.cc                   |   14 +-
 src/Remap.cc                       |   50 +-
 src/Rotuv.cc                       |   25 +-
 src/Samplegrid.cc                  |   23 +-
 src/Selmulti.cc                    |  171 +--
 src/Setgrid.cc                     |    5 +-
 src/Sinfo.cc                       |    5 +-
 src/WindTrans.cc                   |  127 +--
 src/YAR.cc                         |    5 +-
 src/argument.cc                    |   31 +-
 src/cdo.cc                         |   54 +-
 src/cdoDebugOutput.cc              |   82 +-
 src/cdoDebugOutput.h               |  112 +-
 src/config.h.in                    |    5 -
 src/grid_define.cc                 |   27 +-
 src/grid_read.cc                   |    4 +-
 src/grid_rot.cc                    |   63 +-
 src/grid_search.cc                 |  317 +++++-
 src/grid_search.h                  |   47 +-
 src/griddes.cc                     |   13 +-
 src/kdtreelib/kdtree.h             |   56 +-
 src/kdtreelib/kdtree_cartesian.cc  |   16 +-
 src/kdtreelib/kdtree_common.cc     |  168 ++-
 src/kdtreelib/kdtree_spherical.cc  |  118 +--
 src/lib/ncl/Makefile.in            |   24 +-
 src/nanoflann.hpp                  | 1998 ++++++++++++++++++++++++++++++++++++
 src/pipe.cc                        |   63 +-
 src/pipe.h                         |    3 -
 src/printinfo.h                    |   53 +-
 src/process.cc                     |   33 +-
 src/pstream.cc                     |    8 +-
 src/pthread_debug.cc               |   41 +-
 src/remap.h                        |    2 +-
 src/remap_bilinear_scrip.cc        |   20 +-
 src/remaplib.cc                    |  111 +-
 src/text.h                         |   25 +-
 src/util.cc                        |    1 -
 src/util.h                         |    2 -
 src/zaxis.cc                       |    9 +-
 test/Afterburner.test.in           |   18 +-
 test/Arith.test.in                 |   10 +-
 test/Arithc.test.in                |    2 +-
 test/Cat.test.in                   |    6 +-
 test/Collgrid.test.in              |   11 +-
 test/Comp.test.in                  |   13 +-
 test/Compc.test.in                 |    8 +-
 test/Copy_netcdf.test.in           |    8 +-
 test/Detrend.test.in               |   16 +-
 test/EOF.test.in                   |   17 +-
 test/Enspctl.test.in               |   11 +-
 test/Ensstat.test.in               |   11 +-
 test/Expr.test.in                  |    9 +-
 test/File.test.in                  |   12 +-
 test/Fldpctl.test.in               |    8 +-
 test/Fldstat.test.in               |    8 +-
 test/Genweights.test.in            |    9 +-
 test/Gradsdes.test.in              |    4 +-
 test/Gridarea.test.in              |    6 +-
 test/Gridboxstat.test.in           |    7 +-
 test/Makefile.am                   |    5 +-
 test/Makefile.in                   |   74 +-
 test/MapReduce.test.in             |   12 +-
 test/Mergetime.test.in             |    8 +-
 test/Merstat.test.in               |    6 +-
 test/Multiyearstat.test.in         |    8 +-
 test/Ninfo.test.in                 |   21 +-
 test/Read_grib.test.in             |    4 +-
 test/Read_netcdf.test.in           |    4 +-
 test/Remap.test.in                 |   13 +-
 test/Remap2.test.in                |   10 +-
 test/Remapeta.test.in              |    6 +-
 test/Runstat.test.in               |    6 +-
 test/Seasstat.test.in              |    6 +-
 test/Select.test.in                |    6 +-
 test/Spectral.test.in              |   22 +-
 test/Timselstat.test.in            |    6 +-
 test/Timstat.test.in               |    9 +-
 test/Vertint.test.in               |    6 +-
 test/Vertstat.test.in              |    6 +-
 test/Ydrunstat.test.in             |    6 +-
 test/Zonstat.test.in               |    6 +-
 test/data/Makefile.am              |   17 +-
 test/data/Makefile.in              |   43 +-
 test/data/n16_con2_ref             |  Bin 0 -> 8240 bytes
 test/data/n32_con2_ref             |  Bin 0 -> 32816 bytes
 test/data/tsurf_spain_con2_def_ref |  Bin 0 -> 1488 bytes
 test/data/tsurf_spain_con2_off_ref |  Bin 0 -> 1488 bytes
 test/data/tsurf_spain_con2_on_ref  |  Bin 0 -> 1488 bytes
 test/threads.test.in               |    8 +-
 test/tsformat.test.in              |   13 +-
 test/wildcard.test.in              |    8 +-
 135 files changed, 5349 insertions(+), 3043 deletions(-)

diff --cc doc/cdo_cmor.pdf
index 5a1fdf0,4aa114f..0000000
deleted file mode 100644,100644
Binary files differ

-- 
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