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

[knepley at geodynamics.org]

Author: knepley
Date: 2011-05-20 12:48:58 -0700 (Fri, 20 May 2011)
New Revision: 18401

Modified:
   short/3D/PyLith/branches/multifields/TODO
   short/3D/PyLith/branches/multifields/libsrc/meshio/MeshBuilder.cc
Log:
Merge from trunk


Modified: short/3D/PyLith/branches/multifields/TODO
===================================================================
--- short/3D/PyLith/branches/multifields/TODO	2011-05-20 19:01:26 UTC (rev 18400)
+++ short/3D/PyLith/branches/multifields/TODO	2011-05-20 19:48:58 UTC (rev 18401)
@@ -2,6 +2,12 @@
 CURRENT ISSUES/PRIORITIES (1.6.0)
 ======================================================================
 
+* AUSTIN MEETING
+
+ (1) Fix GPU build
+
+ (2) Add FieldSplit null space (translations+rotations)
+
 * [STABLE]
   rate and state friction - sliding test
   predictor/corrector scheme?

Modified: short/3D/PyLith/branches/multifields/libsrc/meshio/MeshBuilder.cc
===================================================================
--- short/3D/PyLith/branches/multifields/libsrc/meshio/MeshBuilder.cc	2011-05-20 19:01:26 UTC (rev 18400)
+++ short/3D/PyLith/branches/multifields/libsrc/meshio/MeshBuilder.cc	2011-05-20 19:48:58 UTC (rev 18401)
@@ -120,13 +120,17 @@
       // Same old thing
       ALE::Obj<SieveFlexMesh::sieve_type> s =
 	new SieveFlexMesh::sieve_type(sieve->comm(), sieve->debug());
+      ALE::Obj<SieveFlexMesh::arrow_section_type> orientation = new SieveFlexMesh::arrow_section_type(sieve->comm(), sieve->debug());
 
+      s->setDebug(2);
       ALE::SieveBuilder<SieveFlexMesh>::buildTopology(s, meshDim, 
-                                                  numCells, 
-                                                  const_cast<int*>(&cells[0]), 
-                                                  numVertices, 
-                                                  interpolate,
-                                                  numCorners);
+                                                      numCells, 
+                                                      const_cast<int*>(&cells[0]), 
+                                                      numVertices, 
+                                                      interpolate,
+                                                      numCorners,
+                                                      -1,
+                                                      orientation);
       std::map<SieveFlexMesh::point_type,SieveFlexMesh::point_type> renumbering;
       ALE::ISieveConverter::convertSieve(*s, *sieve, renumbering);
     } // if/else