[cig-commits] [commit] baagaard/dynrup-new-lagrange: Merge branch 'master' into baagaard/dynrup-new-lagrange (ad7af47)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Wed Nov 5 15:47:10 PST 2014
Repository : https://github.com/geodynamics/pylith
On branch : baagaard/dynrup-new-lagrange
Link : https://github.com/geodynamics/pylith/compare/f33c75b19fd60eedb2a3405db76a1fee333bb1d7...5b6d812b1612809fea3bd331c4e5af98c25a536a
>---------------------------------------------------------------
commit ad7af47970f91fc952cbd9bf38e76f8effdf7aff
Merge: 0736169 de541aa
Author: Brad Aagaard <baagaard at usgs.gov>
Date: Wed Oct 22 13:10:06 2014 -0700
Merge branch 'master' into baagaard/dynrup-new-lagrange
* master: (33 commits)
More updates for partitioner setting to PETSc.
Use PETSc partitioner setting.
Fixed partitioner settings.
Update Distributor for moving partitioner to PETSc setting.
Updated Distributor Python object for removal of partitioner
parameter.
Fixes to comments.
Distribution: Fixed interface to DMPlexDistribute()
Minor fix in Drucker-Prager equations (does not affect results).
Modified manual, code, and unit tests for error in Drucker-Prager
elastoplasticity. We were missing the initial pressure term. I haven't
tested yet.
Small fix for running tests with latest automake.
Configure: Upgrade to PETSc 3.5.2
Another update for PETSc 3.5.1 in libtests.
Update PETSc version check
Change DMPlexGet/SetDImension() to DMGet/SetDimension()
Small fixes to release announcement.
Fix error in making source distribution.
Updated CHANGES to point to Git repo commits.
Updated to v2.0.3.
Increment to v2.0.3.
Add checks for Python header file and shared library.
...
Conflicts:
libsrc/pylith/friction/FrictionModel.cc
>---------------------------------------------------------------
ad7af47970f91fc952cbd9bf38e76f8effdf7aff
CHANGES | 2 +-
README | 12 +-
.../meshing/surface_nurbs/Makefile.am => check.am | 10 +-
configure.ac | 9 +-
.../{announce_v2.0.1.txt => announce_v2.0.3.txt} | 44 +++++-
doc/userguide/materials/materials.lyx | 95 +++++++------
doc/userguide/runpylith/runpylith.lyx | 45 +++---
libsrc/pylith/Makefile.am | 6 +-
libsrc/pylith/faults/CohesiveTopology.cc | 2 +-
libsrc/pylith/faults/FaultCohesive.cc | 2 +-
libsrc/pylith/faults/FaultCohesiveLagrange.cc | 74 +++-------
libsrc/pylith/friction/FrictionModel.cc | 11 +-
libsrc/pylith/materials/DruckerPrager3D.cc | 24 ++--
.../pylith/materials/DruckerPragerPlaneStrain.cc | 24 ++--
libsrc/pylith/materials/Material.cc | 3 +-
libsrc/pylith/topology/Distributor.cc | 5 +-
libsrc/pylith/topology/Distributor.hh | 4 +-
libsrc/pylith/topology/Field.cc | 4 +-
libsrc/pylith/topology/Mesh.cc | 2 +-
libsrc/pylith/topology/Mesh.icc | 2 +-
libsrc/pylith/topology/MeshOps.cc | 2 +-
modulesrc/bc/Makefile.am | 3 +-
modulesrc/faults/Makefile.am | 3 +-
modulesrc/feassemble/Makefile.am | 3 +-
modulesrc/friction/Makefile.am | 3 +-
modulesrc/materials/Makefile.am | 3 +-
modulesrc/meshio/Makefile.am | 3 +-
examples/2d/Makefile.am => modulesrc/module.am | 11 +-
modulesrc/mpi/Makefile.am | 3 +-
modulesrc/problems/Makefile.am | 3 +-
modulesrc/topology/Distributor.i | 5 +-
modulesrc/topology/Makefile.am | 3 +-
modulesrc/utils/Makefile.am | 4 +-
pylith/topology/Distributor.py | 9 +-
pylith/topology/MeshImporter.py | 2 +-
subpackage.am | 17 ---
templates/friction/Makefile.am | 6 +-
templates/materials/Makefile.am | 6 +-
tests/3d/refine/pylithapp.cfg | 2 +-
tests/distribute/mesherapp.cfg | 4 +-
tests/topology/Makefile.am | 4 +-
tests_auto/2d/quad4/Makefile.am | 10 +-
tests_auto/2d/quad4/testpylith.py | 2 +-
tests_auto/2d/tri3/Makefile.am | 10 +-
tests_auto/2d/tri3/sheardispfriction.cfg | 2 +
tests_auto/2d/tri3/testpylith.py | 2 +-
tests_auto/3d/hex8/Makefile.am | 13 +-
...estShearDispNoSlip.py => TestFrictionNoSlip.py} | 37 ++---
...hearDispNoSlip.py => TestFrictionNoSlipHalo.py} | 50 ++-----
.../frictionnoslip.cfg} | 148 ++++++++++++--------
.../frictionnoslip_halo.cfg} | 152 +++++++++++++--------
tests_auto/3d/hex8/testpylith.py | 8 +-
tests_auto/3d/tet4/Makefile.am | 9 +-
tests_auto/3d/tet4/testpylith.py | 2 +-
tests_auto/eqinfo/Makefile.am | 5 +-
tests_auto/eqinfo/test_eqinfo.py | 0
tests_auto/petsc/Makefile.am | 4 +-
tests_auto/petsc/testpetsc.py | 2 +-
unittests/libtests/bc/Makefile.am | 5 +-
unittests/libtests/faults/Makefile.am | 3 +-
unittests/libtests/feassemble/Makefile.am | 3 +-
unittests/libtests/friction/Makefile.am | 3 +-
unittests/libtests/materials/Makefile.am | 3 +-
.../materials/data/DruckerPrager3DTimeDep.py | 2 +-
.../materials/data/DruckerPrager3DTimeDepData.cc | 96 ++++++-------
.../data/DruckerPragerPlaneStrainTimeDep.py | 2 +-
.../data/DruckerPragerPlaneStrainTimeDepData.cc | 32 ++---
unittests/libtests/meshio/Makefile.am | 3 +-
unittests/libtests/topology/Makefile.am | 3 +-
unittests/libtests/topology/TestMesh.cc | 2 +-
unittests/libtests/utils/Makefile.am | 3 +-
unittests/pytests/bc/Makefile.am | 5 +-
unittests/pytests/bc/testbc.py | 2 +-
unittests/pytests/faults/Makefile.am | 5 +-
unittests/pytests/faults/testfaults.py | 2 +-
unittests/pytests/feassemble/Makefile.am | 5 +-
unittests/pytests/feassemble/testfeassemble.py | 2 +-
unittests/pytests/friction/Makefile.am | 5 +-
unittests/pytests/friction/testfriction.py | 2 +-
unittests/pytests/materials/Makefile.am | 5 +-
unittests/pytests/materials/testmaterials.py | 2 +-
unittests/pytests/meshio/Makefile.am | 5 +-
unittests/pytests/meshio/testcubit.py | 2 +-
unittests/pytests/meshio/testhdf5.py | 2 +-
unittests/pytests/meshio/testmeshio.py | 2 +-
unittests/pytests/mpi/Makefile.am | 5 +-
unittests/pytests/mpi/testmpi.py | 2 +-
unittests/pytests/problems/Makefile.am | 5 +-
unittests/pytests/problems/testproblems.py | 2 +-
unittests/pytests/topology/Makefile.am | 12 +-
unittests/pytests/topology/TestMeshGenSimple.py | 82 -----------
unittests/pytests/topology/testgensimple.py | 75 ----------
unittests/pytests/topology/testtopology.py | 2 +-
unittests/pytests/utils/Makefile.am | 5 +-
unittests/pytests/utils/testmanager.py | 2 +-
unittests/pytests/utils/testutils.py | 2 +-
96 files changed, 591 insertions(+), 744 deletions(-)
diff --cc unittests/pytests/faults/testfaults.py
index b80aa4e,2c31ae1..40968c9
mode 100644,100755..100755
--- a/unittests/pytests/faults/testfaults.py
+++ b/unittests/pytests/faults/testfaults.py
More information about the CIG-COMMITS
mailing list