[cig-commits] [commit] next: Merge branch 'baagaard/feature-progress-monitor' into next (37f9ed5)

cig_noreply at geodynamics.org cig_noreply at geodynamics.org
Wed Nov 19 08:54:17 PST 2014


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

On branch  : next
Link       : https://github.com/geodynamics/pylith/compare/3efd7c3bab4647abea5e09db47cbeb670a57a588...78c198a5c3423f05d7a652ed95299710128e568c

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

commit 37f9ed55ee82fad5b5c05504b6fb02f2b2a69981
Merge: efe4889 e8793d1
Author: Brad Aagaard <baagaard at usgs.gov>
Date:   Wed Nov 19 08:26:00 2014 -0800

    Merge branch 'baagaard/feature-progress-monitor' into next
    
    * baagaard/feature-progress-monitor: (21 commits)
      Fix update conditions.
      Added documentation for progress monitors.
      Refactor ProgressMonitor into ProgressMonitor, ProgressMonitorTime, and ProgressMonitorStep.
      Added unit test for ProgressMonitor.
      Added progress monitor to TimeDependent.
      Started work on progress monitor.
      Add missing files for fault interesection test to Makefile.
      Small fix for getting edge nodeset in parallel.
      Cleanup by using Field::globalSection().
      Fix bug. Remove superfluous DMDestroy().
      Add DM for subfields in Field. Refactor Field metadata.
      Fix small compile bug.
      Create Lagrange DM to get global section for fault preconditioner.
      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.
      ...



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

37f9ed55ee82fad5b5c05504b6fb02f2b2a69981
 doc/userguide/runpylith/runpylith.lyx              | 145 ++++++++++-
 libsrc/pylith/bc/DirichletBC.cc                    |   4 +-
 libsrc/pylith/bc/PointForce.cc                     |   6 +-
 libsrc/pylith/faults/FaultCohesive.cc              |  10 +-
 libsrc/pylith/faults/FaultCohesiveDyn.cc           |  35 +--
 libsrc/pylith/faults/FaultCohesiveImpulses.cc      |   2 +-
 libsrc/pylith/faults/FaultCohesiveLagrange.cc      |  56 ++---
 libsrc/pylith/materials/Material.cc                |   4 +-
 libsrc/pylith/meshio/DataWriterHDF5Ext.cc          |   2 +-
 libsrc/pylith/meshio/DataWriterVTK.cc              |   4 +-
 libsrc/pylith/problems/Solver.cc                   |  15 +-
 libsrc/pylith/topology/Field.cc                    | 272 ++++++++++++---------
 libsrc/pylith/topology/Field.hh                    |  49 ++--
 libsrc/pylith/topology/Field.icc                   |  39 +--
 libsrc/pylith/topology/FieldBase.hh                |   8 +-
 libsrc/pylith/topology/VisitorMesh.hh              |   2 +-
 libsrc/pylith/topology/VisitorMesh.icc             |  18 +-
 libsrc/pylith/topology/VisitorSubMesh.icc          |   4 +-
 pylith/Makefile.am                                 |   3 +
 pylith/problems/GreensFns.py                       |  13 +
 pylith/problems/ProgressMonitor.py                 | 140 +++++++++++
 pylith/problems/ProgressMonitorStep.py             | 109 +++++++++
 pylith/problems/ProgressMonitorTime.py             | 118 +++++++++
 pylith/problems/TimeDependent.py                   |  25 +-
 pylith/problems/__init__.py                        |   4 +-
 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 +
 unittests/libtests/bc/TestAbsorbingDampers.cc      |   2 +-
 unittests/libtests/bc/TestDirichletBC.cc           |   4 +-
 unittests/libtests/bc/TestDirichletBCMulti.cc      |   2 +-
 unittests/libtests/faults/TestFaultCohesiveDyn.cc  |   4 +-
 .../libtests/faults/TestFaultCohesiveImpulses.cc   |   2 +-
 unittests/libtests/faults/TestFaultCohesiveKin.cc  |   8 +-
 unittests/libtests/topology/TestFieldMesh.cc       |  38 ++-
 unittests/libtests/topology/TestFieldSubMesh.cc    |  12 +-
 unittests/pytests/problems/Makefile.am             |   5 +-
 unittests/pytests/problems/TestProgressMonitor.py  |  87 +++++++
 .../pytests/problems/TestProgressMonitorStep.py    | 105 ++++++++
 .../pytests/problems/TestProgressMonitorTime.py    | 102 ++++++++
 unittests/pytests/problems/data/Makefile.am        |   4 +-
 unittests/pytests/problems/testproblems.py         |   9 +
 52 files changed, 1421 insertions(+), 489 deletions(-)



More information about the CIG-COMMITS mailing list