[asl] 131/177: Merge branch 'develop'

[Ghislain Vaillant]

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

ghisvail-guest pushed a commit to branch master
in repository asl.

commit 398df1b46401bff8131bb8d0eee6a2216e9c7454
Merge: 266a828 99e89de
Author: Avtech Scientific <AvtechScientific at users.noreply.github.com>
Date:   Thu Jul 30 22:54:59 2015 +0300

    Merge branch 'develop'

 CMakeLists.txt                                     |     2 +-
 NEWS.md                                            |     2 +
 README.md                                          |    20 +-
 cmake/ASLBuildFunctions.cmake                      |    14 +-
 examples/CMakeLists.txt                            |     4 +-
 examples/elastic/CMakeLists.txt                    |     6 +-
 examples/elastic/poroelastic.cc                    |     5 +-
 examples/flow/CMakeLists.txt                       |    21 +-
 examples/flow/bus_wind.cc                          |     3 +-
 .../{locomotive_in_tunnel.cc => locomotive.cc}     |    19 +-
 examples/flow/locomotive_laminar.cc                |    37 +-
 examples/flow/locomotive_stability.cc              |    16 +-
 examples/heatTransfer/CMakeLists.txt               |     2 +-
 examples/heatTransfer/surfaceFlux.cc               |     2 +-
 .../{locomotive_in_tunnel.pvsm => locomotive.pvsm} |     0
 examples/jumpingObjects/CMakeLists.txt             |     2 +-
 examples/levelSet/CMakeLists.txt                   |     4 +-
 examples/massTransferSM/CMakeLists.txt             |     5 +-
 examples/massTransferSM/testSMDiff.cc              |     2 +-
 examples/massTransferSM/testSMDiff3C.cc            |     2 +-
 examples/massTransferSM/testSMPhi.cc               |     2 +-
 examples/massTransferSM/testSMPhiBV.cc             |     2 +-
 src/acl/DataTypes/aclSubvector.h                   |     7 +-
 src/acl/Kernels/aclExpressionContainer.h           |     5 +-
 src/acl/Kernels/aclKernel.h                        |     5 +-
 src/acl/aclHardware.h                              |     6 +-
 src/acl/aclTypesList.h                             |     5 +-
 src/acl/aclUtilities.cxx                           |     2 +-
 src/acl/aclUtilities.h                             |     2 +-
 src/acl/cl.hpp                                     | 12910 +++++++++++++++++++
 src/aslUtilities.cxx                               |     2 +-
 src/aslUtilities.h                                 |     7 +-
 src/num/aslDataResampling.h                        |     5 +-
 src/utilities/aslParametersManager.cxx             |    14 +-
 src/utilities/aslParametersManager.h               |     2 +-
 utilities/asl-hardware.cc                          |     5 +-
 36 files changed, 13060 insertions(+), 89 deletions(-)

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