[cig-commits] [commit] master: Merge branch 'baagaard/fix-friction-initial-state' (a0be517)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/pylith/compare/c8e4d80614fb204fa7d4ac2053268176b5f41024...a0be517f425b20bf7681ce49b4cc62a16734dbcd

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

commit a0be517f425b20bf7681ce49b4cc62a16734dbcd
Merge: c8e4d80 e0cb277
Author: Brad Aagaard <baagaard at usgs.gov>
Date:   Wed Jul 16 17:44:11 2014 -0700

    Merge branch 'baagaard/fix-friction-initial-state'
    
    * 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.



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

a0be517f425b20bf7681ce49b4cc62a16734dbcd
 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(-)