[cig-commits] r18773 - in short/3D/PyLith/trunk: . libsrc/pylith/meshio unittests/libtests/meshio/data

[brad at geodynamics.org]

Author: brad
Date: 2011-07-15 12:03:18 -0700 (Fri, 15 Jul 2011)
New Revision: 18773

Modified:
   short/3D/PyLith/trunk/README
   short/3D/PyLith/trunk/configure.ac
   short/3D/PyLith/trunk/libsrc/pylith/meshio/Xdmf.cc
   short/3D/PyLith/trunk/setup.py
   short/3D/PyLith/trunk/unittests/libtests/meshio/data/tet4_cell.xmf
Log:
Merge from stable.

Modified: short/3D/PyLith/trunk/README
===================================================================
--- short/3D/PyLith/trunk/README	2011-07-15 19:02:16 UTC (rev 18772)
+++ short/3D/PyLith/trunk/README	2011-07-15 19:03:18 UTC (rev 18773)
@@ -1,4 +1,4 @@
-We are pleased to announce release of PyLith version 1.6.1
+We are pleased to announce release of PyLith version 1.6.2
 
 Please submit bug reports via the World Wide Web at:
     http://geodynamics.org/roundup    
@@ -70,6 +70,16 @@
 models.
 
 ----------------------------------------------------------------------
+Version 1.6.2
+----------------------------------------------------------------------
+
+* Bug fixes
+
+  - Fixed bug in writing tensor data for Xdmf files. Switched Tensor
+    to Tensor6 to account for symmetry.
+
+
+----------------------------------------------------------------------
 Version 1.6.1
 ----------------------------------------------------------------------
 

Modified: short/3D/PyLith/trunk/configure.ac
===================================================================
--- short/3D/PyLith/trunk/configure.ac	2011-07-15 19:02:16 UTC (rev 18772)
+++ short/3D/PyLith/trunk/configure.ac	2011-07-15 19:03:18 UTC (rev 18773)
@@ -17,7 +17,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT([PyLith], [1.6.1], [cig-short at geodynamics.org])
+AC_INIT([PyLith], [1.6.2], [cig-short at geodynamics.org])
 AC_CONFIG_AUX_DIR([./aux-config])
 AC_CONFIG_HEADER([portinfo])
 AC_CONFIG_MACRO_DIR([m4])

Modified: short/3D/PyLith/trunk/libsrc/pylith/meshio/Xdmf.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/pylith/meshio/Xdmf.cc	2011-07-15 19:02:16 UTC (rev 18772)
+++ short/3D/PyLith/trunk/libsrc/pylith/meshio/Xdmf.cc	2011-07-15 19:03:18 UTC (rev 18773)
@@ -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/trunk/setup.py
===================================================================
--- short/3D/PyLith/trunk/setup.py	2011-07-15 19:02:16 UTC (rev 18772)
+++ short/3D/PyLith/trunk/setup.py	2011-07-15 19:03:18 UTC (rev 18773)
@@ -22,7 +22,7 @@
 setup(
     
     name = 'PyLith', 
-    version = '1.6.1',
+    version = '1.6.2',
 
     zip_safe = False,
     packages = find_packages(),

Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/data/tet4_cell.xmf
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/data/tet4_cell.xmf	2011-07-15 19:02:16 UTC (rev 18772)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/data/tet4_cell.xmf	2011-07-15 19:03:18 UTC (rev 18773)
@@ -33,7 +33,7 @@
 	</Geometry>
 	<Attribute
 	   Name="other"
-	   Type="Tensor"
+	   Type="Tensor6"
 	   Center="Cell">
           <DataItem ItemType="HyperSlab"
 		    Dimensions="1 2 6"