[MOAB-dev] r3954 - MOAB/trunk/src/io

[tautges at mcs.anl.gov]

Author: tautges
Date: 2010-05-25 13:14:22 -0500 (Tue, 25 May 2010)
New Revision: 3954

Modified:
   MOAB/trunk/src/io/ReadCCMIO.cpp
Log:
Fixing construction of prism entities, and case where there are
holes in index space for material sets.



Modified: MOAB/trunk/src/io/ReadCCMIO.cpp
===================================================================
--- MOAB/trunk/src/io/ReadCCMIO.cpp	2010-05-25 16:54:54 UTC (rev 3953)
+++ MOAB/trunk/src/io/ReadCCMIO.cpp	2010-05-25 18:14:22 UTC (rev 3954)
@@ -221,7 +221,6 @@
   CCMIOError error = kCCMIONoErr;
   ErrorCode rval = MB_SUCCESS;
   CCMIONode rootNode;
-  EntityHandle tag_set = (NULL != file_set ? *file_set : 0);
   if (kCCMIONoErr == CCMIOGetEntityNode(&error, rootID, &rootNode)) {
     char *name = NULL;
     CCMIOGetTitle(&error, rootNode, &name);
@@ -235,7 +234,7 @@
                                   MB_TYPE_OPAQUE, simname, NULL);
         CHKERR(rval, "Simulation name tag not found or created.");
       }
-      rval = mbImpl->tag_set_data(simname, &tag_set, 1, name);
+      rval = mbImpl->tag_set_data(simname, file_set, (file_set ? 1 : 0), name);
       CHKERR(rval, "Problem setting simulation name tag.");
 
     }
@@ -247,7 +246,7 @@
   if (MB_SUCCESS == get_opt_string("CreatingProgram", processorID, opt_string)) {
     if (opt_string.size() >= NAME_TAG_SIZE) opt_string[NAME_TAG_SIZE-1] = '\0';
     else (opt_string.resize(NAME_TAG_SIZE, '\0'));
-    rval = mbImpl->tag_set_data(mNameTag, &tag_set, 1, &opt_string[0]);
+    rval = mbImpl->tag_set_data(mNameTag, file_set, (file_set ? 1 : 0), &opt_string[0]);
     CHKERR(rval, "Failed to set neuset Name Tag.");
   }
   
@@ -277,7 +276,6 @@
       // get index, corresponding set, and label with material set tag
     int mindex;
     CCMIOGetEntityIndex(&error, next, &mindex);
-    assert(mindex > 0 && mindex <= (int)newMatsets.size()+1);
     std::map<int,EntityHandle>::iterator mit = newMatsets.find(mindex);
     if (mit == newMatsets.end()) 
         // no actual faces for this matset; continue to next
@@ -349,7 +347,6 @@
     int mindex;
     CCMIOError error = kCCMIONoErr;
     CCMIOGetEntityIndex(&error, next, &mindex);
-    assert(mindex >= 0 && mindex <= (int)newNeusets.size()+1);
     std::map<int,EntityHandle>::iterator mit = newNeusets.find(mindex);
     if (mit == newNeusets.end()) 
         // no actual faces for this neuset; continue to next
@@ -696,7 +693,9 @@
                                             bool has_mid_nodes,
                                             EntityHandle &cell) 
 {
-    // test to see if they're one type