[cig-commits] r19854 - in short/3D/PyLith/branches/v1.7-trunk: libsrc/pylith/bc libsrc/pylith/feassemble libsrc/pylith/materials modulesrc/feassemble modulesrc/materials pylith/feassemble pylith/problems unittests/libtests/bc unittests/libtests/faults unittests/libtests/feassemble unittests/libtests/materials unittests/pytests/bc unittests/pytests/faults unittests/pytests/feassemble unittests/pytests/materials
brad at geodynamics.org
brad at geodynamics.org
Thu Mar 22 17:23:56 PDT 2012
Author: brad
Date: 2012-03-22 17:23:56 -0700 (Thu, 22 Mar 2012)
New Revision: 19854
Modified:
short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/bc/DirichletBC.cc
short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/feassemble/Constraint.cc
short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/feassemble/Constraint.hh
short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/feassemble/Constraint.icc
short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/feassemble/ElasticityExplicit.cc
short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/feassemble/ElasticityExplicit.hh
short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/feassemble/ElasticityExplicitLgDeform.cc
short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/feassemble/ElasticityExplicitLgDeform.hh
short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/feassemble/ElasticityExplicitTet4.cc
short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/feassemble/ElasticityExplicitTet4.hh
short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/feassemble/ElasticityExplicitTri3.cc
short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/feassemble/ElasticityExplicitTri3.hh
short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/feassemble/ElasticityImplicit.cc
short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/feassemble/ElasticityImplicit.hh
short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/feassemble/ElasticityImplicitCUDA.cc
short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/feassemble/ElasticityImplicitCUDA.hh
short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/feassemble/ElasticityImplicitLgDeform.cc
short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/feassemble/ElasticityImplicitLgDeform.hh
short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/feassemble/Integrator.cc
short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/feassemble/Integrator.hh
short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/feassemble/Integrator.icc
short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/feassemble/IntegratorElasticity.cc
short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/feassemble/IntegratorElasticity.hh
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/ElasticMaterial.hh
short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/ElasticMaterial.icc
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/modulesrc/feassemble/Constraint.i
short/3D/PyLith/branches/v1.7-trunk/modulesrc/feassemble/ElasticityExplicit.i
short/3D/PyLith/branches/v1.7-trunk/modulesrc/feassemble/ElasticityExplicitLgDeform.i
short/3D/PyLith/branches/v1.7-trunk/modulesrc/feassemble/ElasticityExplicitTet4.i
short/3D/PyLith/branches/v1.7-trunk/modulesrc/feassemble/ElasticityExplicitTri3.i
short/3D/PyLith/branches/v1.7-trunk/modulesrc/feassemble/ElasticityImplicit.i
short/3D/PyLith/branches/v1.7-trunk/modulesrc/feassemble/ElasticityImplicitCUDA.i
short/3D/PyLith/branches/v1.7-trunk/modulesrc/feassemble/ElasticityImplicitLgDeform.i
short/3D/PyLith/branches/v1.7-trunk/modulesrc/feassemble/Integrator.i
short/3D/PyLith/branches/v1.7-trunk/modulesrc/feassemble/IntegratorElasticity.i
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/pylith/feassemble/Constraint.py
short/3D/PyLith/branches/v1.7-trunk/pylith/feassemble/Integrator.py
short/3D/PyLith/branches/v1.7-trunk/pylith/problems/Explicit.py
short/3D/PyLith/branches/v1.7-trunk/pylith/problems/ExplicitLumped.py
short/3D/PyLith/branches/v1.7-trunk/pylith/problems/Implicit.py
short/3D/PyLith/branches/v1.7-trunk/pylith/problems/TimeDependent.py
short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/bc/TestDirichletBC.cc
short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/bc/TestDirichletBCMulti.cc
short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/faults/TestFaultCohesiveKin.cc
short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/faults/TestFaultCohesiveKin.hh
short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/feassemble/TestElasticityExplicit.cc
short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/feassemble/TestElasticityExplicit.hh
short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/feassemble/TestElasticityExplicitTet4.cc
short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/feassemble/TestElasticityExplicitTet4.hh
short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/feassemble/TestElasticityExplicitTri3.cc
short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/feassemble/TestElasticityExplicitTri3.hh
short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/feassemble/TestElasticityImplicit.cc
short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/feassemble/TestElasticityImplicit.hh
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/pytests/bc/TestAbsorbingDampers.py
short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/bc/TestDirichletBC.py
short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/bc/TestDirichletBoundary.py
short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/bc/TestNeumann.py
short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/faults/TestFaultCohesiveDyn.py
short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/faults/TestFaultCohesiveKin.py
short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/feassemble/TestElasticityExplicit.py
short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/feassemble/TestElasticityExplicitLgDeform.py
short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/feassemble/TestElasticityImplicit.py
short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/feassemble/TestElasticityImplicitLgDeform.py
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
Log:
Added linear_prestep property to time dependent problem to allow user to turn on/off linear material behavior in first time step. Note that inelastic calculations will require an increment in deformation from t=0 to get deformation.
Modified: short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/bc/DirichletBC.cc
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/bc/DirichletBC.cc 2012-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/bc/DirichletBC.cc 2012-03-23 00:23:56 UTC (rev 19854)
@@ -243,8 +243,6 @@
const PylithScalar t1,
const topology::Field<topology::Mesh>& field)
{ // setFieldIncr
- assert(_useSolnIncr);
-
const int numFixedDOF = _bcDOF.size();
if (0 == numFixedDOF)
return;
Modified: short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/feassemble/Constraint.cc
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/feassemble/Constraint.cc 2012-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/feassemble/Constraint.cc 2012-03-23 00:23:56 UTC (rev 19854)
@@ -25,8 +25,7 @@
// ----------------------------------------------------------------------
// Default constructor.
pylith::feassemble::Constraint::Constraint(void) :
- _normalizer(new spatialdata::units::Nondimensional),
- _useSolnIncr(false)
+ _normalizer(new spatialdata::units::Nondimensional)
{ // constructor
} // constructor
Modified: short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/feassemble/Constraint.hh
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/feassemble/Constraint.hh 2012-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/feassemble/Constraint.hh 2012-03-23 00:23:56 UTC (rev 19854)
@@ -59,14 +59,6 @@
*/
void normalizer(const spatialdata::units::Nondimensional& dim);
- /** Set flag for setting constraints for total field solution or
- * incremental field solution.
- *
- * @param flag True if using incremental solution, false otherwise.
- */
- virtual
- void useSolnIncr(const bool flag);
-
/** Get number of constraints per location.
*
* @returns Number of constraints per location.
@@ -113,10 +105,6 @@
spatialdata::units::Nondimensional* _normalizer; ///< Nondimensionalizer.
- /// Flag indicating whether to set constraints for a total field
- /// solution or an incremental field solution
- bool _useSolnIncr;
-
// NOT IMPLEMENTED ////////////////////////////////////////////////////
private :
Modified: short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/feassemble/Constraint.icc
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/feassemble/Constraint.icc 2012-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/feassemble/Constraint.icc 2012-03-23 00:23:56 UTC (rev 19854)
@@ -20,14 +20,6 @@
#error "Constraint.icc must be included only from Constraint.hh"
#else
-// Set flag for setting constraints for total field solution or
-inline
-void
-pylith::feassemble::Constraint::useSolnIncr(const bool flag) {
- _useSolnIncr = flag;
-} // useSolnIncr
-
-
#endif
// End of file
Modified: short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/feassemble/ElasticityExplicit.cc
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/feassemble/ElasticityExplicit.cc 2012-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/feassemble/ElasticityExplicit.cc 2012-03-23 00:23:56 UTC (rev 19854)
@@ -97,19 +97,6 @@
} // normViscosity
// ----------------------------------------------------------------------
-// Set flag for setting constraints for total field solution or
-// incremental field solution.
-void
-pylith::feassemble::ElasticityExplicit::useSolnIncr(const bool flag)
-{ // useSolnIncr
- _material->useElasticBehavior(false);
- if (!flag)
- throw std::logic_error("Non-incremental solution not supported for "
- "explicit time integration of elasticity "
- "equation.");
-} // useSolnIncr
-
-// ----------------------------------------------------------------------
// Integrate constributions to residual term (r) for operator.
void
pylith::feassemble::ElasticityExplicit::integrateResidual(
Modified: short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/feassemble/ElasticityExplicit.hh
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/feassemble/ElasticityExplicit.hh 2012-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/feassemble/ElasticityExplicit.hh 2012-03-23 00:23:56 UTC (rev 19854)
@@ -96,13 +96,6 @@
*/
void normViscosity(const PylithScalar viscosity);
- /** Set flag for setting constraints for total field solution or
- * incremental field solution.
- *
- * @param flag True if using incremental solution, false otherwise.
- */
- void useSolnIncr(const bool flag);
-
/** Integrate contributions to residual term (r) for operator.
*
* @param residual Field containing values for residual
Modified: short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/feassemble/ElasticityExplicitLgDeform.cc
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/feassemble/ElasticityExplicitLgDeform.cc 2012-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/feassemble/ElasticityExplicitLgDeform.cc 2012-03-23 00:23:56 UTC (rev 19854)
@@ -95,18 +95,6 @@
} // normViscosity
// ----------------------------------------------------------------------
-// Set flag for setting constraints for total field solution or
-// incremental field solution.
-void
-pylith::feassemble::ElasticityExplicitLgDeform::useSolnIncr(const bool flag)
-{ // useSolnIncr
- if (!flag)
- throw std::logic_error("Non-incremental solution not supported for "
- "explicit time integration of elasticity "
- "equation.");
-} // useSolnIncr
-
-// ----------------------------------------------------------------------
// Integrate constributions to residual term (r) for operator.
void
pylith::feassemble::ElasticityExplicitLgDeform::integrateResidual(
Modified: short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/feassemble/ElasticityExplicitLgDeform.hh
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/feassemble/ElasticityExplicitLgDeform.hh 2012-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/feassemble/ElasticityExplicitLgDeform.hh 2012-03-23 00:23:56 UTC (rev 19854)
@@ -98,13 +98,6 @@
*/
void normViscosity(const PylithScalar viscosity);
- /** Set flag for setting constraints for total field solution or
- * incremental field solution.
- *
- * @param flag True if using incremental solution, false otherwise.
- */
- void useSolnIncr(const bool flag);
-
/** Integrate contributions to residual term (r) for operator.
*
* @param residual Field containing values for residual
Modified: short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/feassemble/ElasticityExplicitTet4.cc
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/feassemble/ElasticityExplicitTet4.cc 2012-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/feassemble/ElasticityExplicitTet4.cc 2012-03-23 00:23:56 UTC (rev 19854)
@@ -102,19 +102,6 @@
} // normViscosity
// ----------------------------------------------------------------------
-// Set flag for setting constraints for total field solution or
-// incremental field solution.
-void
-pylith::feassemble::ElasticityExplicitTet4::useSolnIncr(const bool flag)
-{ // useSolnIncr
- _material->useElasticBehavior(false);
- if (!flag)
- throw std::logic_error("Non-incremental solution not supported for "
- "explicit time integration of elasticity "
- "equation.");
-} // useSolnIncr
-
-// ----------------------------------------------------------------------
// Integrate constributions to residual term (r) for operator.
void
pylith::feassemble::ElasticityExplicitTet4::integrateResidual(
Modified: short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/feassemble/ElasticityExplicitTet4.hh
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/feassemble/ElasticityExplicitTet4.hh 2012-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/feassemble/ElasticityExplicitTet4.hh 2012-03-23 00:23:56 UTC (rev 19854)
@@ -96,13 +96,6 @@
*/
void normViscosity(const PylithScalar viscosity);
- /** Set flag for setting constraints for total field solution or
- * incremental field solution.
- *
- * @param flag True if using incremental solution, false otherwise.
- */
- void useSolnIncr(const bool flag);
-
/** Integrate contributions to residual term (r) for operator.
*
* @param residual Field containing values for residual
Modified: short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/feassemble/ElasticityExplicitTri3.cc
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/feassemble/ElasticityExplicitTri3.cc 2012-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/feassemble/ElasticityExplicitTri3.cc 2012-03-23 00:23:56 UTC (rev 19854)
@@ -102,19 +102,6 @@
} // normViscosity
// ----------------------------------------------------------------------
-// Set flag for setting constraints for total field solution or
-// incremental field solution.
-void
-pylith::feassemble::ElasticityExplicitTri3::useSolnIncr(const bool flag)
-{ // useSolnIncr
- _material->useElasticBehavior(false);
- if (!flag)
- throw std::logic_error("Non-incremental solution not supported for "
- "explicit time integration of elasticity "
- "equation.");
-} // useSolnIncr
-
-// ----------------------------------------------------------------------
// Integrate constributions to residual term (r) for operator.
void
pylith::feassemble::ElasticityExplicitTri3::integrateResidual(
Modified: short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/feassemble/ElasticityExplicitTri3.hh
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/feassemble/ElasticityExplicitTri3.hh 2012-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/feassemble/ElasticityExplicitTri3.hh 2012-03-23 00:23:56 UTC (rev 19854)
@@ -96,13 +96,6 @@
*/
void normViscosity(const PylithScalar viscosity);
- /** Set flag for setting constraints for total field solution or
- * incremental field solution.
- *
- * @param flag True if using incremental solution, false otherwise.
- */
- void useSolnIncr(const bool flag);
-
/** Integrate contributions to residual term (r) for operator.
*
* @param residual Field containing values for residual
Modified: short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/feassemble/ElasticityImplicit.cc
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/feassemble/ElasticityImplicit.cc 2012-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/feassemble/ElasticityImplicit.cc 2012-03-23 00:23:56 UTC (rev 19854)
@@ -98,17 +98,6 @@
} // stableTimeStep
// ----------------------------------------------------------------------
-// Set flag for setting constraints for total field solution or
-// incremental field solution.
-void
-pylith::feassemble::ElasticityImplicit::useSolnIncr(const bool flag)
-{ // useSolnIncr
- assert(0 != _material);
- _useSolnIncr = flag;
- _material->useElasticBehavior(!_useSolnIncr);
-} // useSolnIncr
-
-// ----------------------------------------------------------------------
// Integrate constributions to residual term (r) for operator.
void
pylith::feassemble::ElasticityImplicit::integrateResidual(
Modified: short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/feassemble/ElasticityImplicit.hh
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/feassemble/ElasticityImplicit.hh 2012-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/feassemble/ElasticityImplicit.hh 2012-03-23 00:23:56 UTC (rev 19854)
@@ -88,13 +88,6 @@
*/
PylithScalar stableTimeStep(const topology::Mesh& mesh) const;
- /** Set flag for setting constraints for total field solution or
- * incremental field solution.
- *
- * @param flag True if using incremental solution, false otherwise.
- */
- void useSolnIncr(const bool flag);
-
/** Integrate residual part of RHS for 3-D finite elements.
* Includes gravity and element internal force contribution.
*
Modified: short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/feassemble/ElasticityImplicitCUDA.cc
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/feassemble/ElasticityImplicitCUDA.cc 2012-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/feassemble/ElasticityImplicitCUDA.cc 2012-03-23 00:23:56 UTC (rev 19854)
@@ -104,17 +104,6 @@
} // stableTimeStep
// ----------------------------------------------------------------------
-// Set flag for setting constraints for total field solution or
-// incremental field solution.
-void
-pylith::feassemble::ElasticityImplicitCUDA::useSolnIncr(const bool flag)
-{ // useSolnIncr
- assert(0 != _material);
- _useSolnIncr = flag;
- _material->useElasticBehavior(!_useSolnIncr);
-} // useSolnIncr
-
-// ----------------------------------------------------------------------
// Integrate constributions to residual term (r) for operator.
void
pylith::feassemble::ElasticityImplicitCUDA::integrateResidual(
Modified: short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/feassemble/ElasticityImplicitCUDA.hh
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/feassemble/ElasticityImplicitCUDA.hh 2012-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/feassemble/ElasticityImplicitCUDA.hh 2012-03-23 00:23:56 UTC (rev 19854)
@@ -88,13 +88,6 @@
*/
PylithScalar stableTimeStep(const topology::Mesh& mesh) const;
- /** Set flag for setting constraints for total field solution or
- * incremental field solution.
- *
- * @param flag True if using incremental solution, false otherwise.
- */
- void useSolnIncr(const bool flag);
-
/** Integrate residual part of RHS for 3-D finite elements.
* Includes gravity and element internal force contribution.
*
Modified: short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/feassemble/ElasticityImplicitLgDeform.cc
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/feassemble/ElasticityImplicitLgDeform.cc 2012-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/feassemble/ElasticityImplicitLgDeform.cc 2012-03-23 00:23:56 UTC (rev 19854)
@@ -90,17 +90,6 @@
} // stableTimeStep
// ----------------------------------------------------------------------
-// Set flag for setting constraints for total field solution or
-// incremental field solution.
-void
-pylith::feassemble::ElasticityImplicitLgDeform::useSolnIncr(const bool flag)
-{ // useSolnIncr
- assert(0 != _material);
- _useSolnIncr = flag;
- _material->useElasticBehavior(!_useSolnIncr);
-} // useSolnIncr
-
-// ----------------------------------------------------------------------
// Integrate constributions to residual term (r) for operator.
void
pylith::feassemble::ElasticityImplicitLgDeform::integrateResidual(
Modified: short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/feassemble/ElasticityImplicitLgDeform.hh
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/feassemble/ElasticityImplicitLgDeform.hh 2012-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/feassemble/ElasticityImplicitLgDeform.hh 2012-03-23 00:23:56 UTC (rev 19854)
@@ -89,13 +89,6 @@
*/
PylithScalar stableTimeStep(const topology::Mesh& mesh) const;
- /** Set flag for setting constraints for total field solution or
- * incremental field solution.
- *
- * @param flag True if using incremental solution, false otherwise.
- */
- void useSolnIncr(const bool flag);
-
/** Integrate residual part of RHS for 3-D finite elements.
* Includes gravity and element internal force contribution.
*
Modified: short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/feassemble/Integrator.cc
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/feassemble/Integrator.cc 2012-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/feassemble/Integrator.cc 2012-03-23 00:23:56 UTC (rev 19854)
@@ -37,8 +37,7 @@
_gravityField(0),
_logger(0),
_needNewJacobian(true),
- _isJacobianSymmetric(true),
- _useSolnIncr(false)
+ _isJacobianSymmetric(true)
{ // constructor
} // constructor
Modified: short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/feassemble/Integrator.hh
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/feassemble/Integrator.hh 2012-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/feassemble/Integrator.hh 2012-03-23 00:23:56 UTC (rev 19854)
@@ -122,14 +122,6 @@
virtual
bool isJacobianSymmetric(void) const;
- /** Set flag for setting constraints for total field solution or
- * incremental field solution.
- *
- * @param flag True if using incremental solution, false otherwise.
- */
- virtual
- void useSolnIncr(const bool flag);
-
/** Initialize integrator.
*
* @param mesh Finite-element mesh.
@@ -294,10 +286,6 @@
/// Default is false;
bool _isJacobianSymmetric;
- /// Flag indicating whether to set constraints for a total field
- /// solution or an incremental field solution
- bool _useSolnIncr;
-
// NOT IMPLEMENTED //////////////////////////////////////////////////////
private :
Modified: short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/feassemble/Integrator.icc
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/feassemble/Integrator.icc 2012-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/feassemble/Integrator.icc 2012-03-23 00:23:56 UTC (rev 19854)
@@ -44,14 +44,6 @@
return _isJacobianSymmetric;
} // needsVelocity
-// Set flag for setting constraints for total field solution or
-template<typename quadrature_type>
-inline
-void
-pylith::feassemble::Integrator<quadrature_type>::useSolnIncr(const bool flag) {
- _useSolnIncr = flag;
-} // useSolnIncr
-
// Initialize integrator.
template<typename quadrature_type>
inline
Modified: short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/feassemble/IntegratorElasticity.cc
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/feassemble/IntegratorElasticity.cc 2012-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/feassemble/IntegratorElasticity.cc 2012-03-23 00:23:56 UTC (rev 19854)
@@ -88,17 +88,6 @@
} // needNewJacobian
// ----------------------------------------------------------------------
-// Set flag for setting constraints for total field solution or
-void
-pylith::feassemble::IntegratorElasticity::useSolnIncr(const bool flag)
-{ // useSolnIncr
- Integrator<Quadrature<topology::Mesh> >::useSolnIncr(flag);
-
- assert(0 != _material);
- _material->useElasticBehavior(!flag);
-} // useSolnIncr
-
-// ----------------------------------------------------------------------
// Initialize integrator.
void
pylith::feassemble::IntegratorElasticity::initialize(const topology::Mesh& mesh)
Modified: short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/feassemble/IntegratorElasticity.hh
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/feassemble/IntegratorElasticity.hh 2012-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/feassemble/IntegratorElasticity.hh 2012-03-23 00:23:56 UTC (rev 19854)
@@ -82,13 +82,6 @@
*/
bool needNewJacobian(void);
- /** Set flag for setting constraints for total field solution or
- * incremental field solution.
- *
- * @param flag True if using incremental solution, false otherwise.
- */
- void useSolnIncr(const bool flag);
-
/** Initialize integrator.
*
* @param mesh Finite-element mesh.
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-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/DruckerPrager3D.cc 2012-03-23 00:23:56 UTC (rev 19854)
@@ -159,7 +159,7 @@
_calcStressFn(0),
_updateStateVarsFn(0)
{ // constructor
- useElasticBehavior(true);
+ useLinearBehavior(false);
} // constructor
// ----------------------------------------------------------------------
@@ -187,8 +187,8 @@
// ----------------------------------------------------------------------
// Set whether elastic or inelastic constitutive relations are used.
void
-pylith::materials::DruckerPrager3D::useElasticBehavior(const bool flag)
-{ // useElasticBehavior
+pylith::materials::DruckerPrager3D::useLinearBehavior(const bool flag)
+{ // useLinearBehavior
if (flag) {
_calcStressFn =
&pylith::materials::DruckerPrager3D::_calcStressElastic;
@@ -205,7 +205,7 @@
_updateStateVarsFn =
&pylith::materials::DruckerPrager3D::_updateStateVarsElastoplastic;
} // if/else
-} // useElasticBehavior
+} // useLinearBehavior
// ----------------------------------------------------------------------
// 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-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/DruckerPrager3D.hh 2012-03-23 00:23:56 UTC (rev 19854)
@@ -83,7 +83,7 @@
*
* @param flag True to use elastic, false to use inelastic.
*/
- void useElasticBehavior(const bool flag);
+ void useLinearBehavior(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-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/DruckerPragerPlaneStrain.cc 2012-03-23 00:23:56 UTC (rev 19854)
@@ -165,7 +165,7 @@
_calcStressFn(0),
_updateStateVarsFn(0)
{ // constructor
- useElasticBehavior(true);
+ useLinearBehavior(false);
} // constructor
// ----------------------------------------------------------------------
@@ -194,8 +194,8 @@
// ----------------------------------------------------------------------
// Set whether elastic or inelastic constitutive relations are used.
void
-pylith::materials::DruckerPragerPlaneStrain::useElasticBehavior(const bool flag)
-{ // useElasticBehavior
+pylith::materials::DruckerPragerPlaneStrain::useLinearBehavior(const bool flag)
+{ // useLinearBehavior
if (flag) {
_calcStressFn =
&pylith::materials::DruckerPragerPlaneStrain::_calcStressElastic;
@@ -212,7 +212,7 @@
_updateStateVarsFn =
&pylith::materials::DruckerPragerPlaneStrain::_updateStateVarsElastoplastic;
} // if/else
-} // useElasticBehavior
+} // useLinearBehavior
// ----------------------------------------------------------------------
// 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-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/DruckerPragerPlaneStrain.hh 2012-03-23 00:23:56 UTC (rev 19854)
@@ -83,7 +83,7 @@
*
* @param flag True to use elastic, false to use inelastic.
*/
- void useElasticBehavior(const bool flag);
+ void useLinearBehavior(const bool flag);
// PROTECTED METHODS //////////////////////////////////////////////////
Modified: short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/ElasticMaterial.hh
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/ElasticMaterial.hh 2012-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/ElasticMaterial.hh 2012-03-23 00:23:56 UTC (rev 19854)
@@ -183,13 +183,6 @@
virtual
PylithScalar stableTimeStepImplicit(const topology::Mesh& mesh);
- /** Set whether elastic or inelastic constitutive relations are used.
- *
- * @param flag True to use elastic, false to use inelastic.
- */
- virtual
- void useElasticBehavior(const bool flag);
-
/** Get initial stress/strain fields.
*
* @returns Initial stress field.
Modified: short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/ElasticMaterial.icc
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/ElasticMaterial.icc 2012-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/ElasticMaterial.icc 2012-03-23 00:23:56 UTC (rev 19854)
@@ -36,12 +36,6 @@
_dbInitialStrain = db;
}
-// Set whether elastic or inelastic constitutive relations are used.
-inline
-void
-pylith::materials::ElasticMaterial::useElasticBehavior(const bool flag) {
-} // useElasticBehavior
-
// Get flag indicating whether material implements an empty
// _updateProperties() method.
inline
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-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/GenMaxwellIsotropic3D.cc 2012-03-23 00:23:56 UTC (rev 19854)
@@ -199,7 +199,7 @@
_calcStressFn(0),
_updateStateVarsFn(0)
{ // constructor
- useElasticBehavior(true);
+ useLinearBehavior(false);
_viscousStrain.resize(_GenMaxwellIsotropic3D::numMaxwellModels*_tensorSize);
} // constructor
@@ -212,8 +212,8 @@
// ----------------------------------------------------------------------
// Set whether elastic or inelastic constitutive relations are used.
void
-pylith::materials::GenMaxwellIsotropic3D::useElasticBehavior(const bool flag)
-{ // useElasticBehavior
+pylith::materials::GenMaxwellIsotropic3D::useLinearBehavior(const bool flag)
+{ // useLinearBehavior
if (flag) {
_calcStressFn =
&pylith::materials::GenMaxwellIsotropic3D::_calcStressElastic;
@@ -230,7 +230,7 @@
_updateStateVarsFn =
&pylith::materials::GenMaxwellIsotropic3D::_updateStateVarsViscoelastic;
} // if/else
-} // useElasticBehavior
+} // useLinearBehavior
// ----------------------------------------------------------------------
// 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-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/GenMaxwellIsotropic3D.hh 2012-03-23 00:23:56 UTC (rev 19854)
@@ -73,7 +73,7 @@
*
* @param flag True to use elastic, false to use inelastic.
*/
- void useElasticBehavior(const bool flag);
+ void useLinearBehavior(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-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/GenMaxwellPlaneStrain.cc 2012-03-23 00:23:56 UTC (rev 19854)
@@ -194,7 +194,7 @@
_calcStressFn(0),
_updateStateVarsFn(0)
{ // constructor
- useElasticBehavior(true);
+ useLinearBehavior(false);
_viscousStrain.resize(_GenMaxwellPlaneStrain::numMaxwellModels * 4);
} // constructor
@@ -207,8 +207,8 @@
// ----------------------------------------------------------------------
// Set whether elastic or inelastic constitutive relations are used.
void
-pylith::materials::GenMaxwellPlaneStrain::useElasticBehavior(const bool flag)
-{ // useElasticBehavior
+pylith::materials::GenMaxwellPlaneStrain::useLinearBehavior(const bool flag)
+{ // useLinearBehavior
if (flag) {
_calcStressFn =
&pylith::materials::GenMaxwellPlaneStrain::_calcStressElastic;
@@ -225,7 +225,7 @@
_updateStateVarsFn =
&pylith::materials::GenMaxwellPlaneStrain::_updateStateVarsViscoelastic;
} // if/else
-} // useElasticBehavior
+} // useLinearBehavior
// ----------------------------------------------------------------------
// 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-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/GenMaxwellPlaneStrain.hh 2012-03-23 00:23:56 UTC (rev 19854)
@@ -71,7 +71,7 @@
*
* @param flag True to use elastic, false to use inelastic.
*/
- void useElasticBehavior(const bool flag);
+ void useLinearBehavior(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-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/GenMaxwellQpQsIsotropic3D.cc 2012-03-23 00:23:56 UTC (rev 19854)
@@ -239,7 +239,7 @@
_calcStressFn(0),
_updateStateVarsFn(0)
{ // constructor
- useElasticBehavior(true);
+ useLinearBehavior(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::useElasticBehavior(const bool flag)
-{ // useElasticBehavior
+pylith::materials::GenMaxwellQpQsIsotropic3D::useLinearBehavior(const bool flag)
+{ // useLinearBehavior
if (flag) {
_calcStressFn =
&pylith::materials::GenMaxwellQpQsIsotropic3D::_calcStressElastic;
@@ -271,7 +271,7 @@
_updateStateVarsFn =
&pylith::materials::GenMaxwellQpQsIsotropic3D::_updateStateVarsViscoelastic;
} // if/else
-} // useElasticBehavior
+} // useLinearBehavior
// ----------------------------------------------------------------------
// 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-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/GenMaxwellQpQsIsotropic3D.hh 2012-03-23 00:23:56 UTC (rev 19854)
@@ -73,7 +73,7 @@
*
* @param flag True to use elastic, false to use inelastic.
*/
- void useElasticBehavior(const bool flag);
+ void useLinearBehavior(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-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/Material.hh 2012-03-23 00:23:56 UTC (rev 19854)
@@ -166,6 +166,13 @@
/// current state.
void resetNeedNewJacobian(void);
+ /** Set whether elastic or inelastic constitutive relations are used.
+ *
+ * @param flag True to use elastic, false to use inelastic.
+ */
+ virtual
+ void useLinearBehavior(const bool flag);
+
/** Check whether material has a field as a property.
*
* @param name Name of field.
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-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/Material.icc 2012-03-23 00:23:56 UTC (rev 19854)
@@ -113,6 +113,12 @@
return _isJacobianSymmetric;
} // isJacobianSymmetric
+// Set whether elastic or inelastic constitutive relations are used.
+inline
+void
+pylith::materials::Material::useLinearBehavior(const bool flag) {
+} // useLinearBehavior
+
// Compute initial state variables from values in spatial database.
inline
void
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-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/MaxwellIsotropic3D.cc 2012-03-23 00:23:56 UTC (rev 19854)
@@ -146,7 +146,7 @@
_calcStressFn(0),
_updateStateVarsFn(0)
{ // constructor
- useElasticBehavior(true);
+ useLinearBehavior(false);
_viscousStrain.resize(_tensorSize);
} // constructor
@@ -159,8 +159,8 @@
// ----------------------------------------------------------------------
// Set whether elastic or inelastic constitutive relations are used.
void
-pylith::materials::MaxwellIsotropic3D::useElasticBehavior(const bool flag)
-{ // useElasticBehavior
+pylith::materials::MaxwellIsotropic3D::useLinearBehavior(const bool flag)
+{ // useLinearBehavior
if (flag) {
_calcStressFn =
&pylith::materials::MaxwellIsotropic3D::_calcStressElastic;
@@ -177,7 +177,7 @@
_updateStateVarsFn =
&pylith::materials::MaxwellIsotropic3D::_updateStateVarsViscoelastic;
} // if/else
-} // useElasticBehavior
+} // useLinearBehavior
// ----------------------------------------------------------------------
// 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-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/MaxwellIsotropic3D.hh 2012-03-23 00:23:56 UTC (rev 19854)
@@ -60,7 +60,7 @@
*
* @param flag True to use elastic, false to use inelastic.
*/
- void useElasticBehavior(const bool flag);
+ void useLinearBehavior(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-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/MaxwellPlaneStrain.cc 2012-03-23 00:23:56 UTC (rev 19854)
@@ -149,7 +149,7 @@
_calcStressFn(0),
_updateStateVarsFn(0)
{ // constructor
- useElasticBehavior(true);
+ useLinearBehavior(false);
_viscousStrain.resize(4);
} // constructor
@@ -162,8 +162,8 @@
// ----------------------------------------------------------------------
// Set whether elastic or inelastic constitutive relations are used.
void
-pylith::materials::MaxwellPlaneStrain::useElasticBehavior(const bool flag)
-{ // useElasticBehavior
+pylith::materials::MaxwellPlaneStrain::useLinearBehavior(const bool flag)
+{ // useLinearBehavior
if (flag) {
_calcStressFn =
&pylith::materials::MaxwellPlaneStrain::_calcStressElastic;
@@ -180,7 +180,7 @@
_updateStateVarsFn =
&pylith::materials::MaxwellPlaneStrain::_updateStateVarsViscoelastic;
} // if/else
-} // useElasticBehavior
+} // useLinearBehavior
// ----------------------------------------------------------------------
// 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-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/MaxwellPlaneStrain.hh 2012-03-23 00:23:56 UTC (rev 19854)
@@ -62,7 +62,7 @@
*
* @param flag True to use elastic, false to use inelastic.
*/
- void useElasticBehavior(const bool flag);
+ void useLinearBehavior(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-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/PowerLaw3D.cc 2012-03-23 00:23:56 UTC (rev 19854)
@@ -168,7 +168,7 @@
_calcStressFn(0),
_updateStateVarsFn(0)
{ // constructor
- useElasticBehavior(true);
+ useLinearBehavior(false);
} // constructor
// ----------------------------------------------------------------------
@@ -180,8 +180,8 @@
// ----------------------------------------------------------------------
// Set whether elastic or inelastic constitutive relations are used.
void
-pylith::materials::PowerLaw3D::useElasticBehavior(const bool flag)
-{ // useElasticBehavior
+pylith::materials::PowerLaw3D::useLinearBehavior(const bool flag)
+{ // useLinearBehavior
if (flag) {
_calcStressFn =
&pylith::materials::PowerLaw3D::_calcStressElastic;
@@ -198,7 +198,7 @@
_updateStateVarsFn =
&pylith::materials::PowerLaw3D::_updateStateVarsViscoelastic;
} // if/else
-} // useElasticBehavior
+} // useLinearBehavior
// ----------------------------------------------------------------------
// 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-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/PowerLaw3D.hh 2012-03-23 00:23:56 UTC (rev 19854)
@@ -61,7 +61,7 @@
*
* @param flag True to use elastic, false to use inelastic.
*/
- void useElasticBehavior(const bool flag);
+ void useLinearBehavior(const bool flag);
/** Compute effective stress function.
*
Modified: short/3D/PyLith/branches/v1.7-trunk/modulesrc/feassemble/Constraint.i
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/modulesrc/feassemble/Constraint.i 2012-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/modulesrc/feassemble/Constraint.i 2012-03-23 00:23:56 UTC (rev 19854)
@@ -41,14 +41,6 @@
virtual
void deallocate(void);
- /** Set flag for setting constraints for total field solution or
- * incremental field solution.
- *
- * @param flag True if using incremental solution, false otherwise.
- */
- virtual
- void useSolnIncr(const bool flag);
-
/** Get number of constraints per location.
*
* @returns Number of constraints per location.
Modified: short/3D/PyLith/branches/v1.7-trunk/modulesrc/feassemble/ElasticityExplicit.i
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/modulesrc/feassemble/ElasticityExplicit.i 2012-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/modulesrc/feassemble/ElasticityExplicit.i 2012-03-23 00:23:56 UTC (rev 19854)
@@ -51,13 +51,6 @@
*/
void normViscosity(const PylithScalar viscosity);
- /** Set flag for setting constraints for total field solution or
- * incremental field solution.
- *
- * @param flag True if using incremental solution, false otherwise.
- */
- void useSolnIncr(const bool flag);
-
/** Integrate contributions to residual term (r) for operator.
*
* @param residual Field containing values for residual
Modified: short/3D/PyLith/branches/v1.7-trunk/modulesrc/feassemble/ElasticityExplicitLgDeform.i
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/modulesrc/feassemble/ElasticityExplicitLgDeform.i 2012-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/modulesrc/feassemble/ElasticityExplicitLgDeform.i 2012-03-23 00:23:56 UTC (rev 19854)
@@ -51,13 +51,6 @@
*/
void normViscosity(const PylithScalar viscosity);
- /** Set flag for setting constraints for total field solution or
- * incremental field solution.
- *
- * @param flag True if using incremental solution, false otherwise.
- */
- void useSolnIncr(const bool flag);
-
/** Integrate contributions to residual term (r) for operator.
*
* @param residual Field containing values for residual
Modified: short/3D/PyLith/branches/v1.7-trunk/modulesrc/feassemble/ElasticityExplicitTet4.i
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/modulesrc/feassemble/ElasticityExplicitTet4.i 2012-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/modulesrc/feassemble/ElasticityExplicitTet4.i 2012-03-23 00:23:56 UTC (rev 19854)
@@ -51,13 +51,6 @@
*/
void normViscosity(const PylithScalar viscosity);
- /** Set flag for setting constraints for total field solution or
- * incremental field solution.
- *
- * @param flag True if using incremental solution, false otherwise.
- */
- void useSolnIncr(const bool flag);
-
/** Integrate contributions to residual term (r) for operator.
*
* @param residual Field containing values for residual
Modified: short/3D/PyLith/branches/v1.7-trunk/modulesrc/feassemble/ElasticityExplicitTri3.i
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/modulesrc/feassemble/ElasticityExplicitTri3.i 2012-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/modulesrc/feassemble/ElasticityExplicitTri3.i 2012-03-23 00:23:56 UTC (rev 19854)
@@ -51,13 +51,6 @@
*/
void normViscosity(const PylithScalar viscosity);
- /** Set flag for setting constraints for total field solution or
- * incremental field solution.
- *
- * @param flag True if using incremental solution, false otherwise.
- */
- void useSolnIncr(const bool flag);
-
/** Integrate contributions to residual term (r) for operator.
*
* @param residual Field containing values for residual
Modified: short/3D/PyLith/branches/v1.7-trunk/modulesrc/feassemble/ElasticityImplicit.i
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/modulesrc/feassemble/ElasticityImplicit.i 2012-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/modulesrc/feassemble/ElasticityImplicit.i 2012-03-23 00:23:56 UTC (rev 19854)
@@ -54,13 +54,6 @@
*/
PylithScalar stableTimeStep(const pylith::topology::Mesh& mesh);
- /** Set flag for setting constraints for total field solution or
- * incremental field solution.
- *
- * @param flag True if using incremental solution, false otherwise.
- */
- void useSolnIncr(const bool flag);
-
/** Integrate residual part of RHS for 3-D finite elements.
* Includes gravity and element internal force contribution.
*
Modified: short/3D/PyLith/branches/v1.7-trunk/modulesrc/feassemble/ElasticityImplicitCUDA.i
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/modulesrc/feassemble/ElasticityImplicitCUDA.i 2012-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/modulesrc/feassemble/ElasticityImplicitCUDA.i 2012-03-23 00:23:56 UTC (rev 19854)
@@ -54,13 +54,6 @@
*/
PylithScalar stableTimeStep(const pylith::topology::Mesh& mesh);
- /** Set flag for setting constraints for total field solution or
- * incremental field solution.
- *
- * @param flag True if using incremental solution, false otherwise.
- */
- void useSolnIncr(const bool flag);
-
/** Integrate residual part of RHS for 3-D finite elements.
* Includes gravity and element internal force contribution.
*
Modified: short/3D/PyLith/branches/v1.7-trunk/modulesrc/feassemble/ElasticityImplicitLgDeform.i
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/modulesrc/feassemble/ElasticityImplicitLgDeform.i 2012-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/modulesrc/feassemble/ElasticityImplicitLgDeform.i 2012-03-23 00:23:56 UTC (rev 19854)
@@ -54,13 +54,6 @@
*/
PylithScalar stableTimeStep(const pylith::topology::Mesh& mesh) const;
- /** Set flag for setting constraints for total field solution or
- * incremental field solution.
- *
- * @param flag True if using incremental solution, false otherwise.
- */
- void useSolnIncr(const bool flag);
-
/** Integrate residual part of RHS for 3-D finite elements.
* Includes gravity and element internal force contribution.
*
Modified: short/3D/PyLith/branches/v1.7-trunk/modulesrc/feassemble/Integrator.i
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/modulesrc/feassemble/Integrator.i 2012-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/modulesrc/feassemble/Integrator.i 2012-03-23 00:23:56 UTC (rev 19854)
@@ -99,14 +99,6 @@
virtual
bool isJacobianSymmetric(void) const;
- /** Set flag for setting constraints for total field solution or
- * incremental field solution.
- *
- * @param flag True if using incremental solution, false otherwise.
- */
- virtual
- void useSolnIncr(const bool flag);
-
/** Initialize integrator.
*
* @param mesh Finite-element mesh.
Modified: short/3D/PyLith/branches/v1.7-trunk/modulesrc/feassemble/IntegratorElasticity.i
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/modulesrc/feassemble/IntegratorElasticity.i 2012-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/modulesrc/feassemble/IntegratorElasticity.i 2012-03-23 00:23:56 UTC (rev 19854)
@@ -56,13 +56,6 @@
*/
bool needNewJacobian(void);
- /** Set flag for setting constraints for total field solution or
- * incremental field solution.
- *
- * @param flag True if using incremental solution, false otherwise.
- */
- void useSolnIncr(const bool flag);
-
/** Initialize integrator.
*
* @param mesh Finite-element mesh.
Modified: short/3D/PyLith/branches/v1.7-trunk/modulesrc/materials/DruckerPrager3D.i
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/modulesrc/materials/DruckerPrager3D.i 2012-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/modulesrc/materials/DruckerPrager3D.i 2012-03-23 00:23:56 UTC (rev 19854)
@@ -67,7 +67,7 @@
*
* @param flag True to use elastic, false to use inelastic.
*/
- void useElasticBehavior(const bool flag);
+ void useLinearBehavior(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-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/modulesrc/materials/DruckerPragerPlaneStrain.i 2012-03-23 00:23:56 UTC (rev 19854)
@@ -67,7 +67,7 @@
*
* @param flag True to use elastic, false to use inelastic.
*/
- void useElasticBehavior(const bool flag);
+ void useLinearBehavior(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-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/modulesrc/materials/ElasticMaterial.i 2012-03-23 00:23:56 UTC (rev 19854)
@@ -86,7 +86,7 @@
* @param flag True to use elastic, false to use inelastic.
*/
virtual
- void useElasticBehavior(const bool flag);
+ void useLinearBehavior(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-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/modulesrc/materials/GenMaxwellIsotropic3D.i 2012-03-23 00:23:56 UTC (rev 19854)
@@ -46,7 +46,7 @@
*
* @param flag True to use elastic, false to use inelastic.
*/
- void useElasticBehavior(const bool flag);
+ void useLinearBehavior(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-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/modulesrc/materials/GenMaxwellPlaneStrain.i 2012-03-23 00:23:56 UTC (rev 19854)
@@ -46,7 +46,7 @@
*
* @param flag True to use elastic, false to use inelastic.
*/
- void useElasticBehavior(const bool flag);
+ void useLinearBehavior(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-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/modulesrc/materials/GenMaxwellQpQsIsotropic3D.i 2012-03-23 00:23:56 UTC (rev 19854)
@@ -46,7 +46,7 @@
*
* @param flag True to use elastic, false to use inelastic.
*/
- void useElasticBehavior(const bool flag);
+ void useLinearBehavior(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-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/modulesrc/materials/MaxwellIsotropic3D.i 2012-03-23 00:23:56 UTC (rev 19854)
@@ -46,7 +46,7 @@
*
* @param flag True to use elastic, false to use inelastic.
*/
- void useElasticBehavior(const bool flag);
+ void useLinearBehavior(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-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/modulesrc/materials/MaxwellPlaneStrain.i 2012-03-23 00:23:56 UTC (rev 19854)
@@ -46,7 +46,7 @@
*
* @param flag True to use elastic, false to use inelastic.
*/
- void useElasticBehavior(const bool flag);
+ void useLinearBehavior(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-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/modulesrc/materials/PowerLaw3D.i 2012-03-23 00:23:56 UTC (rev 19854)
@@ -46,7 +46,7 @@
*
* @param flag True to use elastic, false to use inelastic.
*/
- void useElasticBehavior(const bool flag);
+ void useLinearBehavior(const bool flag);
// PROTECTED METHODS //////////////////////////////////////////////
protected :
Modified: short/3D/PyLith/branches/v1.7-trunk/pylith/feassemble/Constraint.py
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/pylith/feassemble/Constraint.py 2012-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/pylith/feassemble/Constraint.py 2012-03-23 00:23:56 UTC (rev 19854)
@@ -32,7 +32,6 @@
"initialize",
"setConstraintSizes",
"setConstraints",
- "useSolnIncr",
"setField",
"poststep",
"writeData",
Modified: short/3D/PyLith/branches/v1.7-trunk/pylith/feassemble/Integrator.py
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/pylith/feassemble/Integrator.py 2012-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/pylith/feassemble/Integrator.py 2012-03-23 00:23:56 UTC (rev 19854)
@@ -31,7 +31,6 @@
available = dir(obj)
required = ["timeStep",
"stableTimeStep",
- "useSolnIncr",
"integrateResidual",
"integrateJacobian",
"preinitialize",
Modified: short/3D/PyLith/branches/v1.7-trunk/pylith/problems/Explicit.py
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/pylith/problems/Explicit.py 2012-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/pylith/problems/Explicit.py 2012-03-23 00:23:56 UTC (rev 19854)
@@ -155,12 +155,6 @@
self.solver.initialize(self.fields, self.jacobian, self)
self._debug.log(resourceUsageString())
- # Solve for increment in displacement field.
- for constraint in self.constraints:
- constraint.useSolnIncr(True)
- for integrator in self.integratorsMesh + self.integratorsSubMesh:
- integrator.useSolnIncr(True)
-
logger.stagePop()
logger.setDebug(0)
self._eventLogger.eventEnd(logEvent)
@@ -248,6 +242,31 @@
return
+ def prestepLinear(self, t, dt):
+ """
+ Hook for doing stuff before advancing time step.
+ """
+ from pylith.mpi.Communicator import mpi_comm_world
+ comm = mpi_comm_world()
+
+ if 0 == comm.rank:
+ self._info.log("Setting constraints.")
+ disp = self.fields.get("dispIncr(t->t+dt)")
+ disp.zero()
+ for constraint in self.constraints:
+ constraint.setField(t+dt, disp)
+
+ needNewJacobian = False
+ for integrator in self.integratorsMesh + self.integratorsSubMesh:
+ integrator.timeStep(dt)
+ if integrator.needNewJacobian():
+ needNewJacobian = True
+ if needNewJacobian:
+ self._reformJacobian(t, dt)
+
+ return
+
+
# PRIVATE METHODS ////////////////////////////////////////////////////
def _configure(self):
Modified: short/3D/PyLith/branches/v1.7-trunk/pylith/problems/ExplicitLumped.py
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/pylith/problems/ExplicitLumped.py 2012-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/pylith/problems/ExplicitLumped.py 2012-03-23 00:23:56 UTC (rev 19854)
@@ -150,12 +150,6 @@
self.solver.initialize(self.fields, self.jacobian, self)
self._debug.log(resourceUsageString())
- # Solve for increment in displacement field.
- for constraint in self.constraints:
- constraint.useSolnIncr(True)
- for integrator in self.integratorsMesh + self.integratorsSubMesh:
- integrator.useSolnIncr(True)
-
logger.stagePop()
logger.setDebug(0)
self._eventLogger.eventEnd(logEvent)
Modified: short/3D/PyLith/branches/v1.7-trunk/pylith/problems/Implicit.py
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/pylith/problems/Implicit.py 2012-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/pylith/problems/Implicit.py 2012-03-23 00:23:56 UTC (rev 19854)
@@ -97,7 +97,6 @@
Formulation.__init__(self, name)
ModuleImplicit.__init__(self)
self._loggingPrefix = "TSIm "
- self._stepCount = None
return
@@ -171,27 +170,11 @@
self.solver.initialize(self.fields, self.jacobian, self)
self._debug.log(resourceUsageString())
- # Initial time step solves for total displacement field, not increment
- self._stepCount = 0
- for constraint in self.constraints:
- constraint.useSolnIncr(False)
- for integrator in self.integratorsMesh + self.integratorsSubMesh:
- integrator.useSolnIncr(False)
-
memoryLogger.stagePop()
memoryLogger.setDebug(0)
return
- def getStartTime(self):
- """
- Get time at which time stepping should start.
- """
- dt = self.timeStep.timeStep(self.mesh,
- self.integratorsMesh + self.integratorsSubMesh)
- return -dt
-
-
def prestep(self, t, dt):
"""
Hook for doing stuff before advancing time step.
@@ -199,30 +182,14 @@
from pylith.mpi.Communicator import mpi_comm_world
comm = mpi_comm_world()
- # If finishing first time step, then switch from solving for total
- # displacements to solving for incremental displacements
- needNewJacobian = False
- if 1 == self._stepCount:
- if 0 == comm.rank:
- self._info.log("Switching from total field solution to incremental " \
- "field solution.")
- for constraint in self.constraints:
- constraint.useSolnIncr(True)
- for integrator in self.integratorsMesh + self.integratorsSubMesh:
- integrator.useSolnIncr(True)
- needNewJacobian = True
-
if 0 == comm.rank:
self._info.log("Setting constraints.")
dispIncr = self.fields.get("dispIncr(t->t+dt)")
dispIncr.zero()
- if 0 == self._stepCount:
- for constraint in self.constraints:
- constraint.setField(t+dt, dispIncr)
- else:
- for constraint in self.constraints:
- constraint.setFieldIncr(t, t+dt, dispIncr)
+ for constraint in self.constraints:
+ constraint.setFieldIncr(t, t+dt, dispIncr)
+ needNewJacobian = False
for integrator in self.integratorsMesh + self.integratorsSubMesh:
integrator.timeStep(dt)
if integrator.needNewJacobian():
@@ -285,10 +252,34 @@
output.writeData(t+dt, self.fields)
self._writeData(t+dt)
- self._stepCount += 1
return
+ def prestepLinear(self, t, dt):
+ """
+ Hook for doing stuff before advancing time step.
+ """
+ from pylith.mpi.Communicator import mpi_comm_world
+ comm = mpi_comm_world()
+
+ if 0 == comm.rank:
+ self._info.log("Setting constraints.")
+ disp = self.fields.get("dispIncr(t->t+dt)")
+ disp.zero()
+ for constraint in self.constraints:
+ constraint.setField(t+dt, disp)
+
+ needNewJacobian = False
+ for integrator in self.integratorsMesh + self.integratorsSubMesh:
+ integrator.timeStep(dt)
+ if integrator.needNewJacobian():
+ needNewJacobian = True
+ if needNewJacobian:
+ self._reformJacobian(t, dt)
+
+ return
+
+
def finalize(self):
"""
Cleanup after time stepping.
Modified: short/3D/PyLith/branches/v1.7-trunk/pylith/problems/TimeDependent.py
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/pylith/problems/TimeDependent.py 2012-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/pylith/problems/TimeDependent.py 2012-03-23 00:23:56 UTC (rev 19854)
@@ -52,6 +52,9 @@
import pyre.inventory
+ linearPrestep = pyre.inventory.bool("linear_prestep", default=True)
+ linearPrestep.meta['tip'] = "Include a static calculation with linear behavior before time stepping."
+
from Implicit import Implicit
formulation = pyre.inventory.facility("formulation",
family="pde_formulation",
@@ -128,6 +131,42 @@
self._info.log("Solving problem.")
self.checkpointTimer.toplevel = app # Set handle for saving state
+ # Linear prestep
+ if self.linearPrestep:
+ if 0 == comm.rank:
+ self._info.log("Preparing for prestep with linear behavior.")
+ self._eventLogger.stagePush("Prestep")
+
+ t = self.formulation.getStartTime()
+ dt = self.formulation.getTimeStep()
+ t -= dt
+
+ # Limit material behavior to linear regime
+ for material in self.materials.components():
+ material.useLinearBehavior(True)
+
+ self.formulation.prestepLinear(t, dt)
+ self._eventLogger.stagePop()
+
+ if 0 == comm.rank:
+ self._info.log("Computing prestep with linear 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._eventLogger.stagePush("Poststep")
+ self.formulation.poststep(t, dt)
+ self._eventLogger.stagePop()
+
+
+ # Allow nonlinear behavior
+ for material in self.materials.components():
+ material.useLinearBehavior(False)
+
+
+ # Normal time loop
t = self.formulation.getStartTime()
timeScale = self.normalizer.timeScale()
while t < self.formulation.getTotalTime():
@@ -197,6 +236,7 @@
Set members based using inventory.
"""
Problem._configure(self)
+ self.linearPrestep = self.inventory.linearPrestep
self.formulation = self.inventory.formulation
self.checkpointTimer = self.inventory.checkpointTimer
return
Modified: short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/bc/TestDirichletBC.cc
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/bc/TestDirichletBC.cc 2012-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/bc/TestDirichletBC.cc 2012-03-23 00:23:56 UTC (rev 19854)
@@ -399,8 +399,7 @@
topology::Mesh mesh;
DirichletBC bc;
_initialize(&mesh, &bc);
- CPPUNIT_ASSERT(0 != _data);
- bc.useSolnIncr(true);
+ CPPUNIT_ASSERT(_data);
const ALE::Obj<SieveMesh>& sieveMesh = mesh.sieveMesh();
CPPUNIT_ASSERT(!sieveMesh.isNull());
Modified: short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/bc/TestDirichletBCMulti.cc
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/bc/TestDirichletBCMulti.cc 2012-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/bc/TestDirichletBCMulti.cc 2012-03-23 00:23:56 UTC (rev 19854)
@@ -214,10 +214,7 @@
DirichletBC bcB;
DirichletBC bcC;
_initialize(&mesh, &bcA, &bcB, &bcC);
- CPPUNIT_ASSERT(0 != _data);
- bcA.useSolnIncr(true);
- bcB.useSolnIncr(true);
- bcC.useSolnIncr(true);
+ CPPUNIT_ASSERT(_data);
const ALE::Obj<SieveMesh>& sieveMesh = mesh.sieveMesh();
CPPUNIT_ASSERT(!sieveMesh.isNull());
Modified: short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/faults/TestFaultCohesiveKin.cc
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/faults/TestFaultCohesiveKin.cc 2012-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/faults/TestFaultCohesiveKin.cc 2012-03-23 00:23:56 UTC (rev 19854)
@@ -119,17 +119,6 @@
} // testNeedNewJacobian
// ----------------------------------------------------------------------
-/// Test useSolnIncr()
-void
-pylith::faults::TestFaultCohesiveKin::testUseSolnIncr(void)
-{ // testUseSolnIncr
- FaultCohesiveKin fault;
- CPPUNIT_ASSERT_EQUAL(false, fault._useSolnIncr);
- fault.useSolnIncr(true);
- CPPUNIT_ASSERT_EQUAL(true, fault._useSolnIncr);
-} // testUseSolnIncr
-
-// ----------------------------------------------------------------------
// Test useLagrangeConstraints().
void
pylith::faults::TestFaultCohesiveKin::testUseLagrangeConstraints(void)
@@ -285,7 +274,6 @@
fault.timeStep(dt);
{ // Integrate residual with disp (as opposed to disp increment).
- fault.useSolnIncr(false);
fault.integrateResidual(residual, t, &fields);
//residual.view("RESIDUAL"); // DEBUGGING
@@ -316,7 +304,6 @@
residual.zero();
{ // Integrate residual with disp increment.
- fault.useSolnIncr(true);
fault.integrateResidual(residual, t, &fields);
//residual.view("RESIDUAL"); // DEBUGGING
Modified: short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/faults/TestFaultCohesiveKin.hh
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/faults/TestFaultCohesiveKin.hh 2012-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/faults/TestFaultCohesiveKin.hh 2012-03-23 00:23:56 UTC (rev 19854)
@@ -54,7 +54,6 @@
CPPUNIT_TEST( testConstructor );
CPPUNIT_TEST( testEqsrc );
CPPUNIT_TEST( testNeedNewJacobian );
- CPPUNIT_TEST( testUseSolnIncr );
CPPUNIT_TEST( testUseLagrangeConstraints );
CPPUNIT_TEST_SUITE_END();
@@ -86,9 +85,6 @@
/// Test needNewJacobian()
void testNeedNewJacobian(void);
- /// Test useSolnIncr()
- void testUseSolnIncr(void);
-
/// Test useLagrangeConstraints().
void testUseLagrangeConstraints(void);
Modified: short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/feassemble/TestElasticityExplicit.cc
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/feassemble/TestElasticityExplicit.cc 2012-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/feassemble/TestElasticityExplicit.cc 2012-03-23 00:23:56 UTC (rev 19854)
@@ -142,28 +142,6 @@
} // testNeedNewJacobian
// ----------------------------------------------------------------------
-// Test useSolnIncr().
-void
-pylith::feassemble::TestElasticityExplicit::testUseSolnIncr(void)
-{ // testUseSolnIncr
- ElasticityExplicit integrator;
-
- materials::ElasticIsotropic3D material;
- integrator.material(&material);
- CPPUNIT_ASSERT_EQUAL(false, integrator._useSolnIncr);
- try {
- integrator.useSolnIncr(false);
-
- // Should have thrown exception, so don't make it here.
- CPPUNIT_ASSERT(false);
- } catch (const std::logic_error& err) {
- // Expect logic error so don't do anything.
- } catch (...) {
- CPPUNIT_ASSERT(false);
- } // try/catch
-} // testUseSolnIncr
-
-// ----------------------------------------------------------------------
// Test initialize().
void
pylith::feassemble::TestElasticityExplicit::testInitialize(void)
Modified: short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/feassemble/TestElasticityExplicit.hh
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/feassemble/TestElasticityExplicit.hh 2012-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/feassemble/TestElasticityExplicit.hh 2012-03-23 00:23:56 UTC (rev 19854)
@@ -56,7 +56,6 @@
CPPUNIT_TEST( testNormViscosity );
CPPUNIT_TEST( testMaterial );
CPPUNIT_TEST( testNeedNewJacobian );
- CPPUNIT_TEST( testUseSolnIncr );
// Testing of initialize(), integrateResidual(),
// integrateJacobian(), and updateStateVars() handled by derived
@@ -88,9 +87,6 @@
/// Test needNewJacobian().
void testNeedNewJacobian(void);
- /// Test useSolnIncr().
- void testUseSolnIncr(void);
-
/// Test initialize().
void testInitialize(void);
Modified: short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/feassemble/TestElasticityExplicitTet4.cc
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/feassemble/TestElasticityExplicitTet4.cc 2012-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/feassemble/TestElasticityExplicitTet4.cc 2012-03-23 00:23:56 UTC (rev 19854)
@@ -137,28 +137,6 @@
} // testNeedNewJacobian
// ----------------------------------------------------------------------
-// Test useSolnIncr().
-void
-pylith::feassemble::TestElasticityExplicitTet4::testUseSolnIncr(void)
-{ // testUseSolnIncr
- ElasticityExplicitTet4 integrator;
-
- materials::ElasticIsotropic3D material;
- integrator.material(&material);
- CPPUNIT_ASSERT_EQUAL(false, integrator._useSolnIncr);
- try {
- integrator.useSolnIncr(false);
-
- // Should have thrown exception, so don't make it here.
- CPPUNIT_ASSERT(false);
- } catch (const std::logic_error& err) {
- // Expect logic error so don't do anything.
- } catch (...) {
- CPPUNIT_ASSERT(false);
- } // try/catch
-} // testUseSolnIncr
-
-// ----------------------------------------------------------------------
// Test initialize().
void
pylith::feassemble::TestElasticityExplicitTet4::testInitialize(void)
Modified: short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/feassemble/TestElasticityExplicitTet4.hh
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/feassemble/TestElasticityExplicitTet4.hh 2012-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/feassemble/TestElasticityExplicitTet4.hh 2012-03-23 00:23:56 UTC (rev 19854)
@@ -54,7 +54,6 @@
CPPUNIT_TEST( testTimeStep );
CPPUNIT_TEST( testMaterial );
CPPUNIT_TEST( testNeedNewJacobian );
- CPPUNIT_TEST( testUseSolnIncr );
CPPUNIT_TEST( testInitialize );
CPPUNIT_TEST( testIntegrateResidual );
CPPUNIT_TEST( testIntegrateResidualLumped );
@@ -86,9 +85,6 @@
/// Test needNewJacobian().
void testNeedNewJacobian(void);
- /// Test useSolnIncr().
- void testUseSolnIncr(void);
-
/// Test initialize().
void testInitialize(void);
Modified: short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/feassemble/TestElasticityExplicitTri3.cc
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/feassemble/TestElasticityExplicitTri3.cc 2012-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/feassemble/TestElasticityExplicitTri3.cc 2012-03-23 00:23:56 UTC (rev 19854)
@@ -137,28 +137,6 @@
} // testNeedNewJacobian
// ----------------------------------------------------------------------
-// Test useSolnIncr().
-void
-pylith::feassemble::TestElasticityExplicitTri3::testUseSolnIncr(void)
-{ // testUseSolnIncr
- ElasticityExplicitTri3 integrator;
-
- materials::ElasticPlaneStrain material;
- integrator.material(&material);
- CPPUNIT_ASSERT_EQUAL(false, integrator._useSolnIncr);
- try {
- integrator.useSolnIncr(false);
-
- // Should have thrown exception, so don't make it here.
- CPPUNIT_ASSERT(false);
- } catch (const std::logic_error& err) {
- // Expect logic error so don't do anything.
- } catch (...) {
- CPPUNIT_ASSERT(false);
- } // try/catch
-} // testUseSolnIncr
-
-// ----------------------------------------------------------------------
// Test initialize().
void
pylith::feassemble::TestElasticityExplicitTri3::testInitialize(void)
Modified: short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/feassemble/TestElasticityExplicitTri3.hh
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/feassemble/TestElasticityExplicitTri3.hh 2012-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/feassemble/TestElasticityExplicitTri3.hh 2012-03-23 00:23:56 UTC (rev 19854)
@@ -54,7 +54,6 @@
CPPUNIT_TEST( testTimeStep );
CPPUNIT_TEST( testMaterial );
CPPUNIT_TEST( testNeedNewJacobian );
- CPPUNIT_TEST( testUseSolnIncr );
CPPUNIT_TEST( testInitialize );
CPPUNIT_TEST( testIntegrateResidual );
CPPUNIT_TEST( testIntegrateResidualLumped );
@@ -86,9 +85,6 @@
/// Test needNewJacobian().
void testNeedNewJacobian(void);
- /// Test useSolnIncr().
- void testUseSolnIncr(void);
-
/// Test initialize().
void testInitialize(void);
Modified: short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/feassemble/TestElasticityImplicit.cc
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/feassemble/TestElasticityImplicit.cc 2012-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/feassemble/TestElasticityImplicit.cc 2012-03-23 00:23:56 UTC (rev 19854)
@@ -127,20 +127,6 @@
} // testNeedNewJacobian
// ----------------------------------------------------------------------
-// Test useSolnIncr().
-void
-pylith::feassemble::TestElasticityImplicit::testUseSolnIncr(void)
-{ // testUseSolnIncr
- ElasticityImplicit integrator;
-
- materials::ElasticIsotropic3D material;
- integrator.material(&material);
- CPPUNIT_ASSERT_EQUAL(false, integrator._useSolnIncr);
- integrator.useSolnIncr(true);
- CPPUNIT_ASSERT_EQUAL(true, integrator._useSolnIncr);
-} // testUseSolnIncr
-
-// ----------------------------------------------------------------------
// Test initialize().
void
pylith::feassemble::TestElasticityImplicit::testInitialize(void)
Modified: short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/feassemble/TestElasticityImplicit.hh
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/feassemble/TestElasticityImplicit.hh 2012-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/feassemble/TestElasticityImplicit.hh 2012-03-23 00:23:56 UTC (rev 19854)
@@ -54,7 +54,6 @@
CPPUNIT_TEST( testTimeStep );
CPPUNIT_TEST( testMaterial );
CPPUNIT_TEST( testNeedNewJacobian );
- CPPUNIT_TEST( testUseSolnIncr );
// Testing of initialize(), integrateResidual(),
// integrateJacobian(), and updateStateVars() handled by derived
@@ -86,9 +85,6 @@
/// Test needNewJacobian().
void testNeedNewJacobian(void);
- /// Test useSolnIncr().
- void testUseSolnIncr(void);
-
/// Test initialize().
void testInitialize(void);
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-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/materials/TestDruckerPrager3D.cc 2012-03-23 00:23:56 UTC (rev 19854)
@@ -67,13 +67,13 @@
} // testTimeStep
// ----------------------------------------------------------------------
-// Test useElasticBehavior()
+// Test useLinearBehavior()
void
-pylith::materials::TestDruckerPrager3D::testUseElasticBehavior(void)
-{ // testUseElasticBehavior
+pylith::materials::TestDruckerPrager3D::testUseLinearBehavior(void)
+{ // testUseLinearBehavior
DruckerPrager3D material;
- material.useElasticBehavior(true);
+ material.useLinearBehavior(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.useElasticBehavior(false);
+ material.useLinearBehavior(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
-} // testUseElasticBehavior
+} // testUseLinearBehavior
// ----------------------------------------------------------------------
// Test allowTensileYield()
@@ -122,7 +122,7 @@
pylith::materials::TestDruckerPrager3D::test_calcStressElastic(void)
{ // test_calcStressElastic
CPPUNIT_ASSERT(0 != _matElastic);
- _matElastic->useElasticBehavior(true);
+ _matElastic->useLinearBehavior(true);
test_calcStress();
} // test_calcStressElastic
@@ -133,7 +133,7 @@
pylith::materials::TestDruckerPrager3D::test_calcElasticConstsElastic(void)
{ // test_calcElasticConstsElastic
CPPUNIT_ASSERT(0 != _matElastic);
- _matElastic->useElasticBehavior(true);
+ _matElastic->useLinearBehavior(true);
test_calcElasticConsts();
} // test_calcElasticConstsElastic
@@ -144,7 +144,7 @@
pylith::materials::TestDruckerPrager3D::test_updateStateVarsElastic(void)
{ // test_updateStateVarsElastic
CPPUNIT_ASSERT(0 != _matElastic);
- _matElastic->useElasticBehavior(true);
+ _matElastic->useLinearBehavior(true);
test_updateStateVars();
} // test_updateStateVarsElastic
@@ -155,7 +155,7 @@
pylith::materials::TestDruckerPrager3D::test_calcStressTimeDep(void)
{ // test_calcStressTimeDep
CPPUNIT_ASSERT(0 != _matElastic);
- _matElastic->useElasticBehavior(false);
+ _matElastic->useLinearBehavior(false);
delete _dataElastic; _dataElastic = new DruckerPrager3DTimeDepData();
@@ -170,7 +170,7 @@
pylith::materials::TestDruckerPrager3D::test_calcElasticConstsTimeDep(void)
{ // test_calcElasticConstsTimeDep
CPPUNIT_ASSERT(0 != _matElastic);
- _matElastic->useElasticBehavior(false);
+ _matElastic->useLinearBehavior(false);
delete _dataElastic; _dataElastic = new DruckerPrager3DTimeDepData();
@@ -185,7 +185,7 @@
pylith::materials::TestDruckerPrager3D::test_updateStateVarsTimeDep(void)
{ // test_updateStateVarsTimeDep
CPPUNIT_ASSERT(0 != _matElastic);
- _matElastic->useElasticBehavior(false);
+ _matElastic->useLinearBehavior(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-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/materials/TestDruckerPrager3D.hh 2012-03-23 00:23:56 UTC (rev 19854)
@@ -58,7 +58,7 @@
// Need to test Drucker-Prager elastoplastic specific behavior.
CPPUNIT_TEST( testTimeStep );
- CPPUNIT_TEST( testUseElasticBehavior );
+ CPPUNIT_TEST( testUseLinearBehavior );
CPPUNIT_TEST( testAllowTensileYield );
CPPUNIT_TEST( testHasStateVars );
@@ -83,8 +83,8 @@
/// Test timeStep()
void testTimeStep(void);
- /// Test useElasticBehavior()
- void testUseElasticBehavior(void);
+ /// Test useLinearBehavior()
+ void testUseLinearBehavior(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-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/materials/TestDruckerPragerPlaneStrain.cc 2012-03-23 00:23:56 UTC (rev 19854)
@@ -67,13 +67,13 @@
} // testTimeStep
// ----------------------------------------------------------------------
-// Test useElasticBehavior()
+// Test useLinearBehavior()
void
-pylith::materials::TestDruckerPragerPlaneStrain::testUseElasticBehavior(void)
-{ // testUseElasticBehavior
+pylith::materials::TestDruckerPragerPlaneStrain::testUseLinearBehavior(void)
+{ // testUseLinearBehavior
DruckerPragerPlaneStrain material;
- material.useElasticBehavior(true);
+ material.useLinearBehavior(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.useElasticBehavior(false);
+ material.useLinearBehavior(false);
CPPUNIT_ASSERT(
&pylith::materials::DruckerPragerPlaneStrain::_calcStressElastoplastic ==
material._calcStressFn);
@@ -99,7 +99,7 @@
&pylith::materials::DruckerPragerPlaneStrain::_updateStateVarsElastoplastic ==
material._updateStateVarsFn);
} // if
-} // testUseElasticBehavior
+} // testUseLinearBehavior
// ----------------------------------------------------------------------
// Test allowTensileYield()
@@ -128,7 +128,7 @@
pylith::materials::TestDruckerPragerPlaneStrain::test_calcStressElastic(void)
{ // test_calcStressElastic
CPPUNIT_ASSERT(0 != _matElastic);
- _matElastic->useElasticBehavior(true);
+ _matElastic->useLinearBehavior(true);
test_calcStress();
} // test_calcStressElastic
@@ -139,7 +139,7 @@
pylith::materials::TestDruckerPragerPlaneStrain::test_calcElasticConstsElastic(void)
{ // test_calcElasticConstsElastic
CPPUNIT_ASSERT(0 != _matElastic);
- _matElastic->useElasticBehavior(true);
+ _matElastic->useLinearBehavior(true);
test_calcElasticConsts();
} // test_calcElasticConstsElastic
@@ -150,7 +150,7 @@
pylith::materials::TestDruckerPragerPlaneStrain::test_updateStateVarsElastic(void)
{ // test_updateStateVarsElastic
CPPUNIT_ASSERT(0 != _matElastic);
- _matElastic->useElasticBehavior(true);
+ _matElastic->useLinearBehavior(true);
test_updateStateVars();
} // test_updateStateVarsElastic
@@ -161,7 +161,7 @@
pylith::materials::TestDruckerPragerPlaneStrain::test_calcStressTimeDep(void)
{ // test_calcStressTimeDep
CPPUNIT_ASSERT(0 != _matElastic);
- _matElastic->useElasticBehavior(false);
+ _matElastic->useLinearBehavior(false);
delete _dataElastic; _dataElastic = new DruckerPragerPlaneStrainTimeDepData();
@@ -176,7 +176,7 @@
pylith::materials::TestDruckerPragerPlaneStrain::test_calcElasticConstsTimeDep(void)
{ // test_calcElasticConstsTimeDep
CPPUNIT_ASSERT(0 != _matElastic);
- _matElastic->useElasticBehavior(false);
+ _matElastic->useLinearBehavior(false);
delete _dataElastic; _dataElastic = new DruckerPragerPlaneStrainTimeDepData();
@@ -191,7 +191,7 @@
pylith::materials::TestDruckerPragerPlaneStrain::test_updateStateVarsTimeDep(void)
{ // test_updateStateVarsTimeDep
CPPUNIT_ASSERT(0 != _matElastic);
- _matElastic->useElasticBehavior(false);
+ _matElastic->useLinearBehavior(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-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/materials/TestDruckerPragerPlaneStrain.hh 2012-03-23 00:23:56 UTC (rev 19854)
@@ -58,7 +58,7 @@
// Need to test Drucker-Prager elastoplastic specific behavior.
CPPUNIT_TEST( testTimeStep );
- CPPUNIT_TEST( testUseElasticBehavior );
+ CPPUNIT_TEST( testUseLinearBehavior );
CPPUNIT_TEST( testAllowTensileYield );
CPPUNIT_TEST( testHasStateVars );
@@ -83,8 +83,8 @@
/// Test timeStep()
void testTimeStep(void);
- /// Test useElasticBehavior()
- void testUseElasticBehavior(void);
+ /// Test useLinearBehavior()
+ void testUseLinearBehavior(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-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/materials/TestGenMaxwellIsotropic3D.cc 2012-03-23 00:23:56 UTC (rev 19854)
@@ -64,13 +64,13 @@
} // testTimeStep
// ----------------------------------------------------------------------
-// Test useElasticBehavior()
+// Test useLinearBehavior()
void
-pylith::materials::TestGenMaxwellIsotropic3D::testUseElasticBehavior(void)
-{ // testUseElasticBehavior
+pylith::materials::TestGenMaxwellIsotropic3D::testUseLinearBehavior(void)
+{ // testUseLinearBehavior
GenMaxwellIsotropic3D material;
- material.useElasticBehavior(true);
+ material.useLinearBehavior(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.useElasticBehavior(false);
+ material.useLinearBehavior(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
-} // testUseElasticBehavior
+} // testUseLinearBehavior
// ----------------------------------------------------------------------
// Test usesHasStateVars()
@@ -107,7 +107,7 @@
pylith::materials::TestGenMaxwellIsotropic3D::test_calcStressElastic(void)
{ // testCalcStressElastic
CPPUNIT_ASSERT(0 != _matElastic);
- _matElastic->useElasticBehavior(true);
+ _matElastic->useLinearBehavior(true);
test_calcStress();
} // testCalcStressElastic
@@ -118,7 +118,7 @@
pylith::materials::TestGenMaxwellIsotropic3D::test_calcElasticConstsElastic(void)
{ // testElasticConstsElastic
CPPUNIT_ASSERT(0 != _matElastic);
- _matElastic->useElasticBehavior(true);
+ _matElastic->useLinearBehavior(true);
test_calcElasticConsts();
} // testElasticConstsElastic
@@ -129,7 +129,7 @@
pylith::materials::TestGenMaxwellIsotropic3D::test_updateStateVarsElastic(void)
{ // testUpdateStateVarsElastic
CPPUNIT_ASSERT(0 != _matElastic);
- _matElastic->useElasticBehavior(true);
+ _matElastic->useLinearBehavior(true);
test_updateStateVars();
} // testUpdateStateVarsElastic
@@ -140,7 +140,7 @@
pylith::materials::TestGenMaxwellIsotropic3D::test_calcStressTimeDep(void)
{ // testCalcStressTimeDep
CPPUNIT_ASSERT(0 != _matElastic);
- _matElastic->useElasticBehavior(false);
+ _matElastic->useLinearBehavior(false);
delete _dataElastic; _dataElastic = new GenMaxwellIsotropic3DTimeDepData();
@@ -155,7 +155,7 @@
pylith::materials::TestGenMaxwellIsotropic3D::test_calcElasticConstsTimeDep(void)
{ // testElasticConstsTimeDep
CPPUNIT_ASSERT(0 != _matElastic);
- _matElastic->useElasticBehavior(false);
+ _matElastic->useLinearBehavior(false);
delete _dataElastic; _dataElastic = new GenMaxwellIsotropic3DTimeDepData();
@@ -170,7 +170,7 @@
pylith::materials::TestGenMaxwellIsotropic3D::test_updateStateVarsTimeDep(void)
{ // testUpdateStateVarsTimeDep
CPPUNIT_ASSERT(0 != _matElastic);
- _matElastic->useElasticBehavior(false);
+ _matElastic->useLinearBehavior(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-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/materials/TestGenMaxwellIsotropic3D.hh 2012-03-23 00:23:56 UTC (rev 19854)
@@ -58,7 +58,7 @@
// Need to test Maxwell viscoelastic specific behavior.
CPPUNIT_TEST( testTimeStep );
- CPPUNIT_TEST( testUseElasticBehavior );
+ CPPUNIT_TEST( testUseLinearBehavior );
CPPUNIT_TEST( testHasStateVars );
CPPUNIT_TEST( test_calcStressElastic );
@@ -79,8 +79,8 @@
/// Test timeStep()
void testTimeStep(void);
- /// Test useElasticBehavior()
- void testUseElasticBehavior(void);
+ /// Test useLinearBehavior()
+ void testUseLinearBehavior(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-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/materials/TestGenMaxwellPlaneStrain.cc 2012-03-23 00:23:56 UTC (rev 19854)
@@ -64,13 +64,13 @@
} // testTimeStep
// ----------------------------------------------------------------------
-// Test useElasticBehavior()
+// Test useLinearBehavior()
void
-pylith::materials::TestGenMaxwellPlaneStrain::testUseElasticBehavior(void)
-{ // testUseElasticBehavior
+pylith::materials::TestGenMaxwellPlaneStrain::testUseLinearBehavior(void)
+{ // testUseLinearBehavior
GenMaxwellPlaneStrain material;
- material.useElasticBehavior(true);
+ material.useLinearBehavior(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.useElasticBehavior(false);
+ material.useLinearBehavior(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
-} // testUseElasticBehavior
+} // testUseLinearBehavior
// ----------------------------------------------------------------------
// Test usesHasStateVars()
@@ -107,7 +107,7 @@
pylith::materials::TestGenMaxwellPlaneStrain::test_calcStressElastic(void)
{ // testCalcStressElastic
CPPUNIT_ASSERT(0 != _matElastic);
- _matElastic->useElasticBehavior(true);
+ _matElastic->useLinearBehavior(true);
test_calcStress();
} // testCalcStressElastic
@@ -118,7 +118,7 @@
pylith::materials::TestGenMaxwellPlaneStrain::test_calcElasticConstsElastic(void)
{ // testElasticConstsElastic
CPPUNIT_ASSERT(0 != _matElastic);
- _matElastic->useElasticBehavior(true);
+ _matElastic->useLinearBehavior(true);
test_calcElasticConsts();
} // testElasticConstsElastic
@@ -129,7 +129,7 @@
pylith::materials::TestGenMaxwellPlaneStrain::test_updateStateVarsElastic(void)
{ // testUpdateStateVarsElastic
CPPUNIT_ASSERT(0 != _matElastic);
- _matElastic->useElasticBehavior(true);
+ _matElastic->useLinearBehavior(true);
test_updateStateVars();
} // testUpdateStateVarsElastic
@@ -140,7 +140,7 @@
pylith::materials::TestGenMaxwellPlaneStrain::test_calcStressTimeDep(void)
{ // testCalcStressTimeDep
CPPUNIT_ASSERT(0 != _matElastic);
- _matElastic->useElasticBehavior(false);
+ _matElastic->useLinearBehavior(false);
delete _dataElastic; _dataElastic = new GenMaxwellPlaneStrainTimeDepData();
@@ -155,7 +155,7 @@
pylith::materials::TestGenMaxwellPlaneStrain::test_calcElasticConstsTimeDep(void)
{ // testElasticConstsTimeDep
CPPUNIT_ASSERT(0 != _matElastic);
- _matElastic->useElasticBehavior(false);
+ _matElastic->useLinearBehavior(false);
delete _dataElastic; _dataElastic = new GenMaxwellPlaneStrainTimeDepData();
@@ -170,7 +170,7 @@
pylith::materials::TestGenMaxwellPlaneStrain::test_updateStateVarsTimeDep(void)
{ // testUpdateStateVarsTimeDep
CPPUNIT_ASSERT(0 != _matElastic);
- _matElastic->useElasticBehavior(false);
+ _matElastic->useLinearBehavior(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-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/materials/TestGenMaxwellPlaneStrain.hh 2012-03-23 00:23:56 UTC (rev 19854)
@@ -58,7 +58,7 @@
// Need to test Maxwell viscoelastic specific behavior.
CPPUNIT_TEST( testTimeStep );
- CPPUNIT_TEST( testUseElasticBehavior );
+ CPPUNIT_TEST( testUseLinearBehavior );
CPPUNIT_TEST( testHasStateVars );
CPPUNIT_TEST( test_calcStressElastic );
@@ -79,8 +79,8 @@
/// Test timeStep()
void testTimeStep(void);
- /// Test useElasticBehavior()
- void testUseElasticBehavior(void);
+ /// Test useLinearBehavior()
+ void testUseLinearBehavior(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-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/materials/TestGenMaxwellQpQsIsotropic3D.cc 2012-03-23 00:23:56 UTC (rev 19854)
@@ -64,13 +64,13 @@
} // testTimeStep
// ----------------------------------------------------------------------
-// Test useElasticBehavior()
+// Test useLinearBehavior()
void
-pylith::materials::TestGenMaxwellQpQsIsotropic3D::testUseElasticBehavior(void)
-{ // testUseElasticBehavior
+pylith::materials::TestGenMaxwellQpQsIsotropic3D::testUseLinearBehavior(void)
+{ // testUseLinearBehavior
GenMaxwellQpQsIsotropic3D material;
- material.useElasticBehavior(true);
+ material.useLinearBehavior(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.useElasticBehavior(false);
+ material.useLinearBehavior(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
-} // testUseElasticBehavior
+} // testUseLinearBehavior
// ----------------------------------------------------------------------
// Test usesHasStateVars()
@@ -107,7 +107,7 @@
pylith::materials::TestGenMaxwellQpQsIsotropic3D::test_calcStressElastic(void)
{ // testCalcStressElastic
CPPUNIT_ASSERT(0 != _matElastic);
- _matElastic->useElasticBehavior(true);
+ _matElastic->useLinearBehavior(true);
test_calcStress();
} // testCalcStressElastic
@@ -118,7 +118,7 @@
pylith::materials::TestGenMaxwellQpQsIsotropic3D::test_calcElasticConstsElastic(void)
{ // testElasticConstsElastic
CPPUNIT_ASSERT(0 != _matElastic);
- _matElastic->useElasticBehavior(true);
+ _matElastic->useLinearBehavior(true);
test_calcElasticConsts();
} // testElasticConstsElastic
@@ -134,7 +134,7 @@
// setting the stateVarsUpdate attribute in the Python object.
GenMaxwellQpQsIsotropic3D material;
- material.useElasticBehavior(true);
+ material.useLinearBehavior(true);
const bool computeStateVars = true;
@@ -209,7 +209,7 @@
pylith::materials::TestGenMaxwellQpQsIsotropic3D::test_calcStressTimeDep(void)
{ // testCalcStressTimeDep
CPPUNIT_ASSERT(0 != _matElastic);
- _matElastic->useElasticBehavior(false);
+ _matElastic->useLinearBehavior(false);
delete _dataElastic; _dataElastic = new GenMaxwellQpQsIsotropic3DTimeDepData();
@@ -224,7 +224,7 @@
pylith::materials::TestGenMaxwellQpQsIsotropic3D::test_calcElasticConstsTimeDep(void)
{ // testElasticConstsTimeDep
CPPUNIT_ASSERT(0 != _matElastic);
- _matElastic->useElasticBehavior(false);
+ _matElastic->useLinearBehavior(false);
delete _dataElastic; _dataElastic = new GenMaxwellQpQsIsotropic3DTimeDepData();
@@ -244,7 +244,7 @@
// setting the stateVarsUpdate attribute in the Python object.
GenMaxwellQpQsIsotropic3D material;
- material.useElasticBehavior(false);
+ material.useLinearBehavior(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-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/materials/TestGenMaxwellQpQsIsotropic3D.hh 2012-03-23 00:23:56 UTC (rev 19854)
@@ -58,7 +58,7 @@
// Need to test Maxwell viscoelastic specific behavior.
CPPUNIT_TEST( testTimeStep );
- CPPUNIT_TEST( testUseElasticBehavior );
+ CPPUNIT_TEST( testUseLinearBehavior );
CPPUNIT_TEST( testHasStateVars );
CPPUNIT_TEST( test_calcStressElastic );
@@ -79,8 +79,8 @@
/// Test timeStep()
void testTimeStep(void);
- /// Test useElasticBehavior()
- void testUseElasticBehavior(void);
+ /// Test useLinearBehavior()
+ void testUseLinearBehavior(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-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/materials/TestMaxwellIsotropic3D.cc 2012-03-23 00:23:56 UTC (rev 19854)
@@ -63,13 +63,13 @@
} // testTimeStep
// ----------------------------------------------------------------------
-// Test useElasticBehavior()
+// Test useLinearBehavior()
void
-pylith::materials::TestMaxwellIsotropic3D::testUseElasticBehavior(void)
-{ // testUseElasticBehavior
+pylith::materials::TestMaxwellIsotropic3D::testUseLinearBehavior(void)
+{ // testUseLinearBehavior
MaxwellIsotropic3D material;
- material.useElasticBehavior(true);
+ material.useLinearBehavior(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.useElasticBehavior(false);
+ material.useLinearBehavior(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
-} // testUseElasticBehavior
+} // testUseLinearBehavior
// ----------------------------------------------------------------------
// Test usesHasStateVars()
@@ -107,7 +107,7 @@
pylith::materials::TestMaxwellIsotropic3D::test_calcStressElastic(void)
{ // test_calcStressElastic
CPPUNIT_ASSERT(0 != _matElastic);
- _matElastic->useElasticBehavior(true);
+ _matElastic->useLinearBehavior(true);
test_calcStress();
} // test_calcStressElastic
@@ -118,7 +118,7 @@
pylith::materials::TestMaxwellIsotropic3D::test_calcElasticConstsElastic(void)
{ // test_calcElasticConstsElastic
CPPUNIT_ASSERT(0 != _matElastic);
- _matElastic->useElasticBehavior(true);
+ _matElastic->useLinearBehavior(true);
test_calcElasticConsts();
} // test_calcElasticConstsElastic
@@ -129,7 +129,7 @@
pylith::materials::TestMaxwellIsotropic3D::test_updateStateVarsElastic(void)
{ // test_updateStateVarsElastic
CPPUNIT_ASSERT(0 != _matElastic);
- _matElastic->useElasticBehavior(true);
+ _matElastic->useLinearBehavior(true);
test_updateStateVars();
} // test_updateStateVarsElastic
@@ -140,7 +140,7 @@
pylith::materials::TestMaxwellIsotropic3D::test_calcStressTimeDep(void)
{ // test_calcStressTimeDep
CPPUNIT_ASSERT(0 != _matElastic);
- _matElastic->useElasticBehavior(false);
+ _matElastic->useLinearBehavior(false);
delete _dataElastic; _dataElastic = new MaxwellIsotropic3DTimeDepData();
@@ -155,7 +155,7 @@
pylith::materials::TestMaxwellIsotropic3D::test_calcElasticConstsTimeDep(void)
{ // test_calcElasticConstsTimeDep
CPPUNIT_ASSERT(0 != _matElastic);
- _matElastic->useElasticBehavior(false);
+ _matElastic->useLinearBehavior(false);
delete _dataElastic; _dataElastic = new MaxwellIsotropic3DTimeDepData();
@@ -170,7 +170,7 @@
pylith::materials::TestMaxwellIsotropic3D::test_updateStateVarsTimeDep(void)
{ // test_updateStateVarsTimeDep
CPPUNIT_ASSERT(0 != _matElastic);
- _matElastic->useElasticBehavior(false);
+ _matElastic->useLinearBehavior(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-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/materials/TestMaxwellIsotropic3D.hh 2012-03-23 00:23:56 UTC (rev 19854)
@@ -58,7 +58,7 @@
// Need to test Maxwell viscoelastic specific behavior.
CPPUNIT_TEST( testTimeStep );
- CPPUNIT_TEST( testUseElasticBehavior );
+ CPPUNIT_TEST( testUseLinearBehavior );
CPPUNIT_TEST( testHasStateVars );
CPPUNIT_TEST( test_calcStressElastic );
@@ -82,8 +82,8 @@
/// Test timeStep()
void testTimeStep(void);
- /// Test useElasticBehavior()
- void testUseElasticBehavior(void);
+ /// Test useLinearBehavior()
+ void testUseLinearBehavior(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-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/materials/TestMaxwellPlaneStrain.cc 2012-03-23 00:23:56 UTC (rev 19854)
@@ -63,13 +63,13 @@
} // testTimeStep
// ----------------------------------------------------------------------
-// Test useElasticBehavior()
+// Test useLinearBehavior()
void
-pylith::materials::TestMaxwellPlaneStrain::testUseElasticBehavior(void)
-{ // testUseElasticBehavior
+pylith::materials::TestMaxwellPlaneStrain::testUseLinearBehavior(void)
+{ // testUseLinearBehavior
MaxwellPlaneStrain material;
- material.useElasticBehavior(true);
+ material.useLinearBehavior(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.useElasticBehavior(false);
+ material.useLinearBehavior(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
-} // testUseElasticBehavior
+} // testUseLinearBehavior
// ----------------------------------------------------------------------
// Test usesHasStateVars()
@@ -107,7 +107,7 @@
pylith::materials::TestMaxwellPlaneStrain::test_calcStressElastic(void)
{ // test_calcStressElastic
CPPUNIT_ASSERT(0 != _matElastic);
- _matElastic->useElasticBehavior(true);
+ _matElastic->useLinearBehavior(true);
test_calcStress();
} // test_calcStressElastic
@@ -118,7 +118,7 @@
pylith::materials::TestMaxwellPlaneStrain::test_calcElasticConstsElastic(void)
{ // test_calcElasticConstsElastic
CPPUNIT_ASSERT(0 != _matElastic);
- _matElastic->useElasticBehavior(true);
+ _matElastic->useLinearBehavior(true);
test_calcElasticConsts();
} // test_calcElasticConstsElastic
@@ -129,7 +129,7 @@
pylith::materials::TestMaxwellPlaneStrain::test_updateStateVarsElastic(void)
{ // test_updateStateVarsElastic
CPPUNIT_ASSERT(0 != _matElastic);
- _matElastic->useElasticBehavior(true);
+ _matElastic->useLinearBehavior(true);
test_updateStateVars();
} // test_updateStateVarsElastic
@@ -140,7 +140,7 @@
pylith::materials::TestMaxwellPlaneStrain::test_calcStressTimeDep(void)
{ // test_calcStressTimeDep
CPPUNIT_ASSERT(0 != _matElastic);
- _matElastic->useElasticBehavior(false);
+ _matElastic->useLinearBehavior(false);
delete _dataElastic; _dataElastic = new MaxwellPlaneStrainTimeDepData();
@@ -155,7 +155,7 @@
pylith::materials::TestMaxwellPlaneStrain::test_calcElasticConstsTimeDep(void)
{ // test_calcElasticConstsTimeDep
CPPUNIT_ASSERT(0 != _matElastic);
- _matElastic->useElasticBehavior(false);
+ _matElastic->useLinearBehavior(false);
delete _dataElastic; _dataElastic = new MaxwellPlaneStrainTimeDepData();
@@ -170,7 +170,7 @@
pylith::materials::TestMaxwellPlaneStrain::test_updateStateVarsTimeDep(void)
{ // test_updateStateVarsTimeDep
CPPUNIT_ASSERT(0 != _matElastic);
- _matElastic->useElasticBehavior(false);
+ _matElastic->useLinearBehavior(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-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/materials/TestMaxwellPlaneStrain.hh 2012-03-23 00:23:56 UTC (rev 19854)
@@ -58,7 +58,7 @@
// Need to test Maxwell viscoelastic specific behavior.
CPPUNIT_TEST( testTimeStep );
- CPPUNIT_TEST( testUseElasticBehavior );
+ CPPUNIT_TEST( testUseLinearBehavior );
CPPUNIT_TEST( testHasStateVars );
CPPUNIT_TEST( test_calcStressElastic );
@@ -82,8 +82,8 @@
/// Test timeStep()
void testTimeStep(void);
- /// Test useElasticBehavior()
- void testUseElasticBehavior(void);
+ /// Test useLinearBehavior()
+ void testUseLinearBehavior(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-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/materials/TestPowerLaw3D.cc 2012-03-23 00:23:56 UTC (rev 19854)
@@ -63,13 +63,13 @@
} // testTimeStep
// ----------------------------------------------------------------------
-// Test useElasticBehavior()
+// Test useLinearBehavior()
void
-pylith::materials::TestPowerLaw3D::testUseElasticBehavior(void)
-{ // testUseElasticBehavior
+pylith::materials::TestPowerLaw3D::testUseLinearBehavior(void)
+{ // testUseLinearBehavior
PowerLaw3D material;
- material.useElasticBehavior(true);
+ material.useLinearBehavior(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.useElasticBehavior(false);
+ material.useLinearBehavior(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
-} // testUseElasticBehavior
+} // testUseLinearBehavior
// ----------------------------------------------------------------------
// Test usesHasStateVars()
@@ -106,7 +106,7 @@
pylith::materials::TestPowerLaw3D::test_calcStressElastic(void)
{ // test_calcStressElastic
CPPUNIT_ASSERT(0 != _matElastic);
- _matElastic->useElasticBehavior(true);
+ _matElastic->useLinearBehavior(true);
test_calcStress();
} // test_calcStressElastic
@@ -117,7 +117,7 @@
pylith::materials::TestPowerLaw3D::test_calcElasticConstsElastic(void)
{ // test_calcElasticConstsElastic
CPPUNIT_ASSERT(0 != _matElastic);
- _matElastic->useElasticBehavior(true);
+ _matElastic->useLinearBehavior(true);
test_calcElasticConsts();
} // test_calcElasticConstsElastic
@@ -128,7 +128,7 @@
pylith::materials::TestPowerLaw3D::test_updateStateVarsElastic(void)
{ // test_updateStateVarsElastic
CPPUNIT_ASSERT(0 != _matElastic);
- _matElastic->useElasticBehavior(true);
+ _matElastic->useLinearBehavior(true);
test_updateStateVars();
} // test_updateStateVarsElastic
@@ -139,7 +139,7 @@
pylith::materials::TestPowerLaw3D::test_calcStressTimeDep(void)
{ // test_calcStressTimeDep
CPPUNIT_ASSERT(0 != _matElastic);
- _matElastic->useElasticBehavior(false);
+ _matElastic->useLinearBehavior(false);
delete _dataElastic; _dataElastic = new PowerLaw3DTimeDepData();
@@ -154,7 +154,7 @@
pylith::materials::TestPowerLaw3D::test_calcElasticConstsTimeDep(void)
{ // test_calcElasticConstsTimeDep
CPPUNIT_ASSERT(0 != _matElastic);
- _matElastic->useElasticBehavior(false);
+ _matElastic->useLinearBehavior(false);
delete _dataElastic; _dataElastic = new PowerLaw3DTimeDepData();
@@ -169,7 +169,7 @@
pylith::materials::TestPowerLaw3D::test_updateStateVarsTimeDep(void)
{ // test_updateStateVarsTimeDep
CPPUNIT_ASSERT(0 != _matElastic);
- _matElastic->useElasticBehavior(false);
+ _matElastic->useLinearBehavior(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-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/libtests/materials/TestPowerLaw3D.hh 2012-03-23 00:23:56 UTC (rev 19854)
@@ -58,7 +58,7 @@
// Need to test Power Law viscoelastic specific behavior.
CPPUNIT_TEST( testTimeStep );
- CPPUNIT_TEST( testUseElasticBehavior );
+ CPPUNIT_TEST( testUseLinearBehavior );
CPPUNIT_TEST( testHasStateVars );
CPPUNIT_TEST( test_calcStressElastic );
@@ -82,8 +82,8 @@
/// Test timeStep()
void testTimeStep(void);
- /// Test useElasticBehavior()
- void testUseElasticBehavior(void);
+ /// Test useLinearBehavior()
+ void testUseLinearBehavior(void);
/// Test hasStateVars()
void testHasStateVars(void);
Modified: short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/bc/TestAbsorbingDampers.py
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/bc/TestAbsorbingDampers.py 2012-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/bc/TestAbsorbingDampers.py 2012-03-23 00:23:56 UTC (rev 19854)
@@ -94,15 +94,6 @@
return
- def test_useSolnIncr(self):
- """
- Test useSolnIncr().
- """
- (mesh, bc, fields) = self._initialize()
- bc.useSolnIncr(True)
- return
-
-
def test_integrateResidual(self):
"""
Test integrateResidual().
Modified: short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/bc/TestDirichletBC.py
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/bc/TestDirichletBC.py 2012-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/bc/TestDirichletBC.py 2012-03-23 00:23:56 UTC (rev 19854)
@@ -134,15 +134,6 @@
return
- def test_useSolnIncr(self):
- """
- Test useSolnIncr().
- """
- (mesh, bc, field) = self._initialize()
- bc.useSolnIncr(True)
- return
-
-
def test_setField(self):
"""
Test setField().
@@ -175,7 +166,6 @@
bc.setConstraintSizes(field)
field.allocate()
bc.setConstraints(field)
- bc.useSolnIncr(True)
t0 = 1.0
t1 = 2.0
bc.setFieldIncr(t0, t1, field)
Modified: short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/bc/TestDirichletBoundary.py
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/bc/TestDirichletBoundary.py 2012-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/bc/TestDirichletBoundary.py 2012-03-23 00:23:56 UTC (rev 19854)
@@ -98,15 +98,6 @@
return
- def test_useSolnIncr(self):
- """
- Test useSolnIncr().
- """
- (mesh, bc, field) = self._initialize()
- bc.useSolnIncr(True)
- return
-
-
def test_setField(self):
"""
Test setField().
Modified: short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/bc/TestNeumann.py
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/bc/TestNeumann.py 2012-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/bc/TestNeumann.py 2012-03-23 00:23:56 UTC (rev 19854)
@@ -94,15 +94,6 @@
return
- def test_useSolnIncr(self):
- """
- Test useSolnIncr().
- """
- (mesh, bc, fields) = self._initialize()
- bc.useSolnIncr(True)
- return
-
-
def test_integrateResidual(self):
"""
Test integrateResidual().
Modified: short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/faults/TestFaultCohesiveDyn.py
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/faults/TestFaultCohesiveDyn.py 2012-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/faults/TestFaultCohesiveDyn.py 2012-03-23 00:23:56 UTC (rev 19854)
@@ -146,18 +146,6 @@
return
- def test_useSolnIncr(self):
- """
- Test useSolnIncr().
- """
- (mesh, fault, fields) = self._initialize()
- fault.useSolnIncr(True)
-
- # We should really add something here to check to make sure things
- # actually initialized correctly
- return
-
-
def test_integrateResidual(self):
"""
Test integrateResidual().
Modified: short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/faults/TestFaultCohesiveKin.py
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/faults/TestFaultCohesiveKin.py 2012-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/faults/TestFaultCohesiveKin.py 2012-03-23 00:23:56 UTC (rev 19854)
@@ -175,18 +175,6 @@
return
- def test_useSolnIncr(self):
- """
- Test useSolnIncr().
- """
- (mesh, fault, fields) = self._initialize()
- fault.useSolnIncr(True)
-
- # We should really add something here to check to make sure things
- # actually initialized correctly
- return
-
-
def test_integrateResidual(self):
"""
Test integrateResidual().
Modified: short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/feassemble/TestElasticityExplicit.py
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/feassemble/TestElasticityExplicit.py 2012-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/feassemble/TestElasticityExplicit.py 2012-03-23 00:23:56 UTC (rev 19854)
@@ -137,26 +137,6 @@
return
- def test_useSolnIncr(self):
- """
- Test useSolnIncr().
-
- WARNING: This is not a rigorous test of useSolnIncr() because we
- neither set the input fields or verify the results.
- """
- (mesh, integrator) = self._preinitialize()
- fields = self._initialize(mesh, integrator)
-
- try:
- integrator.useSolnIncr(True)
- self.failIf(True)
- except:
- self.failIf(False)
-
- # No test of result.
- return
-
-
def test_integrateResidual(self):
"""
Test integrateResidual().
Modified: short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/feassemble/TestElasticityExplicitLgDeform.py
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/feassemble/TestElasticityExplicitLgDeform.py 2012-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/feassemble/TestElasticityExplicitLgDeform.py 2012-03-23 00:23:56 UTC (rev 19854)
@@ -137,26 +137,6 @@
return
- def test_useSolnIncr(self):
- """
- Test useSolnIncr().
-
- WARNING: This is not a rigorous test of useSolnIncr() because we
- neither set the input fields or verify the results.
- """
- (mesh, integrator) = self._preinitialize()
- fields = self._initialize(mesh, integrator)
-
- try:
- integrator.useSolnIncr(True)
- self.failIf(True)
- except:
- self.failIf(False)
-
- # No test of result.
- return
-
-
def test_integrateResidual(self):
"""
Test integrateResidual().
Modified: short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/feassemble/TestElasticityImplicit.py
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/feassemble/TestElasticityImplicit.py 2012-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/feassemble/TestElasticityImplicit.py 2012-03-23 00:23:56 UTC (rev 19854)
@@ -121,22 +121,6 @@
return
- def test_useSolnIncr(self):
- """
- Test useSolnIncr().
-
- WARNING: This is not a rigorous test of useSolnIncr() because we
- neither set the input fields or verify the results.
- """
- (mesh, integrator) = self._preinitialize()
- fields = self._initialize(mesh, integrator)
-
- integrator.useSolnIncr(True)
-
- # No test of result.
- return
-
-
def test_integrateResidual(self):
"""
Test integrateResidual().
Modified: short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/feassemble/TestElasticityImplicitLgDeform.py
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/feassemble/TestElasticityImplicitLgDeform.py 2012-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/feassemble/TestElasticityImplicitLgDeform.py 2012-03-23 00:23:56 UTC (rev 19854)
@@ -121,22 +121,6 @@
return
- def test_useSolnIncr(self):
- """
- Test useSolnIncr().
-
- WARNING: This is not a rigorous test of useSolnIncr() because we
- neither set the input fields or verify the results.
- """
- (mesh, integrator) = self._preinitialize()
- fields = self._initialize(mesh, integrator)
-
- integrator.useSolnIncr(True)
-
- # No test of result.
- return
-
-
def test_integrateResidual(self):
"""
Test integrateResidual().
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-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/materials/TestDruckerPrager3D.py 2012-03-23 00:23:56 UTC (rev 19854)
@@ -56,17 +56,17 @@
def test_fitMohrCoulomb(self):
"""
- Test useElasticBehavior().
+ Test fitMohrCoulomb().
"""
self.material.fitMohrCoulomb(self.material.MOHR_COULOMB_MIDDLE)
return
- def test_useElasticBehavior(self):
+ def test_useLinearBehavior(self):
"""
- Test useElasticBehavior().
+ Test useLinearBehavior().
"""
- self.material.useElasticBehavior(False)
+ self.material.useLinearBehavior(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-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/materials/TestDruckerPragerPlaneStrain.py 2012-03-23 00:23:56 UTC (rev 19854)
@@ -56,17 +56,17 @@
def test_fitMohrCoulomb(self):
"""
- Test useElasticBehavior().
+ Test fitMohrCoulomb().
"""
self.material.fitMohrCoulomb(self.material.MOHR_COULOMB_MIDDLE)
return
- def test_useElasticBehavior(self):
+ def test_useLinearBehavior(self):
"""
- Test useElasticBehavior().
+ Test useLinearBehavior().
"""
- self.material.useElasticBehavior(False)
+ self.material.useLinearBehavior(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-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/materials/TestElasticIsotropic3D.py 2012-03-23 00:23:56 UTC (rev 19854)
@@ -46,11 +46,11 @@
return
- def test_useElasticBehavior(self):
+ def test_useLinearBehavior(self):
"""
- Test useElasticBehavior().
+ Test useLinearBehavior().
"""
- self.material.useElasticBehavior(False)
+ self.material.useLinearBehavior(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-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/materials/TestElasticPlaneStrain.py 2012-03-23 00:23:56 UTC (rev 19854)
@@ -46,11 +46,11 @@
return
- def test_useElasticBehavior(self):
+ def test_useLinearBehavior(self):
"""
- Test useElasticBehavior().
+ Test useLinearBehavior().
"""
- self.material.useElasticBehavior(False)
+ self.material.useLinearBehavior(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-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/materials/TestElasticPlaneStress.py 2012-03-23 00:23:56 UTC (rev 19854)
@@ -46,11 +46,11 @@
return
- def test_useElasticBehavior(self):
+ def test_useLinearBehavior(self):
"""
- Test useElasticBehavior().
+ Test useLinearBehavior().
"""
- self.material.useElasticBehavior(False)
+ self.material.useLinearBehavior(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-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/materials/TestElasticStrain1D.py 2012-03-23 00:23:56 UTC (rev 19854)
@@ -46,11 +46,11 @@
return
- def test_useElasticBehavior(self):
+ def test_useLinearBehavior(self):
"""
- Test useElasticBehavior().
+ Test useLinearBehavior().
"""
- self.material.useElasticBehavior(False)
+ self.material.useLinearBehavior(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-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/materials/TestElasticStress1D.py 2012-03-23 00:23:56 UTC (rev 19854)
@@ -46,11 +46,11 @@
return
- def test_useElasticBehavior(self):
+ def test_useLinearBehavior(self):
"""
- Test useElasticBehavior().
+ Test useLinearBehavior().
"""
- self.material.useElasticBehavior(False)
+ self.material.useLinearBehavior(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-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/materials/TestGenMaxwellIsotropic3D.py 2012-03-23 00:23:56 UTC (rev 19854)
@@ -46,11 +46,11 @@
return
- def test_useElasticBehavior(self):
+ def test_useLinearBehavior(self):
"""
- Test useElasticBehavior().
+ Test useLinearBehavior().
"""
- self.material.useElasticBehavior(False)
+ self.material.useLinearBehavior(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-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/materials/TestGenMaxwellPlaneStrain.py 2012-03-23 00:23:56 UTC (rev 19854)
@@ -46,11 +46,11 @@
return
- def test_useElasticBehavior(self):
+ def test_useLinearBehavior(self):
"""
- Test useElasticBehavior().
+ Test useLinearBehavior().
"""
- self.material.useElasticBehavior(False)
+ self.material.useLinearBehavior(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-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/materials/TestGenMaxwellQpQsIsotropic3D.py 2012-03-23 00:23:56 UTC (rev 19854)
@@ -46,11 +46,11 @@
return
- def test_useElasticBehavior(self):
+ def test_useLinearBehavior(self):
"""
- Test useElasticBehavior().
+ Test useLinearBehavior().
"""
- self.material.useElasticBehavior(False)
+ self.material.useLinearBehavior(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-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/materials/TestMaxwellIsotropic3D.py 2012-03-23 00:23:56 UTC (rev 19854)
@@ -46,11 +46,11 @@
return
- def test_useElasticBehavior(self):
+ def test_useLinearBehavior(self):
"""
- Test useElasticBehavior().
+ Test useLinearBehavior().
"""
- self.material.useElasticBehavior(False)
+ self.material.useLinearBehavior(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-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/materials/TestMaxwellPlaneStrain.py 2012-03-23 00:23:56 UTC (rev 19854)
@@ -46,11 +46,11 @@
return
- def test_useElasticBehavior(self):
+ def test_useLinearBehavior(self):
"""
- Test useElasticBehavior().
+ Test useLinearBehavior().
"""
- self.material.useElasticBehavior(False)
+ self.material.useLinearBehavior(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-03-22 20:28:32 UTC (rev 19853)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/materials/TestPowerLaw3D.py 2012-03-23 00:23:56 UTC (rev 19854)
@@ -46,11 +46,11 @@
return
- def test_useElasticBehavior(self):
+ def test_useLinearBehavior(self):
"""
- Test useElasticBehavior().
+ Test useLinearBehavior().
"""
- self.material.useElasticBehavior(False)
+ self.material.useLinearBehavior(False)
return
More information about the CIG-COMMITS
mailing list