[cig-commits] r18496 - in short/3D/PyLith/trunk: libsrc/pylith/meshio unittests/libtests/meshio/data
brad at geodynamics.org
brad at geodynamics.org
Mon May 30 18:38:18 PDT 2011
Author: brad
Date: 2011-05-30 18:38:18 -0700 (Mon, 30 May 2011)
New Revision: 18496
Modified:
short/3D/PyLith/trunk/libsrc/pylith/meshio/Xdmf.cc
short/3D/PyLith/trunk/unittests/libtests/meshio/data/tet4_cell.xmf
short/3D/PyLith/trunk/unittests/libtests/meshio/data/tet4_vertex.xmf
short/3D/PyLith/trunk/unittests/libtests/meshio/data/tri3_cell.xmf
short/3D/PyLith/trunk/unittests/libtests/meshio/data/tri3_vertex.xmf
Log:
Fixed a few small bugs in Xdmf (some values in XML file were hardwired).
Modified: short/3D/PyLith/trunk/libsrc/pylith/meshio/Xdmf.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/pylith/meshio/Xdmf.cc 2011-05-30 21:56:15 UTC (rev 18495)
+++ short/3D/PyLith/trunk/libsrc/pylith/meshio/Xdmf.cc 2011-05-31 01:38:18 UTC (rev 18496)
@@ -402,7 +402,7 @@
_file
<< " <Topology\n"
- << " TopologyType=\"Triangle\"\n"
+ << " TopologyType=\"" << cellType << "\"\n"
<< " NumberOfElements=\"" << numCells << "\">\n"
<< " <DataItem Reference=\"XML\">\n"
<< " /Xdmf/Domain/DataItem[@Name=\"cells\"]\n"
@@ -454,14 +454,18 @@
<< " Type=\"" << metadata.vectorFieldType << "\"\n"
<< " Center=\"" << metadata.domain << "\">\n"
<< " <DataItem ItemType=\"HyperSlab\"\n"
- << " Dimensions=\"1 " << metadata.numPoints << " 1\"\n"
+ << " Dimensions=\"1 "
+ << metadata.numPoints
+ << " " << metadata.fiberDim << "\"\n"
<< " Type=\"HyperSlab\">\n"
<< " <DataItem\n"
<< " Dimensions=\"3 3\"\n"
<< " Format=\"XML\">\n"
<< " " << iTime << " 0 0\n"
<< " 1 1 1\n"
- << " 1 " << metadata.numPoints << " 1\n"
+ << " 1 "
+ << metadata.numPoints
+ << " " << metadata.fiberDim << "\n"
<< " </DataItem>\n"
<< " <DataItem\n"
<< " DataType=\"Float\" Precision=\"8\"\n"
@@ -524,14 +528,21 @@
<< " Type=\"Scalar\"\n"
<< " Center=\"" << metadata.domain << "\">\n"
<< " <DataItem ItemType=\"HyperSlab\"\n"
- << " Dimensions=\"1 " << metadata.numPoints << " 1\"\n"
+ << " Dimensions=\"1 "
+ << metadata.numPoints
+ << " 1\"\n"
<< " Type=\"HyperSlab\">\n"
<< " <DataItem\n"
<< " Dimensions=\"3 3\"\n"
<< " Format=\"XML\">\n"
- << " " << iTime << " 0 "<< component << "\n"
+ << " "
+ << iTime
+ << " 0 "
+ << component << "\n"
<< " 1 1 1\n"
- << " 1 " << metadata.numPoints << " 1\n"
+ << " 1 "
+ << metadata.numPoints
+ << " 1\n"
<< " </DataItem>\n"
<< " <DataItem\n"
<< " DataType=\"Float\" Precision=\"8\"\n"
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/data/tet4_cell.xmf
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/data/tet4_cell.xmf 2011-05-30 21:56:15 UTC (rev 18495)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/data/tet4_cell.xmf 2011-05-31 01:38:18 UTC (rev 18496)
@@ -20,7 +20,7 @@
<!-- ============================================================ -->
<Grid Name="domain" GridType="Uniform">
<Topology
- TopologyType="Triangle"
+ TopologyType="Tetrahedron"
NumberOfElements="2">
<DataItem Reference="XML">
/Xdmf/Domain/DataItem[@Name="cells"]
@@ -36,14 +36,14 @@
Type="Tensor"
Center="Cell">
<DataItem ItemType="HyperSlab"
- Dimensions="1 2 1"
+ Dimensions="1 2 6"
Type="HyperSlab">
<DataItem
Dimensions="3 3"
Format="XML">
0 0 0
1 1 1
- 1 2 1
+ 1 2 6
</DataItem>
<DataItem
DataType="Float" Precision="8"
@@ -80,14 +80,14 @@
Type="Vector"
Center="Cell">
<DataItem ItemType="HyperSlab"
- Dimensions="1 2 1"
+ Dimensions="1 2 3"
Type="HyperSlab">
<DataItem
Dimensions="3 3"
Format="XML">
0 0 0
1 1 1
- 1 2 1
+ 1 2 3
</DataItem>
<DataItem
DataType="Float" Precision="8"
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/data/tet4_vertex.xmf
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/data/tet4_vertex.xmf 2011-05-30 21:56:15 UTC (rev 18495)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/data/tet4_vertex.xmf 2011-05-31 01:38:18 UTC (rev 18496)
@@ -20,7 +20,7 @@
<!-- ============================================================ -->
<Grid Name="domain" GridType="Uniform">
<Topology
- TopologyType="Triangle"
+ TopologyType="Tetrahedron"
NumberOfElements="2">
<DataItem Reference="XML">
/Xdmf/Domain/DataItem[@Name="cells"]
@@ -36,14 +36,14 @@
Type="Vector"
Center="Node">
<DataItem ItemType="HyperSlab"
- Dimensions="1 8 1"
+ Dimensions="1 8 3"
Type="HyperSlab">
<DataItem
Dimensions="3 3"
Format="XML">
0 0 0
1 1 1
- 1 8 1
+ 1 8 3
</DataItem>
<DataItem
DataType="Float" Precision="8"
@@ -58,14 +58,14 @@
Type="Matrix"
Center="Node">
<DataItem ItemType="HyperSlab"
- Dimensions="1 8 1"
+ Dimensions="1 8 2"
Type="HyperSlab">
<DataItem
Dimensions="3 3"
Format="XML">
0 0 0
1 1 1
- 1 8 1
+ 1 8 2
</DataItem>
<DataItem
DataType="Float" Precision="8"
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/data/tri3_cell.xmf
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/data/tri3_cell.xmf 2011-05-30 21:56:15 UTC (rev 18495)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/data/tri3_cell.xmf 2011-05-31 01:38:18 UTC (rev 18496)
@@ -36,14 +36,14 @@
Type="Tensor"
Center="Cell">
<DataItem ItemType="HyperSlab"
- Dimensions="1 2 1"
+ Dimensions="1 2 3"
Type="HyperSlab">
<DataItem
Dimensions="3 3"
Format="XML">
0 0 0
1 1 1
- 1 2 1
+ 1 2 3
</DataItem>
<DataItem
DataType="Float" Precision="8"
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/data/tri3_vertex.xmf
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/data/tri3_vertex.xmf 2011-05-30 21:56:15 UTC (rev 18495)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/data/tri3_vertex.xmf 2011-05-31 01:38:18 UTC (rev 18496)
@@ -80,14 +80,14 @@
Type="Matrix"
Center="Node">
<DataItem ItemType="HyperSlab"
- Dimensions="1 6 1"
+ Dimensions="1 6 2"
Type="HyperSlab">
<DataItem
Dimensions="3 3"
Format="XML">
0 0 0
1 1 1
- 1 6 1
+ 1 6 2
</DataItem>
<DataItem
DataType="Float" Precision="8"
More information about the CIG-COMMITS
mailing list