[cig-commits] r20142 - in short/3D/PyLith/branches/v1.7-trunk: . libsrc/pylith/materials modulesrc/materials pylith/problems unittests/libtests/materials unittests/pytests/materials

Tue May 15 17:38:43 PDT 2012

Author: brad
Date: 2012-05-15 17:38:43 -0700 (Tue, 15 May 2012)
New Revision: 20142

Modified:
   short/3D/PyLith/branches/v1.7-trunk/TODO
   short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/DruckerPrager3D.cc
   short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/DruckerPrager3D.hh
   short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/DruckerPragerPlaneStrain.cc
   short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/DruckerPragerPlaneStrain.hh
   short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/GenMaxwellIsotropic3D.cc
   short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/GenMaxwellIsotropic3D.hh
   short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/GenMaxwellPlaneStrain.cc
   short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/GenMaxwellPlaneStrain.hh
   short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/GenMaxwellQpQsIsotropic3D.cc
   short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/GenMaxwellQpQsIsotropic3D.hh
   short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/Material.hh
   short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/Material.icc
   short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/MaxwellIsotropic3D.cc
   short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/MaxwellIsotropic3D.hh
   short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/MaxwellPlaneStrain.cc
   short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/MaxwellPlaneStrain.hh
   short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/PowerLaw3D.cc
   short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/PowerLaw3D.hh
   short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/PowerLawPlaneStrain.cc
   short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/PowerLawPlaneStrain.hh
   short/3D/PyLith/branches/v1.7-trunk/modulesrc/materials/DruckerPrager3D.i
   short/3D/PyLith/branches/v1.7-trunk/modulesrc/materials/DruckerPragerPlaneStrain.i
   short/3D/PyLith/branches/v1.7-trunk/modulesrc/materials/ElasticMaterial.i
   short/3D/PyLith/branches/v1.7-trunk/modulesrc/materials/GenMaxwellIsotropic3D.i
   short/3D/PyLith/branches/v1.7-trunk/modulesrc/materials/GenMaxwellPlaneStrain.i
   short/3D/PyLith/branches/v1.7-trunk/modulesrc/materials/GenMaxwellQpQsIsotropic3D.i
   short/3D/PyLith/branches/v1.7-trunk/modulesrc/materials/MaxwellIsotropic3D.i
   short/3D/PyLith/branches/v1.7-trunk/modulesrc/materials/MaxwellPlaneStrain.i
   short/3D/PyLith/branches/v1.7-trunk/modulesrc/materials/PowerLaw3D.i
   short/3D/PyLith/branches/v1.7-trunk/modulesrc/materials/PowerLawPlaneStrain.i
   short/3D/PyLith/branches/v1.7-trunk/pylith/problems/TimeDependent.py
   short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/materials/TestDruckerPrager3D.cc
   short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/materials/TestDruckerPrager3D.hh
   short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/materials/TestDruckerPragerPlaneStrain.cc
   short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/materials/TestDruckerPragerPlaneStrain.hh
   short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/materials/TestGenMaxwellIsotropic3D.cc
   short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/materials/TestGenMaxwellIsotropic3D.hh
   short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/materials/TestGenMaxwellPlaneStrain.cc
   short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/materials/TestGenMaxwellPlaneStrain.hh
   short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/materials/TestGenMaxwellQpQsIsotropic3D.cc
   short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/materials/TestGenMaxwellQpQsIsotropic3D.hh
   short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/materials/TestMaxwellIsotropic3D.cc
   short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/materials/TestMaxwellIsotropic3D.hh
   short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/materials/TestMaxwellPlaneStrain.cc
   short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/materials/TestMaxwellPlaneStrain.hh
   short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/materials/TestPowerLaw3D.cc
   short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/materials/TestPowerLaw3D.hh
   short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/materials/TestPowerLawPlaneStrain.cc
   short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/materials/TestPowerLawPlaneStrain.hh
   short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/materials/TestDruckerPrager3D.py
   short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/materials/TestDruckerPragerPlaneStrain.py
   short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/materials/TestElasticIsotropic3D.py
   short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/materials/TestElasticPlaneStrain.py
   short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/materials/TestElasticPlaneStress.py
   short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/materials/TestElasticStrain1D.py
   short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/materials/TestElasticStress1D.py
   short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/materials/TestGenMaxwellIsotropic3D.py
   short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/materials/TestGenMaxwellPlaneStrain.py
   short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/materials/TestGenMaxwellQpQsIsotropic3D.py
   short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/materials/TestMaxwellIsotropic3D.py
   short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/materials/TestMaxwellPlaneStrain.py
   short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/materials/TestPowerLaw3D.py
   short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/materials/TestPowerLawPlaneStrain.py
Log:
Changed linearPrestep to elasticPrestep and useLinearBehavior to useElasticBehavior.

Modified: short/3D/PyLith/branches/v1.7-trunk/TODO
===================================================================

--- short/3D/PyLith/branches/v1.7-trunk/TODO	2012-05-15 22:49:08 UTC (rev 20141)
+++ short/3D/PyLith/branches/v1.7-trunk/TODO	2012-05-16 00:38:43 UTC (rev 20142)
@@ -22,6 +22,7 @@
 * Use HDF5/h5py in automated full-scale tests.
 
 * Setup fieldsplit for SolverNonlinear [Matt]
+  Need to verify
 
 * 2-D materials
 
@@ -35,7 +36,7 @@
   - Output soln points [DONE]
     + Interpolation [DONE]
     + PointsList [DONE]
-  - Linear prestep
+  - Elastic prestep
     + Turned on by default
     + Static solution is linear prestep
     + Inelastic solution requires increment in driving forces

Modified: short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/DruckerPrager3D.cc
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/DruckerPrager3D.cc	2012-05-15 22:49:08 UTC (rev 20141)
+++ short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/DruckerPrager3D.cc	2012-05-16 00:38:43 UTC (rev 20142)
@@ -159,7 +159,7 @@
   _calcStressFn(0),
   _updateStateVarsFn(0)
 { // constructor
-  useLinearBehavior(false);
+  useElasticBehavior(false);
 } // constructor
 
 // ----------------------------------------------------------------------
@@ -187,8 +187,8 @@
 // ----------------------------------------------------------------------
 // Set whether elastic or inelastic constitutive relations are used.
 void
-pylith::materials::DruckerPrager3D::useLinearBehavior(const bool flag)
-{ // useLinearBehavior
+pylith::materials::DruckerPrager3D::useElasticBehavior(const bool flag)
+{ // useElasticBehavior
   if (flag) {
     _calcStressFn = 
       &pylith::materials::DruckerPrager3D::_calcStressElastic;
@@ -205,7 +205,7 @@
     _updateStateVarsFn = 
       &pylith::materials::DruckerPrager3D::_updateStateVarsElastoplastic;
   } // if/else
-} // useLinearBehavior
+} // useElasticBehavior
 
 // ----------------------------------------------------------------------
 // Compute properties from values in spatial database.

Modified: short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/DruckerPrager3D.hh
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/DruckerPrager3D.hh	2012-05-15 22:49:08 UTC (rev 20141)
+++ short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/DruckerPrager3D.hh	2012-05-16 00:38:43 UTC (rev 20142)
@@ -83,7 +83,7 @@
    *
    * @param flag True to use elastic, false to use inelastic.
    */
-  void useLinearBehavior(const bool flag);
+  void useElasticBehavior(const bool flag);
 
 
   // PROTECTED METHODS //////////////////////////////////////////////////

Modified: short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/DruckerPragerPlaneStrain.cc
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/DruckerPragerPlaneStrain.cc	2012-05-15 22:49:08 UTC (rev 20141)
+++ short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/DruckerPragerPlaneStrain.cc	2012-05-16 00:38:43 UTC (rev 20142)
@@ -165,7 +165,7 @@
   _calcStressFn(0),
   _updateStateVarsFn(0)
 { // constructor
-  useLinearBehavior(false);
+  useElasticBehavior(false);
 } // constructor
 
 // ----------------------------------------------------------------------
@@ -194,8 +194,8 @@
 // ----------------------------------------------------------------------
 // Set whether elastic or inelastic constitutive relations are used.
 void
-pylith::materials::DruckerPragerPlaneStrain::useLinearBehavior(const bool flag)
-{ // useLinearBehavior
+pylith::materials::DruckerPragerPlaneStrain::useElasticBehavior(const bool flag)
+{ // useElasticBehavior
   if (flag) {
     _calcStressFn = 
       &pylith::materials::DruckerPragerPlaneStrain::_calcStressElastic;
@@ -212,7 +212,7 @@
     _updateStateVarsFn = 
       &pylith::materials::DruckerPragerPlaneStrain::_updateStateVarsElastoplastic;
   } // if/else
-} // useLinearBehavior
+} // useElasticBehavior
 
 // ----------------------------------------------------------------------
 // Compute properties from values in spatial database.

Modified: short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/DruckerPragerPlaneStrain.hh
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/DruckerPragerPlaneStrain.hh	2012-05-15 22:49:08 UTC (rev 20141)
+++ short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/DruckerPragerPlaneStrain.hh	2012-05-16 00:38:43 UTC (rev 20142)
@@ -83,7 +83,7 @@
    *
    * @param flag True to use elastic, false to use inelastic.
    */
-  void useLinearBehavior(const bool flag);
+  void useElasticBehavior(const bool flag);
 
 
   // PROTECTED METHODS //////////////////////////////////////////////////

Modified: short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/GenMaxwellIsotropic3D.cc
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/GenMaxwellIsotropic3D.cc	2012-05-15 22:49:08 UTC (rev 20141)
+++ short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/GenMaxwellIsotropic3D.cc	2012-05-16 00:38:43 UTC (rev 20142)
@@ -199,7 +199,7 @@
   _calcStressFn(0),
   _updateStateVarsFn(0)  
 { // constructor
-  useLinearBehavior(false);
+  useElasticBehavior(false);
   _viscousStrain.resize(_GenMaxwellIsotropic3D::numMaxwellModels*_tensorSize);
 } // constructor
 
@@ -212,8 +212,8 @@
 // ----------------------------------------------------------------------
 // Set whether elastic or inelastic constitutive relations are used.
 void
-pylith::materials::GenMaxwellIsotropic3D::useLinearBehavior(const bool flag)
-{ // useLinearBehavior
+pylith::materials::GenMaxwellIsotropic3D::useElasticBehavior(const bool flag)
+{ // useElasticBehavior
   if (flag) {
     _calcStressFn = 
       &pylith::materials::GenMaxwellIsotropic3D::_calcStressElastic;
@@ -230,7 +230,7 @@
     _updateStateVarsFn = 
       &pylith::materials::GenMaxwellIsotropic3D::_updateStateVarsViscoelastic;
   } // if/else
-} // useLinearBehavior
+} // useElasticBehavior
 
 // ----------------------------------------------------------------------
 // Compute parameters from values in spatial database.

Modified: short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/GenMaxwellIsotropic3D.hh
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/GenMaxwellIsotropic3D.hh	2012-05-15 22:49:08 UTC (rev 20141)
+++ short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/GenMaxwellIsotropic3D.hh	2012-05-16 00:38:43 UTC (rev 20142)
@@ -73,7 +73,7 @@
    *
    * @param flag True to use elastic, false to use inelastic.
    */
-  void useLinearBehavior(const bool flag);
+  void useElasticBehavior(const bool flag);
 
   // PROTECTED METHODS //////////////////////////////////////////////////
 protected :

