[MOAB-dev] r2781 - MOAB/trunk

[pppebay at sandia.gov]

Author: pebay
Date: 2009-03-30 18:01:26 -0500 (Mon, 30 Mar 2009)
New Revision: 2781

Modified:
   MOAB/trunk/Makefile.am
   MOAB/trunk/SequenceManager.cpp
Log:
ENH: make the SequenceManager capable of creating swept sequences


Modified: MOAB/trunk/Makefile.am
===================================================================
--- MOAB/trunk/Makefile.am	2009-03-30 22:12:09 UTC (rev 2780)
+++ MOAB/trunk/Makefile.am	2009-03-30 23:01:26 UTC (rev 2781)
@@ -195,6 +195,8 @@
   SparseTagCollection.hpp \
   StructuredElementSeq.cpp \
   StructuredElementSeq.hpp \
+  SweptElementSeq.cpp \
+  SweptElementSeq.hpp \
   TagCompare.hpp \
   TagInfo.cpp \
   TagInfo.hpp \

Modified: MOAB/trunk/SequenceManager.cpp
===================================================================
--- MOAB/trunk/SequenceManager.cpp	2009-03-30 22:12:09 UTC (rev 2780)
+++ MOAB/trunk/SequenceManager.cpp	2009-03-30 23:01:26 UTC (rev 2781)
@@ -3,6 +3,7 @@
 #include "UnstructuredElemSeq.hpp"
 #include "ScdVertexData.hpp"
 #include "MeshSetSequence.hpp"
+#include "SweptElementSeq.hpp"
 #include "StructuredElementSeq.hpp"
 #include "HomXform.hpp"
 #include "PolyElementSeq.hpp"
@@ -696,12 +697,10 @@
 {
   int this_dim = MBCN::Dimension(type);
 
-    // use > instead of != in the following assert to also catch cases where imin > imax, etc.
   assert((this_dim < 3 || kmax > kmin) &&
          (this_dim < 2 || jmax > jmin) &&
          (this_dim < 1 || imax > imin));
 
-    // compute # entities; not as easy as it would appear...
   MBEntityID num_ent;
   if (MBVERTEX == type)
     num_ent = (MBEntityID)(imax-imin+1)*(MBEntityID)(jmax-jmin+1)*(MBEntityID)(kmax-kmin+1);
@@ -728,7 +727,7 @@
   case MBEDGE:
   case MBQUAD:
   case MBHEX:
-    sequence = new StructuredElementSeq( handle, imin, jmin, kmin, imax, jmax, kmax );
+    sequence = new SweptElementSeq( handle, imin, jmin, kmin, imax, jmax, kmax, Cq );
     break;
   default:
     return MB_TYPE_OUT_OF_RANGE;