[cdo] 47/84: Merge tag 'dfsg_1.6.3'

Alastair McKinstry mckinstry at moszumanska.debian.org
Sat Jun 13 16:48:34 UTC 2015


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

mckinstry pushed a commit to branch master
in repository cdo.

commit 23458d5a142a6ad1c9235f4e9b7f88fccd4f0a3d
Merge: ba381f2 7a0b5d5
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Mon Feb 24 19:07:54 2014 +0000

    Merge tag 'dfsg_1.6.3'

 ChangeLog                                          |   71 +
 NEWS                                               |   15 +
 OPERATORS                                          |    3 +-
 cdo.spec                                           |    2 +-
 config/default                                     |   19 +-
 configure                                          |   21 +-
 configure.ac                                       |    3 +-
 contrib/cdoCompletion.bash                         |    5 +-
 contrib/cdoCompletion.tcsh                         |    5 +-
 contrib/cdoCompletion.zsh                          |    5 +-
 libcdi/ChangeLog                                   |   36 +-
 libcdi/Makefile.in                                 |   15 +-
 libcdi/NEWS                                        |    9 +
 libcdi/aclocal.m4                                  |  194 +-
 libcdi/app/Makefile.in                             |    9 +-
 libcdi/cdi.settings.in                             |    2 +-
 libcdi/configure                                   |  456 +-
 libcdi/configure.ac                                |   73 +-
 libcdi/examples/Makefile.am                        |    7 -
 libcdi/examples/Makefile.in                        |   11 +-
 libcdi/examples/pio/Makefile.am                    |   13 +-
 libcdi/examples/pio/Makefile.in                    |   44 +-
 libcdi/examples/pio/collectData.c                  |   16 +-
 libcdi/examples/pio/collectData2003.F90            |   20 +-
 libcdi/examples/pio/collectDataNStreams.c          |   26 +-
 libcdi/examples/pio/compareResourcesArray.c        |   13 +-
 libcdi/interfaces/Makefile.in                      |    9 +-
 libcdi/m4/pkg.m4                                   |  159 +
 libcdi/m4/starlink_fpp.m4                          |   31 +-
 libcdi/src/Makefile.am                             |  109 +-
 libcdi/src/Makefile.in                             |  173 +-
 libcdi/src/cdi.h                                   |   80 +-
 libcdi/src/cdi.inc                                 |   80 +-
 libcdi/src/cdiFortran.c                            |   60 +-
 libcdi/src/cdiFortran.h                            |   20 -
 libcdi/src/cdi_cksum.c                             |   17 +
 libcdi/src/cdi_cksum.h                             |    8 +
 libcdi/src/cdi_int.c                               |   27 +-
 libcdi/src/cdi_int.h                               |    2 +
 libcdi/src/cdilib.c                                | 6253 +++++---------------
 libcdi/src/cdipio.h                                |   49 +
 libcdi/src/cdipio.inc                              |   71 +
 libcdi/src/cdipioFortran.c                         |   54 +
 libcdi/src/cgribex.h                               |    2 +-
 libcdi/src/cgribexlib.c                            |   20 +-
 libcdi/{tests => src}/cksum.c                      |   58 +-
 libcdi/{tests => src}/cksum.h                      |    7 +-
 libcdi/src/config.h.in                             |   22 +
 libcdi/src/dmemory.c                               |   30 +
 libcdi/src/dmemory.h                               |   11 +
 libcdi/src/error.c                                 |   16 +-
 libcdi/src/error.h                                 |    2 +
 libcdi/src/grid.c                                  |  267 +-
 libcdi/src/institution.c                           |   46 +-
 libcdi/src/mo_cdi.f90                              |   59 +-
 libcdi/src/model.c                                 |    1 -
 libcdi/src/namespace.c                             |  128 +-
 libcdi/src/namespace.h                             |    3 +
 libcdi/src/pio.c                                   |   15 +-
 libcdi/src/pio.h                                   |    3 +-
 libcdi/src/pio_cdf_int.c                           |    1 +
 libcdi/src/pio_client.c                            |  110 +-
 libcdi/src/pio_comm.c                              |   23 +-
 libcdi/src/pio_comm.h                              |    2 +-
 libcdi/src/pio_impl.h                              |    6 +-
 libcdi/src/pio_interface.c                         |  359 +-
 libcdi/src/pio_interface.h                         |   21 +-
 libcdi/src/pio_list_set.c                          |    1 +
 libcdi/src/pio_mpinonb.c                           |    6 +-
 libcdi/src/pio_posixasynch.c                       |   13 +-
 libcdi/src/pio_posixfpguardsendrecv.c              |   34 +-
 libcdi/src/pio_posixnonb.c                         |    4 +-
 libcdi/src/pio_record_send.c                       |   44 +-
 libcdi/src/pio_rpc.h                               |   48 +-
 libcdi/src/pio_serialize.c                         |   11 +-
 libcdi/src/pio_server.c                            |  454 +-
 libcdi/src/pio_server.h                            |    2 +-
 libcdi/src/pio_util.c                              |   77 +-
 libcdi/src/pio_util.h                              |   45 +-
 libcdi/src/pkgconfig/cdipio.pc.in                  |   48 +
 libcdi/src/resource_handle.c                       |   96 +-
 libcdi/src/resource_handle.h                       |    7 +
 libcdi/src/resource_unpack.c                       |    2 +-
 libcdi/src/serialize.c                             |    7 +-
 libcdi/src/serialize.h                             |    2 -
 libcdi/src/stream.c                                |   97 +-
 libcdi/src/stream_cdf.c                            |  186 +-
 libcdi/src/stream_cgribex.c                        |   38 +-
 libcdi/src/stream_grb.c                            |    4 +-
 libcdi/src/stream_gribapi.c                        |   31 +-
 libcdi/src/taxis.c                                 |   37 +-
 libcdi/src/taxis.h                                 |    2 +
 libcdi/src/varscan.c                               |  107 +-
 libcdi/src/vlist.c                                 |  187 +-
 libcdi/src/vlist.h                                 |    3 +-
 libcdi/src/vlist_att.c                             |   12 +-
 libcdi/src/vlist_var.c                             |  245 +-
 libcdi/src/vlist_var.h                             |    7 +-
 libcdi/src/zaxis.c                                 |  137 +-
 libcdi/tests/Makefile.am                           |   40 +-
 libcdi/tests/Makefile.in                           |  157 +-
 libcdi/tests/cksum_verify                          |  Bin 13808 -> 0 bytes
 libcdi/tests/deco2d_model.c                        |  496 ++
 libcdi/tests/ensure_array_size.c                   |    2 +-
 libcdi/tests/pio_cksum_asynch                      |    9 -
 libcdi/tests/pio_cksum_cdf                         |   10 -
 libcdi/tests/pio_cksum_fpguard                     |    9 -
 libcdi/tests/pio_cksum_mpinonb                     |    9 -
 libcdi/tests/pio_cksum_writer                      |    9 -
 libcdi/tests/pio_write.c                           |  417 +-
 libcdi/tests/pio_write.h                           |   18 +
 .../{pio_write_run => pio_write_deco2d_run.in}     |   10 +-
 libcdi/tests/simple_model.c                        |  333 ++
 libcdi/tests/simple_model_helper.c                 |  135 +
 libcdi/tests/simple_model_helper.h                 |   42 +
 libcdi/tests/stream_cksum.c                        |    5 +-
 libcdi/tests/test_chunk_cksum                      |   14 -
 libcdi/tests/test_cksum_extra                      |   14 -
 libcdi/tests/test_cksum_grib                       |   14 -
 libcdi/tests/test_cksum_ieg                        |   14 -
 libcdi/tests/test_cksum_nc                         |   14 -
 libcdi/tests/test_cksum_nc2                        |   14 -
 libcdi/tests/test_cksum_nc4                        |   14 -
 libcdi/tests/test_cksum_service                    |   14 -
 libcdi/tests/test_grib.sh                          |    9 -
 libcdi/tests/test_resource_copy                    |  Bin 8984 -> 0 bytes
 libcdi/tests/test_resource_copy.c                  |   67 +-
 libcdi/tests/test_resource_copy_mpi_run.in         |    5 +
 libcdi/util/xlfpreproc-wrapper                     |   39 +-
 src/Adisit.c                                       |   10 +-
 src/Arith.c                                        |   18 +-
 src/Arithc.c                                       |    6 +-
 src/Arithdays.c                                    |    4 +-
 src/Arithlat.c                                     |    6 +-
 src/CDIread.c                                      |   26 +-
 src/CDItest.c                                      |    4 +-
 src/CDIwrite.c                                     |   36 +-
 src/Cat.c                                          |    4 +-
 src/Change.c                                       |   10 +-
 src/Change_e5slm.c                                 |   10 +-
 src/Cloudlayer.c                                   |   12 +-
 src/Command.c                                      |    6 +-
 src/Comp.c                                         |   12 +-
 src/Compc.c                                        |    6 +-
 src/Complextorect.c                                |    8 +-
 src/Cond.c                                         |   16 +-
 src/Cond2.c                                        |   18 +-
 src/Condc.c                                        |    6 +-
 src/Consecstat.c                                   |    4 +-
 src/Copy.c                                         |    6 +-
 src/Deltime.c                                      |    4 +-
 src/Derivepar.c                                    |  146 +-
 src/Detrend.c                                      |   14 +-
 src/Diff.c                                         |   10 +-
 src/Duplicate.c                                    |   10 +-
 src/EOFs.c                                         |   67 +-
 src/EcaIndices.c                                   |   38 +-
 src/Echam5ini.c                                    |   56 +-
 src/Enlarge.c                                      |    6 +-
 src/Enlargegrid.c                                  |   20 +-
 src/Ensstat.c                                      |   14 +-
 src/Ensstat3.c                                     |   48 +-
 src/Ensval.c                                       |   34 +-
 src/Eof3d.c                                        |   53 +-
 src/Eofcoeff.c                                     |   25 +-
 src/Eofcoeff3d.c                                   |   33 +-
 src/Exprf.c                                        |   17 +-
 src/FC.c                                           |    8 +-
 src/Filedes.c                                      |    2 +-
 src/Fillmiss.c                                     |   14 +-
 src/Filter.c                                       |   18 +-
 src/Fldrms.c                                       |    9 +-
 src/Fldstat.c                                      |    7 +-
 src/Fldstat2.c                                     |    9 +-
 src/Fourier.c                                      |   20 +-
 src/Gather.c                                       |   50 +-
 src/Gengrid.c                                      |    8 +-
 src/Gradsdes.c                                     |  216 +-
 src/Gridboxstat.c                                  |   46 +-
 src/Gridcell.c                                     |   10 +-
 src/Harmonic.c                                     |   18 +-
 src/Hi.c                                           |    6 +-
 src/Histogram.c                                    |   18 +-
 src/Importamsr.c                                   |    8 +-
 src/Importbinary.c                                 |   25 +-
 src/Importcmsaf.c                                  |   30 +-
 src/Importobs.c                                    |    8 +-
 src/Info.c                                         |    4 +-
 src/Input.c                                        |    8 +-
 src/Intgrid.c                                      |   38 +-
 src/Intgridtraj.c                                  |   16 +-
 src/Intlevel.c                                     |   30 +-
 src/Intlevel3d.c                                   |   48 +-
 src/Intntime.c                                     |   24 +-
 src/Inttime.c                                      |   27 +-
 src/Intyear.c                                      |   10 +-
 src/Invert.c                                       |   30 +-
 src/Invertlev.c                                    |   20 +-
 src/Isosurface.c                                   |   14 +-
 src/Kvl.c                                          |    2 +-
 src/Log.c                                          |    2 +-
 src/Maggraph.c                                     |   42 +-
 src/Magplot.c                                      |    8 +-
 src/Magvector.c                                    |    8 +-
 src/Makefile.am                                    |   20 +
 src/Makefile.in                                    |  174 +-
 src/Maskbox.c                                      |   16 +-
 src/Mastrfu.c                                      |   18 +-
 src/Math.c                                         |    6 +-
 src/Merge.c                                        |   12 +-
 src/Mergegrid.c                                    |   20 +-
 src/Mergetime.c                                    |    6 +-
 src/Merstat.c                                      |    8 +-
 src/Monarith.c                                     |   14 +-
 src/Mrotuv.c                                       |   30 +-
 src/Mrotuvb.c                                      |   30 +-
 src/Ninfo.c                                        |    2 +-
 src/Nmltest.c                                      |    2 +-
 src/Output.c                                       |   10 +-
 src/Outputgmt.c                                    |   44 +-
 src/Pack.c                                         |    8 +-
 src/Pinfo.c                                        |    6 +-
 src/Pressure.c                                     |   32 +-
 src/Regres.c                                       |   10 +-
 src/Remap.c                                        |  330 +-
 src/Remapeta.c                                     |   69 +-
 src/Replace.c                                      |   20 +-
 src/Replacevalues.c                                |    4 +-
 src/Rhopot.c                                       |   10 +-
 src/Rotuv.c                                        |   18 +-
 src/Runpctl.c                                      |   10 +-
 src/Runstat.c                                      |   16 +-
 src/SSOpar.c                                       |   30 +-
 src/Scatter.c                                      |   28 +-
 src/Seascount.c                                    |    6 +-
 src/Seaspctl.c                                     |   12 +-
 src/Seasstat.c                                     |   12 +-
 src/Selbox.c                                       |   72 +-
 src/Select.c                                       |   46 +-
 src/Seloperator.c                                  |    4 +-
 src/Selrec.c                                       |    2 +-
 src/Seltime.c                                      |   14 +-
 src/Selvar.c                                       |    6 +-
 src/Set.c                                          |    6 +-
 src/Setbox.c                                       |    6 +-
 src/Setgatt.c                                      |    4 +-
 src/Setgrid.c                                      |   12 +-
 src/Sethalo.c                                      |   56 +-
 src/Setmiss.c                                      |    4 +-
 src/Setpartab.c                                    |    8 +-
 src/Setrcaname.c                                   |    4 +-
 src/Settime.c                                      |    9 +-
 src/Setzaxis.c                                     |    4 +-
 src/Showinfo.c                                     |    2 +-
 src/Sinfo.c                                        |    2 +-
 src/Smooth9.c                                      |   10 +-
 src/Sort.c                                         |   26 +-
 src/Sorttimestamp.c                                |   16 +-
 src/Specinfo.c                                     |    2 +-
 src/Spectral.c                                     |   10 +-
 src/Spectrum.c                                     |   22 +-
 src/Split.c                                        |   44 +-
 src/Splitrec.c                                     |    4 +-
 src/Splitsel.c                                     |   10 +-
 src/Splittime.c                                    |   10 +-
 src/Splityear.c                                    |    4 +-
 src/StringUtilities.c                              |    2 +-
 src/Subtrend.c                                     |    6 +-
 src/Tee.c                                          |    4 +-
 src/Templates.c                                    |    6 +-
 src/Test.c                                         |   12 +-
 src/Tests.c                                        |    6 +-
 src/Timcount.c                                     |    6 +-
 src/Timpctl.c                                      |    6 +-
 src/Timselpctl.c                                   |    6 +-
 src/Timselstat.c                                   |   12 +-
 src/Timsort.c                                      |   22 +-
 src/Timstat.c                                      |   12 +-
 src/Timstat2.c                                     |   24 +-
 src/Timstat3.c                                     |   22 +-
 src/Tocomplex.c                                    |    6 +-
 src/Transpose.c                                    |   10 +-
 src/Trend.c                                        |   10 +-
 src/Trms.c                                         |   15 +-
 src/Tstepcount.c                                   |   10 +-
 src/Vardup.c                                       |   16 +-
 src/Vargen.c                                       |    7 +-
 src/Varrms.c                                       |   13 +-
 src/Vertint.c                                      |   80 +-
 src/Vertstat.c                                     |   18 +-
 src/Vertwind.c                                     |   20 +-
 src/Wct.c                                          |    4 +-
 src/Wind.c                                         |   12 +-
 src/Writegrid.c                                    |    4 +-
 src/Writerandom.c                                  |   14 +-
 src/YAR.c                                          |   72 +-
 src/Ydayarith.c                                    |   14 +-
 src/Ydaypctl.c                                     |    6 +-
 src/Ydaystat.c                                     |   12 +-
 src/Ydrunpctl.c                                    |   10 +-
 src/Ydrunstat.c                                    |   12 +-
 src/Yearmonstat.c                                  |   12 +-
 src/Yhourarith.c                                   |   14 +-
 src/Yhourstat.c                                    |   12 +-
 src/Ymonarith.c                                    |   14 +-
 src/Ymonpctl.c                                     |    6 +-
 src/Ymonstat.c                                     |   16 +-
 src/Yseaspctl.c                                    |    6 +-
 src/Yseasstat.c                                    |   12 +-
 src/Zonstat.c                                      |    6 +-
 src/cdo.c                                          |   20 +-
 src/cdo.h                                          |   12 +-
 src/cdo_int.h                                      |    6 +-
 src/cdo_pthread.c                                  |    2 +-
 src/cdo_vlist.c                                    |   16 +-
 src/cdotest.c                                      |    6 +-
 src/clipping/area.c                                |  647 ++
 src/clipping/area.h                                |  255 +
 src/clipping/clipping.c                            | 1026 ++++
 src/clipping/clipping.h                            |  114 +
 src/clipping/dep_list.h                            |  215 +
 src/clipping/ensure_array_size.c                   |   47 +
 src/clipping/ensure_array_size.h                   |   55 +
 src/clipping/geometry.h                            |  585 ++
 src/clipping/geometry_tools.c                      |  120 +
 src/clipping/grid.h                                |  473 ++
 src/clipping/grid_cell.c                           |  148 +
 src/clipping/grid_cell.h                           |   84 +
 src/clipping/intersection.c                        | 1395 +++++
 src/clipping/points.h                              |  103 +
 src/clipping/utils.c                               |   99 +
 src/clipping/utils.h                               |  115 +
 src/color.c                                        |    6 +-
 src/commandline.c                                  |    2 +-
 src/ecacore.c                                      |  118 +-
 src/expr.c                                         |   40 +-
 src/expr.h                                         |    2 +-
 src/expr_lex.c                                     |   76 +-
 src/expr_yacc.c                                    |  902 +--
 src/expr_yacc.h                                    |   32 +-
 src/field.c                                        |    4 +-
 src/field.h                                        |    2 +-
 src/field2.c                                       |    2 +-
 src/fieldc.c                                       |    2 +-
 src/fieldmem.c                                     |    8 +-
 src/fieldmer.c                                     |    4 +-
 src/fieldzon.c                                     |    4 +-
 src/fouriertrans.c                                 |   12 +-
 src/grid.c                                         |  276 +-
 src/grid.h                                         |   13 +
 src/grid_area.c                                    |   34 +-
 src/grid_gme.c                                     |   26 +-
 src/griddes.c                                      |   56 +-
 src/griddes_h5.c                                   |   66 +-
 src/griddes_nc.c                                   |   12 +-
 src/gridreference.c                                |    7 +-
 src/hetaeta.c                                      |  222 +-
 src/history.c                                      |    6 +-
 src/institution.c                                  |    2 +-
 src/interpol.c                                     |  269 +-
 src/job.c                                          |   22 +-
 src/kvlist.c                                       |    6 +-
 src/kvlist.h                                       |    2 +-
 src/list.c                                         |    8 +-
 src/list.h                                         |    2 +-
 src/magics_template_parser.c                       |    4 +-
 src/merge_sort2.c                                  |    2 +-
 src/modules.c                                      |   11 +-
 src/modules.h                                      |    2 +-
 src/namelist.c                                     |   10 +-
 src/namelist.h                                     |    2 +-
 src/operator_help.h                                |   40 +-
 src/percentiles.c                                  |   14 +-
 src/pipe.c                                         |   22 +-
 src/pipe.h                                         |    2 +-
 src/printinfo.h                                    |    4 +-
 src/process.c                                      |   20 +-
 src/process.h                                      |    2 +-
 src/pstream.c                                      |   41 +-
 src/pstream.h                                      |    7 +-
 src/pstream_int.h                                  |    2 +-
 src/readline.c                                     |    2 +-
 src/remap.h                                        |  204 +-
 src/remap_scrip_io.c                               |  331 +-
 src/remap_search_latbins.c                         |  125 +
 src/remaplib.c                                     | 4271 +++++++------
 src/remapsort.c                                    |   12 +-
 src/specspace.c                                    |   69 +-
 src/statistic.c                                    |   14 +-
 src/stdnametable.c                                 |   76 +
 src/stdnametable.h                                 |   18 +
 src/table.c                                        |    4 +-
 src/timer.c                                        |    2 +-
 src/userlog.c                                      |   48 +-
 src/util.c                                         |   46 +-
 src/util.h                                         |    2 +-
 src/vinterp.c                                      |    8 +-
 src/zaxis.c                                        |   12 +-
 test/Makefile.am                                   |    4 +-
 test/Makefile.in                                   |    4 +-
 test/data/Makefile.am                              |    5 +-
 test/data/Makefile.in                              |    5 +-
 test/data/hl_l19.grb                               |  Bin 4888 -> 4888 bytes
 test/data/ml2pl_ref                                |  Bin 312 -> 312 bytes
 test/data/pl_data.grb                              |  Bin 0 -> 6920 bytes
 test/data/select1_ref                              |  Bin 0 -> 5760 bytes
 test/data/select2_ref                              |  Bin 0 -> 3480 bytes
 test/data/select3_ref                              |  Bin 0 -> 2088 bytes
 test/data/select4_ref                              |  Bin 0 -> 4600 bytes
 test/data/select5_ref                              |  Bin 0 -> 1120 bytes
 test/test_Cat.sh                                   |   42 +
 test/test_Remap.sh                                 |   43 -
 test/test_Select.sh                                |   55 +
 413 files changed, 18212 insertions(+), 12342 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