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

[brad at geodynamics.org]

Author: brad
Date: 2007-06-04 13:22:56 -0700 (Mon, 04 Jun 2007)
New Revision: 7059

Modified:
   short/3D/PyLith/trunk/libsrc/meshio/MeshIOCubit.cc
   short/3D/PyLith/trunk/unittests/libtests/meshio/TestMeshIOCubit.cc
   short/3D/PyLith/trunk/unittests/libtests/meshio/data/MeshDataCubitTri.cc
Log:
Fixed bug introduced in last push- Cubit tri cells are okay, don't need change in vertex ordering.

Modified: short/3D/PyLith/trunk/libsrc/meshio/MeshIOCubit.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/meshio/MeshIOCubit.cc	2007-06-04 20:15:03 UTC (rev 7058)
+++ short/3D/PyLith/trunk/libsrc/meshio/MeshIOCubit.cc	2007-06-04 20:22:56 UTC (rev 7059)
@@ -319,16 +319,7 @@
   assert(0 != cells);
   assert(cells->size() == numCells*numCorners);
 
-  if (2 == meshDim && 3 == numCorners) // TRI
-    // 0 1 2 -> 0 2 1
-    for (int iCell=0; iCell < numCells; ++iCell) {
-      const int i1 = iCell*numCorners+1;
-      const int i2 = iCell*numCorners+2;
-      const int tmp = (*cells)[i1];
-      (*cells)[i1] = (*cells)[i2];
-      (*cells)[i2] = tmp;
-    } // for
-  else if (2 == meshDim && 4 == numCorners) // QUAD
+  if (2 == meshDim && 4 == numCorners) // QUAD
     // 0 1 2 3 -> 0 1 3 2
     for (int iCell=0; iCell < numCells; ++iCell) {
       const int i2 = iCell*numCorners+2;

Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/TestMeshIOCubit.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/TestMeshIOCubit.cc	2007-06-04 20:15:03 UTC (rev 7058)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/TestMeshIOCubit.cc	2007-06-04 20:22:56 UTC (rev 7059)
@@ -155,7 +155,7 @@
 void
 pylith::meshio::TestMeshIOCubit::testOrientTri(void)
 { // testOrientTri
-  // Swap vertices 1 and 2, vertex 0 is unchanged.
+  // No changes
 
   const int meshDim = 2;
   const int numCells = 2;
@@ -165,8 +165,8 @@
     3, 4, 5
   };
   const int cellsE[] = {
-    0, 2, 1,
-    3, 5, 4
+    0, 1, 2,
+    3, 4, 5
   };
   
   int_array cells(cellsOrig, numCells*numCorners);

Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/data/MeshDataCubitTri.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/data/MeshDataCubitTri.cc	2007-06-04 20:15:03 UTC (rev 7058)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/data/MeshDataCubitTri.cc	2007-06-04 20:22:56 UTC (rev 7059)
@@ -30,8 +30,8 @@
 };
 
 const int pylith::meshio::MeshDataCubitTri::_cells[] = {
-  0,  2,  1,
-  2,  3,  1
+  0,  1,  2,
+  2,  1,  3
 };
 const int pylith::meshio::MeshDataCubitTri::_materialIds[] = {
   2, 3