[cig-commits] [commit] next: Merge branch 'baagaard/fix-friction-initial-state' into next (58b1053)

[cig_noreply at geodynamics.org]

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

On branch  : next
Link       : https://github.com/geodynamics/pylith/compare/3122a341e5b77b45addbe2c77d0ded570a4cd1b5...58b105333b426d70b6ab94f5586b4c6acec5f8d8

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

commit 58b105333b426d70b6ab94f5586b4c6acec5f8d8
Merge: 3122a34 e0cb277
Author: Brad Aagaard <baagaard at usgs.gov>
Date:   Wed Jul 16 17:43:33 2014 -0700

    Merge branch 'baagaard/fix-friction-initial-state' into next
    
    * baagaard/fix-friction-initial-state:
      Finished embedded fault test with friction and field split w/custom fault PC.



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

58b105333b426d70b6ab94f5586b4c6acec5f8d8
 tests_auto/3d/hex8/Makefile.am                     |  6 +-
 ...FrictionNoSlip.py => TestFrictionNoSlipHalo.py} | 45 +++----------
 tests_auto/3d/hex8/frictionnoslip.cfg              | 21 +++---
 ...{frictionnoslip.cfg => frictionnoslip_halo.cfg} | 75 +++++++++++-----------
 tests_auto/3d/hex8/testpylith.py                   |  6 ++
 5 files changed, 68 insertions(+), 85 deletions(-)