[magics] 60/63: Merge branch 'upstream' into debian/master
Alastair McKinstry
mckinstry at moszumanska.debian.org
Fri Mar 24 10:41:55 UTC 2017
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch debian/master
in repository magics.
commit 663af1f73dda06f5de5bb00da67041819333c246
Merge: 83bec30 2276063
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Tue Feb 21 10:53:56 2017 +0000
Merge branch 'upstream' into debian/master
CMakeLists.txt | 29 +-
VERSION.cmake | 4 +-
cmake/FindADSM.cmake | 2 +-
cmake/FindAEC.cmake | 2 +-
cmake/FindAIO.cmake | 2 +-
cmake/FindArmadillo.cmake | 2 +-
cmake/FindCMath.cmake | 2 +-
cmake/FindDl.cmake | 2 +-
cmake/FindEMOS.cmake | 2 +-
cmake/FindFDB.cmake | 2 +-
cmake/FindFFTW.cmake | 2 +-
cmake/FindGeoTIFF.cmake | 2 +-
cmake/FindHPSS.cmake | 2 +-
cmake/FindLEX.cmake | 2 +-
cmake/FindLibGFortran.cmake | 2 +-
cmake/FindLibIFort.cmake | 2 +-
cmake/FindLustreAPI.cmake | 43 +++
cmake/FindMKL.cmake | 2 +-
cmake/FindNDBM.cmake | 2 +-
cmake/FindNetCDF.cmake | 2 +-
cmake/FindNetCDF3.cmake | 2 +-
cmake/FindODB.cmake | 2 +-
cmake/FindOpenCL.cmake | 2 +-
cmake/FindOpenJPEG.cmake | 2 +-
cmake/FindPGIFortran.cmake | 2 +-
cmake/FindPango.cmake | 2 +-
cmake/FindPangoCairo.cmake | 2 +-
cmake/FindREADLINE.cmake | 2 +-
cmake/FindRPCGEN.cmake | 2 +-
cmake/FindRealtime.cmake | 2 +-
cmake/FindSZip.cmake | 2 +-
cmake/FindTrilinos.cmake | 2 +-
cmake/FindViennaCL.cmake | 2 +-
cmake/FindXLFortranLibs.cmake | 2 +-
cmake/FindYACC.cmake | 2 +-
cmake/Findgrib_api.cmake | 2 +-
cmake/Findodb_api.cmake | 2 +-
cmake/Findspot.cmake | 2 +-
cmake/VERSION.cmake | 6 +-
cmake/compiler_flags/Clang_C.cmake | 2 +-
cmake/compiler_flags/Clang_CXX.cmake | 2 +-
cmake/compiler_flags/Cray_C.cmake | 2 +-
cmake/compiler_flags/Cray_CXX.cmake | 2 +-
cmake/compiler_flags/Cray_Fortran.cmake | 2 +-
cmake/compiler_flags/GNU_C.cmake | 2 +-
cmake/compiler_flags/GNU_CXX.cmake | 2 +-
cmake/compiler_flags/GNU_Fortran.cmake | 2 +-
cmake/compiler_flags/Intel_C.cmake | 2 +-
cmake/compiler_flags/Intel_CXX.cmake | 2 +-
cmake/compiler_flags/Intel_Fortran.cmake | 2 +-
cmake/compiler_flags/PGI_C.cmake | 2 +-
cmake/compiler_flags/PGI_CXX.cmake | 2 +-
cmake/compiler_flags/PGI_Fortran.cmake | 2 +-
cmake/ecbuild_add_c_flags.cmake | 2 +-
cmake/ecbuild_add_cxx11_flags.cmake | 2 +-
cmake/ecbuild_add_cxx_flags.cmake | 2 +-
cmake/ecbuild_add_executable.cmake | 70 +++--
cmake/ecbuild_add_extra_search_paths.cmake | 2 +-
cmake/ecbuild_add_fortran_flags.cmake | 2 +-
cmake/ecbuild_add_library.cmake | 114 +++++---
cmake/ecbuild_add_option.cmake | 71 +++--
cmake/ecbuild_add_persistent.cmake | 2 +-
cmake/ecbuild_add_resources.cmake | 2 +-
cmake/ecbuild_add_test.cmake | 2 +-
cmake/ecbuild_append_to_rpath.cmake | 2 +-
cmake/ecbuild_bundle.cmake | 21 +-
cmake/ecbuild_cache.cmake | 2 +-
cmake/ecbuild_check_c_source_return.cmake | 2 +-
cmake/ecbuild_check_compiler.cmake | 2 +-
cmake/ecbuild_check_cxx11.cmake | 2 +-
cmake/ecbuild_check_cxx_source_return.cmake | 2 +-
cmake/ecbuild_check_fortran.cmake | 2 +-
cmake/ecbuild_check_fortran_source_return.cmake | 2 +-
cmake/ecbuild_check_functions.cmake | 2 +-
cmake/ecbuild_check_os.cmake | 335 +++++++++++------------
cmake/ecbuild_compiler_flags.cmake | 8 +-
cmake/ecbuild_config.h.in | 2 +-
cmake/ecbuild_declare_project.cmake | 2 +-
cmake/ecbuild_define_build_types.cmake | 2 +-
cmake/ecbuild_define_libs_and_execs_target.cmake | 2 +-
cmake/ecbuild_define_links_target.cmake | 2 +-
cmake/ecbuild_define_options.cmake | 2 +-
cmake/ecbuild_define_paths.cmake | 2 +-
cmake/ecbuild_dont_pack.cmake | 2 +-
cmake/ecbuild_download_resource.cmake | 34 ++-
cmake/ecbuild_echo_targets.cmake | 2 +-
cmake/ecbuild_enable_fortran.cmake | 10 +-
cmake/ecbuild_features.cmake | 43 +--
cmake/ecbuild_find_fortranlibs.cmake | 2 +-
cmake/ecbuild_find_lexyacc.cmake | 2 +-
cmake/ecbuild_find_mpi.cmake | 2 +-
cmake/ecbuild_find_omp.cmake | 2 +-
cmake/ecbuild_find_package.cmake | 81 ++++--
cmake/ecbuild_find_perl.cmake | 2 +-
cmake/ecbuild_find_python.cmake | 55 +++-
cmake/ecbuild_generate_config_headers.cmake | 2 +-
cmake/ecbuild_generate_fortran_interfaces.cmake | 2 +-
cmake/ecbuild_generate_rpc.cmake | 2 +-
cmake/ecbuild_generate_yy.cmake | 2 +-
cmake/ecbuild_get_cxx11_flags.cmake | 2 +-
cmake/ecbuild_get_date.cmake | 2 +-
cmake/ecbuild_get_resources.cmake | 2 +-
cmake/ecbuild_get_test_data.cmake | 21 +-
cmake/ecbuild_git.cmake | 2 +-
cmake/ecbuild_install_project.cmake | 37 ++-
cmake/ecbuild_list_add_pattern.cmake | 2 +-
cmake/ecbuild_list_exclude_pattern.cmake | 2 +-
cmake/ecbuild_list_extra_search_paths.cmake | 2 +-
cmake/ecbuild_list_macros.cmake | 2 +-
cmake/ecbuild_log.cmake | 46 +---
cmake/ecbuild_pkgconfig.cmake | 2 +-
cmake/ecbuild_policies.cmake | 2 +-
cmake/ecbuild_print_summary.cmake | 18 +-
cmake/ecbuild_project_files.cmake | 2 +-
cmake/ecbuild_remove_fortran_flags.cmake | 2 +-
cmake/ecbuild_requires_macro_version.cmake | 2 +-
cmake/ecbuild_separate_sources.cmake | 26 +-
cmake/ecbuild_source_flags.cmake | 2 +-
cmake/ecbuild_system.cmake | 14 +-
cmake/ecbuild_target_flags.cmake | 2 +-
cmake/ecbuild_use_package.cmake | 57 +++-
cmake/ecbuild_version.h.in | 2 +-
cmake/ecbuild_warn_unused_files.cmake | 2 +-
cmake/gen_source_flags.py | 2 +-
cmake/include/ecbuild/boost_test_framework.h | 2 +-
cmake/sg.pl | 2 +-
python/Magics/macro.py | 4 +-
python/Magics/toolbox.py | 37 +++
share/ecbuild/toolchains/ecmwf-XC30-Cray.cmake | 14 +-
share/ecbuild/toolchains/ecmwf-XC30-GNU.cmake | 14 +-
share/ecbuild/toolchains/ecmwf-XC30-Intel.cmake | 14 +-
share/magics/table_128.xml | 36 +++
src/common/BinaryObject.h | 3 +-
src/common/LogoPlotting.cc | 8 +-
src/common/Matrix.cc | 212 +++++---------
src/common/Matrix.h | 12 +
src/common/MatrixHandler.h | 61 ++++-
src/common/PolarStereographicProjection.cc | 21 +-
src/common/Proj4Projection.cc | 28 +-
src/common/Proj4Projection.h | 1 +
src/decoders/GribRegularInterpretor.cc | 2 +-
src/decoders/GribSatelliteInterpretor.cc | 37 ++-
src/decoders/GribSatelliteInterpretor.h | 2 +-
src/decoders/NetcdfGeoMatrixInterpretor.cc | 17 +-
src/drivers/BaseDriver.cc | 4 +-
src/drivers/BaseDriver.h | 1 +
src/drivers/BaseDriverWind.h | 4 +-
src/drivers/BinaryDriver.cc | 128 ++++-----
src/drivers/CairoDriver-blur.h | 121 ++++++++
src/drivers/CairoDriver.cc | 31 ++-
src/drivers/CairoDriver.h | 5 +-
src/drivers/PostScriptDriver.cc | 45 ++-
src/drivers/SVGDriver.cc | 2 +-
src/params/Bar.xml | 3 +
src/params/BinaryObject.xml | 7 +-
src/params/CMakeLists.txt | 1 -
src/params/Contour.xml | 2 +-
src/params/NetcdfInterpretor.xml | 2 +-
src/params/ObsPlotting.xml | 3 +
src/visualisers/AutomaticContourMethod.h | 54 +---
src/visualisers/Bar.cc | 171 +++++++++++-
src/visualisers/Bar.h | 9 +
src/visualisers/Contour.cc | 2 +-
src/visualisers/EpsGraph.cc | 2 +-
src/visualisers/ObsItemFamily.cc | 35 ++-
src/web/WrepJSon.cc | 12 +-
166 files changed, 1647 insertions(+), 871 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/magics.git
More information about the debian-science-commits
mailing list