[MOAB-dev] r5621 - in MOAB/trunk: . itaps/imesh src src/io src/moab test test/parallel

[tautges at mcs.anl.gov]

Author: tautges
Date: 2012-06-29 19:54:55 -0500 (Fri, 29 Jun 2012)
New Revision: 5621

Modified:
   MOAB/trunk/
   MOAB/trunk/itaps/imesh/iMesh_MOAB.cpp
   MOAB/trunk/src/ScdElementData.cpp
   MOAB/trunk/src/ScdElementData.hpp
   MOAB/trunk/src/ScdInterface.cpp
   MOAB/trunk/src/SequenceManager.cpp
   MOAB/trunk/src/SequenceManager.hpp
   MOAB/trunk/src/StructuredElementSeq.cpp
   MOAB/trunk/src/StructuredElementSeq.hpp
   MOAB/trunk/src/io/ReadNC.cpp
   MOAB/trunk/src/io/ReadNC.hpp
   MOAB/trunk/src/moab/ScdInterface.hpp
   MOAB/trunk/test/parallel/Makefile.am
   MOAB/trunk/test/scdseq_test.cpp
Log:
Fixed the scdpart test and representation of structured meshes, in parallel,
with periodic boundaries.  Tests run in serial and parallel.




Property changes on: MOAB/trunk
___________________________________________________________________
Modified: svn:mergeinfo
   - /MOAB/branches/Version4.0:4323-4497
/MOAB/branches/jk-direct-tag:4069-4327
   + /MOAB/branches/NCparperiodic:5611-5620
/MOAB/branches/Version4.0:4323-4497
/MOAB/branches/jk-direct-tag:4069-4327

Modified: MOAB/trunk/itaps/imesh/iMesh_MOAB.cpp
===================================================================
--- MOAB/trunk/itaps/imesh/iMesh_MOAB.cpp	2012-06-30 00:34:27 UTC (rev 5620)
+++ MOAB/trunk/itaps/imesh/iMesh_MOAB.cpp	2012-06-30 00:54:55 UTC (rev 5621)
@@ -3307,7 +3307,9 @@
   CHKERR(rval, "Trouble creating scd vertex sequence.");
 
     // set the global box parameters
-  if (global_dims) scd_box->set_global_box_dims(global_dims);
+  if (global_dims) {
+    for (int i = 0; i < 6; i++) scd_box->par_data().gDims[i] = global_dims[i];
+  }
 
   tmp_range.insert(scd_box->start_vertex(), scd_box->start_vertex()+scd_box->num_vertices()-1);
   tmp_range.insert(scd_box->start_element(), scd_box->start_element()+scd_box->num_elements()-1);

Modified: MOAB/trunk/src/ScdElementData.cpp
===================================================================
--- MOAB/trunk/src/ScdElementData.cpp	2012-06-30 00:34:27 UTC (rev 5620)
+++ MOAB/trunk/src/ScdElementData.cpp	2012-06-30 00:54:55 UTC (rev 5621)
@@ -25,14 +25,14 @@
 
 EntityID ScdElementData::calc_num_entities(EntityHandle start_handle,
                                            int irange, int jrange, int krange, 
-                                           bool is_periodic_i, bool is_periodic_j)
+                                           int *is_periodic)
 {
   size_t result = 1;
   switch (CN::Dimension(TYPE_FROM_HANDLE(start_handle))) {
     default: result = 0; assert( false ); 
     case 3: result *= krange;
-    case 2: result *= (is_periodic_j ? (jrange+1) : jrange);
-    case 1: result *= (is_periodic_i ? (irange+1) : irange);
+    case 2: result *= (is_periodic && is_periodic[1] ? (jrange+1) : jrange);
+    case 1: result *= (is_periodic && is_periodic[0] ? (irange+1) : irange);
   }
   return result;
 }
@@ -41,17 +41,17 @@
                              EntityHandle start_handle,
                              const int imin, const int jmin, const int kmin,