[cig-commits] r20979 - in short/3D/PyLith/branches/pylith-scecdynrup: libsrc/pylith/bc libsrc/pylith/feassemble libsrc/pylith/materials modulesrc/feassemble pylith/feassemble pylith/problems unittests/libtests/bc unittests/libtests/faults unittests/libtests/feassemble unittests/pytests/bc unittests/pytests/faults unittests/pytests/feassemble unittests/pytests/materials
brad at geodynamics.org
brad at geodynamics.org
Thu Nov 1 11:12:57 PDT 2012
Author: brad
Date: 2012-11-01 11:12:57 -0700 (Thu, 01 Nov 2012)
New Revision: 20979
Modified:
short/3D/PyLith/branches/pylith-scecdynrup/libsrc/pylith/bc/DirichletBC.cc
short/3D/PyLith/branches/pylith-scecdynrup/libsrc/pylith/feassemble/Constraint.cc
short/3D/PyLith/branches/pylith-scecdynrup/libsrc/pylith/feassemble/Constraint.hh
short/3D/PyLith/branches/pylith-scecdynrup/libsrc/pylith/feassemble/Constraint.icc
short/3D/PyLith/branches/pylith-scecdynrup/libsrc/pylith/feassemble/ElasticityExplicit.cc
short/3D/PyLith/branches/pylith-scecdynrup/libsrc/pylith/feassemble/ElasticityExplicit.hh
short/3D/PyLith/branches/pylith-scecdynrup/libsrc/pylith/feassemble/ElasticityExplicitLgDeform.cc
short/3D/PyLith/branches/pylith-scecdynrup/libsrc/pylith/feassemble/ElasticityExplicitLgDeform.hh
short/3D/PyLith/branches/pylith-scecdynrup/libsrc/pylith/feassemble/ElasticityExplicitTet4.cc
short/3D/PyLith/branches/pylith-scecdynrup/libsrc/pylith/feassemble/ElasticityExplicitTet4.hh
short/3D/PyLith/branches/pylith-scecdynrup/libsrc/pylith/feassemble/ElasticityExplicitTri3.cc
short/3D/PyLith/branches/pylith-scecdynrup/libsrc/pylith/feassemble/ElasticityExplicitTri3.hh
short/3D/PyLith/branches/pylith-scecdynrup/libsrc/pylith/feassemble/ElasticityImplicit.cc
short/3D/PyLith/branches/pylith-scecdynrup/libsrc/pylith/feassemble/ElasticityImplicit.hh
short/3D/PyLith/branches/pylith-scecdynrup/libsrc/pylith/feassemble/ElasticityImplicitCUDA.cc
short/3D/PyLith/branches/pylith-scecdynrup/libsrc/pylith/feassemble/ElasticityImplicitCUDA.hh
short/3D/PyLith/branches/pylith-scecdynrup/libsrc/pylith/feassemble/ElasticityImplicitLgDeform.cc
short/3D/PyLith/branches/pylith-scecdynrup/libsrc/pylith/feassemble/ElasticityImplicitLgDeform.hh
short/3D/PyLith/branches/pylith-scecdynrup/libsrc/pylith/feassemble/Integrator.cc
short/3D/PyLith/branches/pylith-scecdynrup/libsrc/pylith/feassemble/Integrator.hh
short/3D/PyLith/branches/pylith-scecdynrup/libsrc/pylith/feassemble/Integrator.icc
short/3D/PyLith/branches/pylith-scecdynrup/libsrc/pylith/feassemble/IntegratorElasticity.cc
short/3D/PyLith/branches/pylith-scecdynrup/libsrc/pylith/feassemble/IntegratorElasticity.hh
short/3D/PyLith/branches/pylith-scecdynrup/libsrc/pylith/materials/ElasticMaterial.hh
short/3D/PyLith/branches/pylith-scecdynrup/libsrc/pylith/materials/ElasticMaterial.icc
short/3D/PyLith/branches/pylith-scecdynrup/modulesrc/feassemble/Constraint.i
short/3D/PyLith/branches/pylith-scecdynrup/modulesrc/feassemble/ElasticityExplicit.i
short/3D/PyLith/branches/pylith-scecdynrup/modulesrc/feassemble/ElasticityExplicitLgDeform.i
short/3D/PyLith/branches/pylith-scecdynrup/modulesrc/feassemble/ElasticityExplicitTet4.i
short/3D/PyLith/branches/pylith-scecdynrup/modulesrc/feassemble/ElasticityExplicitTri3.i
short/3D/PyLith/branches/pylith-scecdynrup/modulesrc/feassemble/ElasticityImplicit.i
short/3D/PyLith/branches/pylith-scecdynrup/modulesrc/feassemble/ElasticityImplicitCUDA.i
short/3D/PyLith/branches/pylith-scecdynrup/modulesrc/feassemble/ElasticityImplicitLgDeform.i
short/3D/PyLith/branches/pylith-scecdynrup/modulesrc/feassemble/Integrator.i
short/3D/PyLith/branches/pylith-scecdynrup/modulesrc/feassemble/IntegratorElasticity.i
short/3D/PyLith/branches/pylith-scecdynrup/pylith/feassemble/Integrator.py
short/3D/PyLith/branches/pylith-scecdynrup/pylith/problems/Formulation.py
short/3D/PyLith/branches/pylith-scecdynrup/pylith/problems/Implicit.py
short/3D/PyLith/branches/pylith-scecdynrup/pylith/problems/TimeStep.py
short/3D/PyLith/branches/pylith-scecdynrup/pylith/problems/TimeStepAdapt.py
short/3D/PyLith/branches/pylith-scecdynrup/pylith/problems/TimeStepUniform.py
short/3D/PyLith/branches/pylith-scecdynrup/pylith/problems/TimeStepUser.py
short/3D/PyLith/branches/pylith-scecdynrup/unittests/libtests/bc/TestDirichletBC.cc
short/3D/PyLith/branches/pylith-scecdynrup/unittests/libtests/bc/TestDirichletBCMulti.cc
short/3D/PyLith/branches/pylith-scecdynrup/unittests/libtests/faults/TestFaultCohesiveKin.cc
short/3D/PyLith/branches/pylith-scecdynrup/unittests/libtests/faults/TestFaultCohesiveKin.hh
short/3D/PyLith/branches/pylith-scecdynrup/unittests/libtests/feassemble/TestElasticityExplicit.cc
short/3D/PyLith/branches/pylith-scecdynrup/unittests/libtests/feassemble/TestElasticityExplicit.hh
short/3D/PyLith/branches/pylith-scecdynrup/unittests/libtests/feassemble/TestElasticityExplicitTet4.cc
short/3D/PyLith/branches/pylith-scecdynrup/unittests/libtests/feassemble/TestElasticityExplicitTet4.hh
short/3D/PyLith/branches/pylith-scecdynrup/unittests/libtests/feassemble/TestElasticityExplicitTri3.cc
short/3D/PyLith/branches/pylith-scecdynrup/unittests/libtests/feassemble/TestElasticityExplicitTri3.hh
short/3D/PyLith/branches/pylith-scecdynrup/unittests/libtests/feassemble/TestElasticityImplicit.cc
short/3D/PyLith/branches/pylith-scecdynrup/unittests/libtests/feassemble/TestElasticityImplicit.hh
short/3D/PyLith/branches/pylith-scecdynrup/unittests/pytests/bc/TestAbsorbingDampers.py
short/3D/PyLith/branches/pylith-scecdynrup/unittests/pytests/bc/TestDirichletBC.py
short/3D/PyLith/branches/pylith-scecdynrup/unittests/pytests/bc/TestDirichletBoundary.py
short/3D/PyLith/branches/pylith-scecdynrup/unittests/pytests/bc/TestNeumann.py
short/3D/PyLith/branches/pylith-scecdynrup/unittests/pytests/faults/TestFaultCohesiveDyn.py
short/3D/PyLith/branches/pylith-scecdynrup/unittests/pytests/faults/TestFaultCohesiveKin.py
short/3D/PyLith/branches/pylith-scecdynrup/unittests/pytests/feassemble/TestElasticityExplicit.py
short/3D/PyLith/branches/pylith-scecdynrup/unittests/pytests/feassemble/TestElasticityExplicitLgDeform.py
short/3D/PyLith/branches/pylith-scecdynrup/unittests/pytests/feassemble/TestElasticityImplicit.py
short/3D/PyLith/branches/pylith-scecdynrup/unittests/pytests/feassemble/TestElasticityImplicitLgDeform.py
short/3D/PyLith/branches/pylith-scecdynrup/unittests/pytests/materials/TestDruckerPrager3D.py
short/3D/PyLith/branches/pylith-scecdynrup/unittests/pytests/materials/TestDruckerPragerPlaneStrain.py
Log:
Merge from v1.7-trunk.
Modified: short/3D/PyLith/branches/pylith-scecdynrup/libsrc/pylith/bc/DirichletBC.cc
===================================================================
--- short/3D/PyLith/branches/pylith-scecdynrup/libsrc/pylith/bc/DirichletBC.cc 2012-11-01 17:26:03 UTC (rev 20978)
+++ short/3D/PyLith/branches/pylith-scecdynrup/libsrc/pylith/bc/DirichletBC.cc 2012-11-01 18:12:57 UTC (rev 20979)
@@ -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/pylith-scecdynrup/libsrc/pylith/feassemble/Constraint.cc
===================================================================
--- short/3D/PyLith/branches/pylith-scecdynrup/libsrc/pylith/feassemble/Constraint.cc 2012-11-01 17:26:03 UTC (rev 20978)
+++ short/3D/PyLith/branches/pylith-scecdynrup/libsrc/pylith/feassemble/Constraint.cc 2012-11-01 18:12:57 UTC (rev 20979)
@@ -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/pylith-scecdynrup/libsrc/pylith/feassemble/Constraint.hh
===================================================================
--- short/3D/PyLith/branches/pylith-scecdynrup/libsrc/pylith/feassemble/Constraint.hh 2012-11-01 17:26:03 UTC (rev 20978)
+++ short/3D/PyLith/branches/pylith-scecdynrup/libsrc/pylith/feassemble/Constraint.hh 2012-11-01 18:12:57 UTC (rev 20979)
@@ -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/pylith-scecdynrup/libsrc/pylith/feassemble/Constraint.icc
===================================================================
--- short/3D/PyLith/branches/pylith-scecdynrup/libsrc/pylith/feassemble/Constraint.icc 2012-11-01 17:26:03 UTC (rev 20978)
+++ short/3D/PyLith/branches/pylith-scecdynrup/libsrc/pylith/feassemble/Constraint.icc 2012-11-01 18:12:57 UTC (rev 20979)
@@ -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/pylith-scecdynrup/libsrc/pylith/feassemble/ElasticityExplicit.cc
===================================================================
--- short/3D/PyLith/branches/pylith-scecdynrup/libsrc/pylith/feassemble/ElasticityExplicit.cc 2012-11-01 17:26:03 UTC (rev 20978)
+++ short/3D/PyLith/branches/pylith-scecdynrup/libsrc/pylith/feassemble/ElasticityExplicit.cc 2012-11-01 18:12:57 UTC (rev 20979)
@@ -106,19 +106,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(const topology::Field<topology::Mesh>& residual,
Modified: short/3D/PyLith/branches/pylith-scecdynrup/libsrc/pylith/feassemble/ElasticityExplicit.hh
===================================================================
--- short/3D/PyLith/branches/pylith-scecdynrup/libsrc/pylith/feassemble/ElasticityExplicit.hh 2012-11-01 17:26:03 UTC (rev 20978)
+++ short/3D/PyLith/branches/pylith-scecdynrup/libsrc/pylith/feassemble/ElasticityExplicit.hh 2012-11-01 18:12:57 UTC (rev 20979)
@@ -105,13 +105,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/pylith-scecdynrup/libsrc/pylith/feassemble/ElasticityExplicitLgDeform.cc
===================================================================
--- short/3D/PyLith/branches/pylith-scecdynrup/libsrc/pylith/feassemble/ElasticityExplicitLgDeform.cc 2012-11-01 17:26:03 UTC (rev 20978)
+++ short/3D/PyLith/branches/pylith-scecdynrup/libsrc/pylith/feassemble/ElasticityExplicitLgDeform.cc 2012-11-01 18:12:57 UTC (rev 20979)
@@ -104,18 +104,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(const topology::Field<topology::Mesh>& residual,
Modified: short/3D/PyLith/branches/pylith-scecdynrup/libsrc/pylith/feassemble/ElasticityExplicitLgDeform.hh
===================================================================
--- short/3D/PyLith/branches/pylith-scecdynrup/libsrc/pylith/feassemble/ElasticityExplicitLgDeform.hh 2012-11-01 17:26:03 UTC (rev 20978)
+++ short/3D/PyLith/branches/pylith-scecdynrup/libsrc/pylith/feassemble/ElasticityExplicitLgDeform.hh 2012-11-01 18:12:57 UTC (rev 20979)
@@ -106,13 +106,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/pylith-scecdynrup/libsrc/pylith/feassemble/ElasticityExplicitTet4.cc
===================================================================
--- short/3D/PyLith/branches/pylith-scecdynrup/libsrc/pylith/feassemble/ElasticityExplicitTet4.cc 2012-11-01 17:26:03 UTC (rev 20978)
+++ short/3D/PyLith/branches/pylith-scecdynrup/libsrc/pylith/feassemble/ElasticityExplicitTet4.cc 2012-11-01 18:12:57 UTC (rev 20979)
@@ -111,19 +111,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/pylith-scecdynrup/libsrc/pylith/feassemble/ElasticityExplicitTet4.hh
===================================================================
--- short/3D/PyLith/branches/pylith-scecdynrup/libsrc/pylith/feassemble/ElasticityExplicitTet4.hh 2012-11-01 17:26:03 UTC (rev 20978)
+++ short/3D/PyLith/branches/pylith-scecdynrup/libsrc/pylith/feassemble/ElasticityExplicitTet4.hh 2012-11-01 18:12:57 UTC (rev 20979)
@@ -105,13 +105,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/pylith-scecdynrup/libsrc/pylith/feassemble/ElasticityExplicitTri3.cc
===================================================================
--- short/3D/PyLith/branches/pylith-scecdynrup/libsrc/pylith/feassemble/ElasticityExplicitTri3.cc 2012-11-01 17:26:03 UTC (rev 20978)
+++ short/3D/PyLith/branches/pylith-scecdynrup/libsrc/pylith/feassemble/ElasticityExplicitTri3.cc 2012-11-01 18:12:57 UTC (rev 20979)
@@ -111,19 +111,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(const topology::Field<topology::Mesh>& residual,
Modified: short/3D/PyLith/branches/pylith-scecdynrup/libsrc/pylith/feassemble/ElasticityExplicitTri3.hh
===================================================================
--- short/3D/PyLith/branches/pylith-scecdynrup/libsrc/pylith/feassemble/ElasticityExplicitTri3.hh 2012-11-01 17:26:03 UTC (rev 20978)
+++ short/3D/PyLith/branches/pylith-scecdynrup/libsrc/pylith/feassemble/ElasticityExplicitTri3.hh 2012-11-01 18:12:57 UTC (rev 20979)
@@ -105,13 +105,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/pylith-scecdynrup/libsrc/pylith/feassemble/ElasticityImplicit.cc
===================================================================
--- short/3D/PyLith/branches/pylith-scecdynrup/libsrc/pylith/feassemble/ElasticityImplicit.cc 2012-11-01 17:26:03 UTC (rev 20978)
+++ short/3D/PyLith/branches/pylith-scecdynrup/libsrc/pylith/feassemble/ElasticityImplicit.cc 2012-11-01 18:12:57 UTC (rev 20979)
@@ -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/pylith-scecdynrup/libsrc/pylith/feassemble/ElasticityImplicit.hh
===================================================================
--- short/3D/PyLith/branches/pylith-scecdynrup/libsrc/pylith/feassemble/ElasticityImplicit.hh 2012-11-01 17:26:03 UTC (rev 20978)
+++ short/3D/PyLith/branches/pylith-scecdynrup/libsrc/pylith/feassemble/ElasticityImplicit.hh 2012-11-01 18:12:57 UTC (rev 20979)
@@ -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/pylith-scecdynrup/libsrc/pylith/feassemble/ElasticityImplicitCUDA.cc
===================================================================
--- short/3D/PyLith/branches/pylith-scecdynrup/libsrc/pylith/feassemble/ElasticityImplicitCUDA.cc 2012-11-01 17:26:03 UTC (rev 20978)
+++ short/3D/PyLith/branches/pylith-scecdynrup/libsrc/pylith/feassemble/ElasticityImplicitCUDA.cc 2012-11-01 18:12:57 UTC (rev 20979)
@@ -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/pylith-scecdynrup/libsrc/pylith/feassemble/ElasticityImplicitCUDA.hh
===================================================================
--- short/3D/PyLith/branches/pylith-scecdynrup/libsrc/pylith/feassemble/ElasticityImplicitCUDA.hh 2012-11-01 17:26:03 UTC (rev 20978)
+++ short/3D/PyLith/branches/pylith-scecdynrup/libsrc/pylith/feassemble/ElasticityImplicitCUDA.hh 2012-11-01 18:12:57 UTC (rev 20979)
@@ -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/pylith-scecdynrup/libsrc/pylith/feassemble/ElasticityImplicitLgDeform.cc
===================================================================
--- short/3D/PyLith/branches/pylith-scecdynrup/libsrc/pylith/feassemble/ElasticityImplicitLgDeform.cc 2012-11-01 17:26:03 UTC (rev 20978)
+++ short/3D/PyLith/branches/pylith-scecdynrup/libsrc/pylith/feassemble/ElasticityImplicitLgDeform.cc 2012-11-01 18:12:57 UTC (rev 20979)
@@ -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/pylith-scecdynrup/libsrc/pylith/feassemble/ElasticityImplicitLgDeform.hh
===================================================================
--- short/3D/PyLith/branches/pylith-scecdynrup/libsrc/pylith/feassemble/ElasticityImplicitLgDeform.hh 2012-11-01 17:26:03 UTC (rev 20978)
+++ short/3D/PyLith/branches/pylith-scecdynrup/libsrc/pylith/feassemble/ElasticityImplicitLgDeform.hh 2012-11-01 18:12:57 UTC (rev 20979)
@@ -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/pylith-scecdynrup/libsrc/pylith/feassemble/Integrator.cc
===================================================================
--- short/3D/PyLith/branches/pylith-scecdynrup/libsrc/pylith/feassemble/Integrator.cc 2012-11-01 17:26:03 UTC (rev 20978)
+++ short/3D/PyLith/branches/pylith-scecdynrup/libsrc/pylith/feassemble/Integrator.cc 2012-11-01 18:12:57 UTC (rev 20979)
@@ -37,8 +37,7 @@
_gravityField(0),
_logger(0),
_needNewJacobian(true),
- _isJacobianSymmetric(true),
- _useSolnIncr(false)
+ _isJacobianSymmetric(true)
{ // constructor
} // constructor
Modified: short/3D/PyLith/branches/pylith-scecdynrup/libsrc/pylith/feassemble/Integrator.hh
===================================================================
--- short/3D/PyLith/branches/pylith-scecdynrup/libsrc/pylith/feassemble/Integrator.hh 2012-11-01 17:26:03 UTC (rev 20978)
+++ short/3D/PyLith/branches/pylith-scecdynrup/libsrc/pylith/feassemble/Integrator.hh 2012-11-01 18:12:57 UTC (rev 20979)
@@ -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/pylith-scecdynrup/libsrc/pylith/feassemble/Integrator.icc
===================================================================
--- short/3D/PyLith/branches/pylith-scecdynrup/libsrc/pylith/feassemble/Integrator.icc 2012-11-01 17:26:03 UTC (rev 20978)
+++ short/3D/PyLith/branches/pylith-scecdynrup/libsrc/pylith/feassemble/Integrator.icc 2012-11-01 18:12:57 UTC (rev 20979)
@@ -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/pylith-scecdynrup/libsrc/pylith/feassemble/IntegratorElasticity.cc
===================================================================
--- short/3D/PyLith/branches/pylith-scecdynrup/libsrc/pylith/feassemble/IntegratorElasticity.cc 2012-11-01 17:26:03 UTC (rev 20978)
+++ short/3D/PyLith/branches/pylith-scecdynrup/libsrc/pylith/feassemble/IntegratorElasticity.cc 2012-11-01 18:12:57 UTC (rev 20979)
@@ -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/pylith-scecdynrup/libsrc/pylith/feassemble/IntegratorElasticity.hh
===================================================================
--- short/3D/PyLith/branches/pylith-scecdynrup/libsrc/pylith/feassemble/IntegratorElasticity.hh 2012-11-01 17:26:03 UTC (rev 20978)
+++ short/3D/PyLith/branches/pylith-scecdynrup/libsrc/pylith/feassemble/IntegratorElasticity.hh 2012-11-01 18:12:57 UTC (rev 20979)
@@ -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/pylith-scecdynrup/libsrc/pylith/materials/ElasticMaterial.hh
===================================================================
--- short/3D/PyLith/branches/pylith-scecdynrup/libsrc/pylith/materials/ElasticMaterial.hh 2012-11-01 17:26:03 UTC (rev 20978)
+++ short/3D/PyLith/branches/pylith-scecdynrup/libsrc/pylith/materials/ElasticMaterial.hh 2012-11-01 18:12:57 UTC (rev 20979)
@@ -198,13 +198,6 @@
feassemble::Quadrature<topology::Mesh>* quadrature,
topology::Field<topology::Mesh>* field =0);
- /** 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/pylith-scecdynrup/libsrc/pylith/materials/ElasticMaterial.icc
===================================================================
--- short/3D/PyLith/branches/pylith-scecdynrup/libsrc/pylith/materials/ElasticMaterial.icc 2012-11-01 17:26:03 UTC (rev 20978)
+++ short/3D/PyLith/branches/pylith-scecdynrup/libsrc/pylith/materials/ElasticMaterial.icc 2012-11-01 18:12:57 UTC (rev 20979)
@@ -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/pylith-scecdynrup/modulesrc/feassemble/Constraint.i
===================================================================
--- short/3D/PyLith/branches/pylith-scecdynrup/modulesrc/feassemble/Constraint.i 2012-11-01 17:26:03 UTC (rev 20978)
+++ short/3D/PyLith/branches/pylith-scecdynrup/modulesrc/feassemble/Constraint.i 2012-11-01 18:12:57 UTC (rev 20979)
@@ -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/pylith-scecdynrup/modulesrc/feassemble/ElasticityExplicit.i
===================================================================
--- short/3D/PyLith/branches/pylith-scecdynrup/modulesrc/feassemble/ElasticityExplicit.i 2012-11-01 17:26:03 UTC (rev 20978)
+++ short/3D/PyLith/branches/pylith-scecdynrup/modulesrc/feassemble/ElasticityExplicit.i 2012-11-01 18:12:57 UTC (rev 20979)
@@ -60,13 +60,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/pylith-scecdynrup/modulesrc/feassemble/ElasticityExplicitLgDeform.i
===================================================================
--- short/3D/PyLith/branches/pylith-scecdynrup/modulesrc/feassemble/ElasticityExplicitLgDeform.i 2012-11-01 17:26:03 UTC (rev 20978)
+++ short/3D/PyLith/branches/pylith-scecdynrup/modulesrc/feassemble/ElasticityExplicitLgDeform.i 2012-11-01 18:12:57 UTC (rev 20979)
@@ -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/pylith-scecdynrup/modulesrc/feassemble/ElasticityExplicitTet4.i
===================================================================
--- short/3D/PyLith/branches/pylith-scecdynrup/modulesrc/feassemble/ElasticityExplicitTet4.i 2012-11-01 17:26:03 UTC (rev 20978)
+++ short/3D/PyLith/branches/pylith-scecdynrup/modulesrc/feassemble/ElasticityExplicitTet4.i 2012-11-01 18:12:57 UTC (rev 20979)
@@ -60,13 +60,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/pylith-scecdynrup/modulesrc/feassemble/ElasticityExplicitTri3.i
===================================================================
--- short/3D/PyLith/branches/pylith-scecdynrup/modulesrc/feassemble/ElasticityExplicitTri3.i 2012-11-01 17:26:03 UTC (rev 20978)
+++ short/3D/PyLith/branches/pylith-scecdynrup/modulesrc/feassemble/ElasticityExplicitTri3.i 2012-11-01 18:12:57 UTC (rev 20979)
@@ -60,13 +60,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/pylith-scecdynrup/modulesrc/feassemble/ElasticityImplicit.i
===================================================================
--- short/3D/PyLith/branches/pylith-scecdynrup/modulesrc/feassemble/ElasticityImplicit.i 2012-11-01 17:26:03 UTC (rev 20978)
+++ short/3D/PyLith/branches/pylith-scecdynrup/modulesrc/feassemble/ElasticityImplicit.i 2012-11-01 18:12:57 UTC (rev 20979)
@@ -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/pylith-scecdynrup/modulesrc/feassemble/ElasticityImplicitCUDA.i
===================================================================
--- short/3D/PyLith/branches/pylith-scecdynrup/modulesrc/feassemble/ElasticityImplicitCUDA.i 2012-11-01 17:26:03 UTC (rev 20978)
+++ short/3D/PyLith/branches/pylith-scecdynrup/modulesrc/feassemble/ElasticityImplicitCUDA.i 2012-11-01 18:12:57 UTC (rev 20979)
@@ -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/pylith-scecdynrup/modulesrc/feassemble/ElasticityImplicitLgDeform.i
===================================================================
--- short/3D/PyLith/branches/pylith-scecdynrup/modulesrc/feassemble/ElasticityImplicitLgDeform.i 2012-11-01 17:26:03 UTC (rev 20978)
+++ short/3D/PyLith/branches/pylith-scecdynrup/modulesrc/feassemble/ElasticityImplicitLgDeform.i 2012-11-01 18:12:57 UTC (rev 20979)
@@ -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/pylith-scecdynrup/modulesrc/feassemble/Integrator.i
===================================================================
--- short/3D/PyLith/branches/pylith-scecdynrup/modulesrc/feassemble/Integrator.i 2012-11-01 17:26:03 UTC (rev 20978)
+++ short/3D/PyLith/branches/pylith-scecdynrup/modulesrc/feassemble/Integrator.i 2012-11-01 18:12:57 UTC (rev 20979)
@@ -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/pylith-scecdynrup/modulesrc/feassemble/IntegratorElasticity.i
===================================================================
--- short/3D/PyLith/branches/pylith-scecdynrup/modulesrc/feassemble/IntegratorElasticity.i 2012-11-01 17:26:03 UTC (rev 20978)
+++ short/3D/PyLith/branches/pylith-scecdynrup/modulesrc/feassemble/IntegratorElasticity.i 2012-11-01 18:12:57 UTC (rev 20979)
@@ -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/pylith-scecdynrup/pylith/feassemble/Integrator.py
===================================================================
--- short/3D/PyLith/branches/pylith-scecdynrup/pylith/feassemble/Integrator.py 2012-11-01 17:26:03 UTC (rev 20978)
+++ short/3D/PyLith/branches/pylith-scecdynrup/pylith/feassemble/Integrator.py 2012-11-01 18:12:57 UTC (rev 20979)
@@ -31,7 +31,6 @@
available = dir(obj)
required = ["timeStep",
"stableTimeStep",
- "useSolnIncr",
"integrateResidual",
"integrateJacobian",
"preinitialize",
Modified: short/3D/PyLith/branches/pylith-scecdynrup/pylith/problems/Formulation.py
===================================================================
--- short/3D/PyLith/branches/pylith-scecdynrup/pylith/problems/Formulation.py 2012-11-01 17:26:03 UTC (rev 20978)
+++ short/3D/PyLith/branches/pylith-scecdynrup/pylith/problems/Formulation.py 2012-11-01 18:12:57 UTC (rev 20979)
@@ -223,7 +223,7 @@
"""
Get start time for simulation.
"""
- return 0.0
+ return self.timeStep.startTimeN
def getTotalTime(self):
Modified: short/3D/PyLith/branches/pylith-scecdynrup/pylith/problems/Implicit.py
===================================================================
--- short/3D/PyLith/branches/pylith-scecdynrup/pylith/problems/Implicit.py 2012-11-01 17:26:03 UTC (rev 20978)
+++ short/3D/PyLith/branches/pylith-scecdynrup/pylith/problems/Implicit.py 2012-11-01 18:12:57 UTC (rev 20979)
@@ -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,7 +252,6 @@
output.writeData(t+dt, self.fields)
self._writeData(t+dt)
- self._stepCount += 1
return
Modified: short/3D/PyLith/branches/pylith-scecdynrup/pylith/problems/TimeStep.py
===================================================================
--- short/3D/PyLith/branches/pylith-scecdynrup/pylith/problems/TimeStep.py 2012-11-01 17:26:03 UTC (rev 20978)
+++ short/3D/PyLith/branches/pylith-scecdynrup/pylith/problems/TimeStep.py 2012-11-01 18:12:57 UTC (rev 20979)
@@ -33,6 +33,34 @@
Factory: time_step.
"""
+ # INVENTORY //////////////////////////////////////////////////////////
+
+ class Inventory(PetscComponent.Inventory):
+ """
+ Python object for managing TimeStepUniform facilities and properties.
+ """
+
+ ## @class Inventory
+ ## Python abstract base class for managing TimeStep facilities and properties.
+ ##
+ ## \b Properties
+ ## @li \b total_time Time duration for simulation.
+ ## @li \b start_time Starting time for simulation.
+ ##
+ ## \b Facilities
+ ## @li None
+
+ import pyre.inventory
+
+ from pyre.units.time import second
+ totalTime = pyre.inventory.dimensional("total_time", default=0.0*second,
+ validator=pyre.inventory.greaterEqual(0.0*second))
+ totalTime.meta['tip'] = "Time duration for simulation."
+
+ startTime = pyre.inventory.dimensional("start_time", default=0.0*second)
+ startTime.meta['tip'] = "Time duration for simulation."
+
+
# PUBLIC METHODS /////////////////////////////////////////////////////
def __init__(self, name="timestep"):
@@ -43,8 +71,10 @@
from pyre.units.time import second
self.timeScale = 1.0*second
self.totalTime = 0.0*second
+ self.startTime = 0.0*second
self.dt = 0.0*second
self.totalTimeN = 0.0 # Nondimensionalized total time
+ self.startTimeN = 0.0 # Nondimensionalized start time
self.dtN = 0.0 # Nondimenionalized time step
return
@@ -82,6 +112,7 @@
# Nondimensionalize time scales
timeScale = normalizer.timeScale()
self.totalTimeN = normalizer.nondimensionalize(self.totalTime, timeScale)
+ self.startTimeN = normalizer.nondimensionalize(self.startTime, timeScale)
self.dtN = normalizer.nondimensionalize(self.dt, timeScale)
self.timeScale = timeScale
@@ -119,6 +150,8 @@
Set members based using inventory.
"""
PetscComponent._configure(self)
+ self.totalTime = self.inventory.totalTime
+ self.startTime = self.inventory.startTime
return
Modified: short/3D/PyLith/branches/pylith-scecdynrup/pylith/problems/TimeStepAdapt.py
===================================================================
--- short/3D/PyLith/branches/pylith-scecdynrup/pylith/problems/TimeStepAdapt.py 2012-11-01 17:26:03 UTC (rev 20978)
+++ short/3D/PyLith/branches/pylith-scecdynrup/pylith/problems/TimeStepAdapt.py 2012-11-01 18:12:57 UTC (rev 20979)
@@ -47,7 +47,6 @@
## Python object for managing TimeStepAdapt facilities and properties.
##
## \b Properties
- ## @li \b total_time Time duration for simulation.
## @li \b max_dt Maximum time step.
## @li \b adapt_skip Number of time steps to skip between adjusting value.
## @li \b stability_factor "Safety factor" for stable time step.
@@ -58,10 +57,6 @@
import pyre.inventory
from pyre.units.time import second
- totalTime = pyre.inventory.dimensional("total_time", default=0.0*second,
- validator=pyre.inventory.greaterEqual(0.0*second))
- totalTime.meta['tip'] = "Time duration for simulation."
-
maxDt = pyre.inventory.dimensional("max_dt", default=1.0*second,
validator=pyre.inventory.greater(0.0*second))
maxDt.meta['tip'] = "Maximum time step permitted."
@@ -138,7 +133,6 @@
Set members based using inventory.
"""
TimeStep._configure(self)
- self.totalTime = self.inventory.totalTime
self.maxDt = self.inventory.maxDt
self.adaptSkip = self.inventory.adaptSkip
self.stabilityFactor = self.inventory.stabilityFactor
Modified: short/3D/PyLith/branches/pylith-scecdynrup/pylith/problems/TimeStepUniform.py
===================================================================
--- short/3D/PyLith/branches/pylith-scecdynrup/pylith/problems/TimeStepUniform.py 2012-11-01 17:26:03 UTC (rev 20978)
+++ short/3D/PyLith/branches/pylith-scecdynrup/pylith/problems/TimeStepUniform.py 2012-11-01 18:12:57 UTC (rev 20979)
@@ -29,7 +29,7 @@
# TimeStepUniform class
class TimeStepUniform(TimeStep):
"""
- Python abstract base class for marching format in time with a uniform time step.
+ Python object for marching format in time with a uniform time step.
Factory: time_step.
"""
@@ -45,7 +45,6 @@
## Python object for managing TimeStepUniform facilities and properties.
##
## \b Properties
- ## @li \b total_time Time duration for simulation.
## @li \b dt Time step for simulation.
##
## \b Facilities
@@ -54,10 +53,6 @@
import pyre.inventory
from pyre.units.time import second
- totalTime = pyre.inventory.dimensional("total_time", default=0.0*second,
- validator=pyre.inventory.greaterEqual(0.0*second))
- totalTime.meta['tip'] = "Time duration for simulation."
-
dt = pyre.inventory.dimensional("dt", default=1.0*second,
validator=pyre.inventory.greater(0.0*second))
dt.meta['tip'] = "Time step for simulation."
@@ -101,7 +96,6 @@
Set members based using inventory.
"""
TimeStep._configure(self)
- self.totalTime = self.inventory.totalTime
self.dt = self.inventory.dt
return
Modified: short/3D/PyLith/branches/pylith-scecdynrup/pylith/problems/TimeStepUser.py
===================================================================
--- short/3D/PyLith/branches/pylith-scecdynrup/pylith/problems/TimeStepUser.py 2012-11-01 17:26:03 UTC (rev 20978)
+++ short/3D/PyLith/branches/pylith-scecdynrup/pylith/problems/TimeStepUser.py 2012-11-01 18:12:57 UTC (rev 20979)
@@ -70,7 +70,6 @@
## Python object for managing TimeStepUser facilities and properties.
##
## \b Properties
- ## @li \b total_time Time duration for simulation.
## @li \b filename Name of file with time step sizes.
## @li \b loop_steps Loop over steps if true, otherwise keep
## using last time step size.
@@ -80,11 +79,6 @@
import pyre.inventory
- from pyre.units.time import second
- totalTime = pyre.inventory.dimensional("total_time", default=0.0*second,
- validator=pyre.inventory.greaterEqual(0.0*second))
- totalTime.meta['tip'] = "Time duration for simulation."
-
filename = pyre.inventory.str("filename", default="timesteps.txt")
filename.meta['tip'] = "Name of file with tme step sizes."
@@ -121,7 +115,6 @@
# Nondimensionalize time steps
timeScale = normalizer.timeScale()
- self.totalTimeN = normalizer.nondimensionalize(self.totalTime, timeScale)
for i in xrange(len(self.steps)):
step = normalizer.nondimensionalize(self.steps[i], timeScale)
assert(step > 0.0)
@@ -181,7 +174,6 @@
Set members based using inventory.
"""
TimeStep._configure(self)
- self.totalTime = self.inventory.totalTime
self.filename = self.inventory.filename
self.loopSteps = self.inventory.loopSteps
return
Modified: short/3D/PyLith/branches/pylith-scecdynrup/unittests/libtests/bc/TestDirichletBC.cc
===================================================================
--- short/3D/PyLith/branches/pylith-scecdynrup/unittests/libtests/bc/TestDirichletBC.cc 2012-11-01 17:26:03 UTC (rev 20978)
+++ short/3D/PyLith/branches/pylith-scecdynrup/unittests/libtests/bc/TestDirichletBC.cc 2012-11-01 18:12:57 UTC (rev 20979)
@@ -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/pylith-scecdynrup/unittests/libtests/bc/TestDirichletBCMulti.cc
===================================================================
--- short/3D/PyLith/branches/pylith-scecdynrup/unittests/libtests/bc/TestDirichletBCMulti.cc 2012-11-01 17:26:03 UTC (rev 20978)
+++ short/3D/PyLith/branches/pylith-scecdynrup/unittests/libtests/bc/TestDirichletBCMulti.cc 2012-11-01 18:12:57 UTC (rev 20979)
@@ -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/pylith-scecdynrup/unittests/libtests/faults/TestFaultCohesiveKin.cc
===================================================================
--- short/3D/PyLith/branches/pylith-scecdynrup/unittests/libtests/faults/TestFaultCohesiveKin.cc 2012-11-01 17:26:03 UTC (rev 20978)
+++ short/3D/PyLith/branches/pylith-scecdynrup/unittests/libtests/faults/TestFaultCohesiveKin.cc 2012-11-01 18:12:57 UTC (rev 20979)
@@ -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/pylith-scecdynrup/unittests/libtests/faults/TestFaultCohesiveKin.hh
===================================================================
--- short/3D/PyLith/branches/pylith-scecdynrup/unittests/libtests/faults/TestFaultCohesiveKin.hh 2012-11-01 17:26:03 UTC (rev 20978)
+++ short/3D/PyLith/branches/pylith-scecdynrup/unittests/libtests/faults/TestFaultCohesiveKin.hh 2012-11-01 18:12:57 UTC (rev 20979)
@@ -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/pylith-scecdynrup/unittests/libtests/feassemble/TestElasticityExplicit.cc
===================================================================
--- short/3D/PyLith/branches/pylith-scecdynrup/unittests/libtests/feassemble/TestElasticityExplicit.cc 2012-11-01 17:26:03 UTC (rev 20978)
+++ short/3D/PyLith/branches/pylith-scecdynrup/unittests/libtests/feassemble/TestElasticityExplicit.cc 2012-11-01 18:12:57 UTC (rev 20979)
@@ -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/pylith-scecdynrup/unittests/libtests/feassemble/TestElasticityExplicit.hh
===================================================================
--- short/3D/PyLith/branches/pylith-scecdynrup/unittests/libtests/feassemble/TestElasticityExplicit.hh 2012-11-01 17:26:03 UTC (rev 20978)
+++ short/3D/PyLith/branches/pylith-scecdynrup/unittests/libtests/feassemble/TestElasticityExplicit.hh 2012-11-01 18:12:57 UTC (rev 20979)
@@ -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/pylith-scecdynrup/unittests/libtests/feassemble/TestElasticityExplicitTet4.cc
===================================================================
--- short/3D/PyLith/branches/pylith-scecdynrup/unittests/libtests/feassemble/TestElasticityExplicitTet4.cc 2012-11-01 17:26:03 UTC (rev 20978)
+++ short/3D/PyLith/branches/pylith-scecdynrup/unittests/libtests/feassemble/TestElasticityExplicitTet4.cc 2012-11-01 18:12:57 UTC (rev 20979)
@@ -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/pylith-scecdynrup/unittests/libtests/feassemble/TestElasticityExplicitTet4.hh
===================================================================
--- short/3D/PyLith/branches/pylith-scecdynrup/unittests/libtests/feassemble/TestElasticityExplicitTet4.hh 2012-11-01 17:26:03 UTC (rev 20978)
+++ short/3D/PyLith/branches/pylith-scecdynrup/unittests/libtests/feassemble/TestElasticityExplicitTet4.hh 2012-11-01 18:12:57 UTC (rev 20979)
@@ -54,7 +54,6 @@
CPPUNIT_TEST( testTimeStep );
CPPUNIT_TEST( testMaterial );
CPPUNIT_TEST( testNeedNewJacobian );
- CPPUNIT_TEST( testUseSolnIncr );
CPPUNIT_TEST( testInitialize );
CPPUNIT_TEST( testIntegrateResidual );
CPPUNIT_TEST( testIntegrateJacobian );
@@ -84,9 +83,6 @@
/// Test needNewJacobian().
void testNeedNewJacobian(void);
- /// Test useSolnIncr().
- void testUseSolnIncr(void);
-
/// Test initialize().
void testInitialize(void);
Modified: short/3D/PyLith/branches/pylith-scecdynrup/unittests/libtests/feassemble/TestElasticityExplicitTri3.cc
===================================================================
--- short/3D/PyLith/branches/pylith-scecdynrup/unittests/libtests/feassemble/TestElasticityExplicitTri3.cc 2012-11-01 17:26:03 UTC (rev 20978)
+++ short/3D/PyLith/branches/pylith-scecdynrup/unittests/libtests/feassemble/TestElasticityExplicitTri3.cc 2012-11-01 18:12:57 UTC (rev 20979)
@@ -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/pylith-scecdynrup/unittests/libtests/feassemble/TestElasticityExplicitTri3.hh
===================================================================
--- short/3D/PyLith/branches/pylith-scecdynrup/unittests/libtests/feassemble/TestElasticityExplicitTri3.hh 2012-11-01 17:26:03 UTC (rev 20978)
+++ short/3D/PyLith/branches/pylith-scecdynrup/unittests/libtests/feassemble/TestElasticityExplicitTri3.hh 2012-11-01 18:12:57 UTC (rev 20979)
@@ -54,7 +54,6 @@
CPPUNIT_TEST( testTimeStep );
CPPUNIT_TEST( testMaterial );
CPPUNIT_TEST( testNeedNewJacobian );
- CPPUNIT_TEST( testUseSolnIncr );
CPPUNIT_TEST( testInitialize );
CPPUNIT_TEST( testIntegrateResidual );
CPPUNIT_TEST( testIntegrateJacobian );
@@ -84,9 +83,6 @@
/// Test needNewJacobian().
void testNeedNewJacobian(void);
- /// Test useSolnIncr().
- void testUseSolnIncr(void);
-
/// Test initialize().
void testInitialize(void);
Modified: short/3D/PyLith/branches/pylith-scecdynrup/unittests/libtests/feassemble/TestElasticityImplicit.cc
===================================================================
--- short/3D/PyLith/branches/pylith-scecdynrup/unittests/libtests/feassemble/TestElasticityImplicit.cc 2012-11-01 17:26:03 UTC (rev 20978)
+++ short/3D/PyLith/branches/pylith-scecdynrup/unittests/libtests/feassemble/TestElasticityImplicit.cc 2012-11-01 18:12:57 UTC (rev 20979)
@@ -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/pylith-scecdynrup/unittests/libtests/feassemble/TestElasticityImplicit.hh
===================================================================
--- short/3D/PyLith/branches/pylith-scecdynrup/unittests/libtests/feassemble/TestElasticityImplicit.hh 2012-11-01 17:26:03 UTC (rev 20978)
+++ short/3D/PyLith/branches/pylith-scecdynrup/unittests/libtests/feassemble/TestElasticityImplicit.hh 2012-11-01 18:12:57 UTC (rev 20979)
@@ -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/pylith-scecdynrup/unittests/pytests/bc/TestAbsorbingDampers.py
===================================================================
--- short/3D/PyLith/branches/pylith-scecdynrup/unittests/pytests/bc/TestAbsorbingDampers.py 2012-11-01 17:26:03 UTC (rev 20978)
+++ short/3D/PyLith/branches/pylith-scecdynrup/unittests/pytests/bc/TestAbsorbingDampers.py 2012-11-01 18:12:57 UTC (rev 20979)
@@ -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/pylith-scecdynrup/unittests/pytests/bc/TestDirichletBC.py
===================================================================
--- short/3D/PyLith/branches/pylith-scecdynrup/unittests/pytests/bc/TestDirichletBC.py 2012-11-01 17:26:03 UTC (rev 20978)
+++ short/3D/PyLith/branches/pylith-scecdynrup/unittests/pytests/bc/TestDirichletBC.py 2012-11-01 18:12:57 UTC (rev 20979)
@@ -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/pylith-scecdynrup/unittests/pytests/bc/TestDirichletBoundary.py
===================================================================
--- short/3D/PyLith/branches/pylith-scecdynrup/unittests/pytests/bc/TestDirichletBoundary.py 2012-11-01 17:26:03 UTC (rev 20978)
+++ short/3D/PyLith/branches/pylith-scecdynrup/unittests/pytests/bc/TestDirichletBoundary.py 2012-11-01 18:12:57 UTC (rev 20979)
@@ -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/pylith-scecdynrup/unittests/pytests/bc/TestNeumann.py
===================================================================
--- short/3D/PyLith/branches/pylith-scecdynrup/unittests/pytests/bc/TestNeumann.py 2012-11-01 17:26:03 UTC (rev 20978)
+++ short/3D/PyLith/branches/pylith-scecdynrup/unittests/pytests/bc/TestNeumann.py 2012-11-01 18:12:57 UTC (rev 20979)
@@ -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/pylith-scecdynrup/unittests/pytests/faults/TestFaultCohesiveDyn.py
===================================================================
--- short/3D/PyLith/branches/pylith-scecdynrup/unittests/pytests/faults/TestFaultCohesiveDyn.py 2012-11-01 17:26:03 UTC (rev 20978)
+++ short/3D/PyLith/branches/pylith-scecdynrup/unittests/pytests/faults/TestFaultCohesiveDyn.py 2012-11-01 18:12:57 UTC (rev 20979)
@@ -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/pylith-scecdynrup/unittests/pytests/faults/TestFaultCohesiveKin.py
===================================================================
--- short/3D/PyLith/branches/pylith-scecdynrup/unittests/pytests/faults/TestFaultCohesiveKin.py 2012-11-01 17:26:03 UTC (rev 20978)
+++ short/3D/PyLith/branches/pylith-scecdynrup/unittests/pytests/faults/TestFaultCohesiveKin.py 2012-11-01 18:12:57 UTC (rev 20979)
@@ -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/pylith-scecdynrup/unittests/pytests/feassemble/TestElasticityExplicit.py
===================================================================
--- short/3D/PyLith/branches/pylith-scecdynrup/unittests/pytests/feassemble/TestElasticityExplicit.py 2012-11-01 17:26:03 UTC (rev 20978)
+++ short/3D/PyLith/branches/pylith-scecdynrup/unittests/pytests/feassemble/TestElasticityExplicit.py 2012-11-01 18:12:57 UTC (rev 20979)
@@ -143,26 +143,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/pylith-scecdynrup/unittests/pytests/feassemble/TestElasticityExplicitLgDeform.py
===================================================================
--- short/3D/PyLith/branches/pylith-scecdynrup/unittests/pytests/feassemble/TestElasticityExplicitLgDeform.py 2012-11-01 17:26:03 UTC (rev 20978)
+++ short/3D/PyLith/branches/pylith-scecdynrup/unittests/pytests/feassemble/TestElasticityExplicitLgDeform.py 2012-11-01 18:12:57 UTC (rev 20979)
@@ -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/pylith-scecdynrup/unittests/pytests/feassemble/TestElasticityImplicit.py
===================================================================
--- short/3D/PyLith/branches/pylith-scecdynrup/unittests/pytests/feassemble/TestElasticityImplicit.py 2012-11-01 17:26:03 UTC (rev 20978)
+++ short/3D/PyLith/branches/pylith-scecdynrup/unittests/pytests/feassemble/TestElasticityImplicit.py 2012-11-01 18:12:57 UTC (rev 20979)
@@ -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/pylith-scecdynrup/unittests/pytests/feassemble/TestElasticityImplicitLgDeform.py
===================================================================
--- short/3D/PyLith/branches/pylith-scecdynrup/unittests/pytests/feassemble/TestElasticityImplicitLgDeform.py 2012-11-01 17:26:03 UTC (rev 20978)
+++ short/3D/PyLith/branches/pylith-scecdynrup/unittests/pytests/feassemble/TestElasticityImplicitLgDeform.py 2012-11-01 18:12:57 UTC (rev 20979)
@@ -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/pylith-scecdynrup/unittests/pytests/materials/TestDruckerPrager3D.py
===================================================================
--- short/3D/PyLith/branches/pylith-scecdynrup/unittests/pytests/materials/TestDruckerPrager3D.py 2012-11-01 17:26:03 UTC (rev 20978)
+++ short/3D/PyLith/branches/pylith-scecdynrup/unittests/pytests/materials/TestDruckerPrager3D.py 2012-11-01 18:12:57 UTC (rev 20979)
@@ -56,7 +56,7 @@
def test_fitMohrCoulomb(self):
"""
- Test useElasticBehavior().
+ Test fitMohrCoulomb().
"""
self.material.fitMohrCoulomb(self.material.MOHR_COULOMB_MIDDLE)
return
Modified: short/3D/PyLith/branches/pylith-scecdynrup/unittests/pytests/materials/TestDruckerPragerPlaneStrain.py
===================================================================
--- short/3D/PyLith/branches/pylith-scecdynrup/unittests/pytests/materials/TestDruckerPragerPlaneStrain.py 2012-11-01 17:26:03 UTC (rev 20978)
+++ short/3D/PyLith/branches/pylith-scecdynrup/unittests/pytests/materials/TestDruckerPragerPlaneStrain.py 2012-11-01 18:12:57 UTC (rev 20979)
@@ -56,7 +56,7 @@
def test_fitMohrCoulomb(self):
"""
- Test useElasticBehavior().
+ Test fitMohrCoulomb().
"""
self.material.fitMohrCoulomb(self.material.MOHR_COULOMB_MIDDLE)
return
More information about the CIG-COMMITS
mailing list