[cig-commits] r18771 - in short/3D/PyLith/branches/v1.6-stable: libsrc/pylith/meshio unittests/libtests/meshio/data
brad at geodynamics.org
brad at geodynamics.org
Fri Jul 15 11:58:09 PDT 2011
Author: brad
Date: 2011-07-15 11:58:09 -0700 (Fri, 15 Jul 2011)
New Revision: 18771
Modified:
short/3D/PyLith/branches/v1.6-stable/libsrc/pylith/meshio/Xdmf.cc
short/3D/PyLith/branches/v1.6-stable/unittests/libtests/meshio/data/tet4_cell.xmf
Log:
Fixed bug in Xdmf output (Tensor -> Tensor6).
Modified: short/3D/PyLith/branches/v1.6-stable/libsrc/pylith/meshio/Xdmf.cc
===================================================================
--- short/3D/PyLith/branches/v1.6-stable/libsrc/pylith/meshio/Xdmf.cc 2011-07-15 17:24:04 UTC (rev 18770)
+++ short/3D/PyLith/branches/v1.6-stable/libsrc/pylith/meshio/Xdmf.cc 2011-07-15 18:58:09 UTC (rev 18771)
@@ -159,7 +159,7 @@
for (int iField=0; iField < numFields; ++iField) {
if (2 == spaceDim &&
(std::string("Vector") == fieldsMetadata[iField].vectorFieldType ||
- std::string("Tensor") == fieldsMetadata[iField].vectorFieldType) ) {
+ std::string("Tensor6") == fieldsMetadata[iField].vectorFieldType) ) {
const int fiberDim = fieldsMetadata[iField].fiberDim;
for (int component=0; component < fiberDim; ++component)
_writeGridAttributeComponent(fieldsMetadata[iField],
@@ -181,7 +181,7 @@
for (int iField=0; iField < numFields; ++iField) {
if (2 == spaceDim &&
(std::string("Vector") == fieldsMetadata[iField].vectorFieldType ||
- std::string("Tensor") == fieldsMetadata[iField].vectorFieldType) ) {
+ std::string("Tensor6") == fieldsMetadata[iField].vectorFieldType) ) {
const int fiberDim = fieldsMetadata[iField].fiberDim;
for (int component=0; component < fiberDim; ++component)
_writeGridAttributeComponent(fieldsMetadata[iField],
@@ -269,7 +269,7 @@
(*metadata)[iOffset+i].vectorFieldType = "Vector";
break;
case topology::FieldBase::TENSOR :
- (*metadata)[iOffset+i].vectorFieldType = "Tensor";
+ (*metadata)[iOffset+i].vectorFieldType = "Tensor6";
break;
default :
(*metadata)[iOffset+i].vectorFieldType = "Matrix";
@@ -312,7 +312,7 @@
(*metadata)[iOffset+i].vectorFieldType = "Vector";
break;
case topology::FieldBase::TENSOR :
- (*metadata)[iOffset+i].vectorFieldType = "Tensor";
+ (*metadata)[iOffset+i].vectorFieldType = "Tensor6";
break;
default :
(*metadata)[iOffset+i].vectorFieldType = "Matrix";
@@ -532,7 +532,7 @@
throw std::logic_error(msg.str());
} // default
} // switch
- } else if (std::string("Tensor") == metadata.vectorFieldType) {
+ } else if (std::string("Tensor6") == metadata.vectorFieldType) {
switch (component) {
case 0:
componentName = std::string(metadata.name) + std::string("_xx");
Modified: short/3D/PyLith/branches/v1.6-stable/unittests/libtests/meshio/data/tet4_cell.xmf
===================================================================
--- short/3D/PyLith/branches/v1.6-stable/unittests/libtests/meshio/data/tet4_cell.xmf 2011-07-15 17:24:04 UTC (rev 18770)
+++ short/3D/PyLith/branches/v1.6-stable/unittests/libtests/meshio/data/tet4_cell.xmf 2011-07-15 18:58:09 UTC (rev 18771)
@@ -33,7 +33,7 @@
</Geometry>
<Attribute
Name="other"
- Type="Tensor"
+ Type="Tensor6"
Center="Cell">
<DataItem ItemType="HyperSlab"
Dimensions="1 2 6"
More information about the CIG-COMMITS
mailing list