[cig-commits] r20653 - in short/3D/PyLith/branches/v1.7-trunk: examples/bar_shearwave/tri3 libsrc/pylith/feassemble libsrc/pylith/materials pylith/materials
brad at geodynamics.org
brad at geodynamics.org
Fri Aug 31 16:43:43 PDT 2012
Author: brad
Date: 2012-08-31 16:43:42 -0700 (Fri, 31 Aug 2012)
New Revision: 20653
Modified:
short/3D/PyLith/branches/v1.7-trunk/examples/bar_shearwave/tri3/pylithapp.cfg
short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/feassemble/IntegratorElasticity.cc
short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/ElasticIsotropic3D.cc
short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/ElasticMaterial.cc
short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/ElasticMaterial.hh
short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/ElasticPlaneStrain.cc
short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/ElasticPlaneStress.cc
short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/ElasticStrain1D.cc
short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/ElasticStress1D.cc
short/3D/PyLith/branches/v1.7-trunk/pylith/materials/DruckerPrager3D.py
short/3D/PyLith/branches/v1.7-trunk/pylith/materials/DruckerPragerPlaneStrain.py
short/3D/PyLith/branches/v1.7-trunk/pylith/materials/ElasticIsotropic3D.py
short/3D/PyLith/branches/v1.7-trunk/pylith/materials/ElasticPlaneStrain.py
short/3D/PyLith/branches/v1.7-trunk/pylith/materials/ElasticPlaneStress.py
short/3D/PyLith/branches/v1.7-trunk/pylith/materials/ElasticStrain1D.py
short/3D/PyLith/branches/v1.7-trunk/pylith/materials/ElasticStress1D.py
short/3D/PyLith/branches/v1.7-trunk/pylith/materials/GenMaxwellIsotropic3D.py
short/3D/PyLith/branches/v1.7-trunk/pylith/materials/GenMaxwellPlaneStrain.py
short/3D/PyLith/branches/v1.7-trunk/pylith/materials/GenMaxwellQpQsIsotropic3D.py
short/3D/PyLith/branches/v1.7-trunk/pylith/materials/MaxwellIsotropic3D.py
short/3D/PyLith/branches/v1.7-trunk/pylith/materials/MaxwellPlaneStrain.py
short/3D/PyLith/branches/v1.7-trunk/pylith/materials/PowerLaw3D.py
short/3D/PyLith/branches/v1.7-trunk/pylith/materials/PowerLawPlaneStrain.py
Log:
Finished implementing stable time step info output.
Modified: short/3D/PyLith/branches/v1.7-trunk/examples/bar_shearwave/tri3/pylithapp.cfg
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/examples/bar_shearwave/tri3/pylithapp.cfg 2012-08-31 22:09:00 UTC (rev 20652)
+++ short/3D/PyLith/branches/v1.7-trunk/examples/bar_shearwave/tri3/pylithapp.cfg 2012-08-31 23:43:42 UTC (rev 20653)
@@ -236,6 +236,7 @@
# Give basename for VTK output of state variables.
[pylithapp.timedependent.materials.elastic.output]
+cell_info_fields = [mu,lambda,density,stable_dt_implicit]
skip = 29
writer.filename = output/shearwave-statevars.vtk
writer.time_format = %05.2f
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-08-31 22:09:00 UTC (rev 20652)
+++ short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/feassemble/IntegratorElasticity.cc 2012-08-31 23:43:42 UTC (rev 20653)
@@ -375,6 +375,23 @@
} // else
} // else
+
+ } else if (0 == strcasecmp(name, "stable_dt_implicit")) {
+ if (!_outputFields->hasField("buffer (other)"))
+ _outputFields->add("buffer (other)", "buffer");
+ topology::Field<topology::Mesh>& buffer = _outputFields->get("buffer (other)");
+ _material->stableTimeStepImplicit(mesh, &buffer);
+ buffer.addDimensionOkay(true);
+ return buffer;
+
+ } else if (0 == strcasecmp(name, "stable_dt_explicit")) {
+ if (!_outputFields->hasField("buffer (other)"))
+ _outputFields->add("buffer (other)", "buffer");
+ topology::Field<topology::Mesh>& buffer = _outputFields->get("buffer (other)");
+ _material->stableTimeStepExplicit(mesh, _quadrature, &buffer);
+ buffer.addDimensionOkay(true);
+ return buffer;
+
} else {
if (!_outputFields->hasField("buffer (other)"))
_outputFields->add("buffer (other)", "buffer");
Modified: short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/ElasticIsotropic3D.cc
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/ElasticIsotropic3D.cc 2012-08-31 22:09:00 UTC (rev 20652)
+++ short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/ElasticIsotropic3D.cc 2012-08-31 23:43:42 UTC (rev 20653)
@@ -327,7 +327,7 @@
PylithScalar
pylith::materials::ElasticIsotropic3D::stableTimeStepImplicit(const topology::Mesh& mesh,
topology::Field<topology::Mesh>* field) {
- return ElasticMaterial::stableTimeStepImplicitMax(mesh, field);
+ return ElasticMaterial::_stableTimeStepImplicitMax(mesh, field);
} // stableTimeStepImplicitMax
// ----------------------------------------------------------------------
Modified: short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/ElasticMaterial.cc
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/ElasticMaterial.cc 2012-08-31 22:09:00 UTC (rev 20652)
+++ short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/ElasticMaterial.cc 2012-08-31 23:43:42 UTC (rev 20653)
@@ -244,8 +244,6 @@
assert(_initialStressCell.size() == numQuadPts*_tensorSize);
assert(_initialStrainCell.size() == numQuadPts*_tensorSize);
- PylithScalar dtStable = pylith::PYLITH_MAXSCALAR;
-
// Get cells associated with material
const ALE::Obj<SieveMesh>& sieveMesh = mesh.sieveMesh();
assert(!sieveMesh.isNull());
@@ -255,6 +253,39 @@
const SieveMesh::label_sequence::iterator cellsBegin = cells->begin();
const SieveMesh::label_sequence::iterator cellsEnd = cells->end();
+ // Setup field if necessary.
+ ALE::Obj<RealSection> fieldSection;
+ if (field) {
+ const int fiberDim = 1*numQuadPts;
+ fieldSection = field->section();
+ bool useCurrentField = false;
+ if (!fieldSection.isNull()) {
+ // check fiber dimension
+ const int fiberDimCurrentLocal = (cells->size() > 0) ? fieldSection->getFiberDimension(*cells->begin()) : 0;
+ int fiberDimCurrent = 0;
+ MPI_Allreduce((void *) &fiberDimCurrentLocal,
+ (void *) &fiberDimCurrent, 1,
+ MPI_INT, MPI_MAX, field->mesh().comm());
+ assert(fiberDimCurrent > 0);
+ useCurrentField = fiberDim == fiberDimCurrent;
+ } // if
+ if (!useCurrentField) {
+ ALE::MemoryLogger& logger = ALE::MemoryLogger::singleton();
+ logger.stagePush("OutputFields");
+ field->newSection(cells, fiberDim);
+ field->allocate();
+ fieldSection = field->section();
+ logger.stagePop();
+ } // if
+ assert(!fieldSection.isNull());
+ field->label("stable_dt_implicit");
+ assert(_normalizer);
+ field->scale(_normalizer->timeScale());
+ field->vectorFieldType(topology::FieldBase::MULTI_SCALAR);
+ } // if
+
+ PylithScalar dtStable = pylith::PYLITH_MAXSCALAR;
+ scalar_array dtStableCell(numQuadPts);
for (SieveMesh::label_sequence::iterator c_iter=cellsBegin;
c_iter != cellsEnd;
++c_iter) {
@@ -266,9 +297,16 @@
numPropsQuadPt,
&_stateVarsCell[iQuad*numVarsQuadPt],
numVarsQuadPt);
- if (dt < dtStable)
+ dtStableCell[iQuad] = dt;
+ if (dt < dtStable) {
dtStable = dt;
+ } // if
} // for
+ if (field) {
+ assert(!fieldSection.isNull());
+ assert(numQuadPts == fieldSection->getFiberDimension(*c_iter));
+ fieldSection->updatePoint(*c_iter, &dtStableCell[0]);
+ } // if
} // for
return dtStable;
@@ -305,7 +343,7 @@
// Setup field if necessary.
ALE::Obj<RealSection> fieldSection;
if (field) {
- const int fiberDim = 1;
+ const int fiberDim = 1*numQuadPts;
fieldSection = field->section();
bool useCurrentField = false;
if (!fieldSection.isNull()) {
@@ -323,16 +361,16 @@
logger.stagePush("OutputFields");
field->newSection(cells, fiberDim);
field->allocate();
+ fieldSection = field->section();
logger.stagePop();
} // if
assert(!fieldSection.isNull());
field->label("stable_dt_explicit");
assert(_normalizer);
field->scale(_normalizer->timeScale());
+ field->vectorFieldType(topology::FieldBase::MULTI_SCALAR);
} // if
- PylithScalar dtStable = pylith::PYLITH_MAXSCALAR;
-
const int spaceDim = quadrature->spaceDim();
const int numBasis = quadrature->numBasis();
scalar_array coordinatesCell(numBasis*spaceDim);
@@ -341,6 +379,8 @@
RestrictVisitor coordsVisitor(*coordinates,
coordinatesCell.size(), &coordinatesCell[0]);
+ PylithScalar dtStable = pylith::PYLITH_MAXSCALAR;
+ scalar_array dtStableCell(numQuadPts);
for (SieveMesh::label_sequence::iterator c_iter=cellsBegin;
c_iter != cellsEnd;
++c_iter) {
@@ -350,7 +390,6 @@
sieveMesh->restrictClosure(*c_iter, coordsVisitor);
const double minCellWidth = quadrature->minCellWidth(coordinatesCell);
- PylithScalar dtStableCell = pylith::PYLITH_MAXSCALAR;
for (int iQuad=0; iQuad < numQuadPts; ++iQuad) {
const PylithScalar dt =
_stableTimeStepExplicit(&_propertiesCell[iQuad*numPropsQuadPt],
@@ -358,17 +397,16 @@
&_stateVarsCell[iQuad*numVarsQuadPt],
numVarsQuadPt,
minCellWidth);
- if (dt < dtStableCell)
- dtStableCell = dt;
+ dtStableCell[iQuad] = dt;
+ if (dt < dtStable) {
+ dtStable = dt;
+ } // if
} // for
if (field) {
assert(!fieldSection.isNull());
- assert(1 == fieldSection->getFiberDimension(*c_iter));
- fieldSection->updatePoint(*c_iter, &dtStableCell);
+ assert(numQuadPts == fieldSection->getFiberDimension(*c_iter));
+ fieldSection->updatePoint(*c_iter, &dtStableCell[0]);
} // if
-
- if (dtStableCell < dtStable)
- dtStable = dtStableCell;
} // for
return dtStable;
@@ -377,11 +415,14 @@
// ----------------------------------------------------------------------
// Get stable time step for implicit time integration (return large value).
PylithScalar
-pylith::materials::ElasticMaterial::stableTimeStepImplicitMax(const topology::Mesh& mesh,
- topology::Field<topology::Mesh>* field) {
+pylith::materials::ElasticMaterial::_stableTimeStepImplicitMax(const topology::Mesh& mesh,
+ topology::Field<topology::Mesh>* field)
+{ // _stableTimeStepImplicitMax
const PylithScalar dtStable = pylith::PYLITH_MAXSCALAR;
if (field) {
+ const int numQuadPts = _numQuadPts;
+
const ALE::Obj<RealSection>& fieldSection = field->section();
// Get cells associated with material
const ALE::Obj<SieveMesh>& sieveMesh = mesh.sieveMesh();
@@ -391,7 +432,7 @@
const SieveMesh::label_sequence::iterator cellsBegin = cells->begin();
const SieveMesh::label_sequence::iterator cellsEnd = cells->end();
- const int fiberDim = 1;
+ const int fiberDim = 1*numQuadPts;
bool useCurrentField = false;
if (!fieldSection.isNull()) {
// check fiber dimension
@@ -411,20 +452,23 @@
logger.stagePop();
} // if
assert(!fieldSection.isNull());
- field->label("stable_dt_explicit");
+ field->label("stable_dt_implicit");
assert(_normalizer);
field->scale(_normalizer->timeScale());
+ field->vectorFieldType(topology::FieldBase::MULTI_SCALAR);
+ scalar_array dtStableCell(numQuadPts);
+ dtStableCell = PYLITH_MAXSCALAR;
for (SieveMesh::label_sequence::iterator c_iter=cellsBegin;
c_iter != cellsEnd;
++c_iter) {
- assert(1 == fieldSection->getFiberDimension(*c_iter));
- fieldSection->updatePoint(*c_iter, &dtStable);
+ assert(numQuadPts == fieldSection->getFiberDimension(*c_iter));
+ fieldSection->updatePoint(*c_iter, &dtStableCell[0]);
} // for
} // if
return dtStable;
-} // stableTimeStepImplicitMax
+} // _stableTimeStepImplicitMax
// ----------------------------------------------------------------------
// Allocate cell arrays.
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-08-31 22:09:00 UTC (rev 20652)
+++ short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/ElasticMaterial.hh 2012-08-31 23:43:42 UTC (rev 20653)
@@ -183,17 +183,6 @@
PylithScalar stableTimeStepImplicit(const topology::Mesh& mesh,
topology::Field<topology::Mesh>* field =0);
- /** Get stable time step for implicit time integration for a
- * material where the stable time step is infinite.
- *
- * @param mesh Finite-element mesh.
- * @param field Field for storing min stable time step for each cell.
- *
- * @returns PYLITH::MAX_SCALAR;
- */
- PylithScalar stableTimeStepImplicitMax(const topology::Mesh& mesh,
- topology::Field<topology::Mesh>* field =0);
-
/** Get stable time step for explicit time integration.
*
* Default is MAXFLOAT (or 1.0e+30 if MAXFLOAT is not defined in math.h).
@@ -355,6 +344,20 @@
const int numStateVars,
const double minCellWidth) const = 0;
+ // PROTECTED METHODS //////////////////////////////////////////////////
+protected :
+
+ /** Get stable time step for implicit time integration for a
+ * material where the stable time step is infinite.
+ *
+ * @param mesh Finite-element mesh.
+ * @param field Field for storing min stable time step for each cell.
+ *
+ * @returns PYLITH::MAX_SCALAR;
+ */
+ PylithScalar _stableTimeStepImplicitMax(const topology::Mesh& mesh,
+ topology::Field<topology::Mesh>* field =0);
+
/** Compute 2D deviatoric stress/strain from vector and mean value.
*
* @param deviatoric Array for deviatoric tensor.
Modified: short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/ElasticPlaneStrain.cc
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/ElasticPlaneStrain.cc 2012-08-31 22:09:00 UTC (rev 20652)
+++ short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/ElasticPlaneStrain.cc 2012-08-31 23:43:42 UTC (rev 20653)
@@ -313,7 +313,7 @@
PylithScalar
pylith::materials::ElasticPlaneStrain::stableTimeStepImplicit(const topology::Mesh& mesh,
topology::Field<topology::Mesh>* field) {
- return ElasticMaterial::stableTimeStepImplicitMax(mesh, field);
+ return ElasticMaterial::_stableTimeStepImplicitMax(mesh, field);
}
// ----------------------------------------------------------------------
Modified: short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/ElasticPlaneStress.cc
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/ElasticPlaneStress.cc 2012-08-31 22:09:00 UTC (rev 20652)
+++ short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/ElasticPlaneStress.cc 2012-08-31 23:43:42 UTC (rev 20653)
@@ -316,7 +316,7 @@
PylithScalar
pylith::materials::ElasticPlaneStress::stableTimeStepImplicit(const topology::Mesh& mesh,
topology::Field<topology::Mesh>* field) {
- return ElasticMaterial::stableTimeStepImplicitMax(mesh, field);
+ return ElasticMaterial::_stableTimeStepImplicitMax(mesh, field);
}
// ----------------------------------------------------------------------
Modified: short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/ElasticStrain1D.cc
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/ElasticStrain1D.cc 2012-08-31 22:09:00 UTC (rev 20652)
+++ short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/ElasticStrain1D.cc 2012-08-31 23:43:42 UTC (rev 20653)
@@ -293,7 +293,7 @@
PylithScalar
pylith::materials::ElasticStrain1D::stableTimeStepImplicit(const topology::Mesh& mesh,
topology::Field<topology::Mesh>* field) {
- return ElasticMaterial::stableTimeStepImplicitMax(mesh, field);
+ return ElasticMaterial::_stableTimeStepImplicitMax(mesh, field);
}
// ----------------------------------------------------------------------
Modified: short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/ElasticStress1D.cc
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/ElasticStress1D.cc 2012-08-31 22:09:00 UTC (rev 20652)
+++ short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/materials/ElasticStress1D.cc 2012-08-31 23:43:42 UTC (rev 20653)
@@ -293,7 +293,7 @@
PylithScalar
pylith::materials::ElasticStress1D::stableTimeStepImplicit(const topology::Mesh& mesh,
topology::Field<topology::Mesh>* field) {
- return ElasticMaterial::stableTimeStepImplicitMax(mesh, field);
+ return ElasticMaterial::_stableTimeStepImplicitMax(mesh, field);
}
// ----------------------------------------------------------------------
Modified: short/3D/PyLith/branches/v1.7-trunk/pylith/materials/DruckerPrager3D.py
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/pylith/materials/DruckerPrager3D.py 2012-08-31 22:09:00 UTC (rev 20652)
+++ short/3D/PyLith/branches/v1.7-trunk/pylith/materials/DruckerPrager3D.py 2012-08-31 23:43:42 UTC (rev 20653)
@@ -86,7 +86,7 @@
{'info': [],
'data': []},
'cell': \
- {'info': ["mu", "lambda", "density",
+ {'info': ["mu", "lambda", "density", "stable_dt_implicit", "stable_dt_explicit",
"alpha_yield", "beta", "alpha_flow"],
'data': ["total_strain", "stress", "plastic_strain"]}}
self._loggingPrefix = "MaDP3D "
Modified: short/3D/PyLith/branches/v1.7-trunk/pylith/materials/DruckerPragerPlaneStrain.py
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/pylith/materials/DruckerPragerPlaneStrain.py 2012-08-31 22:09:00 UTC (rev 20652)
+++ short/3D/PyLith/branches/v1.7-trunk/pylith/materials/DruckerPragerPlaneStrain.py 2012-08-31 23:43:42 UTC (rev 20653)
@@ -86,7 +86,7 @@
{'info': [],
'data': []},
'cell': \
- {'info': ["mu", "lambda", "density",
+ {'info': ["mu", "lambda", "density", "stable_dt_implicit", "stable_dt_explicit",
"alpha_yield", "beta", "alpha_flow"],
'data': ["total_strain", "stress", "stress_zz_initial",
"plastic_strain"]}}
Modified: short/3D/PyLith/branches/v1.7-trunk/pylith/materials/ElasticIsotropic3D.py
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/pylith/materials/ElasticIsotropic3D.py 2012-08-31 22:09:00 UTC (rev 20652)
+++ short/3D/PyLith/branches/v1.7-trunk/pylith/materials/ElasticIsotropic3D.py 2012-08-31 23:43:42 UTC (rev 20653)
@@ -45,7 +45,7 @@
{'info': [],
'data': []},
'cell': \
- {'info': ["mu", "lambda", "density"],
+ {'info': ["mu", "lambda", "density", "stable_dt_implicit", "stable_dt_explicit",],
'data': ["total_strain", "stress"]}}
self._loggingPrefix = "MaEl3D "
return
Modified: short/3D/PyLith/branches/v1.7-trunk/pylith/materials/ElasticPlaneStrain.py
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/pylith/materials/ElasticPlaneStrain.py 2012-08-31 22:09:00 UTC (rev 20652)
+++ short/3D/PyLith/branches/v1.7-trunk/pylith/materials/ElasticPlaneStrain.py 2012-08-31 23:43:42 UTC (rev 20653)
@@ -47,7 +47,7 @@
{'info': [],
'data': []},
'cell': \
- {'info': ["mu", "lambda", "density"],
+ {'info': ["mu", "lambda", "density", "stable_dt_implicit", "stable_dt_explicit",],
'data': ["total_strain", "stress"]}}
self._loggingPrefix = "MaPlSn "
return
Modified: short/3D/PyLith/branches/v1.7-trunk/pylith/materials/ElasticPlaneStress.py
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/pylith/materials/ElasticPlaneStress.py 2012-08-31 22:09:00 UTC (rev 20652)
+++ short/3D/PyLith/branches/v1.7-trunk/pylith/materials/ElasticPlaneStress.py 2012-08-31 23:43:42 UTC (rev 20653)
@@ -47,7 +47,7 @@
{'info': [],
'data': []},
'cell': \
- {'info': ["mu", "lambda", "density"],
+ {'info': ["mu", "lambda", "density", "stable_dt_implicit", "stable_dt_explicit",],
'data': ["total_strain", "stress"]}}
self._loggingPrefix = "MaPlSt "
return
Modified: short/3D/PyLith/branches/v1.7-trunk/pylith/materials/ElasticStrain1D.py
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/pylith/materials/ElasticStrain1D.py 2012-08-31 22:09:00 UTC (rev 20652)
+++ short/3D/PyLith/branches/v1.7-trunk/pylith/materials/ElasticStrain1D.py 2012-08-31 23:43:42 UTC (rev 20653)
@@ -46,7 +46,7 @@
{'info': [],
'data': []},
'cell': \
- {'info': ["mu", "lambda", "density"],
+ {'info': ["mu", "lambda", "density", "stable_dt_implicit", "stable_dt_explicit",],
'data': ["total_strain", "stress"]}}
self._loggingPrefix = "MaSt1D "
return
Modified: short/3D/PyLith/branches/v1.7-trunk/pylith/materials/ElasticStress1D.py
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/pylith/materials/ElasticStress1D.py 2012-08-31 22:09:00 UTC (rev 20652)
+++ short/3D/PyLith/branches/v1.7-trunk/pylith/materials/ElasticStress1D.py 2012-08-31 23:43:42 UTC (rev 20653)
@@ -46,7 +46,7 @@
{'info': [],
'data': []},
'cell': \
- {'info': ["mu", "lambda", "density"],
+ {'info': ["mu", "lambda", "density", "stable_dt_implicit", "stable_dt_explicit",],
'data': ["total_strain", "stress"]}}
self._loggingPrefix = "MaSn1D "
return
Modified: short/3D/PyLith/branches/v1.7-trunk/pylith/materials/GenMaxwellIsotropic3D.py
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/pylith/materials/GenMaxwellIsotropic3D.py 2012-08-31 22:09:00 UTC (rev 20652)
+++ short/3D/PyLith/branches/v1.7-trunk/pylith/materials/GenMaxwellIsotropic3D.py 2012-08-31 23:43:42 UTC (rev 20653)
@@ -47,7 +47,7 @@
{'info': [],
'data': []},
'cell': \
- {'info': ["mu", "lambda", "density",
+ {'info': ["mu", "lambda", "density", "stable_dt_implicit", "stable_dt_explicit",
"shear_ratio", "maxwell_time"],
'data': ["total_strain", "stress",
"viscous_strain_1",
Modified: short/3D/PyLith/branches/v1.7-trunk/pylith/materials/GenMaxwellPlaneStrain.py
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/pylith/materials/GenMaxwellPlaneStrain.py 2012-08-31 22:09:00 UTC (rev 20652)
+++ short/3D/PyLith/branches/v1.7-trunk/pylith/materials/GenMaxwellPlaneStrain.py 2012-08-31 23:43:42 UTC (rev 20653)
@@ -47,7 +47,7 @@
{'info': [],
'data': []},
'cell': \
- {'info': ["mu", "lambda", "density",
+ {'info': ["mu", "lambda", "density", "stable_dt_implicit", "stable_dt_explicit",
"shear_ratio", "maxwell_time"],
'data': ["stress_zz_initial",
"total_strain", "stress",
Modified: short/3D/PyLith/branches/v1.7-trunk/pylith/materials/GenMaxwellQpQsIsotropic3D.py
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/pylith/materials/GenMaxwellQpQsIsotropic3D.py 2012-08-31 22:09:00 UTC (rev 20652)
+++ short/3D/PyLith/branches/v1.7-trunk/pylith/materials/GenMaxwellQpQsIsotropic3D.py 2012-08-31 23:43:42 UTC (rev 20653)
@@ -47,7 +47,7 @@
{'info': [],
'data': []},
'cell': \
- {'info': ["mu", "k", "density",
+ {'info': ["mu", "k", "density", "stable_dt_implicit", "stable_dt_explicit",
"shear_ratio",
"bulk_ratio",
"maxwell_time_shear",
Modified: short/3D/PyLith/branches/v1.7-trunk/pylith/materials/MaxwellIsotropic3D.py
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/pylith/materials/MaxwellIsotropic3D.py 2012-08-31 22:09:00 UTC (rev 20652)
+++ short/3D/PyLith/branches/v1.7-trunk/pylith/materials/MaxwellIsotropic3D.py 2012-08-31 23:43:42 UTC (rev 20653)
@@ -47,7 +47,7 @@
{'info': [],
'data': []},
'cell': \
- {'info': ["mu", "lambda", "density", "maxwell_time"],
+ {'info': ["mu", "lambda", "density", "stable_dt_implicit", "stable_dt_explicit", "maxwell_time"],
'data': ["total_strain", "viscous_strain", "stress"]}}
self._loggingPrefix = "MaMx3D "
return
Modified: short/3D/PyLith/branches/v1.7-trunk/pylith/materials/MaxwellPlaneStrain.py
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/pylith/materials/MaxwellPlaneStrain.py 2012-08-31 22:09:00 UTC (rev 20652)
+++ short/3D/PyLith/branches/v1.7-trunk/pylith/materials/MaxwellPlaneStrain.py 2012-08-31 23:43:42 UTC (rev 20653)
@@ -47,7 +47,7 @@
{'info': [],
'data': []},
'cell': \
- {'info': ["mu", "lambda", "density", "maxwell_time"],
+ {'info': ["mu", "lambda", "density", "stable_dt_implicit", "stable_dt_explicit", "maxwell_time"],
'data': ["total_strain", "stress",
"stress_zz_initial", "viscous_strain"]}}
self._loggingPrefix = "MaMx2D "
Modified: short/3D/PyLith/branches/v1.7-trunk/pylith/materials/PowerLaw3D.py
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/pylith/materials/PowerLaw3D.py 2012-08-31 22:09:00 UTC (rev 20652)
+++ short/3D/PyLith/branches/v1.7-trunk/pylith/materials/PowerLaw3D.py 2012-08-31 23:43:42 UTC (rev 20653)
@@ -46,7 +46,7 @@
{'info': [],
'data': []},
'cell': \
- {'info': ["mu", "lambda", "density",
+ {'info': ["mu", "lambda", "density", "stable_dt_implicit", "stable_dt_explicit",
"reference_strain_rate", "reference_stress",
"power_law_exponent"],
'data': ["total_strain", "stress", "viscous_strain"]}}
Modified: short/3D/PyLith/branches/v1.7-trunk/pylith/materials/PowerLawPlaneStrain.py
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/pylith/materials/PowerLawPlaneStrain.py 2012-08-31 22:09:00 UTC (rev 20652)
+++ short/3D/PyLith/branches/v1.7-trunk/pylith/materials/PowerLawPlaneStrain.py 2012-08-31 23:43:42 UTC (rev 20653)
@@ -46,7 +46,7 @@
{'info': [],
'data': []},
'cell': \
- {'info': ["mu", "lambda", "density",
+ {'info': ["mu", "lambda", "density", "stable_dt_implicit", "stable_dt_explicit",
"reference_strain_rate", "reference_stress",
"power_law_exponent"],
'data': ["total_strain", "stress",
More information about the CIG-COMMITS
mailing list