[cig-commits] [commit] maint: Merge branch 'willic3/fix-plasticity' into maint (86b840a)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Tue Oct 7 15:18:43 PDT 2014
Repository : https://github.com/geodynamics/pylith
On branch : maint
Link : https://github.com/geodynamics/pylith/compare/9218fb4dbce2cd3b5dc33fa8bf4a7f6e007bcf1c...86b840a9a708589ee0c256172674384ab2152ac7
>---------------------------------------------------------------
commit 86b840a9a708589ee0c256172674384ab2152ac7
Merge: 9218fb4 62c07b9
Author: Charles Williams <C.Williams at gns.cri.nz>
Date: Wed Oct 8 11:18:14 2014 +1300
Merge branch 'willic3/fix-plasticity' into maint
>---------------------------------------------------------------
86b840a9a708589ee0c256172674384ab2152ac7
check.am | 2 +-
doc/userguide/materials/materials.lyx | 95 +++++++++++----------
libsrc/pylith/materials/DruckerPrager3D.cc | 24 ++++--
.../pylith/materials/DruckerPragerPlaneStrain.cc | 24 ++++--
.../materials/data/DruckerPrager3DTimeDep.py | 2 +-
.../materials/data/DruckerPrager3DTimeDepData.cc | 96 +++++++++++-----------
.../data/DruckerPragerPlaneStrainTimeDep.py | 2 +-
.../data/DruckerPragerPlaneStrainTimeDepData.cc | 32 ++++----
8 files changed, 151 insertions(+), 126 deletions(-)
More information about the CIG-COMMITS
mailing list