[silo-llnl] 59/96: Merge tag 'upstream_4.9.1' into dev-4.9.1
Alastair McKinstry
mckinstry at moszumanska.debian.org
Tue Jul 21 13:09:35 UTC 2015
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch debian/master
in repository silo-llnl.
commit b44bfb12467282ebba79f5091c3829e80c0c0741
Merge: 1e60140 5d16a00
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Tue Mar 4 14:09:23 2014 +0000
Merge tag 'upstream_4.9.1' into dev-4.9.1
FAQ | 2 +-
Makefile.am | 12 +-
Makefile.in | 280 +-
SiloWindows/MSVC2010/BaseIncludes.props | 12 +
SiloWindows/MSVC2010/DepLibs.props | 75 +
SiloWindows/MSVC2010/HDF5_Defines.props | 19 +
SiloWindows/MSVC2010/ModernDTPR.props | 12 +
SiloWindows/MSVC2010/NO_SEC_DEP.props | 11 +
SiloWindows/MSVC2010/QT_Defines.props | 17 +
SiloWindows/MSVC2010/Silo.sln | 65 +
SiloWindows/MSVC2010/Silo.vcxproj | 211 +
SiloWindows/MSVC2010/Silo.vcxproj.filters | 208 +
SiloWindows/MSVC2010/browser.vcxproj | 200 +
SiloWindows/MSVC2010/browser.vcxproj.filters | 77 +
SiloWindows/MSVC2010/pdb_detect/pdb_detect.vcxproj | 131 +
.../MSVC2010/pdb_detect/pdb_detect.vcxproj.filters | 14 +
SiloWindows/MSVC2010/silex.vcxproj | 212 +
SiloWindows/MSVC2010/silex.vcxproj.filters | 92 +
SiloWindows/MSVC8/Silo.vcproj | 876 -
SiloWindows/MSVC8/SiloWindows.sln | 104 -
SiloWindows/MSVC8/Tests/TestReadMask.vcproj | 212 -
SiloWindows/MSVC8/Tests/Tests.sln | 498 -
SiloWindows/MSVC8/Tests/alltypes.vcproj | 213 -
SiloWindows/MSVC8/Tests/array.vcproj | 212 -
SiloWindows/MSVC8/Tests/array_f.vfproj | 31 -
SiloWindows/MSVC8/Tests/compression.vcproj | 212 -
SiloWindows/MSVC8/Tests/csg.vcproj | 212 -
SiloWindows/MSVC8/Tests/curve_f.vfproj | 31 -
SiloWindows/MSVC8/Tests/dirtest.vcproj | 216 -
SiloWindows/MSVC8/Tests/extface.vcproj | 212 -
SiloWindows/MSVC8/Tests/grab.vcproj | 212 -
SiloWindows/MSVC8/Tests/group_test.vcproj | 212 -
SiloWindows/MSVC8/Tests/largefile.vcproj | 212 -
SiloWindows/MSVC8/Tests/listtypes.vcproj | 212 -
SiloWindows/MSVC8/Tests/mat3d_3across.vcproj | 212 -
SiloWindows/MSVC8/Tests/mat_f.vfproj | 31 -
SiloWindows/MSVC8/Tests/merge_block.vcproj | 212 -
SiloWindows/MSVC8/Tests/mmadjacency.vcproj | 212 -
SiloWindows/MSVC8/Tests/multi_file.vcproj | 212 -
SiloWindows/MSVC8/Tests/multi_test.vcproj | 212 -
SiloWindows/MSVC8/Tests/multispec.vcproj | 212 -
SiloWindows/MSVC8/Tests/namescheme.vcproj | 212 -
SiloWindows/MSVC8/Tests/obj.vcproj | 212 -
SiloWindows/MSVC8/Tests/onehex.vcproj | 212 -
SiloWindows/MSVC8/Tests/oneprism.vcproj | 212 -
SiloWindows/MSVC8/Tests/onepyramid.vcproj | 212 -
SiloWindows/MSVC8/Tests/onetet.vcproj | 212 -
SiloWindows/MSVC8/Tests/partial_io.vcproj | 212 -
SiloWindows/MSVC8/Tests/point.vcproj | 212 -
SiloWindows/MSVC8/Tests/point_f.vfproj | 31 -
SiloWindows/MSVC8/Tests/polyzl.vcproj | 212 -
SiloWindows/MSVC8/Tests/quad.vcproj | 216 -
SiloWindows/MSVC8/Tests/rocket.vcproj | 230 -
SiloWindows/MSVC8/Tests/sami.vcproj | 212 -
SiloWindows/MSVC8/Tests/simple.vcproj | 212 -
SiloWindows/MSVC8/Tests/spec.vcproj | 212 -
SiloWindows/MSVC8/Tests/specmix.vcproj | 212 -
SiloWindows/MSVC8/Tests/subhex.vcproj | 212 -
SiloWindows/MSVC8/Tests/testall.vcproj | 212 -
SiloWindows/MSVC8/Tests/testall_f.vfproj | 31 -
SiloWindows/MSVC8/Tests/testpdb.vcproj | 212 -
SiloWindows/MSVC8/Tests/twohex.vcproj | 212 -
SiloWindows/MSVC8/Tests/ucd.vcproj | 212 -
SiloWindows/MSVC8/Tests/ucd1d.vcproj | 212 -
SiloWindows/MSVC8/Tests/ucd_f.vfproj | 31 -
SiloWindows/MSVC8/Tests/ucdsamp3.vcproj | 212 -
SiloWindows/MSVC8/Tests/version.vcproj | 212 -
SiloWindows/MSVC8/Tests/wave.vcproj | 212 -
SiloWindows/MSVC8/pdb_detect/pdb_detect.vcproj | 114 -
SiloWindows/MSVC8/silex.vcproj | 839 -
SiloWindows/{MSVC8 => MSVC9}/BaseIncludes.vsprops | 0
SiloWindows/MSVC9/DepLibs.vsprops | 59 +
SiloWindows/{MSVC8 => MSVC9}/HDF5_Defines.vsprops | 2 +-
SiloWindows/{MSVC8 => MSVC9}/ModernDTPR.vsprops | 0
SiloWindows/{MSVC8 => MSVC9}/NO_SEC_DEP.vsprops | 0
SiloWindows/MSVC9/QT_Defines.vsprops | 16 +
SiloWindows/MSVC9/Silo.vcproj | 570 +
SiloWindows/MSVC9/SiloWindows.sln | 64 +
SiloWindows/MSVC9/Tests/CopyTestDependencies.bat | 34 +
SiloWindows/MSVC9/Tests/Preparation.vcproj | 121 +
.../{MSVC8 => MSVC9}/Tests/TestIncludes.vsprops | 0
SiloWindows/MSVC9/Tests/TestReadMask.vcproj | 399 +
SiloWindows/MSVC9/Tests/Tests.sln | 539 +
SiloWindows/MSVC9/Tests/alltypes.vcproj | 400 +
SiloWindows/MSVC9/Tests/arbpoly.vcproj | 399 +
SiloWindows/MSVC9/Tests/arbpoly3d.vcproj | 399 +
SiloWindows/MSVC9/Tests/array.vcproj | 399 +
SiloWindows/MSVC9/Tests/array_f.vfproj | 52 +
SiloWindows/MSVC9/Tests/compression.vcproj | 399 +
SiloWindows/MSVC9/Tests/csg.vcproj | 399 +
SiloWindows/MSVC9/Tests/curve_f.vfproj | 52 +
SiloWindows/MSVC9/Tests/dirtest.vcproj | 403 +
SiloWindows/MSVC9/Tests/empty.vcproj | 399 +
SiloWindows/MSVC9/Tests/extface.vcproj | 399 +
SiloWindows/MSVC9/Tests/grab.vcproj | 399 +
SiloWindows/MSVC9/Tests/group_test.vcproj | 399 +
SiloWindows/MSVC9/Tests/largefile.vcproj | 399 +
SiloWindows/MSVC9/Tests/listtypes.vcproj | 399 +
SiloWindows/MSVC9/Tests/mat3d_3across.vcproj | 399 +
SiloWindows/MSVC9/Tests/mat_f.vfproj | 52 +
SiloWindows/MSVC9/Tests/merge_block.vcproj | 399 +
SiloWindows/MSVC9/Tests/mmadjacency.vcproj | 399 +
SiloWindows/MSVC9/Tests/multi_file.vcproj | 399 +
SiloWindows/MSVC9/Tests/multi_test.vcproj | 399 +
SiloWindows/MSVC9/Tests/multispec.vcproj | 399 +
SiloWindows/MSVC9/Tests/namescheme.vcproj | 399 +
SiloWindows/MSVC9/Tests/obj.vcproj | 399 +
SiloWindows/MSVC9/Tests/onehex.vcproj | 399 +
SiloWindows/MSVC9/Tests/oneprism.vcproj | 399 +
SiloWindows/MSVC9/Tests/onepyramid.vcproj | 399 +
SiloWindows/MSVC9/Tests/onetet.vcproj | 399 +
SiloWindows/MSVC9/Tests/partial_io.vcproj | 399 +
SiloWindows/MSVC9/Tests/point.vcproj | 399 +
SiloWindows/MSVC9/Tests/point_f.vfproj | 52 +
SiloWindows/MSVC9/Tests/polyzl.vcproj | 399 +
SiloWindows/MSVC9/Tests/quad.vcproj | 403 +
SiloWindows/MSVC9/Tests/quad_f.vfproj | 52 +
SiloWindows/MSVC9/Tests/sami.vcproj | 399 +
SiloWindows/MSVC9/Tests/simple.vcproj | 399 +
SiloWindows/MSVC9/Tests/spec.vcproj | 399 +
SiloWindows/MSVC9/Tests/specmix.vcproj | 399 +
SiloWindows/MSVC9/Tests/subhex.vcproj | 399 +
SiloWindows/MSVC9/Tests/testall.vcproj | 399 +
SiloWindows/MSVC9/Tests/testall_f.vfproj | 52 +
SiloWindows/MSVC9/Tests/testpdb.vcproj | 399 +
SiloWindows/MSVC9/Tests/twohex.vcproj | 399 +
SiloWindows/MSVC9/Tests/ucd.vcproj | 399 +
SiloWindows/MSVC9/Tests/ucd1d.vcproj | 399 +
SiloWindows/MSVC9/Tests/ucd_f.vfproj | 52 +
SiloWindows/MSVC9/Tests/ucdsamp3.vcproj | 399 +
SiloWindows/MSVC9/Tests/version.vcproj | 399 +
SiloWindows/MSVC9/Tests/wave.vcproj | 399 +
SiloWindows/{MSVC8 => MSVC9}/bin/RunTests.bat | 2 +-
SiloWindows/MSVC9/browser.vcproj | 481 +
SiloWindows/MSVC9/pdb_detect/pdb_detect.vcproj | 200 +
SiloWindows/MSVC9/silex.vcproj | 480 +
SiloWindows/Makefile | 485 +-
SiloWindows/Makefile.am | 289 +-
SiloWindows/Makefile.in | 377 +-
SiloWindows/README | 105 +-
SiloWindows/copysilo.bat | 84 +-
SiloWindows/include/config.h | 46 +-
SiloWindows/runsilexmoc.bat | 2 +-
SiloWindows/silodiff.bat | 25 +
VERSION | 2 +-
aclocal.m4 | 7733 +---
config-site/Makefile.in | 89 +-
config-site/atlas0.conf | 1 -
config-site/atlas1088.conf | 1 -
config-site/atlas1120.conf | 1 -
config-site/atlas32.conf | 1 -
config-site/atlas512.conf | 1 -
config-site/atlas544.conf | 1 -
config-site/atlas576.conf | 1 -
config-site/atlas608.conf | 1 -
config-site/hoth.conf | 4 +-
config-site/kickit.conf | 14 -
config-site/minos.conf | 1 -
config-site/minos0.conf | 1 -
config-site/minos32.conf | 1 -
config-site/minos512.conf | 1 -
config-site/minos544.conf | 1 -
config-site/minos576.conf | 1 -
config-site/minos608.conf | 1 -
config-site/prism1.conf | 1 -
config-site/prism2.conf | 1 -
config-site/purple.conf | 1 -
config-site/purple1441.conf | 1 -
config-site/purple1442.conf | 1 -
config-site/purple1443.conf | 1 -
config-site/purple1444.conf | 1 -
config-site/rhea.conf | 1 -
config-site/rhea0.conf | 1 -
config-site/rhea32.conf | 1 -
config-site/rhea512.conf | 1 -
config-site/rhea544.conf | 1 -
config-site/sasn100.conf | 9 -
config-site/sidious.conf | 6 +-
config-site/sunburn.conf | 1 -
config-site/sunset.conf | 26 -
config-site/sunspot.conf | 34 -
config-site/tread.conf | 37 -
config-site/yana.conf | 1 -
config-site/yana1.conf | 1 -
config-site/yana2.conf | 1 -
config-site/yana3.conf | 1 -
config-site/yana4.conf | 1 -
config/Makefile.am | 3 +-
config/Makefile.in | 92 +-
config/ax_check_compiler_flags.m4 | 79 +
config/ax_have_qt.m4 | 515 +
config/bootstrap | 4 +-
config/config.guess | 291 +-
config/config.h.in | 10 +
config/config.sub | 149 +-
config/depcomp | 116 +-
config/install-sh | 231 +-
config/libtool.m4 | 7360 ++++
config/ltmain.sh | 13216 ++++---
config/ltoptions.m4 | 368 +
config/ltsugar.m4 | 123 +
config/ltversion.m4 | 23 +
config/lt~obsolete.m4 | 92 +
config/missing | 49 +-
config/mkinc | 37 +-
config/mklite | 85 +
config/vl_lib_readline.m4 | 106 +
configure | 37766 +++++++++++--------
configure.ac | 142 +-
docs/Makefile.in | 89 +-
src/Makefile.in | 244 +-
src/debug/Makefile.in | 134 +-
src/filters/Makefile.am | 2 +
src/filters/Makefile.in | 136 +-
src/filters/f_ale3d.c | 43 +-
src/filters/f_ale3d.h | 59 +
src/filters/f_sample.c | 43 +-
src/filters/f_sample.h | 59 +
src/hdf5_drv/H5FDsilo.c | 25 +-
src/hdf5_drv/Makefile.am | 6 +-
src/hdf5_drv/Makefile.in | 144 +-
src/hdf5_drv/silo_hdf5.c | 727 +-
src/hdf5_drv/silo_hdf5_private.h | 84 +-
src/netcdf/Makefile.in | 134 +-
src/netcdf/silo_netcdf.c | 6 +-
src/pdb/Makefile.am | 21 +-
src/pdb/Makefile.in | 219 +-
src/pdb/detect.c | 1 +
src/pdb/pdb.c | 89 +-
src/pdb/pdb.h | 187 +-
src/pdb/pdbdir.c | 19 +-
src/pdb/pdbmm.c | 17 +-
src/pdb/pdbx.c | 6 +-
src/pdb/pdconv.c | 2 +-
src/pdb/pdlow.c | 43 +-
src/pdb/pdmemb.c | 8 +-
src/pdb/pdpath.c | 14 +-
src/pdb/pdrdwr.c | 28 +-
src/pdb_drv/Makefile.in | 134 +-
src/pdb_drv/silo_pdb.c | 878 +-
src/pdb_drv/silo_pdb_private.h | 82 +-
src/pdbp_drv/Makefile.in | 134 +-
src/score/Makefile.am | 14 +-
src/score/Makefile.in | 206 +-
src/score/scctla.c | 61 +-
src/score/schash.c | 88 +-
src/score/score.h | 163 +-
src/silo/Makefile.am | 2 +
src/silo/Makefile.in | 198 +-
src/silo/alloc.c | 287 +-
src/silo/pmpio.h | 4 +-
src/silo/silo.c | 1076 +-
src/silo/silo.h.in | 453 +-
src/silo/silo.inc | 679 +-
src/silo/silo_f.c | 76 +-
src/silo/silo_f.h | 1 +
src/silo/silo_ns.c | 122 +-
src/silo/silo_private.h | 20 +-
src/silo/silo_win32_compatibility.h | 33 +-
src/taurus/Makefile.in | 134 +-
src/unknown/Makefile.in | 134 +-
svn_bin/Makefile.in | 89 +-
tests/Makefile.am | 85 +-
tests/Makefile.in | 658 +-
tests/TestReadMask.c | 1 +
tests/add_amr_mrgtree.c | 39 +-
tests/alltypes.c | 2 +
tests/arbpoly.c | 703 +
tests/arrayf77.f | 16 +-
tests/checksums | 18 +-
tests/compression.c | 6 +-
tests/csg.c | 4 +-
tests/{arrayf77.f => csgmesh.f} | 177 +-
tests/curvef77.f | 15 +-
tests/dir.c | 2 +-
tests/empty.c | 295 +
tests/extface.c | 18 +-
tests/ioperf.c | 25 +-
tests/ioperf_hdf5.c | 3 +-
tests/ioperf_pdb.c | 2 +-
tests/listtypes.c | 52 +-
tests/{ioperf_pdb.c => majorder.c} | 117 +-
tests/mat3d_3across.c | 4 +
tests/matf77.f | 17 +-
tests/{ioperf_pdb.c => mk_nasf_h5.c} | 73 +-
tests/mmadjacency.c | 2 +
tests/multi_file.c | 131 +-
tests/multi_test.c | 981 +-
tests/namescheme.c | 204 +-
tests/onehex.c | 30 +-
tests/oneprism.c | 2 +
tests/onepyramid.c | 2 +
tests/onetet.c | 2 +
tests/package.m4 | 4 +-
tests/pdbtst.c | 4203 +++
tests/point.c | 2 +
tests/pointf77.f | 16 +-
tests/polyzl.c | 2 +
tests/quadf77.f | 22 +-
tests/rocket.cpp | 1750 -
tests/rocket.cxx | 848 +
tests/rocket.h | 232 +
tests/rocket_silo.cxx | 494 +
tests/simple.c | 5 +-
tests/specmix.c | 19 +-
tests/testall.c | 10 +-
tests/testallf77.f | 26 +-
tests/{polyzl.c => testfs.c} | 105 +-
tests/testlib.c | 2 +
tests/{testxvers => testonehex} | 53 +-
tests/testpdb.c | 38 +-
tests/testsuite | 7880 ++--
tests/testsuite.at | 45 +-
tests/testxvers | 22 +-
tests/twohex.c | 2 +
tests/ucd.c | 8 +-
tests/ucdf77.f | 17 +-
tests/zeros.dat | Bin 0 -> 16 bytes
tools/Makefile.in | 194 +-
tools/browser/Makefile.am | 4 +-
tools/browser/Makefile.in | 392 +-
tools/browser/browser.c | 216 +-
tools/browser/browser.h | 10 +
tools/browser/browser.html | 332 +-
tools/browser/browser.info | 175 +-
tools/browser/file.c | 10 +-
tools/browser/func.c | 75 +-
tools/browser/lex.c | 3 +
tools/browser/output.c | 83 +-
tools/browser/parse.c | 13 +-
tools/browser/prim.c | 9 +-
tools/browser/stc.c | 26 +-
tools/browser/switch.c | 4 +-
tools/browser/sym.c | 5 +
tools/python/Makefile.am | 2 +-
tools/python/Makefile.in | 176 +-
tools/python/pydbfile.cpp | 276 +-
tools/python/pydbfile.h | 2 +-
tools/python/pydbtoc.cpp | 246 +-
tools/python/pysilo.cpp | 99 +-
tools/python/pysilo.h | 4 +
tools/silex/Makefile.in | 195 +-
tools/silex/SiloArrayView.cpp | 10 +-
tools/silex/SiloFile.cpp | 8 +-
tools/silock/Makefile.in | 196 +-
345 files changed, 79786 insertions(+), 53468 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/silo-llnl.git
More information about the debian-science-commits
mailing list