[asl] 18/33: 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 4131383f027dbecc903e6cde6be2bfa7f4e858b4
Merge: 003be03 0abd7ae
Author: Avtech Scientific <AvtechScientific at users.noreply.github.com>
Date:   Wed Dec 23 11:10:11 2015 +0200

    Merge branch 'develop'

 CMakeLists.txt                                    |  6 +--
 COPYRIGHT.md                                      |  4 +-
 NEWS.md                                           |  5 +++
 README.md                                         |  8 ++--
 examples/elastic/acousticWaves.cc                 | 18 +++-----
 examples/elastic/cubeGravity.cc                   | 15 +++----
 examples/elastic/cubeIncompressibleGravity.cc     | 22 +++++----
 examples/elastic/cubePoroelasticGravity.cc        | 22 +++++----
 examples/elastic/poroelastic.cc                   | 17 +++----
 examples/flow/bus_wind.cc                         | 19 ++++----
 examples/flow/compressor.cc                       | 16 +++----
 examples/flow/flow.cc                             | 17 ++++---
 examples/flow/flow2.cc                            | 17 ++++---
 examples/flow/flow3.cc                            | 17 ++++---
 examples/flow/flowKDPGrowth.cc                    | 22 +++++----
 examples/flow/flowRotatingCylinders.cc            | 16 +++----
 examples/flow/locomotive.cc                       |  9 ++--
 examples/flow/locomotive_laminar.cc               |  7 +--
 examples/flow/locomotive_stability.cc             | 18 ++++----
 examples/flow/multicomponent_flow.cc              | 15 ++++---
 examples/flow/multiphase_flow.cc                  | 20 ++++-----
 examples/flow/pitot_tube_ice.cc                   | 21 ++++-----
 examples/heatTransfer/surfaceFlux.cc              | 15 +++----
 examples/jumpingObjects/jumpingBox.cc             | 17 +++----
 examples/levelSet/levelSetBasic.cc                | 15 +++----
 examples/levelSet/levelSetFacetedGrowth.cc        | 15 +++----
 examples/levelSet/levelSetNormalGrowth.cc         | 15 +++----
 examples/massTransferSM/testSMDiff.cc             | 15 +++----
 examples/massTransferSM/testSMDiff3C.cc           | 15 +++----
 examples/massTransferSM/testSMPhi.cc              | 15 +++----
 examples/massTransferSM/testSMPhiBV.cc            | 15 +++----
 src/acl/DataTypes/aclMemBlock.cxx                 |  2 +-
 src/acl/acl.cxx                                   |  2 +-
 src/acl/aclHardware.cxx                           |  6 +++
 src/acl/aclHardware.h                             |  5 ++-
 src/acl/aclMath/aclVectorOfElementsDef.cxx        |  4 +-
 src/acl/aclMath/aclVectorOfElementsOperations.cxx |  4 +-
 src/utilities/aslTimer.h                          | 55 ++++++++++-------------
 utilities/asl-hardware.cc                         |  3 +-
 39 files changed, 250 insertions(+), 299 deletions(-)

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