[cig-commits] [commit] master: Merge branch 'knepley/fix-faults-parallel' (7cd133d)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Sat May 17 16:55:44 PDT 2014
Repository : https://github.com/geodynamics/pylith
On branch : master
Link : https://github.com/geodynamics/pylith/compare/3b657718e5b48e38c4eb86fe9465030314f19523...7cd133d547b1b251d8be3c9ddf2d2c073dc886a4
>---------------------------------------------------------------
commit 7cd133d547b1b251d8be3c9ddf2d2c073dc886a4
Merge: 3b65771 5b27f10
Author: Brad Aagaard <baagaard at usgs.gov>
Date: Sat May 17 16:47:55 2014 -0700
Merge branch 'knepley/fix-faults-parallel'
* knepley/fix-faults-parallel: (51 commits)
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.
Updated 2-D tri3 refinement w/embedded fault case.
Updated data for tri3 full-scale test with embedded fault w/edge.
...
Conflicts:
libsrc/pylith/faults/CohesiveTopology.cc
>---------------------------------------------------------------
7cd133d547b1b251d8be3c9ddf2d2c073dc886a4
examples/2d/greensfns/reverse/pylithapp.cfg | 1 +
examples/2d/greensfns/strikeslip/pylithapp.cfg | 1 +
examples/3d/hex8/pylithapp.cfg | 2 +-
examples/3d/tet4/pylithapp.cfg | 1 +
examples/bar_shearwave/hex8/pylithapp.cfg | 1 +
examples/bar_shearwave/quad4/pylithapp.cfg | 1 +
examples/bar_shearwave/tet4/pylithapp.cfg | 1 +
examples/bar_shearwave/tri3/pylithapp.cfg | 1 +
libsrc/pylith/faults/BruneSlipFn.cc | 22 +-
libsrc/pylith/faults/CohesiveTopology.cc | 639 +---
libsrc/pylith/faults/CohesiveTopology.hh | 33 +-
libsrc/pylith/faults/ConstRateSlipFn.cc | 9 +
libsrc/pylith/faults/FaultCohesive.cc | 14 +-
libsrc/pylith/faults/FaultCohesiveDyn.cc | 122 +-
libsrc/pylith/faults/FaultCohesiveImpulses.cc | 12 +-
libsrc/pylith/faults/FaultCohesiveLagrange.cc | 125 +-
libsrc/pylith/faults/FaultCohesiveLagrange.hh | 9 +
libsrc/pylith/faults/LiuCosSlipFn.cc | 9 +
libsrc/pylith/faults/StepSlipFn.cc | 9 +
libsrc/pylith/faults/TimeHistorySlipFn.cc | 9 +
libsrc/pylith/feassemble/CellGeometry.cc | 2 +-
libsrc/pylith/topology/Mesh.icc | 3 +-
pylith/apps/PyLithApp.py | 6 +-
pylith/tests/Fault.py | 1 +
pylith/topology/MeshImporter.py | 2 -
pylith/topology/RefineUniform.py | 5 +
tests_auto/2d/tri3/TestDislocation2.py | 76 -
tests_auto/2d/tri3/TestShearDispNoSlip.py | 8 +-
tests_auto/2d/tri3/TestShearDispNoSlipRefine.py | 10 +-
tests_auto/2d/tri3/dislocation2.cfg | 122 -
tests_auto/2d/tri3/sheardispnoslip.cfg | 5 +-
tests_auto/2d/tri3/sheardispnosliprefine.cfg | 3 +
tests_auto/2d/tri3/testpylith.py | 6 +-
tests_auto/3d/hex8/TestShearDispNoSlip.py | 10 +-
tests_auto/3d/hex8/TestShearDispNoSlipRefine.py | 4 +-
tests_auto/3d/hex8/sheardispnoslip.cfg | 3 +
tests_auto/3d/hex8/sheardispnosliprefine.cfg | 23 +-
tests_auto/3d/hex8/testpylith.py | 6 +-
tests_auto/3d/tet4/TestShearDispNoSlip.py | 9 +-
tests_auto/3d/tet4/TestShearDispNoSlipRefine.py | 13 +-
tests_auto/3d/tet4/sheardispnoslip.cfg | 3 +
tests_auto/3d/tet4/sheardispnosliprefine.cfg | 27 +-
tests_auto/3d/tet4/testpylith.py | 6 +-
unittests/libtests/faults/Makefile.am | 4 +
unittests/libtests/faults/TestFaultCohesive.cc | 42 +-
unittests/libtests/faults/TestFaultCohesive.hh | 8 +
unittests/libtests/faults/TestFaultCohesiveKin.cc | 37 +-
unittests/libtests/faults/TestFaultMesh.cc | 10 +-
unittests/libtests/faults/TestSlipFn.cc | 6 +-
unittests/libtests/faults/data/CohesiveData.cc | 4 +-
unittests/libtests/faults/data/CohesiveData.hh | 2 +
.../libtests/faults/data/CohesiveDataHex8j.cc | 103 +
.../{CohesiveDataHex8.hh => CohesiveDataHex8j.hh} | 16 +-
.../libtests/faults/data/CohesiveDataQuad4h.cc | 2 +-
.../libtests/faults/data/CohesiveDataQuad4i.cc | 39 +-
.../libtests/faults/data/CohesiveDataQuad4i.hh | 2 +
.../libtests/faults/data/CohesiveDataTet4k.cc | 218 ++
.../{CohesiveDataHex8.hh => CohesiveDataTet4k.hh} | 16 +-
.../libtests/faults/data/CohesiveDataTri3g.cc | 30 +-
.../libtests/faults/data/CohesiveDataTri3g.hh | 2 +
.../libtests/faults/data/CohesiveDataTri3h.cc | 30 +-
.../libtests/faults/data/CohesiveDataTri3h.hh | 2 +
unittests/libtests/faults/data/CohesiveKinData.cc | 1 +
unittests/libtests/faults/data/CohesiveKinData.hh | 1 +
.../libtests/faults/data/CohesiveKinDataQuad4i.cc | 360 +--
.../libtests/faults/data/CohesiveKinDataQuad4i.hh | 3 +-
.../libtests/faults/data/CohesiveKinDataTri3g.cc | 224 +-
.../libtests/faults/data/CohesiveKinDataTri3g.hh | 1 +
unittests/libtests/faults/data/Makefile.am | 6 +-
unittests/libtests/faults/data/exotoascii.py | 33 +
unittests/libtests/faults/data/hex8j.mesh | 170 +
unittests/libtests/faults/data/quad4i.mesh | 8 +
.../libtests/faults/data/tet4k.jou | 86 +-
unittests/libtests/faults/data/tet4k.mesh | 3281 ++++++++++++++++++++
unittests/libtests/faults/data/tri3g.mesh | 8 +
unittests/libtests/faults/data/tri3h.mesh | 9 +
76 files changed, 4683 insertions(+), 1455 deletions(-)
More information about the CIG-COMMITS
mailing list