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

[cig_noreply at geodynamics.org]

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

On branch  : baagaard/dynrup-new-lagrange
Link       : https://github.com/geodynamics/pylith/compare/85fe9961fb58cc7323dc26e78085e3f9b7748433...d42a67a6ec678bc8486e0f74f439efbe2f82a25d

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

commit 8644a54820f63528e8da85f806819ab5329841fd
Merge: b4db12c d42a67a
Author: Brad Aagaard <baagaard at usgs.gov>
Date:   Sun Jun 1 17:53:01 2014 -0700

    Merge branch 'master' into baagaard/dynrup-new-lagrange
    
    * master: (29 commits)
      Add more info about solver tolerances for friction in quasi static simulations.
      Fix for parallel faults (not all procs with faults have fault edges).
      Update make clean target.
      Fix bug in creating scatter vec.
      Adjust DataWriterHDF5Ext info dataset dimensions to match DataWriterHDF5.
      Switch to HDF5Ext in one 3d/tet4 full scale test.
      Small cleanup of README.
      Fix typo in README.
      Fix typo in parameter file.
      Create nodeset for fault edge in 2-D subduction example.
      Added use of split fields for 2-D embedded fault test case.
      Fixed filtering of vertices/edges in setting constraints for fault fields.
      Update full-scale test to use split fields and custom fault preconditioner.
      More fixes to fault field constraints.
      Add TestShearDispFriction to test suite.
      Finish full-scale test for spontaneous rupture with embedded fault.
      Fix for settings constraints for fault fields in parallel.
      Fault: We need a consistent closure for clamped cohesive cells - We get the two end faces of the prism and concatenate their closure
      Fix some small bugs in settings constraints in fault section.
      Fault: Fix definition of fault Section - Must constrain clamped vertices - We get the vertices from the label, translate to fault numbering, and constrain all dofs
      ...
    
    Conflicts:
    	libsrc/pylith/faults/FaultCohesiveDyn.cc



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

8644a54820f63528e8da85f806819ab5329841fd
 README                                             |  14 +
 doc/releasenotes/announce_v2.0.0.txt               |  14 +
 .../boundaryconditions/boundaryconditions.lyx      | 136 +++++++-
 .../boundaryconditions}/figs/cohesivecell.pdf      | Bin 61338 -> 58493 bytes
 .../boundaryconditions/figs/cohesivecell.tex       | 361 +++++++++++++++++++
 .../boundaryconditions}/figs/figcolors.tex         |   0
 .../boundaryconditions/figs/quad4cohesivekin.fig   | 122 -------
 .../boundaryconditions/figs/quad4cohesivekin.pdf   | Bin 5081 -> 0 bytes
 examples/2d/greensfns/reverse/createbc.jou         |  24 +-
 examples/2d/greensfns/reverse/mesh_tri3.exo        | Bin 127096 -> 150488 bytes
 examples/2d/greensfns/reverse/pylithapp.cfg        |   3 +
 examples/2d/greensfns/strikeslip/createbc.jou      |  24 +-
 examples/2d/greensfns/strikeslip/mesh_tri3.exo     | Bin 198276 -> 234976 bytes
 examples/2d/greensfns/strikeslip/pylithapp.cfg     |  26 +-
 examples/2d/subduction/createbc.jou                |  14 +-
 examples/2d/subduction/mesh_tri3.exo               | Bin 49544 -> 58172 bytes
 examples/3d/tet4/step04.cfg                        |   9 +-
 examples/greensfns/hex8/README                     |  63 ----
 examples/greensfns/hex8/box_hex8_1000m.exo         | Bin 16900 -> 0 bytes
 examples/greensfns/hex8/finalslip.spatialdb        |  31 --
 examples/greensfns/hex8/geometry.jou               |  39 ---
 examples/greensfns/hex8/gfgen.cfg                  |  14 -
 examples/greensfns/hex8/gfgen.py                   | 384 ---------------------
 examples/greensfns/hex8/gfoutput.cfg               |  51 ---
 examples/greensfns/hex8/initial-run.cfg            |  66 ----
 examples/greensfns/hex8/mat_elastic.spatialdb      |  26 --
 examples/greensfns/hex8/mesh_hex8_1000m.jou        |  86 -----
 examples/greensfns/hex8/pylithapp.cfg              | 139 --------
 examples/greensfns/hex8/sliptime.spatialdb         |  26 --
 examples/meshing/surface_nurbs/subduction/README   |   6 +-
 examples/meshing/surface_nurbs/triangles/README    |   8 +-
 libsrc/pylith/faults/FaultCohesiveLagrange.cc      | 149 +++++---
 libsrc/pylith/friction/FrictionModel.cc            |   9 +
 libsrc/pylith/meshio/DataWriterHDF5Ext.cc          |  24 +-
 libsrc/pylith/topology/Field.cc                    |  36 +-
 libsrc/pylith/utils/error.h                        |   4 +-
 tests_auto/2d/tri3/Makefile.am                     |   2 +
 ...ShearDispNoSlip.py => TestShearDispFriction.py} |  43 ++-
 .../sheardispfriction.cfg}                         | 147 ++++----
 tests_auto/2d/tri3/sheardispnosliprefine.cfg       |  17 +-
 tests_auto/2d/tri3/testpylith.py                   |   3 +
 tests_auto/3d/tet4/Makefile.am                     |   2 +-
 tests_auto/3d/tet4/sheardispnoslip.cfg             |  25 +-
 43 files changed, 869 insertions(+), 1278 deletions(-)