[asl] 49/177: Merge branch 'master' of AvtechScientific/ASL-dev

[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 b1b9943f6e55cbc4a651f6cccef5629c56e0db1a
Merge: 813eeca 72f267b
Author: Avtech Scientific <AvtechScientific at users.noreply.github.com>
Date:   Mon Jun 22 12:32:10 2015 +0300

    Merge branch 'master' of AvtechScientific/ASL-dev

 CMakeLists.txt                                     |   1 +
 {test/testPhysics => examples}/CMakeLists.txt      |   0
 .../elastic/CMakeLists.txt                         |   0
 .../elastic/acousticWaves.cc                       |   0
 .../elastic/cubeGravity.cc                         |   0
 .../elastic/cubeIncompressibleGravity.cc           |   0
 .../elastic/cubePoroelasticGravity.cc              |   0
 .../elastic/poroelastic.cc                         |   0
 {test/testPhysics => examples}/flow/CMakeLists.txt |   6 +-
 {test/testPhysics => examples}/flow/bus_wind.cc    |   2 +-
 {test/testPhysics => examples}/flow/compressor.cc  |   4 +-
 {test/testPhysics => examples}/flow/flow.cc        |   0
 {test/testPhysics => examples}/flow/flow2.cc       |   0
 {test/testPhysics => examples}/flow/flow3.cc       |   0
 .../testPhysics => examples}/flow/flowKDPGrowth.cc |   0
 .../flow/flowRotatingCylinders.cc                  |   0
 .../flow/locomotive_in_tunnel.cc                   |   8 +-
 .../flow/locomotive_laminar.cc                     |  10 +-
 .../flow/locomotive_stability.cc                   |   2 +-
 .../flow/multicomponent_flow.cc                    |  64 ++++----
 .../flow/multiphase_flow.cc                        |   0
 .../flow/pitot_tube_ice.cc                         |   0
 .../heatTransfer/CMakeLists.txt                    |   0
 .../heatTransfer/surfaceFlux.cc                    |   0
 examples/input_data/axial-compressor.stl           | Bin 0 -> 32248484 bytes
 {test => examples}/input_data/bus.stl              | Bin
 {test => examples}/input_data/locomotive.stl       | Bin
 .../jumpingObjects/CMakeLists.txt                  |   0
 .../jumpingObjects/jumpingBox.cc                   |   0
 .../levelSet/CMakeLists.txt                        |   0
 .../levelSet/levelSetBasic.cc                      |   0
 .../levelSet/levelSetFacetedGrowth.cc              |   0
 .../levelSet/levelSetNormalGrowth.cc               |   0
 .../massTransferSM/CMakeLists.txt                  |   0
 .../massTransferSM/testSMDiff.cc                   |   0
 .../massTransferSM/testSMDiff3C.cc                 |   0
 .../massTransferSM/testSMPhi.cc                    |   0
 .../massTransferSM/testSMPhiBV.cc                  |   0
 src/acl/aclHardware.cxx                            |  62 ++++----
 src/acl/aclHardware.h                              |  10 +-
 src/aslUtilities.cxx                               |  14 +-
 src/aslUtilities.h                                 |   4 +-
 src/readers/aslVTKFormatReaders.cxx                | 166 ++++++++++-----------
 src/readers/aslVTKFormatReaders.h                  |  24 +--
 src/utilities/aslParametersManager.cxx             | 100 +++++++++++--
 src/utilities/aslParametersManager.h               |  15 +-
 test/CMakeLists.txt                                |   2 -
 test/input_data/asl.ini                            |   8 -
 test/testAGL/testVTK_IO.cc                         |  10 +-
 49 files changed, 292 insertions(+), 220 deletions(-)

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