[MOAB-dev] r5149 - in MOAB/trunk: src test

[tautges at mcs.anl.gov]

Author: tautges
Date: 2011-09-02 10:01:02 -0500 (Fri, 02 Sep 2011)
New Revision: 5149

Modified:
   MOAB/trunk/src/ScdElementData.cpp
   MOAB/trunk/src/ScdElementData.hpp
   MOAB/trunk/test/scdseq_test.cpp
Log:
test/scdseq_test.cpp: corrections to how some of the sequences are set up, that improved error
  checking exposed.
src/ScdElementData.?pp: renaming elementParams member boxParams, to indicate that they're parameters
  for the box (vertices, or vertices and elements for periodic boxes), rather than for the
  elements.  Also, in get_vertex(), adding an assertion that the parameter space of the box contains
  the specified parameters.

Passes make check in serial and parallel.




Modified: MOAB/trunk/src/ScdElementData.cpp
===================================================================
--- MOAB/trunk/src/ScdElementData.cpp	2011-09-01 20:40:32 UTC (rev 5148)
+++ MOAB/trunk/src/ScdElementData.cpp	2011-09-02 15:01:02 UTC (rev 5149)
@@ -53,14 +53,14 @@
   isPeriodic[0] = is_periodic_i;
   isPeriodic[1] = is_periodic_j;
   
-  elementParams[0] = HomCoord(imin, jmin, kmin);
-  elementParams[1] = HomCoord(imax, jmax, kmax);
-  elementParams[2] = HomCoord(1, 1, 1);
+  boxParams[0] = HomCoord(imin, jmin, kmin);
+  boxParams[1] = HomCoord(imax, jmax, kmax);
+  boxParams[2] = HomCoord(1, 1, 1);
   
     // assign and compute parameter stuff
-  dIJK[0] = elementParams[1][0] - elementParams[0][0] + 1;
-  dIJK[1] = elementParams[1][1] - elementParams[0][1] + 1;
-  dIJK[2] = elementParams[1][2] - elementParams[0][2] + 1;
+  dIJK[0] = boxParams[1][0] - boxParams[0][0] + 1;
+  dIJK[1] = boxParams[1][1] - boxParams[0][1] + 1;
+  dIJK[2] = boxParams[1][2] - boxParams[0][2] + 1;
   dIJKm1[0] = dIJK[0] - (isPeriodic[0] ? 0 : 1);
   dIJKm1[1] = dIJK[1] - (isPeriodic[1] ? 0 : 1);
   dIJKm1[2] = dIJK[2] - 1;
@@ -132,8 +132,8 @@
     // if minlist.size = 1 & maxlist.size = 1 & minlist[0] = esequence.min &
     //         maxlist[0] = esequence.max+(1,1,1)
   if (minlist.size() == 1 && maxlist.size() == 1 &&
-      minlist[0].minmax[0] == elementParams[0] && 
-      maxlist[0].minmax[1] == elementParams[1])
+      minlist[0].minmax[0] == boxParams[0] && 
+      maxlist[0].minmax[1] == boxParams[1])
       //   complete
     return true;
     // else

Modified: MOAB/trunk/src/ScdElementData.hpp
===================================================================
--- MOAB/trunk/src/ScdElementData.hpp	2011-09-01 20:40:32 UTC (rev 5148)
+++ MOAB/trunk/src/ScdElementData.hpp	2011-09-02 15:01:02 UTC (rev 5149)
@@ -60,8 +60,9 @@
 
 private:
 
-    //! parameter min/max/stride, in homogeneous coords ijkh
-  HomCoord elementParams[3];
+    //! parameter min/max/stride for vertices, in homogeneous coords ijkh; elements
+    //! are one less than max
+  HomCoord boxParams[3];