[adios] 15/207: Merge branch 'master' into debian

Alastair McKinstry mckinstry at moszumanska.debian.org
Fri Jun 12 06:04:25 UTC 2015


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

mckinstry pushed a commit to branch master
in repository adios.

commit e6035fa07236cecf82144afba2a00a03759297aa
Merge: 9353e25 31f01a2
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Tue Aug 9 20:32:27 2011 +0100

    Merge branch 'master' into debian

 Makefile.am                                        |    7 +
 Makefile.in                                        |   17 +
 NEWS                                               |    5 +
 README                                             |    2 +-
 aclocal.m4                                         |    1 +
 adios_config                                       |   44 +-
 adios_config.flags.in                              |    8 +-
 config.h.in                                        |    3 +
 config/ac_datatap.m4                               |    4 +-
 config/ac_dmalloc.m4                               |    2 +-
 config/ac_hdf5.m4                                  |    2 +-
 config/ac_lustre.m4                                |   73 +
 config/ac_nc4par.m4                                |    3 +
 configure                                          |  559 +-
 configure.ac                                       |  277 +-
 examples/C/Makefile.in                             |   10 +
 examples/C/arrays/Makefile.in                      |   10 +
 examples/C/attributes/Makefile.in                  |   10 +
 examples/C/global-array-time/Makefile.am           |    2 +-
 examples/C/global-array-time/Makefile.in           |   12 +-
 examples/C/global-array-time/adios_globaltime.c    |   14 +-
 examples/C/global-array-time/adios_globaltime.xml  |    8 +-
 .../C/global-array-time/adios_globaltime_no_xml.c  |    2 +-
 .../C/global-array-time/adios_read_globaltime.c    |    2 +-
 .../{gread_temperature.ch => gread_restart.ch}     |    4 +
 .../{gwrite_temperature.ch => gwrite_restart.ch}   |    6 +-
 examples/C/global-array/Makefile.in                |   10 +
 examples/C/global-array/adios_global.xml           |    4 +-
 examples/C/global-array/adios_global_2files.c      |    2 +-
 examples/C/global-array/adios_global_no_xml.c      |  101 +-
 examples/C/global-array/adios_read_global.c        |    2 +-
 examples/C/global-array/adios_read_global_no_xml.c |   28 +-
 examples/C/global-array/job.pbs                    |    4 +-
 examples/C/manual/Makefile.in                      |   10 +
 examples/C/read_all/Makefile.in                    |   10 +
 examples/C/scalars/Makefile.in                     |   10 +
 examples/C/stat/Makefile.in                        |   10 +
 examples/Fortran/Makefile.in                       |   10 +
 examples/Fortran/arrays/Makefile.in                |   10 +
 examples/Fortran/global-array-time/Makefile.am     |    2 +-
 examples/Fortran/global-array-time/Makefile.in     |   12 +-
 .../Fortran/global-array-time/adios_globaltime.F90 |   15 +-
 .../Fortran/global-array-time/adios_globaltime.xml |    8 +-
 .../{gread_temperature.fh => gread_restart.fh}     |    4 +
 .../{gwrite_temperature.fh => gwrite_restart.fh}   |    6 +-
 examples/Fortran/global-array/Makefile.in          |   10 +
 .../Fortran/global-array/adios_global_no_xml.F90   |    2 +-
 examples/Fortran/scalars/Makefile.in               |   10 +
 examples/Makefile.in                               |   10 +
 runconf                                            |  187 +-
 scripts/create.nssi.config.sh                      |    7 +
 scripts/kill.nssi.staging.sh                       |   14 +-
 src/Makefile.am                                    |  129 +-
 src/Makefile.in                                    |  956 +++-
 src/adios.c                                        |   49 +
 src/adios.h                                        |  114 +-
 src/adios_bp_v1.c                                  |   33 +-
 src/adios_bp_v1.h                                  |   10 +-
 src/adios_dart.c                                   |  605 ++-
 src/adios_datatap.c                                |    1 -
 src/adios_dimes.c                                  |    5 -
 src/adios_error.c                                  |    4 +-
 src/adios_error.h                                  |    7 +-
 src/adios_internals.c                              |  131 +-
 src/adios_internals.h                              |    7 +-
 src/adios_internals_mxml.c                         |   45 +-
 src/adios_mpi.c                                    |   14 +-
 src/adios_mpi_amr.c                                | 1914 ++++---
 src/adios_mpi_lustre.c                             |  333 +-
 src/adios_nc4.c                                    |   36 +-
 src/adios_nssi.c                                   |  295 +-
 src/adios_nssi_args.x                              |   91 +-
 src/adios_posix.c                                  |   10 +-
 src/adios_posix1.c                                 |   27 +-
 src/adios_read.c                                   |   10 +
 src/adios_read.h                                   |  122 +-
 src/adios_read_hooks.c                             |   17 +-
 src/adios_read_hooks.h                             |   44 +-
 src/adios_transport_hooks.c                        |   64 +-
 src/adios_transport_hooks.h                        |   35 +-
 src/adiosf.c                                       |   43 +-
 src/adiosf_read.c                                  |   28 +
 src/bp_types.h                                     |   12 +
 src/bp_utils.c                                     |   16 +-
 src/common_adios.c                                 |   11 +-
 src/common_read.c                                  |   46 +-
 src/common_read.h                                  |    7 +-
 src/ds_metadata.h                                  |  109 +
 src/futils.c                                       |    2 +-
 src/globals.c                                      |   58 +
 src/globals.h                                      |    7 +
 src/mpidummy.c                                     |    8 +
 src/mpidummy.h                                     |    9 +-
 src/nssi_coupling_server.cpp                       | 1703 ++++++
 src/nssi_staging_server.cpp                        |   52 +-
 src/read_bp.c                                      |  716 ++-
 src/read_bp_staged.c                               | 5649 ++++++++++++++++++++
 src/read_dart.c                                    |  809 ++-
 src/read_datatap.c                                 | 2304 ++++++++
 src/read_dimes.c                                   |   30 +-
 src/read_nssi.c                                    |  653 +++
 tests/C/Makefile.in                                |   10 +
 tests/C/config_c.xml                               |    8 +-
 tests/Fortran/Makefile.in                          |   10 +
 tests/Makefile.in                                  |   10 +
 tests/bp_read/Makefile.in                          |   10 +
 tests/bp_read/bp_read_f.F90                        |  134 +-
 tests/genarray/Makefile.in                         |   10 +
 tests/genarray/genarray.F90                        |   73 +-
 tests/genarray/genarray3d.xml                      |   22 +-
 tests/suite/Makefile.in                            |   10 +
 tests/suite/programs/Makefile.in                   |   10 +
 tests/suite/reference/global_array_no_xml_bpls.txt |  206 +-
 tests/suite/reference/global_array_no_xml_read.txt |  216 +-
 tests/suite/reference/global_array_time_bpls.txt   |    8 +-
 tests/suite/tests/07_global_array_no_xml.sh        |    2 +-
 utils/Makefile.am                                  |    2 +-
 utils/Makefile.in                                  |   14 +-
 utils/adios_lint/Makefile.am                       |    6 +-
 utils/adios_lint/Makefile.in                       |   16 +-
 utils/bp2ascii/Makefile.am                         |    6 +-
 utils/bp2ascii/Makefile.in                         |   16 +-
 utils/bp2bp/Makefile.am                            |   19 +
 utils/{bp2ascii => bp2bp}/Makefile.in              |   62 +-
 utils/bp2bp/README                                 |    2 +
 utils/bp2bp/bp2bp.c                                |  963 ++++
 utils/bp2h5/Makefile.am                            |   19 +-
 utils/bp2h5/Makefile.in                            |   38 +-
 utils/bp2h5/README                                 |   92 +-
 utils/bp2h5/bp2h5.c                                |  685 ++-
 utils/bp2h5/hw-utils.c                             | 1665 ------
 utils/bp2h5/hw-utils.h                             |  163 -
 utils/bp2ncd/Makefile.am                           |   17 +-
 utils/bp2ncd/Makefile.in                           |   33 +-
 utils/bpdump/Makefile.am                           |    6 +-
 utils/bpdump/Makefile.in                           |   16 +-
 utils/bpdump/bpdump.c                              |   10 +-
 utils/bpls/Makefile.in                             |   10 +
 utils/bpls/bpls.c                                  |   21 +-
 utils/bpsplit/Makefile.am                          |   18 +-
 utils/bpsplit/Makefile.in                          |   28 +-
 utils/gpp/Makefile.in                              |   10 +
 utils/gpp/gpp.py                                   |   28 +-
 143 files changed, 19166 insertions(+), 4503 deletions(-)

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



More information about the debian-science-commits mailing list