[cig-commits] r11644 - in short/3D/PyLith/trunk: libsrc/faults libsrc/feassemble libsrc/materials pylith/faults pylith/materials pylith/meshio
brad at geodynamics.org
brad at geodynamics.org
Sun Mar 30 15:21:28 PDT 2008
Author: brad
Date: 2008-03-30 15:21:28 -0700 (Sun, 30 Mar 2008)
New Revision: 11644
Modified:
short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveKin.cc
short/3D/PyLith/trunk/libsrc/feassemble/IntegratorElasticity.cc
short/3D/PyLith/trunk/libsrc/materials/GenMaxwellIsotropic3D.cc
short/3D/PyLith/trunk/libsrc/materials/MaxwellIsotropic3D.cc
short/3D/PyLith/trunk/pylith/faults/FaultCohesiveKin.py
short/3D/PyLith/trunk/pylith/materials/ElasticIsotropic3D.py
short/3D/PyLith/trunk/pylith/materials/ElasticPlaneStrain.py
short/3D/PyLith/trunk/pylith/materials/ElasticPlaneStress.py
short/3D/PyLith/trunk/pylith/materials/ElasticStrain1D.py
short/3D/PyLith/trunk/pylith/materials/ElasticStress1D.py
short/3D/PyLith/trunk/pylith/materials/GenMaxwellIsotropic3D.py
short/3D/PyLith/trunk/pylith/materials/MaxwellIsotropic3D.py
short/3D/PyLith/trunk/pylith/meshio/OutputFaultKin.py
short/3D/PyLith/trunk/pylith/meshio/OutputMatElastic.py
Log:
Switched hypens to underscores for all output fields for future compatibility with PyTables.
Modified: short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveKin.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveKin.cc 2008-03-30 21:51:34 UTC (rev 11643)
+++ short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveKin.cc 2008-03-30 22:21:28 UTC (rev 11644)
@@ -433,32 +433,32 @@
assert(!_slip.isNull());
return _slip;
- } else if (cohesiveDim > 0 && 0 == strcasecmp("strike-dir", name)) {
+ } else if (cohesiveDim > 0 && 0 == strcasecmp("strike_dir", name)) {
_bufferVertexVector = _orientation->getFibration(0);
*fieldType = VECTOR_FIELD;
return _bufferVertexVector;
- } else if (2 == cohesiveDim && 0 == strcasecmp("dip-dir", name)) {
+ } else if (2 == cohesiveDim && 0 == strcasecmp("dip_dir", name)) {
_bufferVertexVector = _orientation->getFibration(1);
*fieldType = VECTOR_FIELD;
return _bufferVertexVector;
- } else if (0 == strcasecmp("normal-dir", name)) {
+ } else if (0 == strcasecmp("normal_dir", name)) {
const int space =
(0 == cohesiveDim) ? 0 : (1 == cohesiveDim) ? 1 : 2;
_bufferVertexVector = _orientation->getFibration(space);
*fieldType = VECTOR_FIELD;
return _bufferVertexVector;
- } else if (0 == strcasecmp("final-slip", name)) {
+ } else if (0 == strcasecmp("final_slip", name)) {
_bufferVertexVector = _eqsrc->finalSlip();
*fieldType = VECTOR_FIELD;
return _bufferVertexVector;
- } else if (0 == strcasecmp("slip-time", name)) {
+ } else if (0 == strcasecmp("slip_time", name)) {
_bufferVertexScalar = _eqsrc->slipTime();
*fieldType = SCALAR_FIELD;
return _bufferVertexScalar;
- } else if (0 == strcasecmp("traction-change", name)) {
+ } else if (0 == strcasecmp("traction_change", name)) {
*fieldType = VECTOR_FIELD;
const ALE::Obj<real_section_type>& solution = fields->getSolution();
_calcTractionsChange(&_bufferVertexVector, solution);
Modified: short/3D/PyLith/trunk/libsrc/feassemble/IntegratorElasticity.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/feassemble/IntegratorElasticity.cc 2008-03-30 21:51:34 UTC (rev 11643)
+++ short/3D/PyLith/trunk/libsrc/feassemble/IntegratorElasticity.cc 2008-03-30 22:21:28 UTC (rev 11644)
@@ -226,7 +226,7 @@
const int numQuadPts = _quadrature->numQuadPts();
if (!_material->usesUpdateProperties() &&
- (0 == strcasecmp(name, "total-strain") ||
+ (0 == strcasecmp(name, "total_strain") ||
0 == strcasecmp(name, "stress")) ) {
assert(0 != fields);
_calcStrainStressField(&_bufferCellOther, name, mesh, fields);
@@ -234,7 +234,7 @@
} else if (0 == strcasecmp(name, "stress")) {
_material->propertyField(&_bufferCellOther,
- "total-strain", mesh, numQuadPts);
+ "total_strain", mesh, numQuadPts);
_calcStressFromStrain(&_bufferCellOther, mesh);
return _bufferCellOther;
Modified: short/3D/PyLith/trunk/libsrc/materials/GenMaxwellIsotropic3D.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/materials/GenMaxwellIsotropic3D.cc 2008-03-30 21:51:34 UTC (rev 11643)
+++ short/3D/PyLith/trunk/libsrc/materials/GenMaxwellIsotropic3D.cc 2008-03-30 22:21:28 UTC (rev 11644)
@@ -47,10 +47,10 @@
{ "density", 1, OTHER_FIELD },
{ "lambda", 1, OTHER_FIELD },
{ "mu", 1, OTHER_FIELD },
- { "shear-ratio", numMaxwellModels, OTHER_FIELD },
- { "Maxwell-time", numMaxwellModels, OTHER_FIELD },
- { "total-strain", tensorSize, OTHER_FIELD },
- { "viscous-strain", numMaxwellModels*tensorSize, OTHER_FIELD },
+ { "shear_ratio", numMaxwellModels, OTHER_FIELD },
+ { "maxwell_time", numMaxwellModels, OTHER_FIELD },
+ { "total_strain", tensorSize, OTHER_FIELD },
+ { "viscous_strain", numMaxwellModels*tensorSize, OTHER_FIELD },
};
/// Indices (order) of properties.
const int pidDensity = 0;
Modified: short/3D/PyLith/trunk/libsrc/materials/MaxwellIsotropic3D.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/materials/MaxwellIsotropic3D.cc 2008-03-30 21:51:34 UTC (rev 11643)
+++ short/3D/PyLith/trunk/libsrc/materials/MaxwellIsotropic3D.cc 2008-03-30 22:21:28 UTC (rev 11644)
@@ -44,9 +44,9 @@
{ "density", 1, OTHER_FIELD },
{ "lambda", 1, OTHER_FIELD },
{ "mu", 1, OTHER_FIELD },
- { "Maxwell-time", 1, OTHER_FIELD },
- { "total-strain", 6, OTHER_FIELD },
- { "viscous-strain", 6, OTHER_FIELD },
+ { "maxwell_time", 1, OTHER_FIELD },
+ { "total_strain", 6, OTHER_FIELD },
+ { "viscous_strain", 6, OTHER_FIELD },
};
/// Indices (order) of properties.
const int pidDensity = 0;
Modified: short/3D/PyLith/trunk/pylith/faults/FaultCohesiveKin.py
===================================================================
--- short/3D/PyLith/trunk/pylith/faults/FaultCohesiveKin.py 2008-03-30 21:51:34 UTC (rev 11643)
+++ short/3D/PyLith/trunk/pylith/faults/FaultCohesiveKin.py 2008-03-30 22:21:28 UTC (rev 11644)
@@ -73,10 +73,11 @@
self.availableFields = \
{'vertex': \
- {'info': ["normal-dir",
- "final-slip",
- "slip-time"],
- 'data': ["slip", "traction-change"]},
+ {'info': ["normal_dir",
+ "final_slip",
+ "slip_time"],
+ 'data': ["slip",
+ "traction_change"]},
'cell': \
{'info': [],
'data': []}}
@@ -95,10 +96,10 @@
self.cppHandle.eqsrc = self.eqsrc.cppHandle
if mesh.dimension() == 2:
- self.availableFields['vertex']['info'] += ["strike-dir"]
+ self.availableFields['vertex']['info'] += ["strike_dir"]
elif mesh.dimension() == 3:
- self.availableFields['vertex']['info'] += ["strike-dir",
- "dip-dir"]
+ self.availableFields['vertex']['info'] += ["strike_dir",
+ "dip_dir"]
return
Modified: short/3D/PyLith/trunk/pylith/materials/ElasticIsotropic3D.py
===================================================================
--- short/3D/PyLith/trunk/pylith/materials/ElasticIsotropic3D.py 2008-03-30 21:51:34 UTC (rev 11643)
+++ short/3D/PyLith/trunk/pylith/materials/ElasticIsotropic3D.py 2008-03-30 22:21:28 UTC (rev 11644)
@@ -39,7 +39,7 @@
'data': []},
'cell': \
{'info': ["mu", "lambda", "density"],
- 'data': ["total-strain", "stress"]}}
+ 'data': ["total_strain", "stress"]}}
self._loggingPrefix = "MaEl3D "
return
Modified: short/3D/PyLith/trunk/pylith/materials/ElasticPlaneStrain.py
===================================================================
--- short/3D/PyLith/trunk/pylith/materials/ElasticPlaneStrain.py 2008-03-30 21:51:34 UTC (rev 11643)
+++ short/3D/PyLith/trunk/pylith/materials/ElasticPlaneStrain.py 2008-03-30 22:21:28 UTC (rev 11644)
@@ -41,7 +41,7 @@
'data': []},
'cell': \
{'info': ["mu", "lambda", "density"],
- 'data': ["total-strain", "stress"]}}
+ 'data': ["total_strain", "stress"]}}
self._loggingPrefix = "MaPlSn "
return
Modified: short/3D/PyLith/trunk/pylith/materials/ElasticPlaneStress.py
===================================================================
--- short/3D/PyLith/trunk/pylith/materials/ElasticPlaneStress.py 2008-03-30 21:51:34 UTC (rev 11643)
+++ short/3D/PyLith/trunk/pylith/materials/ElasticPlaneStress.py 2008-03-30 22:21:28 UTC (rev 11644)
@@ -41,7 +41,7 @@
'data': []},
'cell': \
{'info': ["mu", "lambda", "density"],
- 'data': ["total-strain", "stress"]}}
+ 'data': ["total_strain", "stress"]}}
self._loggingPrefix = "MaPlSt "
return
Modified: short/3D/PyLith/trunk/pylith/materials/ElasticStrain1D.py
===================================================================
--- short/3D/PyLith/trunk/pylith/materials/ElasticStrain1D.py 2008-03-30 21:51:34 UTC (rev 11643)
+++ short/3D/PyLith/trunk/pylith/materials/ElasticStrain1D.py 2008-03-30 22:21:28 UTC (rev 11644)
@@ -40,7 +40,7 @@
'data': []},
'cell': \
{'info': ["mu", "lambda", "density"],
- 'data': ["total-strain", "stress"]}}
+ 'data': ["total_strain", "stress"]}}
self._loggingPrefix = "MaSt1D "
return
Modified: short/3D/PyLith/trunk/pylith/materials/ElasticStress1D.py
===================================================================
--- short/3D/PyLith/trunk/pylith/materials/ElasticStress1D.py 2008-03-30 21:51:34 UTC (rev 11643)
+++ short/3D/PyLith/trunk/pylith/materials/ElasticStress1D.py 2008-03-30 22:21:28 UTC (rev 11644)
@@ -40,7 +40,7 @@
'data': []},
'cell': \
{'info': ["mu", "lambda", "density"],
- 'data': ["total-strain", "stress"]}}
+ 'data': ["total_strain", "stress"]}}
self._loggingPrefix = "MaSn1D "
return
Modified: short/3D/PyLith/trunk/pylith/materials/GenMaxwellIsotropic3D.py
===================================================================
--- short/3D/PyLith/trunk/pylith/materials/GenMaxwellIsotropic3D.py 2008-03-30 21:51:34 UTC (rev 11643)
+++ short/3D/PyLith/trunk/pylith/materials/GenMaxwellIsotropic3D.py 2008-03-30 22:21:28 UTC (rev 11644)
@@ -38,8 +38,8 @@
{'info': [],
'data': []},
'cell': \
- {'info': ["mu", "lambda", "density", "shear-ratio", "Maxwell-time"],
- 'data': ["total-strain", "viscous-strain", "stress"]}}
+ {'info': ["mu", "lambda", "density", "shear_ratio", "maxwell_time"],
+ 'data': ["total_strain", "viscous_strain", "stress"]}}
self._loggingPrefix = "MaGM3D "
return
Modified: short/3D/PyLith/trunk/pylith/materials/MaxwellIsotropic3D.py
===================================================================
--- short/3D/PyLith/trunk/pylith/materials/MaxwellIsotropic3D.py 2008-03-30 21:51:34 UTC (rev 11643)
+++ short/3D/PyLith/trunk/pylith/materials/MaxwellIsotropic3D.py 2008-03-30 22:21:28 UTC (rev 11644)
@@ -38,8 +38,8 @@
{'info': [],
'data': []},
'cell': \
- {'info': ["mu", "lambda", "density", "Maxwell-time"],
- 'data': ["total-strain", "viscous-strain", "stress"]}}
+ {'info': ["mu", "lambda", "density", "maxwell_time"],
+ 'data': ["total_strain", "viscous_strain", "stress"]}}
self._loggingPrefix = "MaMx3D "
return
Modified: short/3D/PyLith/trunk/pylith/meshio/OutputFaultKin.py
===================================================================
--- short/3D/PyLith/trunk/pylith/meshio/OutputFaultKin.py 2008-03-30 21:51:34 UTC (rev 11643)
+++ short/3D/PyLith/trunk/pylith/meshio/OutputFaultKin.py 2008-03-30 22:21:28 UTC (rev 11644)
@@ -48,13 +48,14 @@
import pyre.inventory
vertexInfoFields = pyre.inventory.list("vertex_info_fields",
- default=["normal-dir",
- "final-slip",
- "slip-time"])
+ default=["normal_dir",
+ "final_slip",
+ "slip_time"])
vertexInfoFields.meta['tip'] = "Names of vertex info fields to output."
vertexDataFields = pyre.inventory.list("vertex_data_fields",
- default=["slip","traction-change"])
+ default=["slip",
+ "traction_change"])
vertexDataFields.meta['tip'] = "Names of vertex data fields to output."
# PUBLIC METHODS /////////////////////////////////////////////////////
Modified: short/3D/PyLith/trunk/pylith/meshio/OutputMatElastic.py
===================================================================
--- short/3D/PyLith/trunk/pylith/meshio/OutputMatElastic.py 2008-03-30 21:51:34 UTC (rev 11643)
+++ short/3D/PyLith/trunk/pylith/meshio/OutputMatElastic.py 2008-03-30 22:21:28 UTC (rev 11644)
@@ -54,7 +54,7 @@
cellInfoFields.meta['tip'] = "Names of cell info fields to output."
cellDataFields = pyre.inventory.list("cell_data_fields",
- default=["total-strain", "stress"])
+ default=["total_strain", "stress"])
cellDataFields.meta['tip'] = "Names of cell data fields to output."
More information about the cig-commits
mailing list