Modified: short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/GenMaxwellPlaneStrain.cc
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/GenMaxwellPlaneStrain.cc	2012-05-15 22:49:08 UTC (rev 20141)
+++ short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/GenMaxwellPlaneStrain.cc	2012-05-16 00:38:43 UTC (rev 20142)
@@ -194,7 +194,7 @@
   _calcStressFn(0),
   _updateStateVarsFn(0)  
 { // constructor
-  useLinearBehavior(false);
+  useElasticBehavior(false);
   _viscousStrain.resize(_GenMaxwellPlaneStrain::numMaxwellModels * 4);
 } // constructor
 
@@ -207,8 +207,8 @@
 // ----------------------------------------------------------------------
 // Set whether elastic or inelastic constitutive relations are used.
 void
-pylith::materials::GenMaxwellPlaneStrain::useLinearBehavior(const bool flag)
-{ // useLinearBehavior
+pylith::materials::GenMaxwellPlaneStrain::useElasticBehavior(const bool flag)
+{ // useElasticBehavior
   if (flag) {
     _calcStressFn = 
       &pylith::materials::GenMaxwellPlaneStrain::_calcStressElastic;
@@ -225,7 +225,7 @@
     _updateStateVarsFn = 
       &pylith::materials::GenMaxwellPlaneStrain::_updateStateVarsViscoelastic;
   } // if/else
-} // useLinearBehavior
+} // useElasticBehavior
 
 // ----------------------------------------------------------------------
 // Compute parameters from values in spatial database.

Modified: short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/GenMaxwellPlaneStrain.hh
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/GenMaxwellPlaneStrain.hh	2012-05-15 22:49:08 UTC (rev 20141)
+++ short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/GenMaxwellPlaneStrain.hh	2012-05-16 00:38:43 UTC (rev 20142)
@@ -71,7 +71,7 @@
    *
    * @param flag True to use elastic, false to use inelastic.
    */
-  void useLinearBehavior(const bool flag);
+  void useElasticBehavior(const bool flag);
 
   // PROTECTED METHODS //////////////////////////////////////////////////
 protected :

Modified: short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/GenMaxwellQpQsIsotropic3D.cc
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/GenMaxwellQpQsIsotropic3D.cc	2012-05-15 22:49:08 UTC (rev 20141)
+++ short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/GenMaxwellQpQsIsotropic3D.cc	2012-05-16 00:38:43 UTC (rev 20142)
@@ -239,7 +239,7 @@
   _calcStressFn(0),
   _updateStateVarsFn(0)  
 { // constructor
-  useLinearBehavior(false);
+  useElasticBehavior(false);
   _viscousDevStrain.resize(_GenMaxwellQpQsIsotropic3D::numMaxwellModels*_tensorSize);
   _viscousMeanStrain.resize(_GenMaxwellQpQsIsotropic3D::numMaxwellModels);
 } // constructor
@@ -253,8 +253,8 @@
 // ----------------------------------------------------------------------
 // Set whether elastic or inelastic constitutive relations are used.
 void
-pylith::materials::GenMaxwellQpQsIsotropic3D::useLinearBehavior(const bool flag)
-{ // useLinearBehavior
+pylith::materials::GenMaxwellQpQsIsotropic3D::useElasticBehavior(const bool flag)
+{ // useElasticBehavior
   if (flag) {
     _calcStressFn = 
       &pylith::materials::GenMaxwellQpQsIsotropic3D::_calcStressElastic;
@@ -271,7 +271,7 @@
     _updateStateVarsFn = 
       &pylith::materials::GenMaxwellQpQsIsotropic3D::_updateStateVarsViscoelastic;
   } // if/else
-} // useLinearBehavior
+} // useElasticBehavior
 
 // ----------------------------------------------------------------------
 // Compute parameters from values in spatial database.

Modified: short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/GenMaxwellQpQsIsotropic3D.hh
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/GenMaxwellQpQsIsotropic3D.hh	2012-05-15 22:49:08 UTC (rev 20141)
+++ short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/GenMaxwellQpQsIsotropic3D.hh	2012-05-16 00:38:43 UTC (rev 20142)
@@ -73,7 +73,7 @@
    *
    * @param flag True to use elastic, false to use inelastic.
    */
-  void useLinearBehavior(const bool flag);
+  void useElasticBehavior(const bool flag);
 
   // PROTECTED METHODS //////////////////////////////////////////////////
 protected :

Modified: short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/Material.hh
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/Material.hh	2012-05-15 22:49:08 UTC (rev 20141)
+++ short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/Material.hh	2012-05-16 00:38:43 UTC (rev 20142)
@@ -171,7 +171,7 @@
    * @param flag True to use elastic, false to use inelastic.
    */
   virtual
-  void useLinearBehavior(const bool flag);
+  void useElasticBehavior(const bool flag);
 
   /** Check whether material has a field as a property.
    *

Modified: short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/Material.icc
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/Material.icc	2012-05-15 22:49:08 UTC (rev 20141)
+++ short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/Material.icc	2012-05-16 00:38:43 UTC (rev 20142)
@@ -116,8 +116,8 @@
 // Set whether elastic or inelastic constitutive relations are used.
 inline
 void
-pylith::materials::Material::useLinearBehavior(const bool flag) {
-} // useLinearBehavior
+pylith::materials::Material::useElasticBehavior(const bool flag) {
+} // useElasticBehavior
 
 // Compute initial state variables from values in spatial database.
 inline

Modified: short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/MaxwellIsotropic3D.cc
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/MaxwellIsotropic3D.cc	2012-05-15 22:49:08 UTC (rev 20141)
+++ short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/MaxwellIsotropic3D.cc	2012-05-16 00:38:43 UTC (rev 20142)
@@ -146,7 +146,7 @@
   _calcStressFn(0),
   _updateStateVarsFn(0)
 { // constructor
-  useLinearBehavior(false);
+  useElasticBehavior(false);
   _viscousStrain.resize(_tensorSize);
 } // constructor
 
@@ -159,8 +159,8 @@
 // ----------------------------------------------------------------------
 // Set whether elastic or inelastic constitutive relations are used.
 void
-pylith::materials::MaxwellIsotropic3D::useLinearBehavior(const bool flag)
-{ // useLinearBehavior
+pylith::materials::MaxwellIsotropic3D::useElasticBehavior(const bool flag)
+{ // useElasticBehavior
   if (flag) {
     _calcStressFn = 
       &pylith::materials::MaxwellIsotropic3D::_calcStressElastic;
@@ -177,7 +177,7 @@
     _updateStateVarsFn = 
       &pylith::materials::MaxwellIsotropic3D::_updateStateVarsViscoelastic;
   } // if/else
-} // useLinearBehavior
+} // useElasticBehavior
 
 // ----------------------------------------------------------------------
 // Compute properties from values in spatial database.

Modified: short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/MaxwellIsotropic3D.hh
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/MaxwellIsotropic3D.hh	2012-05-15 22:49:08 UTC (rev 20141)
+++ short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/MaxwellIsotropic3D.hh	2012-05-16 00:38:43 UTC (rev 20142)
@@ -60,7 +60,7 @@
    *
    * @param flag True to use elastic, false to use inelastic.
    */
-  void useLinearBehavior(const bool flag);
+  void useElasticBehavior(const bool flag);
 
   // PROTECTED METHODS //////////////////////////////////////////////////
 protected :

Modified: short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/MaxwellPlaneStrain.cc
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/MaxwellPlaneStrain.cc	2012-05-15 22:49:08 UTC (rev 20141)
+++ short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/MaxwellPlaneStrain.cc	2012-05-16 00:38:43 UTC (rev 20142)
@@ -149,7 +149,7 @@
   _calcStressFn(0),
   _updateStateVarsFn(0)
 { // constructor
-  useLinearBehavior(false);
+  useElasticBehavior(false);
   _viscousStrain.resize(4);
 } // constructor
 
@@ -162,8 +162,8 @@
 // ----------------------------------------------------------------------
 // Set whether elastic or inelastic constitutive relations are used.
 void
-pylith::materials::MaxwellPlaneStrain::useLinearBehavior(const bool flag)
-{ // useLinearBehavior
+pylith::materials::MaxwellPlaneStrain::useElasticBehavior(const bool flag)
+{ // useElasticBehavior
   if (flag) {
     _calcStressFn = 
       &pylith::materials::MaxwellPlaneStrain::_calcStressElastic;
@@ -180,7 +180,7 @@
     _updateStateVarsFn = 
       &pylith::materials::MaxwellPlaneStrain::_updateStateVarsViscoelastic;
   } // if/else
-} // useLinearBehavior
+} // useElasticBehavior
 
 // ----------------------------------------------------------------------
 // Compute properties from values in spatial database.

Modified: short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/MaxwellPlaneStrain.hh
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/MaxwellPlaneStrain.hh	2012-05-15 22:49:08 UTC (rev 20141)
+++ short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/MaxwellPlaneStrain.hh	2012-05-16 00:38:43 UTC (rev 20142)
@@ -62,7 +62,7 @@
    *
    * @param flag True to use elastic, false to use inelastic.
    */
-  void useLinearBehavior(const bool flag);
+  void useElasticBehavior(const bool flag);
 
   // PROTECTED METHODS //////////////////////////////////////////////////
 protected :

Modified: short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/PowerLaw3D.cc
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/PowerLaw3D.cc	2012-05-15 22:49:08 UTC (rev 20141)
+++ short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/PowerLaw3D.cc	2012-05-16 00:38:43 UTC (rev 20142)
@@ -168,7 +168,7 @@
   _calcStressFn(0),
   _updateStateVarsFn(0)
 { // constructor
-  useLinearBehavior(false);
+  useElasticBehavior(false);
 } // constructor
 
 // ----------------------------------------------------------------------
@@ -180,8 +180,8 @@
 // ----------------------------------------------------------------------
 // Set whether elastic or inelastic constitutive relations are used.
 void
-pylith::materials::PowerLaw3D::useLinearBehavior(const bool flag)
-{ // useLinearBehavior
+pylith::materials::PowerLaw3D::useElasticBehavior(const bool flag)
+{ // useElasticBehavior
   if (flag) {
     _calcStressFn = 
       &pylith::materials::PowerLaw3D::_calcStressElastic;
@@ -198,7 +198,7 @@
     _updateStateVarsFn = 
       &pylith::materials::PowerLaw3D::_updateStateVarsViscoelastic;
   } // if/else
-} // useLinearBehavior
+} // useElasticBehavior
 
 // ----------------------------------------------------------------------
 // Compute properties from values in spatial database.

Modified: short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/PowerLaw3D.hh
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/PowerLaw3D.hh	2012-05-15 22:49:08 UTC (rev 20141)
+++ short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/PowerLaw3D.hh	2012-05-16 00:38:43 UTC (rev 20142)
@@ -61,7 +61,7 @@
    *
    * @param flag True to use elastic, false to use inelastic.
    */
