[cig-commits] r19781 - short/3D/PyLith/branches/pylith-scecdynrup/pylith/materials

[brad at geodynamics.org]

Author: brad
Date: 2012-03-14 17:10:51 -0700 (Wed, 14 Mar 2012)
New Revision: 19781

Modified:
   short/3D/PyLith/branches/pylith-scecdynrup/pylith/materials/DruckerPrager3D.py
   short/3D/PyLith/branches/pylith-scecdynrup/pylith/materials/DruckerPragerPlaneStrain.py
Log:
Merge from trunk.

Modified: short/3D/PyLith/branches/pylith-scecdynrup/pylith/materials/DruckerPrager3D.py
===================================================================
--- short/3D/PyLith/branches/pylith-scecdynrup/pylith/materials/DruckerPrager3D.py	2012-03-15 00:09:57 UTC (rev 19780)
+++ short/3D/PyLith/branches/pylith-scecdynrup/pylith/materials/DruckerPrager3D.py	2012-03-15 00:10:51 UTC (rev 19781)
@@ -69,12 +69,11 @@
     fitMohrCoulomb = pyre.inventory.str("fit_mohr_coulomb", default="inscribed",
                                         validator=validateFitMohrCoulomb)
     fitMohrCoulomb.meta['tip'] = "Fit to Mohr-Coulomb yield surface."
-    allowTensileYield = pyre.inventory.bool("allow_tensile_yield",
-                                            default=False)
-    allowTensileYield.meta['tip'] = "If true, allow yield beyond tensile " \
-      "strength; otherwise, an exception is thrown."
 
+    allowTensileYield = pyre.inventory.bool("allow_tensile_yield", default=False)
+    allowTensileYield.meta['tip'] = "Extend yield surface past tip of cone to allow yielding with tensile stresses."
 
+
   # PUBLIC METHODS /////////////////////////////////////////////////////
 
   def __init__(self, name="druckerprager3d"):
@@ -110,8 +109,7 @@
     else:
       raise ValueError("Unknown fit to Mohr-Coulomb yield surface.")
     ModuleDruckerPrager3D.fitMohrCoulomb(self, fitEnum)
-    ModuleDruckerPrager3D.allowTensileYield(self,
-                                            self.inventory.allowTensileYield)
+    ModuleDruckerPrager3D.allowTensileYield(self, self.inventory.allowTensileYield)
     return
 
   

Modified: short/3D/PyLith/branches/pylith-scecdynrup/pylith/materials/DruckerPragerPlaneStrain.py
===================================================================
--- short/3D/PyLith/branches/pylith-scecdynrup/pylith/materials/DruckerPragerPlaneStrain.py	2012-03-15 00:09:57 UTC (rev 19780)
+++ short/3D/PyLith/branches/pylith-scecdynrup/pylith/materials/DruckerPragerPlaneStrain.py	2012-03-15 00:10:51 UTC (rev 19781)
@@ -70,6 +70,9 @@
                                         validator=validateFitMohrCoulomb)
     fitMohrCoulomb.meta['tip'] = "Fit to Mohr-Coulomb yield surface."
 
+    allowTensileYield = pyre.inventory.bool("allow_tensile_yield", default=False)
+    allowTensileYield.meta['tip'] = "Extend yield surface past tip of cone to allow yielding with tensile stresses."
+    
 
   # PUBLIC METHODS /////////////////////////////////////////////////////
 
@@ -107,6 +110,7 @@
     else:
       raise ValueError("Unknown fit to Mohr-Coulomb yield surface.")
     ModuleDruckerPragerPlaneStrain.fitMohrCoulomb(self, fitEnum)
+    ModuleDruckerPragerPlaneStrain.allowTensileYield(self, self.inventory.allowTensileYield)
     return