[cig-commits] [commit] next: Merge remote-tracking branch 'origin/baagaard/fix-friction-initial-state' into next (3122a34)

cig_noreply at geodynamics.org cig_noreply at geodynamics.org
Wed Nov 5 15:44:54 PST 2014


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

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

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

commit 3122a341e5b77b45addbe2c77d0ded570a4cd1b5
Merge: ffaa715 78ec935
Author: Matthew G. Knepley <knepley at gmail.com>
Date:   Wed Jul 16 15:07:16 2014 -0500

    Merge remote-tracking branch 'origin/baagaard/fix-friction-initial-state' into next
    
    * origin/baagaard/fix-friction-initial-state:
      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.
      Improved some error messages.
      Incremented version number and updated README.
      Added README to examples/debugging.
      Added debugging to examples Makefile. Updated filenames in debugging Makefile.
      Added files to Makefile.
      Added files to Makefile.



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

3122a341e5b77b45addbe2c77d0ded570a4cd1b5
 README                                             |  29 +++-
 configure.ac                                       |   4 +-
 examples/3d/hex8/Makefile.am                       |   7 +-
 examples/Makefile.am                               |   1 +
 examples/debugging/Makefile.am                     |   9 +-
 examples/debugging/README                          |   8 +
 examples/meshing/cubit_cellsize/Makefile.am        |   3 +-
 libsrc/pylith/faults/CohesiveTopology.cc           |  12 +-
 libsrc/pylith/faults/FaultCohesive.cc              |   3 +-
 libsrc/pylith/faults/FaultCohesiveImpulses.cc      |  11 +-
 libsrc/pylith/faults/FaultCohesiveLagrange.cc      |  80 +++-------
 libsrc/pylith/faults/TimeHistorySlipFn.cc          |   4 +-
 libsrc/pylith/faults/TopologyOps.cc                |   2 +-
 libsrc/pylith/faults/TractPerturbation.cc          |   6 +-
 libsrc/pylith/feassemble/CellGeometry.cc           |   3 +-
 libsrc/pylith/friction/FrictionModel.cc            |  22 +--
 libsrc/pylith/materials/ElasticMaterial.cc         |  10 +-
 libsrc/pylith/materials/Material.cc                |  14 +-
 libsrc/pylith/meshio/DataWriterHDF5.cc             |   6 +-
 libsrc/pylith/meshio/DataWriterHDF5Ext.cc          |   6 +-
 libsrc/pylith/meshio/MeshBuilder.cc                |   3 +-
 libsrc/pylith/meshio/MeshIOCubit.cc                |   3 +-
 libsrc/pylith/topology/Field.cc                    |   9 +-
 libsrc/pylith/topology/Fields.cc                   |  18 +--
 libsrc/pylith/topology/Jacobian.cc                 |   8 +-
 libsrc/pylith/topology/Mesh.cc                     |   6 +-
 libsrc/pylith/topology/MeshOps.cc                  |   3 +-
 libsrc/pylith/topology/SolutionFields.cc           |   3 +-
 ...estShearDispNoSlip.py => TestFrictionNoSlip.py} |  37 +++--
 .../frictionnoslip.cfg}                            | 163 +++++++++++++--------
 30 files changed, 251 insertions(+), 242 deletions(-)



More information about the CIG-COMMITS mailing list