-  void useLinearBehavior(const bool flag);
+  void useElasticBehavior(const bool flag);
 
   /** Compute effective stress function.
    *

Modified: short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/PowerLawPlaneStrain.cc
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/PowerLawPlaneStrain.cc	2012-05-15 22:49:08 UTC (rev 20141)
+++ short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/PowerLawPlaneStrain.cc	2012-05-16 00:38:43 UTC (rev 20142)
@@ -170,7 +170,7 @@
   _calcStressFn(0),
   _updateStateVarsFn(0)
 { // constructor
-  useLinearBehavior(false);
+  useElasticBehavior(false);
 } // constructor
 
 // ----------------------------------------------------------------------
@@ -182,8 +182,8 @@
 // ----------------------------------------------------------------------
 // Set whether elastic or inelastic constitutive relations are used.
 void
-pylith::materials::PowerLawPlaneStrain::useLinearBehavior(const bool flag)
-{ // useLinearBehavior
+pylith::materials::PowerLawPlaneStrain::useElasticBehavior(const bool flag)
+{ // useElasticBehavior
   if (flag) {
     _calcStressFn = 
       &pylith::materials::PowerLawPlaneStrain::_calcStressElastic;
@@ -200,7 +200,7 @@
     _updateStateVarsFn = 
       &pylith::materials::PowerLawPlaneStrain::_updateStateVarsViscoelastic;
   } // if/else
-} // useLinearBehavior
+} // useElasticBehavior
 
 // ----------------------------------------------------------------------
 // Compute properties from values in spatial database.

Modified: short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/PowerLawPlaneStrain.hh
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/PowerLawPlaneStrain.hh	2012-05-15 22:49:08 UTC (rev 20141)
+++ short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/PowerLawPlaneStrain.hh	2012-05-16 00:38:43 UTC (rev 20142)
@@ -61,7 +61,7 @@
    *
    * @param flag True to use elastic, false to use inelastic.
    */
-  void useLinearBehavior(const bool flag);
+  void useElasticBehavior(const bool flag);
 
   /** Compute effective stress function.
    *

Modified: short/3D/PyLith/branches/v1.7-trunk/modulesrc/materials/DruckerPrager3D.i
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/modulesrc/materials/DruckerPrager3D.i	2012-05-15 22:49:08 UTC (rev 20141)
+++ short/3D/PyLith/branches/v1.7-trunk/modulesrc/materials/DruckerPrager3D.i	2012-05-16 00:38:43 UTC (rev 20142)
@@ -67,7 +67,7 @@
        *
        * @param flag True to use elastic, false to use inelastic.
        */
-      void useLinearBehavior(const bool flag);
+      void useElasticBehavior(const bool flag);
       
       // PROTECTED METHODS //////////////////////////////////////////////
     protected :

Modified: short/3D/PyLith/branches/v1.7-trunk/modulesrc/materials/DruckerPragerPlaneStrain.i
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/modulesrc/materials/DruckerPragerPlaneStrain.i	2012-05-15 22:49:08 UTC (rev 20141)
+++ short/3D/PyLith/branches/v1.7-trunk/modulesrc/materials/DruckerPragerPlaneStrain.i	2012-05-16 00:38:43 UTC (rev 20142)
@@ -67,7 +67,7 @@
        *
        * @param flag True to use elastic, false to use inelastic.
        */
-      void useLinearBehavior(const bool flag);
+      void useElasticBehavior(const bool flag);
       
       // PROTECTED METHODS //////////////////////////////////////////////
     protected :

Modified: short/3D/PyLith/branches/v1.7-trunk/modulesrc/materials/ElasticMaterial.i
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/modulesrc/materials/ElasticMaterial.i	2012-05-15 22:49:08 UTC (rev 20141)
+++ short/3D/PyLith/branches/v1.7-trunk/modulesrc/materials/ElasticMaterial.i	2012-05-16 00:38:43 UTC (rev 20142)
@@ -86,7 +86,7 @@
        * @param flag True to use elastic, false to use inelastic.
        */
       virtual
-      void useLinearBehavior(const bool flag);
+      void useElasticBehavior(const bool flag);
 
       /** Get initial stress/strain fields.
        *

Modified: short/3D/PyLith/branches/v1.7-trunk/modulesrc/materials/GenMaxwellIsotropic3D.i
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/modulesrc/materials/GenMaxwellIsotropic3D.i	2012-05-15 22:49:08 UTC (rev 20141)
+++ short/3D/PyLith/branches/v1.7-trunk/modulesrc/materials/GenMaxwellIsotropic3D.i	2012-05-16 00:38:43 UTC (rev 20142)
@@ -46,7 +46,7 @@
        *
        * @param flag True to use elastic, false to use inelastic.
        */
-      void useLinearBehavior(const bool flag);
+      void useElasticBehavior(const bool flag);
       
       // PROTECTED METHODS //////////////////////////////////////////////
     protected :

Modified: short/3D/PyLith/branches/v1.7-trunk/modulesrc/materials/GenMaxwellPlaneStrain.i
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/modulesrc/materials/GenMaxwellPlaneStrain.i	2012-05-15 22:49:08 UTC (rev 20141)
+++ short/3D/PyLith/branches/v1.7-trunk/modulesrc/materials/GenMaxwellPlaneStrain.i	2012-05-16 00:38:43 UTC (rev 20142)
@@ -46,7 +46,7 @@
        *
        * @param flag True to use elastic, false to use inelastic.
        */
-      void useLinearBehavior(const bool flag);
+      void useElasticBehavior(const bool flag);
       
       // PROTECTED METHODS //////////////////////////////////////////////
     protected :

Modified: short/3D/PyLith/branches/v1.7-trunk/modulesrc/materials/GenMaxwellQpQsIsotropic3D.i
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/modulesrc/materials/GenMaxwellQpQsIsotropic3D.i	2012-05-15 22:49:08 UTC (rev 20141)
+++ short/3D/PyLith/branches/v1.7-trunk/modulesrc/materials/GenMaxwellQpQsIsotropic3D.i	2012-05-16 00:38:43 UTC (rev 20142)
@@ -46,7 +46,7 @@
        *
        * @param flag True to use elastic, false to use inelastic.
        */
-      void useLinearBehavior(const bool flag);
+      void useElasticBehavior(const bool flag);
       
       // PROTECTED METHODS //////////////////////////////////////////////
     protected :

Modified: short/3D/PyLith/branches/v1.7-trunk/modulesrc/materials/MaxwellIsotropic3D.i
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/modulesrc/materials/MaxwellIsotropic3D.i	2012-05-15 22:49:08 UTC (rev 20141)
+++ short/3D/PyLith/branches/v1.7-trunk/modulesrc/materials/MaxwellIsotropic3D.i	2012-05-16 00:38:43 UTC (rev 20142)
@@ -46,7 +46,7 @@
        *
        * @param flag True to use elastic, false to use inelastic.
        */
-      void useLinearBehavior(const bool flag);
+      void useElasticBehavior(const bool flag);
 
       // PROTECTED METHODS //////////////////////////////////////////////
     protected :

Modified: short/3D/PyLith/branches/v1.7-trunk/modulesrc/materials/MaxwellPlaneStrain.i
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/modulesrc/materials/MaxwellPlaneStrain.i	2012-05-15 22:49:08 UTC (rev 20141)
+++ short/3D/PyLith/branches/v1.7-trunk/modulesrc/materials/MaxwellPlaneStrain.i	2012-05-16 00:38:43 UTC (rev 20142)
@@ -46,7 +46,7 @@
        *
        * @param flag True to use elastic, false to use inelastic.
        */
-      void useLinearBehavior(const bool flag);
+      void useElasticBehavior(const bool flag);
 
       // PROTECTED METHODS //////////////////////////////////////////////
     protected :

Modified: short/3D/PyLith/branches/v1.7-trunk/modulesrc/materials/PowerLaw3D.i
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/modulesrc/materials/PowerLaw3D.i	2012-05-15 22:49:08 UTC (rev 20141)
+++ short/3D/PyLith/branches/v1.7-trunk/modulesrc/materials/PowerLaw3D.i	2012-05-16 00:38:43 UTC (rev 20142)
@@ -46,7 +46,7 @@
        *
        * @param flag True to use elastic, false to use inelastic.
        */
-      void useLinearBehavior(const bool flag);
+      void useElasticBehavior(const bool flag);
       
       // PROTECTED METHODS //////////////////////////////////////////////
     protected :

Modified: short/3D/PyLith/branches/v1.7-trunk/modulesrc/materials/PowerLawPlaneStrain.i
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/modulesrc/materials/PowerLawPlaneStrain.i	2012-05-15 22:49:08 UTC (rev 20141)
+++ short/3D/PyLith/branches/v1.7-trunk/modulesrc/materials/PowerLawPlaneStrain.i	2012-05-16 00:38:43 UTC (rev 20142)
@@ -46,7 +46,7 @@
        *
        * @param flag True to use elastic, false to use inelastic.
        */
-      void useLinearBehavior(const bool flag);
+      void useElasticBehavior(const bool flag);
       
       // PROTECTED METHODS //////////////////////////////////////////////
     protected :

Modified: short/3D/PyLith/branches/v1.7-trunk/pylith/problems/TimeDependent.py
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/pylith/problems/TimeDependent.py	2012-05-15 22:49:08 UTC (rev 20141)
+++ short/3D/PyLith/branches/v1.7-trunk/pylith/problems/TimeDependent.py	2012-05-16 00:38:43 UTC (rev 20142)
@@ -52,8 +52,8 @@
 
     import pyre.inventory
 
