[cig-commits] r18407 - in short/3D/PyLith/branches/multifields/libsrc: materials meshio

[knepley at geodynamics.org]

Author: knepley
Date: 2011-05-21 06:56:23 -0700 (Sat, 21 May 2011)
New Revision: 18407

Modified:
   short/3D/PyLith/branches/multifields/libsrc/materials/Material.cc
   short/3D/PyLith/branches/multifields/libsrc/meshio/MeshBuilder.cc
Log:
Interpolated meshes now work


Modified: short/3D/PyLith/branches/multifields/libsrc/materials/Material.cc
===================================================================
--- short/3D/PyLith/branches/multifields/libsrc/materials/Material.cc	2011-05-21 13:46:30 UTC (rev 18406)
+++ short/3D/PyLith/branches/multifields/libsrc/materials/Material.cc	2011-05-21 13:56:23 UTC (rev 18407)
@@ -121,6 +121,7 @@
 
   // Get quadrature information
   const int numQuadPts = quadrature->numQuadPts();
+  const int numCorners = quadrature->refGeometry().numCorners();
   const int numBasis = quadrature->numBasis();
   const int spaceDim = quadrature->spaceDim();
 
@@ -147,7 +148,7 @@
   assert(!propertiesSection.isNull());
 
 #if !defined(PRECOMPUTE_GEOMETRY)
-  double_array coordinatesCell(numBasis*spaceDim);
+  double_array coordinatesCell(numCorners*spaceDim);
   const ALE::Obj<RealSection>& coordinates = 
     sieveMesh->getRealSection("coordinates");
   RestrictVisitor coordsVisitor(*coordinates,

Modified: short/3D/PyLith/branches/multifields/libsrc/meshio/MeshBuilder.cc
===================================================================
--- short/3D/PyLith/branches/multifields/libsrc/meshio/MeshBuilder.cc	2011-05-21 13:46:30 UTC (rev 18406)
+++ short/3D/PyLith/branches/multifields/libsrc/meshio/MeshBuilder.cc	2011-05-21 13:56:23 UTC (rev 18407)
@@ -133,6 +133,7 @@
                                                       orientation);
       std::map<SieveFlexMesh::point_type,SieveFlexMesh::point_type> renumbering;
       ALE::ISieveConverter::convertSieve(*s, *sieve, renumbering);
+      ALE::ISieveConverter::convertOrientation(*s, *sieve, renumbering, orientation.ptr());
     } // if/else
     logger.stagePop();
     logger.stagePush("MeshStratification");