[cig-commits] [commit] baagaard/dynrup-new-lagrange: Merge branch 'master' into baagaard/dynrup-new-lagrange (b4db12c)

[cig_noreply at geodynamics.org]

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

On branch  : baagaard/dynrup-new-lagrange
Link       : https://github.com/geodynamics/pylith/compare/51e5990f4c018c4545a7a34547bdb2e1f538d629...b4db12ca279421280582dde3f17172d156fe3222

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

commit b4db12ca279421280582dde3f17172d156fe3222
Merge: 51e5990 330be43
Author: Brad Aagaard <baagaard at usgs.gov>
Date:   Mon May 19 15:33:09 2014 -0700

    Merge branch 'master' into baagaard/dynrup-new-lagrange
    
    * master: (53 commits)
      MeshBuilder: spaceDim must be consistent across processes
      Turn off journal output.
      Turn off more debugging output (PETSc).
      Turn off journal output in full-scale test.
      Update mesh info for 3d/tet4 embedded fault full-scale tests.
      Faults: Fixed checking for cross edge - I needed to throw out non-
    fault edges when checking the support size
      Update test data for 3d/tet4/TestShearDispNoSlipRefine (may need
    another update).
      Faults: Added missing destroy
      Faults: Fix completion of fault boundary label
      Updated tests_auto/3d/hex8 embedded fault settings (fault edge).
      Remove binary Exodus file (keep ASCII mesh file).
      Updated tet4k mesh file.
      Updated test data for adjusting topology for tet4k (embedded fault).
      Fault Test: Fixed data for Hex8j - Fault cells have 5 vertices since 3
    are clamped per cell - Fault label includes split points
      Fix fault edge group.
      Use nonzero tolerance for detecting inability to determine face
    orientation with respect to up direction.
      Added unit test for adjusting topology of tet4 cells w/embedded fault.
      Created unit test for adjusting topology for hex8 cells w/embedded
    fault.
      Faults: Removed the creation of the fault boundary mesh - Also removed non-
    interpolated code for fault creation
      Enable fault edge in 3d/tet4 embedded fault test.
      ...
    
    Conflicts:
    	libsrc/pylith/faults/FaultCohesiveDyn.cc



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


Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc b4db12ca279421280582dde3f17172d156fe3222