[cig-commits] [commit] baagaard/feature-output-station-names, baagaard/feature-progress-monitor, master: Merge branch 'baagaard/fix-faults-intersect' (c242bb7)

[cig_noreply at geodynamics.org]

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

On branches: baagaard/feature-output-station-names,baagaard/feature-progress-monitor,master
Link       : https://github.com/geodynamics/pylith/compare/f33c75b19fd60eedb2a3405db76a1fee333bb1d7...5b6d812b1612809fea3bd331c4e5af98c25a536a

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

commit c242bb7c095f2965a2e30f40bbda71016b5abb1c
Merge: f339645 0dd37c1
Author: Brad Aagaard <baagaard at usgs.gov>
Date:   Tue Oct 28 11:48:51 2014 -0700

    Merge branch 'baagaard/fix-faults-intersect'
    
    * baagaard/fix-faults-intersect:
      Add missing files for fault interesection test to Makefile.
      Small fix for getting edge nodeset in parallel.
      Small code cleanup.
      Added hex8 fault intersection full-scale test.
      Check to make sure label for fault edge is defined.
      Fixed test data for fault intersection full-scale tests.
      Trivial code cleanup in test.
      Added 3-D fault intersection full-scale test.
      Add 2-D fault intersection full-scale test.
      Trivial code cleanup of test code.



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

c242bb7c095f2965a2e30f40bbda71016b5abb1c
 libsrc/pylith/faults/FaultCohesive.cc              | 10 ++-
 pylith/tests/Fault.py                              |  4 +-
 tests_auto/2d/tri3/Makefile.am                     |  6 +-
 ...{TestSlipOneFault.py => TestFaultsIntersect.py} | 61 +++++++++++-----
 .../{sliptwofaults.cfg => faultsintersect.cfg}     | 60 ++++++++--------
 tests_auto/2d/tri3/testpylith.py                   |  3 +
 tests_auto/3d/hex8/Makefile.am                     |  6 +-
 ...{TestSlipOneFault.py => TestFaultsIntersect.py} | 71 +++++++++++++------
 .../{sliptwofaults.cfg => faultsintersect.cfg}     | 66 ++++++++---------
 tests_auto/3d/hex8/testpylith.py                   |  3 +
 tests_auto/3d/tet4/Makefile.am                     |  6 +-
 ...tSlipTwoFaultsNP2.py => TestFaultsIntersect.py} | 82 +++++++++++-----------
 .../{sliptwofaults.cfg => faultsintersect.cfg}     | 68 +++++++++---------
 tests_auto/3d/tet4/testpylith.py                   |  3 +
 14 files changed, 265 insertions(+), 184 deletions(-)