[cig-commits] [commit] maint: Merge branch 'baagaard/fix-friction-initial-state' into maint (27f8233)

[cig_noreply at geodynamics.org]

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

On branch  : maint
Link       : https://github.com/geodynamics/pylith/compare/f33c75b19fd60eedb2a3405db76a1fee333bb1d7...5b6d812b1612809fea3bd331c4e5af98c25a536a

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

commit 27f823379881e3da8d15852323bdb0a6c2f72c48
Merge: 8d847b5 e0cb277
Author: Brad Aagaard <baagaard at usgs.gov>
Date:   Wed Jul 16 17:44:45 2014 -0700

    Merge branch 'baagaard/fix-friction-initial-state' into maint
    
    * baagaard/fix-friction-initial-state:
      Finished embedded fault test with friction and field split w/custom fault PC.
      Upgrade to new PETSc release
      Fault: Replace logic using clamped label with logic using _cohesiveVertices[] - This makes all parts agree on fault definition
      Turn on field split, remove marking of buried edges.
      Fixed bug in overzealous size checking.
      Code formatting cleanup.
      Added test case for embedded fault and initial state for friction.



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

27f823379881e3da8d15852323bdb0a6c2f72c48
 configure.ac                                       |   2 +-
 libsrc/pylith/faults/FaultCohesiveLagrange.cc      |  74 +++-------
 libsrc/pylith/friction/FrictionModel.cc            |  12 +-
 libsrc/pylith/materials/Material.cc                |   3 +-
 tests_auto/3d/hex8/Makefile.am                     |   6 +-
 ...estShearDispNoSlip.py => TestFrictionNoSlip.py} |  37 ++---
 ...hearDispNoSlip.py => TestFrictionNoSlipHalo.py} |  50 ++-----
 .../frictionnoslip.cfg}                            | 148 ++++++++++++--------
 .../frictionnoslip_halo.cfg}                       | 152 +++++++++++++--------
 tests_auto/3d/hex8/testpylith.py                   |   6 +
 10 files changed, 258 insertions(+), 232 deletions(-)