-    linearPrestep = pyre.inventory.bool("linear_prestep", default=True)
-    linearPrestep.meta['tip'] = "Include a static calculation with linear behavior before time stepping."
+    elasticPrestep = pyre.inventory.bool("elastic_prestep", default=True)
+    elasticPrestep.meta['tip'] = "Include a static calculation with elastic behavior before time stepping."
 
     from Implicit import Implicit
     formulation = pyre.inventory.facility("formulation",
@@ -131,39 +131,39 @@
       self._info.log("Solving problem.")
     self.checkpointTimer.toplevel = app # Set handle for saving state
     
-    # Linear prestep
-    if self.linearPrestep:
+    # Elastic prestep
+    if self.elasticPrestep:
       if 0 == comm.rank:
-        self._info.log("Preparing for prestep with linear behavior.")
+        self._info.log("Preparing for prestep with elastic behavior.")
       self._eventLogger.stagePush("Prestep")
 
       t = self.formulation.getStartTime()
       dt = self.formulation.getTimeStep()
       t -= dt
 
-      # Limit material behavior to linear regime
+      # Limit material behavior to elastic regime
       for material in self.materials.components():
-        material.useLinearBehavior(True)
+        material.useElasticBehavior(True)
 
-      self.formulation.prestepLinear(t, dt)
+      self.formulation.prestepElastic(t, dt)
       self._eventLogger.stagePop()
 
       if 0 == comm.rank:
-        self._info.log("Computing prestep with linear behavior.")
+        self._info.log("Computing prestep with elastic behavior.")
       self._eventLogger.stagePush("Step")
       self.formulation.step(t, dt)
       self._eventLogger.stagePop()
 
       if 0 == comm.rank:
-        self._info.log("Finishing prestep with linear behavior.")
+        self._info.log("Finishing prestep with elastic behavior.")
       self._eventLogger.stagePush("Poststep")
       self.formulation.poststep(t, dt)
       self._eventLogger.stagePop()
 
 
-    # Allow nonlinear behavior
+    # Allow inelastic behavior
     for material in self.materials.components():
-      material.useLinearBehavior(False)
+      material.useElasticBehavior(False)
 
 
     # Normal time loop
@@ -236,7 +236,7 @@
     Set members based using inventory.
     """
     Problem._configure(self)
-    self.linearPrestep = self.inventory.linearPrestep
+    self.elasticPrestep = self.inventory.elasticPrestep
     self.formulation = self.inventory.formulation
     self.checkpointTimer = self.inventory.checkpointTimer
     return

Modified: short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/materials/TestDruckerPrager3D.cc
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/materials/TestDruckerPrager3D.cc	2012-05-15 22:49:08 UTC (rev 20141)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/materials/TestDruckerPrager3D.cc	2012-05-16 00:38:43 UTC (rev 20142)
@@ -67,13 +67,13 @@
 } // testTimeStep
 
 // ----------------------------------------------------------------------
-// Test useLinearBehavior()
+// Test useElasticBehavior()
 void
-pylith::materials::TestDruckerPrager3D::testUseLinearBehavior(void)
-{ // testUseLinearBehavior
+pylith::materials::TestDruckerPrager3D::testUseElasticBehavior(void)
+{ // testUseElasticBehavior
   DruckerPrager3D material;
 
-  material.useLinearBehavior(true);
+  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::DruckerPrager3D::_calcStressElastic == 
@@ -85,7 +85,7 @@
     CPPUNIT_ASSERT(&pylith::materials::DruckerPrager3D::_updateStateVarsElastic ==
 		   material._updateStateVarsFn);
 
-    material.useLinearBehavior(false);
+    material.useElasticBehavior(false);
     CPPUNIT_ASSERT(&pylith::materials::DruckerPrager3D::_calcStressElastoplastic ==
 		   material._calcStressFn);
     CPPUNIT_ASSERT(&pylith::materials::DruckerPrager3D::_calcElasticConstsElastoplastic ==
@@ -93,7 +93,7 @@
     CPPUNIT_ASSERT(&pylith::materials::DruckerPrager3D::_updateStateVarsElastoplastic ==
 		   material._updateStateVarsFn);
   } // if
-} // testUseLinearBehavior
+} // testUseElasticBehavior
 
 // ----------------------------------------------------------------------
 // Test allowTensileYield()
@@ -122,7 +122,7 @@
 pylith::materials::TestDruckerPrager3D::test_calcStressElastic(void)
 { // test_calcStressElastic
   CPPUNIT_ASSERT(0 != _matElastic);
-  _matElastic->useLinearBehavior(true);
+  _matElastic->useElasticBehavior(true);
 
   test_calcStress();
 } // test_calcStressElastic
@@ -133,7 +133,7 @@
 pylith::materials::TestDruckerPrager3D::test_calcElasticConstsElastic(void)
 { // test_calcElasticConstsElastic
   CPPUNIT_ASSERT(0 != _matElastic);
-  _matElastic->useLinearBehavior(true);
+  _matElastic->useElasticBehavior(true);
 
   test_calcElasticConsts();
 } // test_calcElasticConstsElastic
@@ -144,7 +144,7 @@
 pylith::materials::TestDruckerPrager3D::test_updateStateVarsElastic(void)
 { // test_updateStateVarsElastic
   CPPUNIT_ASSERT(0 != _matElastic);
-  _matElastic->useLinearBehavior(true);
+  _matElastic->useElasticBehavior(true);
 
   test_updateStateVars();
 } // test_updateStateVarsElastic
@@ -155,7 +155,7 @@
 pylith::materials::TestDruckerPrager3D::test_calcStressTimeDep(void)
 { // test_calcStressTimeDep
   CPPUNIT_ASSERT(0 != _matElastic);
-  _matElastic->useLinearBehavior(false);
+  _matElastic->useElasticBehavior(false);
 
   delete _dataElastic; _dataElastic = new DruckerPrager3DTimeDepData();
 
@@ -170,7 +170,7 @@
 pylith::materials::TestDruckerPrager3D::test_calcElasticConstsTimeDep(void)
 { // test_calcElasticConstsTimeDep
   CPPUNIT_ASSERT(0 != _matElastic);
-  _matElastic->useLinearBehavior(false);
+  _matElastic->useElasticBehavior(false);
 
   delete _dataElastic; _dataElastic = new DruckerPrager3DTimeDepData();
 
@@ -185,7 +185,7 @@
 pylith::materials::TestDruckerPrager3D::test_updateStateVarsTimeDep(void)
 { // test_updateStateVarsTimeDep
   CPPUNIT_ASSERT(0 != _matElastic);
-  _matElastic->useLinearBehavior(false);
+  _matElastic->useElasticBehavior(false);
 
   delete _dataElastic; _dataElastic = new DruckerPrager3DTimeDepData();
 

Modified: short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/materials/TestDruckerPrager3D.hh
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/materials/TestDruckerPrager3D.hh	2012-05-15 22:49:08 UTC (rev 20141)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/materials/TestDruckerPrager3D.hh	2012-05-16 00:38:43 UTC (rev 20142)
@@ -58,7 +58,7 @@
 
   // Need to test Drucker-Prager elastoplastic specific behavior.
   CPPUNIT_TEST( testTimeStep );
-  CPPUNIT_TEST( testUseLinearBehavior );
+  CPPUNIT_TEST( testUseElasticBehavior );
   CPPUNIT_TEST( testAllowTensileYield );
   CPPUNIT_TEST( testHasStateVars );
 
@@ -83,8 +83,8 @@
   /// Test timeStep()
   void testTimeStep(void);
 
-  /// Test useLinearBehavior()
-  void testUseLinearBehavior(void);
+  /// Test useElasticBehavior()
+  void testUseElasticBehavior(void);
 
   /// Test allowTensileYield()
   void testAllowTensileYield(void);

Modified: short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/materials/TestDruckerPragerPlaneStrain.cc
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/materials/TestDruckerPragerPlaneStrain.cc	2012-05-15 22:49:08 UTC (rev 20141)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/materials/TestDruckerPragerPlaneStrain.cc	2012-05-16 00:38:43 UTC (rev 20142)
@@ -67,13 +67,13 @@
 } // testTimeStep
 
 // ----------------------------------------------------------------------
-// Test useLinearBehavior()
+// Test useElasticBehavior()
 void
-pylith::materials::TestDruckerPragerPlaneStrain::testUseLinearBehavior(void)
-{ // testUseLinearBehavior
+pylith::materials::TestDruckerPragerPlaneStrain::testUseElasticBehavior(void)
+{ // testUseElasticBehavior
   DruckerPragerPlaneStrain material;
 
-  material.useLinearBehavior(true);
+  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 == 
@@ -88,7 +88,7 @@
       &pylith::materials::DruckerPragerPlaneStrain::_updateStateVarsElastic ==
       material._updateStateVarsFn);
 
-    material.useLinearBehavior(false);
+    material.useElasticBehavior(false);
     CPPUNIT_ASSERT(
       &pylith::materials::DruckerPragerPlaneStrain::_calcStressElastoplastic ==
       material._calcStressFn);
@@ -99,7 +99,7 @@
       &pylith::materials::DruckerPragerPlaneStrain::_updateStateVarsElastoplastic ==
       material._updateStateVarsFn);
   } // if
-} // testUseLinearBehavior
+} // testUseElasticBehavior
 
 // ----------------------------------------------------------------------
 // Test allowTensileYield()
@@ -128,7 +128,7 @@
 pylith::materials::TestDruckerPragerPlaneStrain::test_calcStressElastic(void)
 { // test_calcStressElastic
   CPPUNIT_ASSERT(0 != _matElastic);
-  _matElastic->useLinearBehavior(true);
+  _matElastic->useElasticBehavior(true);
 
   test_calcStress();
 } // test_calcStressElastic
@@ -139,7 +139,7 @@
 pylith::materials::TestDruckerPragerPlaneStrain::test_calcElasticConstsElastic(void)
 { // test_calcElasticConstsElastic
   CPPUNIT_ASSERT(0 != _matElastic);
-  _matElastic->useLinearBehavior(true);
+  _matElastic->useElasticBehavior(true);
 
   test_calcElasticConsts();
 } // test_calcElasticConstsElastic
@@ -150,7 +150,7 @@
 pylith::materials::TestDruckerPragerPlaneStrain::test_updateStateVarsElastic(void)
 { // test_updateStateVarsElastic
   CPPUNIT_ASSERT(0 != _matElastic);
-  _matElastic->useLinearBehavior(true);
+  _matElastic->useElasticBehavior(true);
 
   test_updateStateVars();
 } // test_updateStateVarsElastic
@@ -161,7 +161,7 @@
 pylith::materials::TestDruckerPragerPlaneStrain::test_calcStressTimeDep(void)
 { // test_calcStressTimeDep
   CPPUNIT_ASSERT(0 != _matElastic);
-  _matElastic->useLinearBehavior(false);
+  _matElastic->useElasticBehavior(false);
 
   delete _dataElastic; _dataElastic = new DruckerPragerPlaneStrainTimeDepData();
 
@@ -176,7 +176,7 @@
 pylith::materials::TestDruckerPragerPlaneStrain::test_calcElasticConstsTimeDep(void)
 { // test_calcElasticConstsTimeDep
   CPPUNIT_ASSERT(0 != _matElastic);
-  _matElastic->useLinearBehavior(false);
+  _matElastic->useElasticBehavior(false);
 
   delete _dataElastic; _dataElastic = new DruckerPragerPlaneStrainTimeDepData();
 
@@ -191,7 +191,7 @@
 pylith::materials::TestDruckerPragerPlaneStrain::test_updateStateVarsTimeDep(void)
 { // test_updateStateVarsTimeDep
   CPPUNIT_ASSERT(0 != _matElastic);
-  _matElastic->useLinearBehavior(false);
+  _matElastic->useElasticBehavior(false);
 
   delete _dataElastic; _dataElastic = new DruckerPragerPlaneStrainTimeDepData();
 

Modified: short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/materials/TestDruckerPragerPlaneStrain.hh
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/materials/TestDruckerPragerPlaneStrain.hh	2012-05-15 22:49:08 UTC (rev 20141)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/materials/TestDruckerPragerPlaneStrain.hh	2012-05-16 00:38:43 UTC (rev 20142)
@@ -58,7 +58,7 @@
 
   // Need to test Drucker-Prager elastoplastic specific behavior.
   CPPUNIT_TEST( testTimeStep );
-  CPPUNIT_TEST( testUseLinearBehavior );
+  CPPUNIT_TEST( testUseElasticBehavior );
   CPPUNIT_TEST( testAllowTensileYield );
   CPPUNIT_TEST( testHasStateVars );
 
@@ -83,8 +83,8 @@
   /// Test timeStep()
   void testTimeStep(void);
 
-  /// Test useLinearBehavior()
-  void testUseLinearBehavior(void);
+  /// Test useElasticBehavior()
+  void testUseElasticBehavior(void);
 
   /// Test allowTensileYield()
   void testAllowTensileYield(void);

Modified: short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/materials/TestGenMaxwellIsotropic3D.cc
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/materials/TestGenMaxwellIsotropic3D.cc	2012-05-15 22:49:08 UTC (rev 20141)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/materials/TestGenMaxwellIsotropic3D.cc	2012-05-16 00:38:43 UTC (rev 20142)
@@ -64,13 +64,13 @@
 } // testTimeStep
 
 // ----------------------------------------------------------------------
-// Test useLinearBehavior()
+// Test useElasticBehavior()
 void
-pylith::materials::TestGenMaxwellIsotropic3D::testUseLinearBehavior(void)
-{ // testUseLinearBehavior
+pylith::materials::TestGenMaxwellIsotropic3D::testUseElasticBehavior(void)
+{ // testUseElasticBehavior
   GenMaxwellIsotropic3D material;
 
-  material.useLinearBehavior(true);
+  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::GenMaxwellIsotropic3D::_calcStressElastic == 
@@ -82,7 +82,7 @@
     CPPUNIT_ASSERT(&pylith::materials::GenMaxwellIsotropic3D::_updateStateVarsElastic ==
 		   material._updateStateVarsFn);
 
-    material.useLinearBehavior(false);
+    material.useElasticBehavior(false);
     CPPUNIT_ASSERT(&pylith::materials::GenMaxwellIsotropic3D::_calcStressViscoelastic ==
 		   material._calcStressFn);
     CPPUNIT_ASSERT(&pylith::materials::GenMaxwellIsotropic3D::_calcElasticConstsViscoelastic == 
@@ -90,7 +90,7 @@
   CPPUNIT_ASSERT(&pylith::materials::GenMaxwellIsotropic3D::_updateStateVarsViscoelastic ==
 		 material._updateStateVarsFn);
   } // if
-} // testUseLinearBehavior
+} // testUseElasticBehavior
 
 // ----------------------------------------------------------------------
 // Test usesHasStateVars()
@@ -107,7 +107,7 @@
 pylith::materials::TestGenMaxwellIsotropic3D::test_calcStressElastic(void)
 { // testCalcStressElastic
   CPPUNIT_ASSERT(0 != _matElastic);
-  _matElastic->useLinearBehavior(true);
+  _matElastic->useElasticBehavior(true);
 
   test_calcStress();
 } // testCalcStressElastic
@@ -118,7 +118,7 @@
 pylith::materials::TestGenMaxwellIsotropic3D::test_calcElasticConstsElastic(void)
 { // testElasticConstsElastic
   CPPUNIT_ASSERT(0 != _matElastic);
-  _matElastic->useLinearBehavior(true);
+  _matElastic->useElasticBehavior(true);
 
   test_calcElasticConsts();
 } // testElasticConstsElastic
@@ -129,7 +129,7 @@
 pylith::materials::TestGenMaxwellIsotropic3D::test_updateStateVarsElastic(void)
 { // testUpdateStateVarsElastic
   CPPUNIT_ASSERT(0 != _matElastic);
-  _matElastic->useLinearBehavior(true);
+  _matElastic->useElasticBehavior(true);
 
   test_updateStateVars();
 } // testUpdateStateVarsElastic
@@ -140,7 +140,7 @@
 pylith::materials::TestGenMaxwellIsotropic3D::test_calcStressTimeDep(void)
 { // testCalcStressTimeDep
   CPPUNIT_ASSERT(0 != _matElastic);
-  _matElastic->useLinearBehavior(false);
+  _matElastic->useElasticBehavior(false);
 
   delete _dataElastic; _dataElastic = new GenMaxwellIsotropic3DTimeDepData();
 
@@ -155,7 +155,7 @@
 pylith::materials::TestGenMaxwellIsotropic3D::test_calcElasticConstsTimeDep(void)
 { // testElasticConstsTimeDep
   CPPUNIT_ASSERT(0 != _matElastic);
-  _matElastic->useLinearBehavior(false);
+  _matElastic->useElasticBehavior(false);
 
   delete _dataElastic; _dataElastic = new GenMaxwellIsotropic3DTimeDepData();
 
@@ -170,7 +170,7 @@
 pylith::materials::TestGenMaxwellIsotropic3D::test_updateStateVarsTimeDep(void)
 { // testUpdateStateVarsTimeDep
   CPPUNIT_ASSERT(0 != _matElastic);
-  _matElastic->useLinearBehavior(false);
+  _matElastic->useElasticBehavior(false);
 
   delete _dataElastic; _dataElastic = new GenMaxwellIsotropic3DTimeDepData();
 

Modified: short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/materials/TestGenMaxwellIsotropic3D.hh
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/materials/TestGenMaxwellIsotropic3D.hh	2012-05-15 22:49:08 UTC (rev 20141)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/materials/TestGenMaxwellIsotropic3D.hh	2012-05-16 00:38:43 UTC (rev 20142)
@@ -58,7 +58,7 @@
 
   // Need to test Maxwell viscoelastic specific behavior.
   CPPUNIT_TEST( testTimeStep );
-  CPPUNIT_TEST( testUseLinearBehavior );
+  CPPUNIT_TEST( testUseElasticBehavior );
   CPPUNIT_TEST( testHasStateVars );
 
   CPPUNIT_TEST( test_calcStressElastic );
@@ -79,8 +79,8 @@
   /// Test timeStep()
   void testTimeStep(void);
 
-  /// Test useLinearBehavior()
-  void testUseLinearBehavior(void);
+  /// Test useElasticBehavior()
+  void testUseElasticBehavior(void);
 
   /// Test hasStateVars()
   void testHasStateVars(void);

Modified: short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/materials/TestGenMaxwellPlaneStrain.cc
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/materials/TestGenMaxwellPlaneStrain.cc	2012-05-15 22:49:08 UTC (rev 20141)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/materials/TestGenMaxwellPlaneStrain.cc	2012-05-16 00:38:43 UTC (rev 20142)
@@ -64,13 +64,13 @@
 } // testTimeStep
 
 // ----------------------------------------------------------------------
-// Test useLinearBehavior()
+// Test useElasticBehavior()
 void
-pylith::materials::TestGenMaxwellPlaneStrain::testUseLinearBehavior(void)
-{ // testUseLinearBehavior
+pylith::materials::TestGenMaxwellPlaneStrain::testUseElasticBehavior(void)
+{ // testUseElasticBehavior
   GenMaxwellPlaneStrain material;
 
-  material.useLinearBehavior(true);
+  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::GenMaxwellPlaneStrain::_calcStressElastic == 
@@ -82,7 +82,7 @@
     CPPUNIT_ASSERT(&pylith::materials::GenMaxwellPlaneStrain::_updateStateVarsElastic ==
 		   material._updateStateVarsFn);
 
-    material.useLinearBehavior(false);
+    material.useElasticBehavior(false);
     CPPUNIT_ASSERT(&pylith::materials::GenMaxwellPlaneStrain::_calcStressViscoelastic ==
 		   material._calcStressFn);
     CPPUNIT_ASSERT(&pylith::materials::GenMaxwellPlaneStrain::_calcElasticConstsViscoelastic == 
@@ -90,7 +90,7 @@
   CPPUNIT_ASSERT(&pylith::materials::GenMaxwellPlaneStrain::_updateStateVarsViscoelastic ==
 		 material._updateStateVarsFn);
   } // if
-} // testUseLinearBehavior
+} // testUseElasticBehavior
 
 // ----------------------------------------------------------------------
 // Test usesHasStateVars()
@@ -107,7 +107,7 @@
 pylith::materials::TestGenMaxwellPlaneStrain::test_calcStressElastic(void)
 { // testCalcStressElastic
   CPPUNIT_ASSERT(0 != _matElastic);
-  _matElastic->useLinearBehavior(true);
+  _matElastic->useElasticBehavior(true);
 
   test_calcStress();
 } // testCalcStressElastic
@@ -118,7 +118,7 @@
 pylith::materials::TestGenMaxwellPlaneStrain::test_calcElasticConstsElastic(void)
 { // testElasticConstsElastic
   CPPUNIT_ASSERT(0 != _matElastic);
-  _matElastic->useLinearBehavior(true);
+  _matElastic->useElasticBehavior(true);
 
   test_calcElasticConsts();
 } // testElasticConstsElastic
@@ -129,7 +129,7 @@
 pylith::materials::TestGenMaxwellPlaneStrain::test_updateStateVarsElastic(void)
 { // testUpdateStateVarsElastic
   CPPUNIT_ASSERT(0 != _matElastic);
-  _matElastic->useLinearBehavior(true);
+  _matElastic->useElasticBehavior(true);
 
   test_updateStateVars();
 } // testUpdateStateVarsElastic
@@ -140,7 +140,7 @@
 pylith::materials::TestGenMaxwellPlaneStrain::test_calcStressTimeDep(void)
 { // testCalcStressTimeDep
   CPPUNIT_ASSERT(0 != _matElastic);
-  _matElastic->useLinearBehavior(false);
+  _matElastic->useElasticBehavior(false);
 
   delete _dataElastic; _dataElastic = new GenMaxwellPlaneStrainTimeDepData();
 
@@ -155,7 +155,7 @@
 pylith::materials::TestGenMaxwellPlaneStrain::test_calcElasticConstsTimeDep(void)
 { // testElasticConstsTimeDep
   CPPUNIT_ASSERT(0 != _matElastic);
-  _matElastic->useLinearBehavior(false);
+  _matElastic->useElasticBehavior(false);
 
   delete _dataElastic; _dataElastic = new GenMaxwellPlaneStrainTimeDepData();
 
@@ -170,7 +170,7 @@
 pylith::materials::TestGenMaxwellPlaneStrain::test_updateStateVarsTimeDep(void)
 { // testUpdateStateVarsTimeDep
   CPPUNIT_ASSERT(0 != _matElastic);
-   _matElastic->useLinearBehavior(false);
+   _matElastic->useElasticBehavior(false);
 
   delete _dataElastic; _dataElastic = new GenMaxwellPlaneStrainTimeDepData();
 

Modified: short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/materials/TestGenMaxwellPlaneStrain.hh
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/materials/TestGenMaxwellPlaneStrain.hh	2012-05-15 22:49:08 UTC (rev 20141)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/materials/TestGenMaxwellPlaneStrain.hh	2012-05-16 00:38:43 UTC (rev 20142)
@@ -58,7 +58,7 @@
 
   // Need to test Maxwell viscoelastic specific behavior.
   CPPUNIT_TEST( testTimeStep );
-  CPPUNIT_TEST( testUseLinearBehavior );
+  CPPUNIT_TEST( testUseElasticBehavior );
   CPPUNIT_TEST( testHasStateVars );
 
   CPPUNIT_TEST( test_calcStressElastic );
@@ -79,8 +79,8 @@
   /// Test timeStep()
   void testTimeStep(void);
 
-  /// Test useLinearBehavior()
-  void testUseLinearBehavior(void);
+  /// Test useElasticBehavior()
+  void testUseElasticBehavior(void);
 
   /// Test hasStateVars()
   void testHasStateVars(void);

Modified: short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/materials/TestGenMaxwellQpQsIsotropic3D.cc
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/materials/TestGenMaxwellQpQsIsotropic3D.cc	2012-05-15 22:49:08 UTC (rev 20141)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/materials/TestGenMaxwellQpQsIsotropic3D.cc	2012-05-16 00:38:43 UTC (rev 20142)
@@ -64,13 +64,13 @@
 } // testTimeStep
 
 // ----------------------------------------------------------------------
-// Test useLinearBehavior()
+// Test useElasticBehavior()
 void
-pylith::materials::TestGenMaxwellQpQsIsotropic3D::testUseLinearBehavior(void)
-{ // testUseLinearBehavior
+pylith::materials::TestGenMaxwellQpQsIsotropic3D::testUseElasticBehavior(void)
+{ // testUseElasticBehavior
   GenMaxwellQpQsIsotropic3D material;
 
-  material.useLinearBehavior(true);
+  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::GenMaxwellQpQsIsotropic3D::_calcStressElastic == 
@@ -82,7 +82,7 @@
     CPPUNIT_ASSERT(&pylith::materials::GenMaxwellQpQsIsotropic3D::_updateStateVarsElastic ==
 		   material._updateStateVarsFn);
 
-    material.useLinearBehavior(false);
+    material.useElasticBehavior(false);
     CPPUNIT_ASSERT(&pylith::materials::GenMaxwellQpQsIsotropic3D::_calcStressViscoelastic ==
 		   material._calcStressFn);
     CPPUNIT_ASSERT(&pylith::materials::GenMaxwellQpQsIsotropic3D::_calcElasticConstsViscoelastic == 
@@ -90,7 +90,7 @@
   CPPUNIT_ASSERT(&pylith::materials::GenMaxwellQpQsIsotropic3D::_updateStateVarsViscoelastic ==
 		 material._updateStateVarsFn);
   } // if
-} // testUseLinearBehavior
+} // testUseElasticBehavior
 
 // ----------------------------------------------------------------------
 // Test usesHasStateVars()
@@ -107,7 +107,7 @@
 pylith::materials::TestGenMaxwellQpQsIsotropic3D::test_calcStressElastic(void)
 { // testCalcStressElastic
   CPPUNIT_ASSERT(0 != _matElastic);
-  _matElastic->useLinearBehavior(true);
+  _matElastic->useElasticBehavior(true);
 
   test_calcStress();
 } // testCalcStressElastic
@@ -118,7 +118,7 @@
 pylith::materials::TestGenMaxwellQpQsIsotropic3D::test_calcElasticConstsElastic(void)
 { // testElasticConstsElastic
   CPPUNIT_ASSERT(0 != _matElastic);
-  _matElastic->useLinearBehavior(true);
+  _matElastic->useElasticBehavior(true);
 
   test_calcElasticConsts();
 } // testElasticConstsElastic
@@ -134,7 +134,7 @@
   // setting the stateVarsUpdate attribute in the Python object.
 
   GenMaxwellQpQsIsotropic3D material;
-  material.useLinearBehavior(true);
+  material.useElasticBehavior(true);
 
   const bool computeStateVars = true;
   
@@ -209,7 +209,7 @@
 pylith::materials::TestGenMaxwellQpQsIsotropic3D::test_calcStressTimeDep(void)
 { // testCalcStressTimeDep
   CPPUNIT_ASSERT(0 != _matElastic);
-  _matElastic->useLinearBehavior(false);
+  _matElastic->useElasticBehavior(false);
 
   delete _dataElastic; _dataElastic = new GenMaxwellQpQsIsotropic3DTimeDepData();
 
@@ -224,7 +224,7 @@
 pylith::materials::TestGenMaxwellQpQsIsotropic3D::test_calcElasticConstsTimeDep(void)
 { // testElasticConstsTimeDep
   CPPUNIT_ASSERT(0 != _matElastic);
-  _matElastic->useLinearBehavior(false);
+  _matElastic->useElasticBehavior(false);
 
   delete _dataElastic; _dataElastic = new GenMaxwellQpQsIsotropic3DTimeDepData();
 
@@ -244,7 +244,7 @@
   // setting the stateVarsUpdate attribute in the Python object.
 
   GenMaxwellQpQsIsotropic3D material;
-  material.useLinearBehavior(false);
+  material.useElasticBehavior(false);
 
   delete _dataElastic; _dataElastic = new GenMaxwellQpQsIsotropic3DTimeDepData();
 

Modified: short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/materials/TestGenMaxwellQpQsIsotropic3D.hh
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/materials/TestGenMaxwellQpQsIsotropic3D.hh	2012-05-15 22:49:08 UTC (rev 20141)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/materials/TestGenMaxwellQpQsIsotropic3D.hh	2012-05-16 00:38:43 UTC (rev 20142)
@@ -58,7 +58,7 @@
 
   // Need to test Maxwell viscoelastic specific behavior.
   CPPUNIT_TEST( testTimeStep );
-  CPPUNIT_TEST( testUseLinearBehavior );
+  CPPUNIT_TEST( testUseElasticBehavior );
   CPPUNIT_TEST( testHasStateVars );
 
   CPPUNIT_TEST( test_calcStressElastic );
@@ -79,8 +79,8 @@
   /// Test timeStep()
   void testTimeStep(void);
 
-  /// Test useLinearBehavior()
-  void testUseLinearBehavior(void);
+  /// Test useElasticBehavior()
+  void testUseElasticBehavior(void);
 
   /// Test hasStateVars()
   void testHasStateVars(void);

Modified: short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/materials/TestMaxwellIsotropic3D.cc
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/materials/TestMaxwellIsotropic3D.cc	2012-05-15 22:49:08 UTC (rev 20141)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/materials/TestMaxwellIsotropic3D.cc	2012-05-16 00:38:43 UTC (rev 20142)
@@ -63,13 +63,13 @@
 } // testTimeStep
 
 // ----------------------------------------------------------------------
-// Test useLinearBehavior()
+// Test useElasticBehavior()
 void
-pylith::materials::TestMaxwellIsotropic3D::testUseLinearBehavior(void)
-{ // testUseLinearBehavior
+pylith::materials::TestMaxwellIsotropic3D::testUseElasticBehavior(void)
+{ // testUseElasticBehavior
   MaxwellIsotropic3D material;
 
-  material.useLinearBehavior(true);
+  material.useElasticBehavior(true);
   
   // Some compilers/operating systems (cygwin) don't allow comparing
   // pointers. Use first test to determine if we can compare pointers.
@@ -82,7 +82,7 @@
     CPPUNIT_ASSERT(&pylith::materials::MaxwellIsotropic3D::_updateStateVarsElastic ==
 		   material._updateStateVarsFn);
 
-    material.useLinearBehavior(false);
+    material.useElasticBehavior(false);
     CPPUNIT_ASSERT(&pylith::materials::MaxwellIsotropic3D::_calcStressViscoelastic ==
 		   material._calcStressFn);
     CPPUNIT_ASSERT(&pylith::materials::MaxwellIsotropic3D::_calcElasticConstsViscoelastic ==
@@ -90,7 +90,7 @@
     CPPUNIT_ASSERT(&pylith::materials::MaxwellIsotropic3D::_updateStateVarsViscoelastic ==
 		   material._updateStateVarsFn);
   } // if
-} // testUseLinearBehavior
+} // testUseElasticBehavior
 
 // ----------------------------------------------------------------------
 // Test usesHasStateVars()
@@ -107,7 +107,7 @@
 pylith::materials::TestMaxwellIsotropic3D::test_calcStressElastic(void)
 { // test_calcStressElastic
   CPPUNIT_ASSERT(0 != _matElastic);
-  _matElastic->useLinearBehavior(true);
+  _matElastic->useElasticBehavior(true);
 
   test_calcStress();
 } // test_calcStressElastic
@@ -118,7 +118,7 @@
 pylith::materials::TestMaxwellIsotropic3D::test_calcElasticConstsElastic(void)
 { // test_calcElasticConstsElastic
   CPPUNIT_ASSERT(0 != _matElastic);
-  _matElastic->useLinearBehavior(true);
+  _matElastic->useElasticBehavior(true);
 
   test_calcElasticConsts();
 } // test_calcElasticConstsElastic
@@ -129,7 +129,7 @@
 pylith::materials::TestMaxwellIsotropic3D::test_updateStateVarsElastic(void)
 { // test_updateStateVarsElastic
   CPPUNIT_ASSERT(0 != _matElastic);
-  _matElastic->useLinearBehavior(true);
+  _matElastic->useElasticBehavior(true);
 
   test_updateStateVars();
 } // test_updateStateVarsElastic
@@ -140,7 +140,7 @@
 pylith::materials::TestMaxwellIsotropic3D::test_calcStressTimeDep(void)
 { // test_calcStressTimeDep
   CPPUNIT_ASSERT(0 != _matElastic);
-  _matElastic->useLinearBehavior(false);
+  _matElastic->useElasticBehavior(false);
 
   delete _dataElastic; _dataElastic = new MaxwellIsotropic3DTimeDepData();
 
@@ -155,7 +155,7 @@
 pylith::materials::TestMaxwellIsotropic3D::test_calcElasticConstsTimeDep(void)
 { // test_calcElasticConstsTimeDep
   CPPUNIT_ASSERT(0 != _matElastic);
-  _matElastic->useLinearBehavior(false);
+  _matElastic->useElasticBehavior(false);
 
   delete _dataElastic; _dataElastic = new MaxwellIsotropic3DTimeDepData();
 
@@ -170,7 +170,7 @@
 pylith::materials::TestMaxwellIsotropic3D::test_updateStateVarsTimeDep(void)
 { // test_updateStateVarsTimeDep
   CPPUNIT_ASSERT(0 != _matElastic);
-   _matElastic->useLinearBehavior(false);
+   _matElastic->useElasticBehavior(false);
 
   delete _dataElastic; _dataElastic = new MaxwellIsotropic3DTimeDepData();
 

Modified: short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/materials/TestMaxwellIsotropic3D.hh
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/materials/TestMaxwellIsotropic3D.hh	2012-05-15 22:49:08 UTC (rev 20141)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/materials/TestMaxwellIsotropic3D.hh	2012-05-16 00:38:43 UTC (rev 20142)
@@ -58,7 +58,7 @@
 
   // Need to test Maxwell viscoelastic specific behavior.
   CPPUNIT_TEST( testTimeStep );
-  CPPUNIT_TEST( testUseLinearBehavior );
+  CPPUNIT_TEST( testUseElasticBehavior );
   CPPUNIT_TEST( testHasStateVars );
 
   CPPUNIT_TEST( test_calcStressElastic );
@@ -82,8 +82,8 @@
   /// Test timeStep()
   void testTimeStep(void);
 
-  /// Test useLinearBehavior()
-  void testUseLinearBehavior(void);
+  /// Test useElasticBehavior()
+  void testUseElasticBehavior(void);
 
   /// Test hasStateVars()
   void testHasStateVars(void);

Modified: short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/materials/TestMaxwellPlaneStrain.cc
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/materials/TestMaxwellPlaneStrain.cc	2012-05-15 22:49:08 UTC (rev 20141)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/materials/TestMaxwellPlaneStrain.cc	2012-05-16 00:38:43 UTC (rev 20142)
@@ -63,13 +63,13 @@
 } // testTimeStep
 
 // ----------------------------------------------------------------------
-// Test useLinearBehavior()
+// Test useElasticBehavior()
 void
-pylith::materials::TestMaxwellPlaneStrain::testUseLinearBehavior(void)
-{ // testUseLinearBehavior
+pylith::materials::TestMaxwellPlaneStrain::testUseElasticBehavior(void)
+{ // testUseElasticBehavior
   MaxwellPlaneStrain material;
 
-  material.useLinearBehavior(true);
+  material.useElasticBehavior(true);
   
   // Some compilers/operating systems (cygwin) don't allow comparing
   // pointers. Use first test to determine if we can compare pointers.
@@ -82,7 +82,7 @@
     CPPUNIT_ASSERT(&pylith::materials::MaxwellPlaneStrain::_updateStateVarsElastic ==
 		   material._updateStateVarsFn);
 
-    material.useLinearBehavior(false);
+    material.useElasticBehavior(false);
     CPPUNIT_ASSERT(&pylith::materials::MaxwellPlaneStrain::_calcStressViscoelastic ==
 		   material._calcStressFn);
     CPPUNIT_ASSERT(&pylith::materials::MaxwellPlaneStrain::_calcElasticConstsViscoelastic ==
@@ -90,7 +90,7 @@
     CPPUNIT_ASSERT(&pylith::materials::MaxwellPlaneStrain::_updateStateVarsViscoelastic ==
 		   material._updateStateVarsFn);
   } // if
-} // testUseLinearBehavior
+} // testUseElasticBehavior
 
 // ----------------------------------------------------------------------
 // Test usesHasStateVars()
@@ -107,7 +107,7 @@
 pylith::materials::TestMaxwellPlaneStrain::test_calcStressElastic(void)
 { // test_calcStressElastic
   CPPUNIT_ASSERT(0 != _matElastic);
-  _matElastic->useLinearBehavior(true);
+  _matElastic->useElasticBehavior(true);
 
   test_calcStress();
 } // test_calcStressElastic
@@ -118,7 +118,7 @@
 pylith::materials::TestMaxwellPlaneStrain::test_calcElasticConstsElastic(void)
 { // test_calcElasticConstsElastic
   CPPUNIT_ASSERT(0 != _matElastic);
-  _matElastic->useLinearBehavior(true);
+  _matElastic->useElasticBehavior(true);
 
   test_calcElasticConsts();
 } // test_calcElasticConstsElastic
@@ -129,7 +129,7 @@
 pylith::materials::TestMaxwellPlaneStrain::test_updateStateVarsElastic(void)
 { // test_updateStateVarsElastic
   CPPUNIT_ASSERT(0 != _matElastic);
-  _matElastic->useLinearBehavior(true);
+  _matElastic->useElasticBehavior(true);
 
   test_updateStateVars();
 } // test_updateStateVarsElastic
@@ -140,7 +140,7 @@
 pylith::materials::TestMaxwellPlaneStrain::test_calcStressTimeDep(void)
 { // test_calcStressTimeDep
   CPPUNIT_ASSERT(0 != _matElastic);
-  _matElastic->useLinearBehavior(false);
+  _matElastic->useElasticBehavior(false);
 
   delete _dataElastic; _dataElastic = new MaxwellPlaneStrainTimeDepData();
 
@@ -155,7 +155,7 @@
 pylith::materials::TestMaxwellPlaneStrain::test_calcElasticConstsTimeDep(void)
 { // test_calcElasticConstsTimeDep
   CPPUNIT_ASSERT(0 != _matElastic);
-  _matElastic->useLinearBehavior(false);
+  _matElastic->useElasticBehavior(false);
 
   delete _dataElastic; _dataElastic = new MaxwellPlaneStrainTimeDepData();
 
@@ -170,7 +170,7 @@
 pylith::materials::TestMaxwellPlaneStrain::test_updateStateVarsTimeDep(void)
 { // test_updateStateVarsTimeDep
   CPPUNIT_ASSERT(0 != _matElastic);
-   _matElastic->useLinearBehavior(false);
+   _matElastic->useElasticBehavior(false);
 
   delete _dataElastic; _dataElastic = new MaxwellPlaneStrainTimeDepData();
 

Modified: short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/materials/TestMaxwellPlaneStrain.hh
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/materials/TestMaxwellPlaneStrain.hh	2012-05-15 22:49:08 UTC (rev 20141)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/materials/TestMaxwellPlaneStrain.hh	2012-05-16 00:38:43 UTC (rev 20142)
@@ -58,7 +58,7 @@
 
   // Need to test Maxwell viscoelastic specific behavior.
   CPPUNIT_TEST( testTimeStep );
-  CPPUNIT_TEST( testUseLinearBehavior );
+  CPPUNIT_TEST( testUseElasticBehavior );
   CPPUNIT_TEST( testHasStateVars );
 
   CPPUNIT_TEST( test_calcStressElastic );
@@ -82,8 +82,8 @@
   /// Test timeStep()
   void testTimeStep(void);
 
-  /// Test useLinearBehavior()
-  void testUseLinearBehavior(void);
+  /// Test useElasticBehavior()
+  void testUseElasticBehavior(void);
 
   /// Test hasStateVars()
   void testHasStateVars(void);

Modified: short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/materials/TestPowerLaw3D.cc
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/materials/TestPowerLaw3D.cc	2012-05-15 22:49:08 UTC (rev 20141)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/materials/TestPowerLaw3D.cc	2012-05-16 00:38:43 UTC (rev 20142)
@@ -63,13 +63,13 @@
 } // testTimeStep
 
 // ----------------------------------------------------------------------
-// Test useLinearBehavior()
+// Test useElasticBehavior()
 void
-pylith::materials::TestPowerLaw3D::testUseLinearBehavior(void)
-{ // testUseLinearBehavior
+pylith::materials::TestPowerLaw3D::testUseElasticBehavior(void)
+{ // testUseElasticBehavior
   PowerLaw3D material;
 
-  material.useLinearBehavior(true);
+  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::PowerLaw3D::_calcStressElastic == 
@@ -81,7 +81,7 @@
     CPPUNIT_ASSERT(&pylith::materials::PowerLaw3D::_updateStateVarsElastic ==
 		   material._updateStateVarsFn);
 
-    material.useLinearBehavior(false);
+    material.useElasticBehavior(false);
     CPPUNIT_ASSERT(&pylith::materials::PowerLaw3D::_calcStressViscoelastic ==
 		   material._calcStressFn);
     CPPUNIT_ASSERT(&pylith::materials::PowerLaw3D::_calcElasticConstsViscoelastic ==
@@ -89,7 +89,7 @@
     CPPUNIT_ASSERT(&pylith::materials::PowerLaw3D::_updateStateVarsViscoelastic ==
 		   material._updateStateVarsFn);
   } // if
-} // testUseLinearBehavior
+} // testUseElasticBehavior
 
 // ----------------------------------------------------------------------
 // Test usesHasStateVars()
@@ -106,7 +106,7 @@
 pylith::materials::TestPowerLaw3D::test_calcStressElastic(void)
 { // test_calcStressElastic
   CPPUNIT_ASSERT(0 != _matElastic);
-  _matElastic->useLinearBehavior(true);
+  _matElastic->useElasticBehavior(true);
 
   test_calcStress();
 } // test_calcStressElastic
@@ -117,7 +117,7 @@
 pylith::materials::TestPowerLaw3D::test_calcElasticConstsElastic(void)
 { // test_calcElasticConstsElastic
   CPPUNIT_ASSERT(0 != _matElastic);
-  _matElastic->useLinearBehavior(true);
+  _matElastic->useElasticBehavior(true);
 
   test_calcElasticConsts();
 } // test_calcElasticConstsElastic
@@ -128,7 +128,7 @@
 pylith::materials::TestPowerLaw3D::test_updateStateVarsElastic(void)
 { // test_updateStateVarsElastic
   CPPUNIT_ASSERT(0 != _matElastic);
-  _matElastic->useLinearBehavior(true);
+  _matElastic->useElasticBehavior(true);
 
   test_updateStateVars();
 } // test_updateStateVarsElastic
@@ -139,7 +139,7 @@
 pylith::materials::TestPowerLaw3D::test_calcStressTimeDep(void)
 { // test_calcStressTimeDep
   CPPUNIT_ASSERT(0 != _matElastic);
-  _matElastic->useLinearBehavior(false);
+  _matElastic->useElasticBehavior(false);
 
   delete _dataElastic; _dataElastic = new PowerLaw3DTimeDepData();
 
@@ -154,7 +154,7 @@
 pylith::materials::TestPowerLaw3D::test_calcElasticConstsTimeDep(void)
 { // test_calcElasticConstsTimeDep
   CPPUNIT_ASSERT(0 != _matElastic);
-  _matElastic->useLinearBehavior(false);
+  _matElastic->useElasticBehavior(false);
 
   delete _dataElastic; _dataElastic = new PowerLaw3DTimeDepData();
 
@@ -169,7 +169,7 @@
 pylith::materials::TestPowerLaw3D::test_updateStateVarsTimeDep(void)
 { // test_updateStateVarsTimeDep
   CPPUNIT_ASSERT(0 != _matElastic);
-  _matElastic->useLinearBehavior(false);
+  _matElastic->useElasticBehavior(false);
 
   delete _dataElastic; _dataElastic = new PowerLaw3DTimeDepData();
 

Modified: short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/materials/TestPowerLaw3D.hh
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/materials/TestPowerLaw3D.hh	2012-05-15 22:49:08 UTC (rev 20141)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/materials/TestPowerLaw3D.hh	2012-05-16 00:38:43 UTC (rev 20142)
@@ -58,7 +58,7 @@
 
   // Need to test Power Law viscoelastic specific behavior.
   CPPUNIT_TEST( testTimeStep );
-  CPPUNIT_TEST( testUseLinearBehavior );
+  CPPUNIT_TEST( testUseElasticBehavior );
   CPPUNIT_TEST( testHasStateVars );
 
   CPPUNIT_TEST( test_calcStressElastic );
@@ -82,8 +82,8 @@
   /// Test timeStep()
   void testTimeStep(void);
 
-  /// Test useLinearBehavior()
-  void testUseLinearBehavior(void);
+  /// Test useElasticBehavior()
+  void testUseElasticBehavior(void);
 
   /// Test hasStateVars()
   void testHasStateVars(void);

Modified: short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/materials/TestPowerLawPlaneStrain.cc
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/materials/TestPowerLawPlaneStrain.cc	2012-05-15 22:49:08 UTC (rev 20141)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/materials/TestPowerLawPlaneStrain.cc	2012-05-16 00:38:43 UTC (rev 20142)
@@ -63,13 +63,13 @@
 } // testTimeStep
 
 // ----------------------------------------------------------------------
-// Test useLinearBehavior()
+// Test useElasticBehavior()
 void
-pylith::materials::TestPowerLawPlaneStrain::testUseLinearBehavior(void)
-{ // testUseLinearBehavior
+pylith::materials::TestPowerLawPlaneStrain::testUseElasticBehavior(void)
+{ // testUseElasticBehavior
   PowerLawPlaneStrain material;
 
-  material.useLinearBehavior(true);
+  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::PowerLawPlaneStrain::_calcStressElastic == 
@@ -81,7 +81,7 @@
     CPPUNIT_ASSERT(&pylith::materials::PowerLawPlaneStrain::_updateStateVarsElastic ==
 		   material._updateStateVarsFn);
 
-    material.useLinearBehavior(false);
+    material.useElasticBehavior(false);
     CPPUNIT_ASSERT(&pylith::materials::PowerLawPlaneStrain::_calcStressViscoelastic ==
 		   material._calcStressFn);
     CPPUNIT_ASSERT(&pylith::materials::PowerLawPlaneStrain::_calcElasticConstsViscoelastic ==
@@ -89,7 +89,7 @@
     CPPUNIT_ASSERT(&pylith::materials::PowerLawPlaneStrain::_updateStateVarsViscoelastic ==
 		   material._updateStateVarsFn);
   } // if
-} // testUseLinearBehavior
+} // testUseElasticBehavior
 
 // ----------------------------------------------------------------------
 // Test usesHasStateVars()
@@ -106,7 +106,7 @@
 pylith::materials::TestPowerLawPlaneStrain::test_calcStressElastic(void)
 { // test_calcStressElastic
   CPPUNIT_ASSERT(0 != _matElastic);
-  _matElastic->useLinearBehavior(true);
+  _matElastic->useElasticBehavior(true);
 
   test_calcStress();
 } // test_calcStressElastic
@@ -117,7 +117,7 @@
 pylith::materials::TestPowerLawPlaneStrain::test_calcElasticConstsElastic(void)
 { // test_calcElasticConstsElastic
   CPPUNIT_ASSERT(0 != _matElastic);
-  _matElastic->useLinearBehavior(true);
+  _matElastic->useElasticBehavior(true);
 
   test_calcElasticConsts();
 } // test_calcElasticConstsElastic
@@ -128,7 +128,7 @@
 pylith::materials::TestPowerLawPlaneStrain::test_updateStateVarsElastic(void)
 { // test_updateStateVarsElastic
   CPPUNIT_ASSERT(0 != _matElastic);
-  _matElastic->useLinearBehavior(true);
+  _matElastic->useElasticBehavior(true);
 
   test_updateStateVars();
 } // test_updateStateVarsElastic
@@ -139,7 +139,7 @@
 pylith::materials::TestPowerLawPlaneStrain::test_calcStressTimeDep(void)
 { // test_calcStressTimeDep
   CPPUNIT_ASSERT(0 != _matElastic);
-  _matElastic->useLinearBehavior(false);
+  _matElastic->useElasticBehavior(false);
 
   delete _dataElastic; _dataElastic = new PowerLawPlaneStrainTimeDepData();
 
@@ -154,7 +154,7 @@
 pylith::materials::TestPowerLawPlaneStrain::test_calcElasticConstsTimeDep(void)
 { // test_calcElasticConstsTimeDep
   CPPUNIT_ASSERT(0 != _matElastic);
-  _matElastic->useLinearBehavior(false);
+  _matElastic->useElasticBehavior(false);
 
   delete _dataElastic; _dataElastic = new PowerLawPlaneStrainTimeDepData();
 
@@ -169,7 +169,7 @@
 pylith::materials::TestPowerLawPlaneStrain::test_updateStateVarsTimeDep(void)
 { // test_updateStateVarsTimeDep
   CPPUNIT_ASSERT(0 != _matElastic);
-  _matElastic->useLinearBehavior(false);
+  _matElastic->useElasticBehavior(false);
 
   delete _dataElastic; _dataElastic = new PowerLawPlaneStrainTimeDepData();
 

Modified: short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/materials/TestPowerLawPlaneStrain.hh
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/materials/TestPowerLawPlaneStrain.hh	2012-05-15 22:49:08 UTC (rev 20141)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/materials/TestPowerLawPlaneStrain.hh	2012-05-16 00:38:43 UTC (rev 20142)
@@ -58,7 +58,7 @@
 
   // Need to test Power Law viscoelastic specific behavior.
   CPPUNIT_TEST( testTimeStep );
-  CPPUNIT_TEST( testUseLinearBehavior );
+  CPPUNIT_TEST( testUseElasticBehavior );
   CPPUNIT_TEST( testHasStateVars );
 
   CPPUNIT_TEST( test_calcStressElastic );
@@ -82,8 +82,8 @@
   /// Test timeStep()
   void testTimeStep(void);
 
-  /// Test useLinearBehavior()
-  void testUseLinearBehavior(void);
+  /// Test useElasticBehavior()
+  void testUseElasticBehavior(void);
 
   /// Test hasStateVars()
   void testHasStateVars(void);

Modified: short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/materials/TestDruckerPrager3D.py
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/materials/TestDruckerPrager3D.py	2012-05-15 22:49:08 UTC (rev 20141)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/materials/TestDruckerPrager3D.py	2012-05-16 00:38:43 UTC (rev 20142)
@@ -62,11 +62,11 @@
     return
 
 
-  def test_useLinearBehavior(self):
+  def test_useElasticBehavior(self):
     """
-    Test useLinearBehavior().
+    Test useElasticBehavior().
     """
-    self.material.useLinearBehavior(False)
+    self.material.useElasticBehavior(False)
     return
 
 

Modified: short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/materials/TestDruckerPragerPlaneStrain.py
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/materials/TestDruckerPragerPlaneStrain.py	2012-05-15 22:49:08 UTC (rev 20141)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/materials/TestDruckerPragerPlaneStrain.py	2012-05-16 00:38:43 UTC (rev 20142)
@@ -62,11 +62,11 @@
     return
 
 
-  def test_useLinearBehavior(self):
+  def test_useElasticBehavior(self):
     """
-    Test useLinearBehavior().
+    Test useElasticBehavior().
     """
-    self.material.useLinearBehavior(False)
+    self.material.useElasticBehavior(False)
     return
 
 

Modified: short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/materials/TestElasticIsotropic3D.py
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/materials/TestElasticIsotropic3D.py	2012-05-15 22:49:08 UTC (rev 20141)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/materials/TestElasticIsotropic3D.py	2012-05-16 00:38:43 UTC (rev 20142)
@@ -46,11 +46,11 @@
     return
 
 
-  def test_useLinearBehavior(self):
+  def test_useElasticBehavior(self):
     """
-    Test useLinearBehavior().
+    Test useElasticBehavior().
     """
-    self.material.useLinearBehavior(False)
+    self.material.useElasticBehavior(False)
     return
 
 

Modified: short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/materials/TestElasticPlaneStrain.py
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/materials/TestElasticPlaneStrain.py	2012-05-15 22:49:08 UTC (rev 20141)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/materials/TestElasticPlaneStrain.py	2012-05-16 00:38:43 UTC (rev 20142)
@@ -46,11 +46,11 @@
     return
 
 
-  def test_useLinearBehavior(self):
+  def test_useElasticBehavior(self):
     """
-    Test useLinearBehavior().
+    Test useElasticBehavior().
     """
-    self.material.useLinearBehavior(False)
+    self.material.useElasticBehavior(False)
     return
 
 

Modified: short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/materials/TestElasticPlaneStress.py
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/materials/TestElasticPlaneStress.py	2012-05-15 22:49:08 UTC (rev 20141)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/materials/TestElasticPlaneStress.py	2012-05-16 00:38:43 UTC (rev 20142)
@@ -46,11 +46,11 @@
     return
 
 
-  def test_useLinearBehavior(self):
+  def test_useElasticBehavior(self):
     """
-    Test useLinearBehavior().
+    Test useElasticBehavior().
     """
-    self.material.useLinearBehavior(False)
+    self.material.useElasticBehavior(False)
     return
 
 

Modified: short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/materials/TestElasticStrain1D.py
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/materials/TestElasticStrain1D.py	2012-05-15 22:49:08 UTC (rev 20141)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/materials/TestElasticStrain1D.py	2012-05-16 00:38:43 UTC (rev 20142)
@@ -46,11 +46,11 @@
     return
 
 
-  def test_useLinearBehavior(self):
+  def test_useElasticBehavior(self):
     """
-    Test useLinearBehavior().
+    Test useElasticBehavior().
     """
-    self.material.useLinearBehavior(False)
+    self.material.useElasticBehavior(False)
     return
 
 

Modified: short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/materials/TestElasticStress1D.py
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/materials/TestElasticStress1D.py	2012-05-15 22:49:08 UTC (rev 20141)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/materials/TestElasticStress1D.py	2012-05-16 00:38:43 UTC (rev 20142)
@@ -46,11 +46,11 @@
     return
 
 
-  def test_useLinearBehavior(self):
+  def test_useElasticBehavior(self):
     """
-    Test useLinearBehavior().
+    Test useElasticBehavior().
     """
-    self.material.useLinearBehavior(False)
+    self.material.useElasticBehavior(False)
     return
 
 

Modified: short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/materials/TestGenMaxwellIsotropic3D.py
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/materials/TestGenMaxwellIsotropic3D.py	2012-05-15 22:49:08 UTC (rev 20141)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/materials/TestGenMaxwellIsotropic3D.py	2012-05-16 00:38:43 UTC (rev 20142)
@@ -46,11 +46,11 @@
     return
 
 
-  def test_useLinearBehavior(self):
+  def test_useElasticBehavior(self):
     """
-    Test useLinearBehavior().
+    Test useElasticBehavior().
     """
-    self.material.useLinearBehavior(False)
+    self.material.useElasticBehavior(False)
     return
 
 

Modified: short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/materials/TestGenMaxwellPlaneStrain.py
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/materials/TestGenMaxwellPlaneStrain.py	2012-05-15 22:49:08 UTC (rev 20141)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/materials/TestGenMaxwellPlaneStrain.py	2012-05-16 00:38:43 UTC (rev 20142)
@@ -46,11 +46,11 @@
     return
 
 
-  def test_useLinearBehavior(self):
+  def test_useElasticBehavior(self):
     """
-    Test useLinearBehavior().
+    Test useElasticBehavior().
     """
-    self.material.useLinearBehavior(False)
+    self.material.useElasticBehavior(False)
     return
 
 

Modified: short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/materials/TestGenMaxwellQpQsIsotropic3D.py
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/materials/TestGenMaxwellQpQsIsotropic3D.py	2012-05-15 22:49:08 UTC (rev 20141)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/materials/TestGenMaxwellQpQsIsotropic3D.py	2012-05-16 00:38:43 UTC (rev 20142)
@@ -46,11 +46,11 @@
     return
 
 
-  def test_useLinearBehavior(self):
+  def test_useElasticBehavior(self):
     """
-    Test useLinearBehavior().
+    Test useElasticBehavior().
     """
-    self.material.useLinearBehavior(False)
+    self.material.useElasticBehavior(False)
     return
 
 

Modified: short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/materials/TestMaxwellIsotropic3D.py
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/materials/TestMaxwellIsotropic3D.py	2012-05-15 22:49:08 UTC (rev 20141)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/materials/TestMaxwellIsotropic3D.py	2012-05-16 00:38:43 UTC (rev 20142)
@@ -46,11 +46,11 @@
     return
 
 
-  def test_useLinearBehavior(self):
+  def test_useElasticBehavior(self):
     """
-    Test useLinearBehavior().
+    Test useElasticBehavior().
     """
-    self.material.useLinearBehavior(False)
+    self.material.useElasticBehavior(False)
     return
 
 

Modified: short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/materials/TestMaxwellPlaneStrain.py
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/materials/TestMaxwellPlaneStrain.py	2012-05-15 22:49:08 UTC (rev 20141)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/materials/TestMaxwellPlaneStrain.py	2012-05-16 00:38:43 UTC (rev 20142)
@@ -46,11 +46,11 @@
     return
 
 
-  def test_useLinearBehavior(self):
+  def test_useElasticBehavior(self):
     """
-    Test useLinearBehavior().
+    Test useElasticBehavior().
     """
-    self.material.useLinearBehavior(False)
+    self.material.useElasticBehavior(False)
     return
 
 

Modified: short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/materials/TestPowerLaw3D.py
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/materials/TestPowerLaw3D.py	2012-05-15 22:49:08 UTC (rev 20141)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/materials/TestPowerLaw3D.py	2012-05-16 00:38:43 UTC (rev 20142)
@@ -46,11 +46,11 @@
     return
 
 
-  def test_useLinearBehavior(self):
+  def test_useElasticBehavior(self):
     """
-    Test useLinearBehavior().
+    Test useElasticBehavior().
     """
-    self.material.useLinearBehavior(False)
+    self.material.useElasticBehavior(False)
     return
 
 

Modified: short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/materials/TestPowerLawPlaneStrain.py
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/materials/TestPowerLawPlaneStrain.py	2012-05-15 22:49:08 UTC (rev 20141)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/materials/TestPowerLawPlaneStrain.py	2012-05-16 00:38:43 UTC (rev 20142)
@@ -46,11 +46,11 @@
     return
 
 
-  def test_useLinearBehavior(self):
+  def test_useElasticBehavior(self):
     """
-    Test useLinearBehavior().
+    Test useElasticBehavior().
     """
-    self.material.useLinearBehavior(False)
+    self.material.useElasticBehavior(False)
     return
 
 

