[cig-commits] [commit] master: Merge pull request #243 from gassmoeller/update_composition_boundaries (7eb5dd7)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/aspect/compare/1a11b0a3b75cbf6d4140c7d0e4860b94c56c9198...7eb5dd7a1a7f54306391ab2a8555b149d6a5164e

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

commit 7eb5dd7a1a7f54306391ab2a8555b149d6a5164e
Merge: 1a11b0a cbf1eae
Author: Wolfgang Bangerth <bangerth at math.tamu.edu>
Date:   Tue Jan 13 07:45:46 2015 -0600

    Merge pull request #243 from gassmoeller/update_composition_boundaries
    
    Update composition boundaries



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

7eb5dd7a1a7f54306391ab2a8555b149d6a5164e
 include/aspect/boundary_composition/interface.h | 15 +++++++++++
 source/boundary_composition/interface.cc        |  5 ++++
 source/simulator/core.cc                        | 36 ++++++++++++++++++-------
 3 files changed, 47 insertions(+), 9 deletions(-)