[cig-commits] [commit] master: Merge pull request #4 from ian-r-rose/fix-solution-transfer-with-hanging-nodes (96162d0)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/aspect/compare/6b7c137fa297caa534f0c498bb594d05ed012a95...dd3794be780d4879f029fcef1efb957c61665109

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

commit 96162d03b999cac8f1dedff6b90a5b2856eccfc6
Merge: 4f595a4 ac9401b
Author: Wolfgang Bangerth <bangerth at math.tamu.edu>
Date:   Tue Jun 24 13:02:39 2014 -0500

    Merge pull request #4 from ian-r-rose/fix-solution-transfer-with-hanging-nodes
    
    Add a new ConstraintMatrix to keep the mesh conforming on redistribution



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

96162d03b999cac8f1dedff6b90a5b2856eccfc6
 include/aspect/simulator.h      |  9 ++++++--
 source/simulator/core.cc        | 10 +--------
 source/simulator/freesurface.cc | 48 ++++++++++++++++++++++++++---------------
 3 files changed, 39 insertions(+), 28 deletions(-)