[cig-commits] [commit] master: Merge pull request #131 from gassmoeller/compatibility_normal_flux (ea45ef1)

[cig_noreply at geodynamics.org]

Repository : https://github.com/geodynamics/aspect

On branch  : master
Link       : https://github.com/geodynamics/aspect/compare/78abb106b73747fb364d8481c9df27e32aed4597...ea45ef11705f505f2d2d63c77aa04f2d7be9a4c1

>---------------------------------------------------------------

commit ea45ef11705f505f2d2d63c77aa04f2d7be9a4c1
Merge: 78abb10 5c9362d
Author: Wolfgang Bangerth <bangerth at math.tamu.edu>
Date:   Mon Aug 4 10:06:39 2014 -0500

    Merge pull request #131 from gassmoeller/compatibility_normal_flux
    
    Compatibility normal flux



>---------------------------------------------------------------

ea45ef11705f505f2d2d63c77aa04f2d7be9a4c1
 source/simulator/core.cc                           |  9 +-
 source/simulator/helper_functions.cc               | 65 +++++++++++---
 source/simulator/solver.cc                         |  4 +-
 tests/pressure-compatibility-2.prm                 | 99 ++++++++++++++++++++++
 tests/pressure-compatibility-2/screen-output       | 50 +++++++++++
 tests/pressure-compatibility-2/statistics          | 21 +++++
 .../pressure-compatibility.prm                     | 44 ++++------
 tests/pressure-compatibility/screen-output         | 60 +++++++++++++
 tests/pressure-compatibility/statistics            | 23 +++++
 9 files changed, 329 insertions(+), 46 deletions(-)