[cig-commits] r19588 - in short/3D/PyLith/trunk/unittests/libtests/materials: . data
willic3 at geodynamics.org
willic3 at geodynamics.org
Mon Feb 6 16:52:43 PST 2012
Author: willic3
Date: 2012-02-06 16:52:43 -0800 (Mon, 06 Feb 2012)
New Revision: 19588
Added:
short/3D/PyLith/trunk/unittests/libtests/materials/TestDruckerPragerPlaneStrain.cc
short/3D/PyLith/trunk/unittests/libtests/materials/TestDruckerPragerPlaneStrain.hh
short/3D/PyLith/trunk/unittests/libtests/materials/data/DruckerPragerPlaneStrainElastic.py
short/3D/PyLith/trunk/unittests/libtests/materials/data/DruckerPragerPlaneStrainElasticData.cc
short/3D/PyLith/trunk/unittests/libtests/materials/data/DruckerPragerPlaneStrainElasticData.hh
short/3D/PyLith/trunk/unittests/libtests/materials/data/DruckerPragerPlaneStrainTimeDep.py
short/3D/PyLith/trunk/unittests/libtests/materials/data/DruckerPragerPlaneStrainTimeDepData.cc
short/3D/PyLith/trunk/unittests/libtests/materials/data/DruckerPragerPlaneStrainTimeDepData.hh
Modified:
short/3D/PyLith/trunk/unittests/libtests/materials/Makefile.am
short/3D/PyLith/trunk/unittests/libtests/materials/data/generate.sh
Log:
Added unit tests for Drucker-Prager Plane Strain.
All unit tests pass, but I still need to do a full-scale test.
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/Makefile.am
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/Makefile.am 2012-02-04 22:21:05 UTC (rev 19587)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/Makefile.am 2012-02-07 00:52:43 UTC (rev 19588)
@@ -42,6 +42,7 @@
TestGenMaxwellQpQsIsotropic3D.cc \
TestPowerLaw3D.cc \
TestDruckerPrager3D.cc \
+ TestDruckerPragerPlaneStrain.cc \
TestEffectiveStress.cc \
test_materials.cc
@@ -62,6 +63,7 @@
TestMaxwellPlaneStrain.hh \
TestPowerLaw3D.hh \
TestDruckerPrager3D.hh \
+ TestDruckerPragerPlaneStrain.hh \
TestEffectiveStress.hh
# Source files associated with testing data
@@ -86,7 +88,9 @@
data/PowerLaw3DElasticData.cc \
data/PowerLaw3DTimeDepData.cc \
data/DruckerPrager3DElasticData.cc \
- data/DruckerPrager3DTimeDepData.cc
+ data/DruckerPrager3DTimeDepData.cc \
+ data/DruckerPragerPlaneStrainElasticData.cc \
+ data/DruckerPragerPlaneStrainTimeDepData.cc
noinst_HEADERS += \
@@ -111,6 +115,8 @@
data/PowerLaw3DTimeDepData.hh \
data/DruckerPrager3DElasticData.hh \
data/DruckerPrager3DTimeDepData.hh \
+ data/DruckerPragerPlaneStrainElasticData.hh \
+ data/DruckerPragerPlaneStrainTimeDepData.hh \
data/header.hh
AM_CPPFLAGS = \
Added: short/3D/PyLith/trunk/unittests/libtests/materials/TestDruckerPragerPlaneStrain.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/TestDruckerPragerPlaneStrain.cc (rev 0)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/TestDruckerPragerPlaneStrain.cc 2012-02-07 00:52:43 UTC (rev 19588)
@@ -0,0 +1,240 @@
+// -*- C++ -*-
+//
+// ----------------------------------------------------------------------
+//
+// Brad T. Aagaard, U.S. Geological Survey
+// Charles A. Williams, GNS Science
+// Matthew G. Knepley, University of Chicago
+//
+// This code was developed as part of the Computational Infrastructure
+// for Geodynamics (http://geodynamics.org).
+//
+// Copyright (c) 2010-2011 University of California, Davis
+//
+// See COPYING for license information.
+//
+// ----------------------------------------------------------------------
+//
+
+#include <portinfo>
+
+#include "TestDruckerPragerPlaneStrain.hh" // Implementation of class methods
+
+#include "data/DruckerPragerPlaneStrainElasticData.hh" // USES DruckerPragerPlaneStrainElasticData
+#include "data/DruckerPragerPlaneStrainTimeDepData.hh" // USES DruckerPragerPlaneStrainTimeDepData
+
+#include "pylith/materials/DruckerPragerPlaneStrain.hh" // USES DruckerPragerPlaneStrain
+
+#include <cstring> // USES memcpy()
+
+// ----------------------------------------------------------------------
+CPPUNIT_TEST_SUITE_REGISTRATION( pylith::materials::TestDruckerPragerPlaneStrain );
+
+// ----------------------------------------------------------------------
+// Setup testing data.
+void
+pylith::materials::TestDruckerPragerPlaneStrain::setUp(void)
+{ // setUp
+ _material = new DruckerPragerPlaneStrain();
+ _matElastic = new DruckerPragerPlaneStrain();
+ _data = new DruckerPragerPlaneStrainElasticData();
+ _dataElastic = new DruckerPragerPlaneStrainElasticData();
+ setupNormalizer();
+} // setUp
+
+// ----------------------------------------------------------------------
+// Test timeStep()
+void
+pylith::materials::TestDruckerPragerPlaneStrain::testTimeStep(void)
+{ // testTimeStep
+ DruckerPragerPlaneStrain material;
+
+ CPPUNIT_ASSERT_EQUAL(false, material._needNewJacobian);
+
+ const PylithScalar dt1 = 1.0;
+ material.timeStep(dt1);
+ CPPUNIT_ASSERT_EQUAL(dt1, material.Material::timeStep());
+ CPPUNIT_ASSERT_EQUAL(true, material.needNewJacobian());
+
+ const PylithScalar dt2 = 2.0;
+ material.timeStep(dt2);
+ CPPUNIT_ASSERT_EQUAL(dt2, material.Material::timeStep());
+ CPPUNIT_ASSERT_EQUAL(true, material.needNewJacobian());
+} // testTimeStep
+
+// ----------------------------------------------------------------------
+// Test useElasticBehavior()
+void
+pylith::materials::TestDruckerPragerPlaneStrain::testUseElasticBehavior(void)
+{ // testUseElasticBehavior
+ DruckerPragerPlaneStrain material;
+
+ material.useElasticBehavior(true);
+ // Some compilers/operating systems (cygwin) don't allow comparing
+ // pointers. Use first test to determine if we can compare pointers.
+ if (&pylith::materials::DruckerPragerPlaneStrain::_calcStressElastic ==
+ material._calcStressFn) {
+ CPPUNIT_ASSERT(
+ &pylith::materials::DruckerPragerPlaneStrain::_calcStressElastic ==
+ material._calcStressFn);
+ CPPUNIT_ASSERT(
+ &pylith::materials::DruckerPragerPlaneStrain::_calcElasticConstsElastic ==
+ material._calcElasticConstsFn);
+ CPPUNIT_ASSERT(
+ &pylith::materials::DruckerPragerPlaneStrain::_updateStateVarsElastic ==
+ material._updateStateVarsFn);
+
+ material.useElasticBehavior(false);
+ CPPUNIT_ASSERT(
+ &pylith::materials::DruckerPragerPlaneStrain::_calcStressElastoplastic ==
+ material._calcStressFn);
+ CPPUNIT_ASSERT(
+ &pylith::materials::DruckerPragerPlaneStrain::_calcElasticConstsElastoplastic ==
+ material._calcElasticConstsFn);
+ CPPUNIT_ASSERT(
+ &pylith::materials::DruckerPragerPlaneStrain::_updateStateVarsElastoplastic ==
+ material._updateStateVarsFn);
+ } // if
+} // testUseElasticBehavior
+
+// ----------------------------------------------------------------------
+// Test usesHasStateVars()
+void
+pylith::materials::TestDruckerPragerPlaneStrain::testHasStateVars(void)
+{ // testHasStateVars
+ DruckerPragerPlaneStrain material;
+ CPPUNIT_ASSERT_EQUAL(true, material.hasStateVars());
+} // testHasStateVars
+
+// ----------------------------------------------------------------------
+// Test _calcStressElastic()
+void
+pylith::materials::TestDruckerPragerPlaneStrain::test_calcStressElastic(void)
+{ // test_calcStressElastic
+ CPPUNIT_ASSERT(0 != _matElastic);
+ _matElastic->useElasticBehavior(true);
+
+ test_calcStress();
+} // test_calcStressElastic
+
+// ----------------------------------------------------------------------
+// Test calcElasticConstsElastic()
+void
+pylith::materials::TestDruckerPragerPlaneStrain::test_calcElasticConstsElastic(void)
+{ // test_calcElasticConstsElastic
+ CPPUNIT_ASSERT(0 != _matElastic);
+ _matElastic->useElasticBehavior(true);
+
+ test_calcElasticConsts();
+} // test_calcElasticConstsElastic
+
+// ----------------------------------------------------------------------
+// Test _updateStateVarsElastic()
+void
+pylith::materials::TestDruckerPragerPlaneStrain::test_updateStateVarsElastic(void)
+{ // test_updateStateVarsElastic
+ CPPUNIT_ASSERT(0 != _matElastic);
+ _matElastic->useElasticBehavior(true);
+
+ test_updateStateVars();
+} // test_updateStateVarsElastic
+
+// ----------------------------------------------------------------------
+// Test _calcStressTimeDep()
+void
+pylith::materials::TestDruckerPragerPlaneStrain::test_calcStressTimeDep(void)
+{ // test_calcStressTimeDep
+ CPPUNIT_ASSERT(0 != _matElastic);
+ _matElastic->useElasticBehavior(false);
+
+ delete _dataElastic; _dataElastic = new DruckerPragerPlaneStrainTimeDepData();
+
+ PylithScalar dt = 2.0e+5;
+ _matElastic->timeStep(dt);
+ test_calcStress();
+} // test_calcStressTimeDep
+
+// ----------------------------------------------------------------------
+// Test _calcElasticConstsTimeDep()
+void
+pylith::materials::TestDruckerPragerPlaneStrain::test_calcElasticConstsTimeDep(void)
+{ // test_calcElasticConstsTimeDep
+ CPPUNIT_ASSERT(0 != _matElastic);
+ _matElastic->useElasticBehavior(false);
+
+ delete _dataElastic; _dataElastic = new DruckerPragerPlaneStrainTimeDepData();
+
+ PylithScalar dt = 2.0e+5;
+ _matElastic->timeStep(dt);
+ test_calcElasticConsts();
+} // test_calcElasticConstsTimeDep
+
+// ----------------------------------------------------------------------
+// Test _updateStateVarsTimeDep()
+void
+pylith::materials::TestDruckerPragerPlaneStrain::test_updateStateVarsTimeDep(void)
+{ // test_updateStateVarsTimeDep
+ CPPUNIT_ASSERT(0 != _matElastic);
+ _matElastic->useElasticBehavior(false);
+
+ delete _dataElastic; _dataElastic = new DruckerPragerPlaneStrainTimeDepData();
+
+ PylithScalar dt = 2.0e+5;
+ _matElastic->timeStep(dt);
+ test_updateStateVars();
+
+} // test_updateStateVarsTimeDep
+
+// ----------------------------------------------------------------------
+// Test _stableTimeStepImplicit()
+void
+pylith::materials::TestDruckerPragerPlaneStrain::test_stableTimeStepImplicit(void)
+{ // test_stableTimeStepImplicit
+ CPPUNIT_ASSERT(0 != _matElastic);
+
+ delete _dataElastic; _dataElastic = new DruckerPragerPlaneStrainTimeDepData();
+
+ TestElasticMaterial::test_stableTimeStepImplicit();
+} // test_stableTimeStepImplicit
+
+// ----------------------------------------------------------------------
+// Test hasProperty().
+void
+pylith::materials::TestDruckerPragerPlaneStrain::testHasProperty(void)
+{ // testHasProperty
+ DruckerPragerPlaneStrain material;
+
+ CPPUNIT_ASSERT(material.hasProperty("mu"));
+ CPPUNIT_ASSERT(material.hasProperty("lambda"));
+ CPPUNIT_ASSERT(material.hasProperty("density"));
+ CPPUNIT_ASSERT(material.hasProperty("alpha_yield"));
+ CPPUNIT_ASSERT(material.hasProperty("beta"));
+ CPPUNIT_ASSERT(material.hasProperty("alpha_flow"));
+ CPPUNIT_ASSERT(!material.hasProperty("aaa"));
+} // testHasProperty
+
+// ----------------------------------------------------------------------
+// Test hasStateVar().
+void
+pylith::materials::TestDruckerPragerPlaneStrain::testHasStateVar(void)
+{ // testHasStateVar
+ DruckerPragerPlaneStrain material;
+
+ CPPUNIT_ASSERT(material.hasStateVar("stress_zz_initial"));
+ CPPUNIT_ASSERT(material.hasStateVar("plastic_strain"));
+} // testHasStateVar
+
+// ----------------------------------------------------------------------
+// Test _dbToProperties().
+void
+pylith::materials::TestDruckerPragerPlaneStrain::testDBToProperties(void)
+{ // testDBToProperties
+ CPPUNIT_ASSERT(0 != _material);
+
+ TestMaterial::testDBToProperties();
+
+ CPPUNIT_ASSERT_EQUAL(false, _material->isJacobianSymmetric());
+} // testDBToProperties
+
+
+// End of file
Added: short/3D/PyLith/trunk/unittests/libtests/materials/TestDruckerPragerPlaneStrain.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/TestDruckerPragerPlaneStrain.hh (rev 0)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/TestDruckerPragerPlaneStrain.hh 2012-02-07 00:52:43 UTC (rev 19588)
@@ -0,0 +1,126 @@
+// -*- C++ -*-
+//
+// ----------------------------------------------------------------------
+//
+// Brad T. Aagaard, U.S. Geological Survey
+// Charles A. Williams, GNS Science
+// Matthew G. Knepley, University of Chicago
+//
+// This code was developed as part of the Computational Infrastructure
+// for Geodynamics (http://geodynamics.org).
+//
+// Copyright (c) 2010-2011 University of California, Davis
+//
+// See COPYING for license information.
+//
+// ----------------------------------------------------------------------
+//
+
+/**
+ * @file unittests/libtests/materials/TestDruckerPragerPlaneStrain.hh
+ *
+ * @brief C++ TestDruckerPragerPlaneStrain object
+ *
+ * C++ unit testing for DruckerPragerPlaneStrain.
+ */
+
+#if !defined(pylith_materials_testdruckerpragerplanestrain_hh)
+#define pylith_materials_testdruckerpragerplanestrain_hh
+
+#include "TestElasticMaterial.hh"
+
+/// Namespace for pylith package
+namespace pylith {
+ namespace materials {
+ class TestDruckerPragerPlaneStrain;
+ class DruckerPragerPlaneStrainElasticData;
+ class DruckerPragerPlaneStrainTimeDepData;
+ } // materials
+} // pylith
+
+/// C++ unit testing for DruckerPragerPlaneStrain
+class pylith::materials::TestDruckerPragerPlaneStrain : public TestElasticMaterial
+{ // class TestDruckerPragerPlaneStrain
+
+ // CPPUNIT TEST SUITE /////////////////////////////////////////////////
+ CPPUNIT_TEST_SUITE( TestDruckerPragerPlaneStrain );
+
+ CPPUNIT_TEST( testDimension );
+ CPPUNIT_TEST( testTensorSize );
+ CPPUNIT_TEST( testDBToProperties );
+ CPPUNIT_TEST( testNonDimProperties );
+ CPPUNIT_TEST( testDimProperties );
+ CPPUNIT_TEST( testDBToStateVars );
+ CPPUNIT_TEST( testNonDimStateVars );
+ CPPUNIT_TEST( testDimStateVars );
+ CPPUNIT_TEST( test_calcDensity );
+ CPPUNIT_TEST( test_stableTimeStepImplicit );
+
+ // Need to test Drucker-Prager elastoplastic specific behavior.
+ CPPUNIT_TEST( testTimeStep );
+ CPPUNIT_TEST( testUseElasticBehavior );
+ CPPUNIT_TEST( testHasStateVars );
+
+ CPPUNIT_TEST( test_calcStressElastic );
+ CPPUNIT_TEST( test_calcStressTimeDep );
+ CPPUNIT_TEST( test_calcElasticConstsElastic );
+ CPPUNIT_TEST( test_calcElasticConstsTimeDep );
+ CPPUNIT_TEST( test_updateStateVarsElastic );
+ CPPUNIT_TEST( test_updateStateVarsTimeDep );
+
+ CPPUNIT_TEST( testHasProperty );
+ CPPUNIT_TEST( testHasStateVar );
+
+ CPPUNIT_TEST_SUITE_END();
+
+ // PUBLIC METHODS /////////////////////////////////////////////////////
+public :
+
+ /// Setup testing data.
+ void setUp(void);
+
+ /// Test timeStep()
+ void testTimeStep(void);
+
+ /// Test useElasticBehavior()
+ void testUseElasticBehavior(void);
+
+ /// Test hasStateVars()
+ void testHasStateVars(void);
+
+ /// Test _calcStressElastic()
+ void test_calcStressElastic(void);
+
+ /// Test _calcElasticConstsElastic()
+ void test_calcElasticConstsElastic(void);
+
+ /// Test _updateStateVarsElastic()
+ void test_updateStateVarsElastic(void);
+
+ /// Test _calcStressTimeDep()
+ void test_calcStressTimeDep(void);
+
+ /// Test _calcElasticConstsTimeDep()
+ void test_calcElasticConstsTimeDep(void);
+
+ /// Test _updateStatevarsTimeDep()
+ void test_updateStateVarsTimeDep(void);
+
+ /// Test _stableTimeStepImplicit()
+ void test_stableTimeStepImplicit(void);
+
+ /// Test hasProperty()
+ void testHasProperty(void);
+
+ /// Test hasStateVar()
+ void testHasStateVar(void);
+
+ /// Test _dbToProperties() and check flag for symmetry of Jacobian.
+ void testDBToProperties(void);
+
+}; // class TestDruckerPragerPlaneStrain
+
+#endif // pylith_materials_testdruckerpragerplanestrain_hh
+
+
+// End of file
Added: short/3D/PyLith/trunk/unittests/libtests/materials/data/DruckerPragerPlaneStrainElastic.py
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/data/DruckerPragerPlaneStrainElastic.py (rev 0)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/data/DruckerPragerPlaneStrainElastic.py 2012-02-07 00:52:43 UTC (rev 19588)
@@ -0,0 +1,228 @@
+#!/usr/bin/env python
+#
+# ----------------------------------------------------------------------
+#
+# Brad T. Aagaard, U.S. Geological Survey
+# Charles A. Williams, GNS Science
+# Matthew G. Knepley, University of Chicago
+#
+# This code was developed as part of the Computational Infrastructure
+# for Geodynamics (http://geodynamics.org).
+#
+# Copyright (c) 2010-2011 University of California, Davis
+#
+# See COPYING for license information.
+#
+# ----------------------------------------------------------------------
+#
+
+## @file unittests/libtests/materials/data/DruckerPragerPlaneStrainElastic.py
+
+## @brief Python application for generating C++ data files for testing
+## C++ DruckerPragerPlaneStrain object with elastic behavior.
+
+from ElasticMaterialApp import ElasticMaterialApp
+
+import numpy
+import math
+
+# ----------------------------------------------------------------------
+dimension = 2
+numElasticConsts = 9
+tensorSize = 3
+
+# DruckerPragerPlaneStrainElastic class
+class DruckerPragerPlaneStrainElastic(ElasticMaterialApp):
+ """
+ Python application for generating C++ data files for testing C++
+ DruckerPragerPlaneStrain object with elastic behavior.
+ """
+
+ # PUBLIC METHODS /////////////////////////////////////////////////////
+
+ def __init__(self, name="druckerpragerplanestrainelastic"):
+ """
+ Constructor.
+ """
+ ElasticMaterialApp.__init__(self, name)
+
+ import pdb
+ pdb.set_trace()
+ numLocs = 2
+
+ self.dimension = dimension
+ self.numLocs = numLocs
+
+ self.dbPropertyValues = ["density", "vs", "vp",
+ "friction-angle", "cohesion",
+ "dilatation-angle"]
+ self.numPropertyValues = numpy.array([1, 1, 1, 1, 1, 1], dtype=numpy.int32)
+
+ self.dbStateVarValues = ["stress-zz-initial",
+ "plastic-strain-xx",
+ "plastic-strain-yy",
+ "plastic-strain-zz",
+ "plastic-strain-xy"
+ ]
+ self.numStateVarValues = numpy.array([1, 4], dtype=numpy.int32)
+
+ densityA = 2500.0
+ vsA = 3000.0
+ vpA = vsA*3**0.5
+ # First case has different values for friction angle and dilatation angle.
+ frictionAngleA = math.radians(30.0)
+ dilatationAngleA = math.radians(20.0)
+ cohesionA = 3.0e5
+ strainA = [1.1e-4, 1.2e-4, 1.4e-4]
+ initialStressA = [2.1e4, 2.2e4, 2.4e4]
+ initialStrainA = [3.1e-4, 3.2e-4, 3.4e-4]
+ muA = vsA*vsA*densityA
+ lambdaA = vpA*vpA*densityA - 2.0*muA
+ stressZZInitialA = numpy.array([1.075e4], dtype=numpy.float64)
+
+ denomFrictionA = math.sqrt(3.0) * (3.0 - math.sin(frictionAngleA))
+ denomDilatationA = math.sqrt(3.0) * (3.0 - math.sin(dilatationAngleA))
+ alphaYieldA = 2.0 * math.sin(frictionAngleA)/denomFrictionA
+ betaA = 6.0 * cohesionA * math.cos(frictionAngleA)/denomFrictionA
+ alphaFlowA = 2.0 * math.sin(dilatationAngleA)/denomDilatationA
+
+ densityB = 2000.0
+ vsB = 1200.0
+ vpB = vsB*3**0.5
+ # Second case has same values for friction angle and dilatation angle.
+ frictionAngleB = math.radians(25.0)
+ dilatationAngleB = math.radians(25.0)
+ cohesionB = 1.0e5
+ strainB = [4.1e-4, 4.2e-4, 4.4e-4]
+ initialStressB = [5.1e4, 5.2e4, 5.4e4]
+ initialStrainB = [6.1e-4, 6.2e-4, 6.4e-4]
+ muB = vsB*vsB*densityB
+ lambdaB = vpB*vpB*densityB - 2.0*muB
+ denomFrictionB = math.sqrt(3.0) * (3.0 - math.sin(frictionAngleB))
+ denomDilatationB = math.sqrt(3.0) * (3.0 - math.sin(dilatationAngleB))
+ alphaYieldB = 2.0 * math.sin(frictionAngleB)/denomFrictionB
+ betaB = 6.0 * cohesionB * math.cos(frictionAngleB)/denomFrictionB
+ alphaFlowB = 2.0 * math.sin(dilatationAngleB)/denomDilatationB
+ stressZZInitialB = numpy.array([2.575e4], dtype=numpy.float64)
+
+ self.lengthScale = 1.0e+3
+ self.pressureScale = muA
+ self.densityScale = 1.0e+3
+ self.timeScale = 1.0
+
+ self.dbProperties = numpy.array([ [densityA, vsA, vpA, \
+ frictionAngleA, cohesionA, \
+ dilatationAngleA],
+ [densityB, vsB, vpB, \
+ frictionAngleB, cohesionB, \
+ dilatationAngleB] ],
+ dtype=numpy.float64)
+ self.properties = numpy.array([ [densityA, muA, lambdaA, \
+ alphaYieldA, betaA, \
+ alphaFlowA],
+ [densityB, muB, lambdaB, \
+ alphaYieldB, betaB, \
+ alphaFlowB] ],
+ dtype=numpy.float64)
+
+ # TEMPORARY, need to determine how to use initial state variables
+ self.dbStateVars = numpy.zeros( (numLocs, 1 + 4), dtype=numpy.float64)
+ self.dbStateVars[0, 0] = stressZZInitialA
+ self.dbStateVars[1, 0] = stressZZInitialB
+
+ self.stateVars = numpy.zeros( (numLocs, 1 + 4), dtype=numpy.float64)
+ self.stateVars[0, 0] = stressZZInitialA
+ self.stateVars[1, 0] = stressZZInitialB
+
+ mu0 = self.pressureScale
+ density0 = self.densityScale
+ self.propertiesNondim = \
+ numpy.array([ [densityA/density0, muA/mu0, lambdaA/mu0, \
+ alphaYieldA, betaA/mu0, \
+ alphaFlowA],
+ [densityB/density0, muB/mu0, lambdaB/mu0, \
+ alphaYieldB, betaB/mu0, \
+ alphaFlowB] ],
+ dtype=numpy.float64)
+
+ stressZZInitialANondim = stressZZInitialA/mu0
+ stressZZInitialBNondim = stressZZInitialB/mu0
+
+ self.stateVarsNondim = numpy.zeros( (numLocs, 1 + 4), dtype=numpy.float64)
+ self.stateVarsNondim[0, 0] = stressZZInitialANondim
+ self.stateVarsNondim[1, 0] = stressZZInitialBNondim
+
+ self.initialStress = numpy.array([initialStressA,
+ initialStressB],
+ dtype=numpy.float64)
+ self.initialStrain = numpy.array([initialStrainA,
+ initialStrainB],
+ dtype=numpy.float64)
+
+ self.density = numpy.array([densityA,
+ densityB],
+ dtype=numpy.float64)
+
+ self.strain = numpy.array([strainA,
+ strainB],
+ dtype=numpy.float64)
+
+ self.stress = numpy.zeros( (numLocs, tensorSize), dtype=numpy.float64)
+ self.elasticConsts = numpy.zeros( (self.numLocs, numElasticConsts), \
+ dtype=numpy.float64)
+
+ (self.elasticConsts[0,:], self.stress[0,:]) = \
+ self._calcStress(strainA, muA, lambdaA, \
+ initialStressA, initialStrainA)
+ (self.elasticConsts[1,:], self.stress[1,:]) = \
+ self._calcStress(strainB, muB, lambdaB, \
+ initialStressB, initialStrainB)
+
+ self.dtStableImplicit = 1.0e10
+
+ stateVarsUpdatedA = numpy.array([stressZZInitialA, 0.0, 0.0, 0.0, 0.0],
+ dtype=numpy.float64)
+ stateVarsUpdatedB = numpy.array([stressZZInitialB, 0.0, 0.0, 0.0, 0.0],
+ dtype=numpy.float64)
+
+ self.stateVarsUpdated = numpy.array( [stateVarsUpdatedA, stateVarsUpdatedB],
+ dtype=numpy.float64)
+
+ return
+
+
+ def _calcStress(self, strainV, muV, lambdaV, initialStressV, initialStrainV):
+ """
+ Compute stress and derivative of elasticity matrix.
+ """
+ C1111 = lambdaV + 2.0*muV
+ C1122 = lambdaV
+ C1112 = 0.0
+ C2211 = lambdaV
+ C2222 = lambdaV + 2.0*muV
+ C2212 = 0.0
+ C1211 = 0.0
+ C1222 = 0.0
+ C1212 = 2.0*muV
+ elasticConsts = numpy.array([C1111, C1122, C1112,
+ C2211, C2222, C2212,
+ C1211, C1222, C1212], dtype=numpy.float64)
+
+ strain = numpy.reshape(strainV, (tensorSize,1))
+ initialStress = numpy.reshape(initialStressV, (tensorSize,1))
+ initialStrain = numpy.reshape(initialStrainV, (tensorSize,1))
+ elastic = numpy.array([ [C1111, C1122, C1112],
+ [C2211, C2222, C2212],
+ [C1211, C1222, C1212] ], dtype=numpy.float64)
+ stress = numpy.dot(elastic, strain-initialStrain) + initialStress
+ return (elasticConsts, numpy.ravel(stress))
+
+
+# MAIN /////////////////////////////////////////////////////////////////
+if __name__ == "__main__":
+
+ app = DruckerPragerPlaneStrainElastic()
+ app.run()
+
+
+# End of file
Added: short/3D/PyLith/trunk/unittests/libtests/materials/data/DruckerPragerPlaneStrainElasticData.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/data/DruckerPragerPlaneStrainElasticData.cc (rev 0)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/data/DruckerPragerPlaneStrainElasticData.cc 2012-02-07 00:52:43 UTC (rev 19588)
@@ -0,0 +1,278 @@
+// -*- C++ -*-
+//
+// ======================================================================
+//
+// Brad T. Aagaard, U.S. Geological Survey
+// Charles A. Williams, GNS Science
+// Matthew G. Knepley, University of Chicago
+//
+// This code was developed as part of the Computational Infrastructure
+// for Geodynamics (http://geodynamics.org).
+//
+// Copyright (c) 2010-2011 University of California, Davis
+//
+// See COPYING for license information.
+//
+// ======================================================================
+//
+
+// DO NOT EDIT THIS FILE
+// This file was generated from python application druckerpragerplanestrainelastic.
+
+#include "DruckerPragerPlaneStrainElasticData.hh"
+
+const int pylith::materials::DruckerPragerPlaneStrainElasticData::_dimension = 2;
+
+const int pylith::materials::DruckerPragerPlaneStrainElasticData::_numLocs = 2;
+
+const int pylith::materials::DruckerPragerPlaneStrainElasticData::_numProperties = 6;
+
+const int pylith::materials::DruckerPragerPlaneStrainElasticData::_numStateVars = 2;
+
+const int pylith::materials::DruckerPragerPlaneStrainElasticData::_numDBProperties = 6;
+
+const int pylith::materials::DruckerPragerPlaneStrainElasticData::_numDBStateVars = 5;
+
+const int pylith::materials::DruckerPragerPlaneStrainElasticData::_numPropsQuadPt = 6;
+
+const int pylith::materials::DruckerPragerPlaneStrainElasticData::_numVarsQuadPt = 5;
+
+const PylithScalar pylith::materials::DruckerPragerPlaneStrainElasticData::_lengthScale = 1.00000000e+03;
+
+const PylithScalar pylith::materials::DruckerPragerPlaneStrainElasticData::_timeScale = 1.00000000e+00;
+
+const PylithScalar pylith::materials::DruckerPragerPlaneStrainElasticData::_pressureScale = 2.25000000e+10;
+
+const PylithScalar pylith::materials::DruckerPragerPlaneStrainElasticData::_densityScale = 1.00000000e+03;
+
+const PylithScalar pylith::materials::DruckerPragerPlaneStrainElasticData::_dtStableImplicit = 1.00000000e+10;
+
+const int pylith::materials::DruckerPragerPlaneStrainElasticData::_numPropertyValues[] = {
+1,
+1,
+1,
+1,
+1,
+1,
+};
+
+const int pylith::materials::DruckerPragerPlaneStrainElasticData::_numStateVarValues[] = {
+1,
+4,
+};
+
+const char* pylith::materials::DruckerPragerPlaneStrainElasticData::_dbPropertyValues[] = {
+"density",
+"vs",
+"vp",
+"friction-angle",
+"cohesion",
+"dilatation-angle",
+};
+
+const char* pylith::materials::DruckerPragerPlaneStrainElasticData::_dbStateVarValues[] = {
+"stress-zz-initial",
+"plastic-strain-xx",
+"plastic-strain-yy",
+"plastic-strain-zz",
+"plastic-strain-xy",
+};
+
+const PylithScalar pylith::materials::DruckerPragerPlaneStrainElasticData::_dbProperties[] = {
+ 2.50000000e+03,
+ 3.00000000e+03,
+ 5.19615242e+03,
+ 5.23598776e-01,
+ 3.00000000e+05,
+ 3.49065850e-01,
+ 2.00000000e+03,
+ 1.20000000e+03,
+ 2.07846097e+03,
+ 4.36332313e-01,
+ 1.00000000e+05,
+ 4.36332313e-01,
+};
+
+const PylithScalar pylith::materials::DruckerPragerPlaneStrainElasticData::_dbStateVars[] = {
+ 1.07500000e+04,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 2.57500000e+04,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
+};
+
+const PylithScalar pylith::materials::DruckerPragerPlaneStrainElasticData::_properties[] = {
+ 2.50000000e+03,
+ 2.25000000e+10,
+ 2.25000000e+10,
+ 2.30940108e-01,
+ 3.60000000e+05,
+ 1.48583084e-01,
+ 2.00000000e+03,
+ 2.88000000e+09,
+ 2.88000000e+09,
+ 1.89338478e-01,
+ 1.21811303e+05,
+ 1.89338478e-01,
+};
+
+const PylithScalar pylith::materials::DruckerPragerPlaneStrainElasticData::_stateVars[] = {
+ 1.07500000e+04,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 2.57500000e+04,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
+};
+
+const PylithScalar pylith::materials::DruckerPragerPlaneStrainElasticData::_propertiesNondim[] = {
+ 2.50000000e+00,
+ 1.00000000e+00,
+ 1.00000000e+00,
+ 2.30940108e-01,
+ 1.60000000e-05,
+ 1.48583084e-01,
+ 2.00000000e+00,
+ 1.28000000e-01,
+ 1.28000000e-01,
+ 1.89338478e-01,
+ 5.41383567e-06,
+ 1.89338478e-01,
+};
+
+const PylithScalar pylith::materials::DruckerPragerPlaneStrainElasticData::_stateVarsNondim[] = {
+ 4.77777778e-07,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 1.14444444e-06,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
+};
+
+const PylithScalar pylith::materials::DruckerPragerPlaneStrainElasticData::_density[] = {
+ 2.50000000e+03,
+ 2.00000000e+03,
+};
+
+const PylithScalar pylith::materials::DruckerPragerPlaneStrainElasticData::_strain[] = {
+ 1.10000000e-04,
+ 1.20000000e-04,
+ 1.40000000e-04,
+ 4.10000000e-04,
+ 4.20000000e-04,
+ 4.40000000e-04,
+};
+
+const PylithScalar pylith::materials::DruckerPragerPlaneStrainElasticData::_stress[] = {
+ -1.79790000e+07,
+ -1.79780000e+07,
+ -8.97600000e+06,
+ -2.25300000e+06,
+ -2.25200000e+06,
+ -1.09800000e+06,
+};
+
+const PylithScalar pylith::materials::DruckerPragerPlaneStrainElasticData::_elasticConsts[] = {
+ 6.75000000e+10,
+ 2.25000000e+10,
+ 0.00000000e+00,
+ 2.25000000e+10,
+ 6.75000000e+10,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 4.50000000e+10,
+ 8.64000000e+09,
+ 2.88000000e+09,
+ 0.00000000e+00,
+ 2.88000000e+09,
+ 8.64000000e+09,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 5.76000000e+09,
+};
+
+const PylithScalar pylith::materials::DruckerPragerPlaneStrainElasticData::_initialStress[] = {
+ 2.10000000e+04,
+ 2.20000000e+04,
+ 2.40000000e+04,
+ 5.10000000e+04,
+ 5.20000000e+04,
+ 5.40000000e+04,
+};
+
+const PylithScalar pylith::materials::DruckerPragerPlaneStrainElasticData::_initialStrain[] = {
+ 3.10000000e-04,
+ 3.20000000e-04,
+ 3.40000000e-04,
+ 6.10000000e-04,
+ 6.20000000e-04,
+ 6.40000000e-04,
+};
+
+const PylithScalar pylith::materials::DruckerPragerPlaneStrainElasticData::_stateVarsUpdated[] = {
+ 1.07500000e+04,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 2.57500000e+04,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
+};
+
+pylith::materials::DruckerPragerPlaneStrainElasticData::DruckerPragerPlaneStrainElasticData(void)
+{ // constructor
+ dimension = _dimension;
+ numLocs = _numLocs;
+ numProperties = _numProperties;
+ numStateVars = _numStateVars;
+ numDBProperties = _numDBProperties;
+ numDBStateVars = _numDBStateVars;
+ numPropsQuadPt = _numPropsQuadPt;
+ numVarsQuadPt = _numVarsQuadPt;
+ lengthScale = _lengthScale;
+ timeScale = _timeScale;
+ pressureScale = _pressureScale;
+ densityScale = _densityScale;
+ dtStableImplicit = _dtStableImplicit;
+ numPropertyValues = const_cast<int*>(_numPropertyValues);
+ numStateVarValues = const_cast<int*>(_numStateVarValues);
+ dbPropertyValues = const_cast<char**>(_dbPropertyValues);
+ dbStateVarValues = const_cast<char**>(_dbStateVarValues);
+ dbProperties = const_cast<PylithScalar*>(_dbProperties);
+ dbStateVars = const_cast<PylithScalar*>(_dbStateVars);
+ properties = const_cast<PylithScalar*>(_properties);
+ stateVars = const_cast<PylithScalar*>(_stateVars);
+ propertiesNondim = const_cast<PylithScalar*>(_propertiesNondim);
+ stateVarsNondim = const_cast<PylithScalar*>(_stateVarsNondim);
+ density = const_cast<PylithScalar*>(_density);
+ strain = const_cast<PylithScalar*>(_strain);
+ stress = const_cast<PylithScalar*>(_stress);
+ elasticConsts = const_cast<PylithScalar*>(_elasticConsts);
+ initialStress = const_cast<PylithScalar*>(_initialStress);
+ initialStrain = const_cast<PylithScalar*>(_initialStrain);
+ stateVarsUpdated = const_cast<PylithScalar*>(_stateVarsUpdated);
+} // constructor
+
+pylith::materials::DruckerPragerPlaneStrainElasticData::~DruckerPragerPlaneStrainElasticData(void)
+{}
+
+
+// End of file
Added: short/3D/PyLith/trunk/unittests/libtests/materials/data/DruckerPragerPlaneStrainElasticData.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/data/DruckerPragerPlaneStrainElasticData.hh (rev 0)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/data/DruckerPragerPlaneStrainElasticData.hh 2012-02-07 00:52:43 UTC (rev 19588)
@@ -0,0 +1,110 @@
+// -*- C++ -*-
+//
+// ======================================================================
+//
+// Brad T. Aagaard, U.S. Geological Survey
+// Charles A. Williams, GNS Science
+// Matthew G. Knepley, University of Chicago
+//
+// This code was developed as part of the Computational Infrastructure
+// for Geodynamics (http://geodynamics.org).
+//
+// Copyright (c) 2010-2011 University of California, Davis
+//
+// See COPYING for license information.
+//
+// ======================================================================
+//
+
+// DO NOT EDIT THIS FILE
+// This file was generated from python application druckerpragerplanestrainelastic.
+
+#if !defined(pylith_materials_druckerpragerplanestrainelasticdata_hh)
+#define pylith_materials_druckerpragerplanestrainelasticdata_hh
+
+#include "ElasticMaterialData.hh"
+
+namespace pylith {
+ namespace materials {
+ class DruckerPragerPlaneStrainElasticData;
+ } // pylith
+} // materials
+
+class pylith::materials::DruckerPragerPlaneStrainElasticData : public ElasticMaterialData
+{
+
+public:
+
+ /// Constructor
+ DruckerPragerPlaneStrainElasticData(void);
+
+ /// Destructor
+ ~DruckerPragerPlaneStrainElasticData(void);
+
+private:
+
+ static const int _dimension;
+
+ static const int _numLocs;
+
+ static const int _numProperties;
+
+ static const int _numStateVars;
+
+ static const int _numDBProperties;
+
+ static const int _numDBStateVars;
+
+ static const int _numPropsQuadPt;
+
+ static const int _numVarsQuadPt;
+
+ static const PylithScalar _lengthScale;
+
+ static const PylithScalar _timeScale;
+
+ static const PylithScalar _pressureScale;
+
+ static const PylithScalar _densityScale;
+
+ static const PylithScalar _dtStableImplicit;
+
+ static const int _numPropertyValues[];
+
+ static const int _numStateVarValues[];
+
+ static const char* _dbPropertyValues[];
+
+ static const char* _dbStateVarValues[];
+
+ static const PylithScalar _dbProperties[];
+
+ static const PylithScalar _dbStateVars[];
+
+ static const PylithScalar _properties[];
+
+ static const PylithScalar _stateVars[];
+
+ static const PylithScalar _propertiesNondim[];
+
+ static const PylithScalar _stateVarsNondim[];
+
+ static const PylithScalar _density[];
+
+ static const PylithScalar _strain[];
+
+ static const PylithScalar _stress[];
+
+ static const PylithScalar _elasticConsts[];
+
+ static const PylithScalar _initialStress[];
+
+ static const PylithScalar _initialStrain[];
+
+ static const PylithScalar _stateVarsUpdated[];
+
+};
+
+#endif // pylith_materials_druckerpragerplanestrainelasticdata_hh
+
+// End of file
Added: short/3D/PyLith/trunk/unittests/libtests/materials/data/DruckerPragerPlaneStrainTimeDep.py
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/data/DruckerPragerPlaneStrainTimeDep.py (rev 0)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/data/DruckerPragerPlaneStrainTimeDep.py 2012-02-07 00:52:43 UTC (rev 19588)
@@ -0,0 +1,378 @@
+#!/usr/bin/env python
+#
+# ----------------------------------------------------------------------
+#
+# Brad T. Aagaard, U.S. Geological Survey
+# Charles A. Williams, GNS Science
+# Matthew G. Knepley, University of Chicago
+#
+# This code was developed as part of the Computational Infrastructure
+# for Geodynamics (http://geodynamics.org).
+#
+# Copyright (c) 2010-2011 University of California, Davis
+#
+# See COPYING for license information.
+#
+# ----------------------------------------------------------------------
+#
+
+## @file unittests/libtests/materials/data/DruckerPragerPlaneStrainTimeDep.py
+
+## @brief Python application for generating C++ data files for testing
+## C++ DruckerPragerPlaneStrain object with time dependent behavior.
+
+from ElasticMaterialApp import ElasticMaterialApp
+
+import numpy
+import math
+
+# ----------------------------------------------------------------------
+dimension = 2
+numElasticConsts = 9
+tensorSize = 3
+
+# DruckerPragerPlaneStrainTimeDep class
+class DruckerPragerPlaneStrainTimeDep(ElasticMaterialApp):
+ """
+ Python application for generating C++ data files for testing C++
+ DruckerPragerPlaneStrain object with time dependent behavior.
+ """
+
+ # PUBLIC METHODS /////////////////////////////////////////////////////
+
+ def __init__(self, name="druckerpragerplanestraintimedep"):
+ """
+ Constructor.
+ """
+ ElasticMaterialApp.__init__(self, name)
+
+ # import pdb
+ # pdb.set_trace()
+ numLocs = 2
+
+ self.dimension = dimension
+ self.numLocs = numLocs
+
+ self.dbPropertyValues = ["density", "vs", "vp",
+ "friction-angle", "cohesion",
+ "dilatation-angle"]
+ self.propertyValues = ["density", "mu", "lambda",
+ "alpha_yield", "beta", "alpha_flow"]
+ self.numPropertyValues = numpy.array([1, 1, 1, 1, 1, 1], dtype=numpy.int32)
+
+ self.dbStateVarValues = ["stress-zz-initial",
+ "plastic-strain-xx",
+ "plastic-strain-yy",
+ "plastic-strain-zz",
+ "plastic-strain-xy"
+ ]
+ self.numStateVarValues = numpy.array([1, 4], dtype=numpy.int32)
+
+ self.dt = 2.0e5
+
+ densityA = 2500.0
+ vsA = 3000.0
+ vpA = vsA*3**0.5
+ # First case has same values for friction angle and dilatation angle.
+ frictionAngleA = math.radians(30.0)
+ dilatationAngleA = math.radians(20.0)
+ cohesionA = 3.0e5
+ strainA = [1.1e-4, 1.2e-4, 1.4e-4]
+ initialStressA = [2.1e4, 2.2e4, 2.4e4]
+ initialStrainA = [3.6e-5, 3.5e-5, 3.3e-5]
+ muA = vsA*vsA*densityA
+ lambdaA = vpA*vpA*densityA - 2.0*muA
+ stressZZInitialA = 1.075e4
+
+ denomFrictionA = math.sqrt(3.0) * (3.0 - math.sin(frictionAngleA))
+ denomDilatationA = math.sqrt(3.0) * (3.0 - math.sin(dilatationAngleA))
+ alphaYieldA = 2.0 * math.sin(frictionAngleA)/denomFrictionA
+ betaA = 6.0 * cohesionA * math.cos(frictionAngleA)/denomFrictionA
+ alphaFlowA = 2.0 * math.sin(dilatationAngleA)/denomDilatationA
+
+ densityB = 2000.0
+ vsB = 1200.0
+ vpB = vsB*3**0.5
+ # Second case has different values for friction angle and dilatation angle.
+ frictionAngleB = math.radians(25.0)
+ dilatationAngleB = math.radians(25.0)
+ cohesionB = 1.0e4
+ strainB = [4.1e-4, 4.2e-4, 4.4e-4]
+ initialStressB = [5.1e4, 5.2e4, 5.4e4]
+ initialStrainB = [6.1e-5, 6.2e-5, 6.6e-5]
+ muB = vsB*vsB*densityB
+ lambdaB = vpB*vpB*densityB - 2.0*muB
+ stressZZInitialB = 2.575e4
+
+ denomFrictionB = math.sqrt(3.0) * (3.0 - math.sin(frictionAngleB))
+ denomDilatationB = math.sqrt(3.0) * (3.0 - math.sin(dilatationAngleB))
+ alphaYieldB = 2.0 * math.sin(frictionAngleB)/denomFrictionB
+ betaB = 6.0 * cohesionB * math.cos(frictionAngleB)/denomFrictionB
+ alphaFlowB = 2.0 * math.sin(dilatationAngleB)/denomDilatationB
+
+ self.lengthScale = 1.0e+3
+ self.pressureScale = muA
+ self.densityScale = 1.0e+3
+ self.timeScale = 1.0
+
+ self.dbProperties = numpy.array([ [densityA, vsA, vpA, \
+ frictionAngleA, cohesionA, \
+ dilatationAngleA],
+ [densityB, vsB, vpB, \
+ frictionAngleB, cohesionB, \
+ dilatationAngleB] ],
+ dtype=numpy.float64)
+ self.properties = numpy.array([ [densityA, muA, lambdaA, \
+ alphaYieldA, betaA, \
+ alphaFlowA],
+ [densityB, muB, lambdaB, \
+ alphaYieldB, betaB, \
+ alphaFlowB] ],
+ dtype=numpy.float64)
+
+ # TEMPORARY, need to determine how to use initial state variables
+ self.dbStateVars = numpy.zeros( (numLocs, 1 + 4), dtype=numpy.float64)
+ self.dbStateVars[0, 0] = stressZZInitialA
+ self.dbStateVars[1, 0] = stressZZInitialB
+
+ stateVarsA = [stressZZInitialA, 4.1e-5, 4.2e-5, 4.4e-5, 4.5e-5]
+ stateVarsB = [stressZZInitialB, 1.1e-5, 1.2e-5, 1.4e-5, 1.5e-5]
+ plasStrainA = stateVarsA[1:]
+ plasStrainB = stateVarsB[1:]
+ self.stateVars = numpy.array([[stateVarsA], [stateVarsB] ],
+ dtype=numpy.float64)
+
+ mu0 = self.pressureScale
+ density0 = self.densityScale
+ self.propertiesNondim = \
+ numpy.array([ [densityA/density0, muA/mu0, lambdaA/mu0, \
+ alphaYieldA, betaA/mu0, \
+ alphaFlowA],
+ [densityB/density0, muB/mu0, lambdaB/mu0, \
+ alphaYieldB, betaB/mu0, \
+ alphaFlowB] ],
+ dtype=numpy.float64)
+
+ stressZZInitialANondim = stressZZInitialA/mu0
+ stressZZInitialBNondim = stressZZInitialB/mu0
+ self.stateVarsNondim = numpy.array([[stateVarsA], [stateVarsB] ],
+ dtype=numpy.float64)
+ self.stateVarsNondim[0, 0] = stressZZInitialANondim
+ self.stateVarsNondim[1, 0] = stressZZInitialBNondim
+
+ self.initialStress = numpy.array([initialStressA,
+ initialStressB],
+ dtype=numpy.float64)
+ self.initialStrain = numpy.array([initialStrainA,
+ initialStrainB],
+ dtype=numpy.float64)
+
+ self.density = numpy.array([densityA,
+ densityB],
+ dtype=numpy.float64)
+
+ self.strain = numpy.array([strainA,
+ strainB],
+ dtype=numpy.float64)
+
+ self.stress = numpy.zeros( (numLocs, tensorSize), dtype=numpy.float64)
+ self.stateVarsUpdated = numpy.zeros( (numLocs, 5),
+ dtype=numpy.float64)
+ self.elasticConsts = numpy.zeros( (self.numLocs, numElasticConsts), \
+ dtype=numpy.float64)
+
+ (self.elasticConsts[0,:], self.stress[0,:], self.stateVarsUpdated[0,:]) = \
+ self._calcStress(strainA, muA, lambdaA,
+ alphaYieldA, betaA, alphaFlowA,
+ plasStrainA,
+ initialStressA, initialStrainA,
+ stateVarsA)
+ (self.elasticConsts[1,:], self.stress[1,:], self.stateVarsUpdated[1,:]) = \
+ self._calcStress(strainB, muB, lambdaB,
+ alphaYieldB, betaB, alphaFlowB,
+ plasStrainB,
+ initialStressB, initialStrainB,
+ stateVarsB)
+
+ self.dtStableImplicit = 1.0e30
+
+ return
+
+
+ def _scalarProduct(self, tensor1, tensor2):
+ """
+ Compute the scalar product of two tensors stored in vector form (length 4).
+ """
+ scalarProduct = tensor1[0] * tensor2[0] + \
+ tensor1[1] * tensor2[1] + \
+ tensor1[2] * tensor2[2] + \
+ 2.0 * tensor1[3] * tensor2[3]
+ return scalarProduct
+
+
+ def _calcStressComponent(self, strainVal, strainComp, stressComp, strainTpdt,
+ muV, lambdaV, alphaYieldV, betaV, alphaFlowV,
+ plasStrainT, initialStress, initialStrain,
+ stateVars):
+ """
+ Function to compute a particular stress component as a function of a
+ strain component.
+ """
+ strainTest = numpy.array(strainTpdt, dtype=numpy.float64)
+ strainTest[strainComp] = strainVal
+ stressTpdt, visStrainTpdt = self._computeStress(strainTest, muV, lambdaV,
+ alphaYieldV, betaV,
+ alphaFlowV,
+ plasStrainT,
+ initialStress,
+ initialStrain,
+ stateVars)
+ return stressTpdt[stressComp]
+
+
+ def _computeStress(self, strainTpdt, muV, lambdaV, alphaYieldV, betaV,
+ alphaFlowV, plasStrainT, initialStress, initialStrain,
+ stateVars):
+ """
+ Function to compute stresses and plastic strains.
+ """
+
+ # Constants
+ mu2 = 2.0 * muV
+ lamPlusMu = lambdaV + muV
+ bulkModulus = lambdaV + mu2/3.0
+ ae = 1.0/mu2
+ am = 1.0/(3.0 * bulkModulus)
+ diag = numpy.array([1.0, 1.0, 1.0, 0.0], dtype=numpy.float64)
+
+ # Values from previous time step
+ meanPlasStrainT = (plasStrainT[0] + plasStrainT[1] + plasStrainT[2])/3.0
+ devPlasStrainT = plasStrainT - meanPlasStrainT * diag
+
+ # Initial stress values
+ initialStress4 = numpy.array([initialStress[0], initialStress[1],
+ stateVars[0], initialStress[2]],
+ dtype=numpy.float64)
+ meanStressInitial = (initialStress[0] + initialStress[1] + stateVars[0])/3.0
+ devStressInitial = initialStress4 - meanStressInitial * diag
+
+ # Initial strain values
+ initialStrain4 = numpy.array([initialStrain[0], initialStrain[1],
+ 0.0, initialStrain[2]], dtype=numpy.float64)
+ meanStrainInitial = (initialStrain[0] + initialStrain[1])/3.0
+ devStrainInitial = initialStrain4 - meanStrainInitial * diag
+
+ # Values for current time step
+ strainTpdt4 = numpy.array([strainTpdt[0], strainTpdt[1],
+ 0.0, strainTpdt[2]], dtype=numpy.float64)
+ meanStrainTpdt = (strainTpdt[0] + strainTpdt[1])/3.0
+ meanStrainPPTpdt = meanStrainTpdt - meanPlasStrainT - meanStrainInitial
+ strainPPTpdt = strainTpdt4 - meanStrainTpdt * diag - \
+ devPlasStrainT - devStrainInitial
+
+ # Compute trial elastic stresses and yield function to see if yield should
+ # occur.
+ trialDevStress = strainPPTpdt/ae + devStressInitial
+ trialMeanStress = meanStrainPPTpdt/am + meanStressInitial
+ yieldFunction = 3.0 * alphaYieldV * trialMeanStress + \
+ math.sqrt(0.5 * self._scalarProduct(trialDevStress,
+ trialDevStress)) - \
+ betaV
+
+ # If yield function is greater than zero, compute elastoplastic stress.
+ if (yieldFunction >= 0.0):
+ devStressInitialProd = self._scalarProduct(devStressInitial,
+ devStressInitial)
+ strainPPTpdtProd = self._scalarProduct(strainPPTpdt, strainPPTpdt)
+ d = math.sqrt(ae * ae * devStressInitialProd + \
+ 2.0 * ae * self._scalarProduct(devStressInitial, \
+ strainPPTpdt) + \
+ strainPPTpdtProd)
+ plasticMult = 2.0 * ae * am * \
+ (3.0 * alphaYieldV * meanStrainPPTpdt/am + \
+ d/(math.sqrt(2.0) * ae) - betaV)/ \
+ (6.0 * alphaYieldV * alphaFlowV * ae + am)
+ deltaMeanPlasticStrain = plasticMult * alphaFlowV
+ meanStressTpdt = (meanStrainPPTpdt - deltaMeanPlasticStrain)/am + \
+ meanStressInitial
+
+ deltaDevPlasticStrain = 0.0
+ stressTpdt4 = numpy.zeros( (4), dtype=numpy.float64)
+ stressTpdt = numpy.zeros( (tensorSize), dtype=numpy.float64)
+ plasStrainTpdt = numpy.zeros( (4), dtype=numpy.float64)
+
+ for iComp in range(4):
+ deltaDevPlasticStrain = plasticMult * (strainPPTpdt[iComp] + \
+ ae * devStressInitial[iComp])/ \
+ (math.sqrt(2.0) * d)
+ devStressTpdt = (strainPPTpdt[iComp] - deltaDevPlasticStrain)/ae + \
+ devStressInitial[iComp]
+ stressTpdt4[iComp] = devStressTpdt + diag[iComp] * meanStressTpdt
+ plasStrainTpdt[iComp] = plasStrainT[iComp] + deltaDevPlasticStrain + \
+ diag[iComp] * deltaMeanPlasticStrain
+
+ stressTpdt[0] = stressTpdt4[0]
+ stressTpdt[1] = stressTpdt4[1]
+ stressTpdt[2] = stressTpdt4[3]
+
+ return stressTpdt, plasStrainTpdt
+
+
+ def _calcStress(self, strainV, muV, lambdaV, alphaYieldV, betaV, alphaFlowV,
+ plasStrainV, initialStressV, initialStrainV, stateVars):
+ """
+ Compute stress, updated state variables and derivative of elasticity matrix.
+ """
+ import scipy.misc
+
+ # Define some numpy arrays
+ strainTpdt = numpy.array(strainV, dtype=numpy.float64)
+ plasStrainT = numpy.array(plasStrainV, dtype=numpy.float64)
+ initialStress = numpy.array(initialStressV, dtype=numpy.float64)
+ initialStrain = numpy.array(initialStrainV, dtype=numpy.float64)
+ stressTpdt, plasStrainTpdt = self._computeStress(strainTpdt, muV, lambdaV,
+ alphaYieldV, betaV,
+ alphaFlowV, plasStrainT,
+ initialStress,
+ initialStrain,
+ stateVars)
+ stateVarsUpdated = numpy.array( (stateVars[0], plasStrainTpdt[0],
+ plasStrainTpdt[1], plasStrainTpdt[2],
+ plasStrainTpdt[3]))
+ # Compute components of tangent constitutive matrix using numerical
+ # derivatives.
+ derivDx = 1.0e-12
+ derivOrder = 3
+ elasticConstsList = []
+
+ for stressComp in range(tensorSize):
+ for strainComp in range(tensorSize):
+ dStressDStrain = scipy.misc.derivative(self._calcStressComponent,
+ strainTpdt[strainComp],
+ dx=derivDx,
+ args=(strainComp,
+ stressComp,
+ strainTpdt, muV, lambdaV,
+ alphaYieldV, betaV,
+ alphaFlowV,
+ plasStrainT,
+ initialStress,
+ initialStrain,
+ stateVars),
+ order=derivOrder)
+ elasticConstsList.append(dStressDStrain)
+
+ elasticConsts = numpy.array(elasticConstsList, dtype=numpy.float64)
+
+ return (elasticConsts, numpy.ravel(stressTpdt),
+ numpy.ravel(stateVarsUpdated))
+
+
+# MAIN /////////////////////////////////////////////////////////////////
+if __name__ == "__main__":
+
+ app = DruckerPragerPlaneStrainTimeDep()
+ app.run()
+
+
+# End of file
Added: short/3D/PyLith/trunk/unittests/libtests/materials/data/DruckerPragerPlaneStrainTimeDepData.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/data/DruckerPragerPlaneStrainTimeDepData.cc (rev 0)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/data/DruckerPragerPlaneStrainTimeDepData.cc 2012-02-07 00:52:43 UTC (rev 19588)
@@ -0,0 +1,278 @@
+// -*- C++ -*-
+//
+// ======================================================================
+//
+// Brad T. Aagaard, U.S. Geological Survey
+// Charles A. Williams, GNS Science
+// Matthew G. Knepley, University of Chicago
+//
+// This code was developed as part of the Computational Infrastructure
+// for Geodynamics (http://geodynamics.org).
+//
+// Copyright (c) 2010-2011 University of California, Davis
+//
+// See COPYING for license information.
+//
+// ======================================================================
+//
+
+// DO NOT EDIT THIS FILE
+// This file was generated from python application druckerpragerplanestraintimedep.
+
+#include "DruckerPragerPlaneStrainTimeDepData.hh"
+
+const int pylith::materials::DruckerPragerPlaneStrainTimeDepData::_dimension = 2;
+
+const int pylith::materials::DruckerPragerPlaneStrainTimeDepData::_numLocs = 2;
+
+const int pylith::materials::DruckerPragerPlaneStrainTimeDepData::_numProperties = 6;
+
+const int pylith::materials::DruckerPragerPlaneStrainTimeDepData::_numStateVars = 2;
+
+const int pylith::materials::DruckerPragerPlaneStrainTimeDepData::_numDBProperties = 6;
+
+const int pylith::materials::DruckerPragerPlaneStrainTimeDepData::_numDBStateVars = 5;
+
+const int pylith::materials::DruckerPragerPlaneStrainTimeDepData::_numPropsQuadPt = 6;
+
+const int pylith::materials::DruckerPragerPlaneStrainTimeDepData::_numVarsQuadPt = 5;
+
+const PylithScalar pylith::materials::DruckerPragerPlaneStrainTimeDepData::_lengthScale = 1.00000000e+03;
+
+const PylithScalar pylith::materials::DruckerPragerPlaneStrainTimeDepData::_timeScale = 1.00000000e+00;
+
+const PylithScalar pylith::materials::DruckerPragerPlaneStrainTimeDepData::_pressureScale = 2.25000000e+10;
+
+const PylithScalar pylith::materials::DruckerPragerPlaneStrainTimeDepData::_densityScale = 1.00000000e+03;
+
+const PylithScalar pylith::materials::DruckerPragerPlaneStrainTimeDepData::_dtStableImplicit = 1.00000000e+30;
+
+const int pylith::materials::DruckerPragerPlaneStrainTimeDepData::_numPropertyValues[] = {
+1,
+1,
+1,
+1,
+1,
+1,
+};
+
+const int pylith::materials::DruckerPragerPlaneStrainTimeDepData::_numStateVarValues[] = {
+1,
+4,
+};
+
+const char* pylith::materials::DruckerPragerPlaneStrainTimeDepData::_dbPropertyValues[] = {
+"density",
+"vs",
+"vp",
+"friction-angle",
+"cohesion",
+"dilatation-angle",
+};
+
+const char* pylith::materials::DruckerPragerPlaneStrainTimeDepData::_dbStateVarValues[] = {
+"stress-zz-initial",
+"plastic-strain-xx",
+"plastic-strain-yy",
+"plastic-strain-zz",
+"plastic-strain-xy",
+};
+
+const PylithScalar pylith::materials::DruckerPragerPlaneStrainTimeDepData::_dbProperties[] = {
+ 2.50000000e+03,
+ 3.00000000e+03,
+ 5.19615242e+03,
+ 5.23598776e-01,
+ 3.00000000e+05,
+ 3.49065850e-01,
+ 2.00000000e+03,
+ 1.20000000e+03,
+ 2.07846097e+03,
+ 4.36332313e-01,
+ 1.00000000e+04,
+ 4.36332313e-01,
+};
+
+const PylithScalar pylith::materials::DruckerPragerPlaneStrainTimeDepData::_dbStateVars[] = {
+ 1.07500000e+04,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 2.57500000e+04,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
+ 0.00000000e+00,
+};
+
+const PylithScalar pylith::materials::DruckerPragerPlaneStrainTimeDepData::_properties[] = {
+ 2.50000000e+03,
+ 2.25000000e+10,
+ 2.25000000e+10,
+ 2.30940108e-01,
+ 3.60000000e+05,
+ 1.48583084e-01,
+ 2.00000000e+03,
+ 2.88000000e+09,
+ 2.88000000e+09,
+ 1.89338478e-01,
+ 1.21811303e+04,
+ 1.89338478e-01,
+};
+
+const PylithScalar pylith::materials::DruckerPragerPlaneStrainTimeDepData::_stateVars[] = {
+ 1.07500000e+04,
+ 4.10000000e-05,
+ 4.20000000e-05,
+ 4.40000000e-05,
+ 4.50000000e-05,
+ 2.57500000e+04,
+ 1.10000000e-05,
+ 1.20000000e-05,
+ 1.40000000e-05,
+ 1.50000000e-05,
+};
+
+const PylithScalar pylith::materials::DruckerPragerPlaneStrainTimeDepData::_propertiesNondim[] = {
+ 2.50000000e+00,
+ 1.00000000e+00,
+ 1.00000000e+00,
+ 2.30940108e-01,
+ 1.60000000e-05,
+ 1.48583084e-01,
+ 2.00000000e+00,
+ 1.28000000e-01,
+ 1.28000000e-01,
+ 1.89338478e-01,
+ 5.41383567e-07,
+ 1.89338478e-01,
+};
+
+const PylithScalar pylith::materials::DruckerPragerPlaneStrainTimeDepData::_stateVarsNondim[] = {
+ 4.77777778e-07,
+ 4.77777778e-07,
+ 4.77777778e-07,
+ 4.77777778e-07,
+ 4.77777778e-07,
+ 1.14444444e-06,
+ 1.14444444e-06,
+ 1.14444444e-06,
+ 1.14444444e-06,
+ 1.14444444e-06,
+};
+
+const PylithScalar pylith::materials::DruckerPragerPlaneStrainTimeDepData::_density[] = {
+ 2.50000000e+03,
+ 2.00000000e+03,
+};
+
+const PylithScalar pylith::materials::DruckerPragerPlaneStrainTimeDepData::_strain[] = {
+ 1.10000000e-04,
+ 1.20000000e-04,
+ 1.40000000e-04,
+ 4.10000000e-04,
+ 4.20000000e-04,
+ 4.40000000e-04,
+};
+
+const PylithScalar pylith::materials::DruckerPragerPlaneStrainTimeDepData::_stress[] = {
+ -4.95807185e+05,
+ -3.82197636e+05,
+ 7.08863124e+05,
+ 5.51473672e+05,
+ 5.45142209e+05,
+ -2.85351554e+05,
+};
+
+const PylithScalar pylith::materials::DruckerPragerPlaneStrainTimeDepData::_elasticConsts[] = {
+ 2.44487161e+10,
+ 1.17789183e+10,
+ -1.66473214e+10,
+ 1.09997245e+10,
+ 2.10335485e+10,
+ -1.62468306e+10,
+ -1.31854142e+10,
+ -1.29851687e+10,
+ 1.38346134e+10,
+ 1.73722726e+09,
+ 2.48498883e+09,
+ -2.42123101e+09,
+ 2.48498825e+09,
+ 1.68402528e+09,
+ -2.37432763e+09,
+ -1.21061568e+09,
+ -1.18716349e+09,
+ 1.33926043e+09,
+};
+
+const PylithScalar pylith::materials::DruckerPragerPlaneStrainTimeDepData::_initialStress[] = {
+ 2.10000000e+04,
+ 2.20000000e+04,
+ 2.40000000e+04,
+ 5.10000000e+04,
+ 5.20000000e+04,
+ 5.40000000e+04,
+};
+
+const PylithScalar pylith::materials::DruckerPragerPlaneStrainTimeDepData::_initialStrain[] = {
+ 3.60000000e-05,
+ 3.50000000e-05,
+ 3.30000000e-05,
+ 6.10000000e-05,
+ 6.20000000e-05,
+ 6.60000000e-05,
+};
+
+const PylithScalar pylith::materials::DruckerPragerPlaneStrainTimeDepData::_stateVarsUpdated[] = {
+ 1.07500000e+04,
+ 7.52490579e-05,
+ 8.37466235e-05,
+ 2.04754109e-05,
+ 9.17808195e-05,
+ 2.57500000e+04,
+ 3.24452570e-04,
+ 3.34725393e-04,
+ -7.68586819e-05,
+ 4.32915200e-04,
+};
+
+pylith::materials::DruckerPragerPlaneStrainTimeDepData::DruckerPragerPlaneStrainTimeDepData(void)
+{ // constructor
+ dimension = _dimension;
+ numLocs = _numLocs;
+ numProperties = _numProperties;
+ numStateVars = _numStateVars;
+ numDBProperties = _numDBProperties;
+ numDBStateVars = _numDBStateVars;
+ numPropsQuadPt = _numPropsQuadPt;
+ numVarsQuadPt = _numVarsQuadPt;
+ lengthScale = _lengthScale;
+ timeScale = _timeScale;
+ pressureScale = _pressureScale;
+ densityScale = _densityScale;
+ dtStableImplicit = _dtStableImplicit;
+ numPropertyValues = const_cast<int*>(_numPropertyValues);
+ numStateVarValues = const_cast<int*>(_numStateVarValues);
+ dbPropertyValues = const_cast<char**>(_dbPropertyValues);
+ dbStateVarValues = const_cast<char**>(_dbStateVarValues);
+ dbProperties = const_cast<PylithScalar*>(_dbProperties);
+ dbStateVars = const_cast<PylithScalar*>(_dbStateVars);
+ properties = const_cast<PylithScalar*>(_properties);
+ stateVars = const_cast<PylithScalar*>(_stateVars);
+ propertiesNondim = const_cast<PylithScalar*>(_propertiesNondim);
+ stateVarsNondim = const_cast<PylithScalar*>(_stateVarsNondim);
+ density = const_cast<PylithScalar*>(_density);
+ strain = const_cast<PylithScalar*>(_strain);
+ stress = const_cast<PylithScalar*>(_stress);
+ elasticConsts = const_cast<PylithScalar*>(_elasticConsts);
+ initialStress = const_cast<PylithScalar*>(_initialStress);
+ initialStrain = const_cast<PylithScalar*>(_initialStrain);
+ stateVarsUpdated = const_cast<PylithScalar*>(_stateVarsUpdated);
+} // constructor
+
+pylith::materials::DruckerPragerPlaneStrainTimeDepData::~DruckerPragerPlaneStrainTimeDepData(void)
+{}
+
+
+// End of file
Added: short/3D/PyLith/trunk/unittests/libtests/materials/data/DruckerPragerPlaneStrainTimeDepData.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/data/DruckerPragerPlaneStrainTimeDepData.hh (rev 0)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/data/DruckerPragerPlaneStrainTimeDepData.hh 2012-02-07 00:52:43 UTC (rev 19588)
@@ -0,0 +1,110 @@
+// -*- C++ -*-
+//
+// ======================================================================
+//
+// Brad T. Aagaard, U.S. Geological Survey
+// Charles A. Williams, GNS Science
+// Matthew G. Knepley, University of Chicago
+//
+// This code was developed as part of the Computational Infrastructure
+// for Geodynamics (http://geodynamics.org).
+//
+// Copyright (c) 2010-2011 University of California, Davis
+//
+// See COPYING for license information.
+//
+// ======================================================================
+//
+
+// DO NOT EDIT THIS FILE
+// This file was generated from python application druckerpragerplanestraintimedep.
+
+#if !defined(pylith_materials_druckerpragerplanestraintimedepdata_hh)
+#define pylith_materials_druckerpragerplanestraintimedepdata_hh
+
+#include "ElasticMaterialData.hh"
+
+namespace pylith {
+ namespace materials {
+ class DruckerPragerPlaneStrainTimeDepData;
+ } // pylith
+} // materials
+
+class pylith::materials::DruckerPragerPlaneStrainTimeDepData : public ElasticMaterialData
+{
+
+public:
+
+ /// Constructor
+ DruckerPragerPlaneStrainTimeDepData(void);
+
+ /// Destructor
+ ~DruckerPragerPlaneStrainTimeDepData(void);
+
+private:
+
+ static const int _dimension;
+
+ static const int _numLocs;
+
+ static const int _numProperties;
+
+ static const int _numStateVars;
+
+ static const int _numDBProperties;
+
+ static const int _numDBStateVars;
+
+ static const int _numPropsQuadPt;
+
+ static const int _numVarsQuadPt;
+
+ static const PylithScalar _lengthScale;
+
+ static const PylithScalar _timeScale;
+
+ static const PylithScalar _pressureScale;
+
+ static const PylithScalar _densityScale;
+
+ static const PylithScalar _dtStableImplicit;
+
+ static const int _numPropertyValues[];
+
+ static const int _numStateVarValues[];
+
+ static const char* _dbPropertyValues[];
+
+ static const char* _dbStateVarValues[];
+
+ static const PylithScalar _dbProperties[];
+
+ static const PylithScalar _dbStateVars[];
+
+ static const PylithScalar _properties[];
+
+ static const PylithScalar _stateVars[];
+
+ static const PylithScalar _propertiesNondim[];
+
+ static const PylithScalar _stateVarsNondim[];
+
+ static const PylithScalar _density[];
+
+ static const PylithScalar _strain[];
+
+ static const PylithScalar _stress[];
+
+ static const PylithScalar _elasticConsts[];
+
+ static const PylithScalar _initialStress[];
+
+ static const PylithScalar _initialStrain[];
+
+ static const PylithScalar _stateVarsUpdated[];
+
+};
+
+#endif // pylith_materials_druckerpragerplanestraintimedepdata_hh
+
+// End of file
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/data/generate.sh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/data/generate.sh 2012-02-04 22:21:05 UTC (rev 19587)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/data/generate.sh 2012-02-07 00:52:43 UTC (rev 19588)
@@ -78,6 +78,11 @@
--data.object=GenMaxwellPlaneStrainElasticData \
--data.parent=ElasticMaterialData
+ python DruckerPragerPlaneStrainElastic.py \
+ --data.namespace=pylith,materials \
+ --data.object=DruckerPragerPlaneStrainElasticData \
+ --data.parent=ElasticMaterialData
+
# 1-D ----------------------------------------------------------------
python ElasticStrain1D.py \
@@ -130,6 +135,11 @@
--data.object=DruckerPrager3DTimeDepData \
--data.parent=ElasticMaterialData
+ python DruckerPragerPlaneStrainTimeDep.py \
+ --data.namespace=pylith,materials \
+ --data.object=DruckerPragerPlaneStrainTimeDepData \
+ --data.parent=ElasticMaterialData
+
fi
More information about the CIG-COMMITS
mailing list