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

[wilsonp at engr.wisc.edu]

Author: wilsonp
Date: 2010-04-20 16:19:08 -0500 (Tue, 20 Apr 2010)
New Revision: 3794

Modified:
   MOAB/trunk/src/io/ReadABAQUS.cpp
   MOAB/trunk/src/io/ReadABAQUS.hpp
Log:
Updated ABAQUS Reader to allow a more flexible hierarchy of mesh definition vis-a-vis 
PART vs INSTANCE.



Modified: MOAB/trunk/src/io/ReadABAQUS.cpp
===================================================================
--- MOAB/trunk/src/io/ReadABAQUS.cpp	2010-04-20 21:19:04 UTC (rev 3793)
+++ MOAB/trunk/src/io/ReadABAQUS.cpp	2010-04-20 21:19:08 UTC (rev 3794)
@@ -375,7 +375,7 @@
 	    default:
 	      in_unsupported = true;
 	      // std::cout << "\tIgnoring unsupported keyword in this ASSEMBLY: "
-	      //		<< readline << std::endl;
+	      //           << readline << std::endl;
 	      next_line_type = get_next_line_type();
 	      break;
 	    }
@@ -387,7 +387,7 @@
 	  if (!in_unsupported)
 	    {
 	      // std::cout << "Internal Error: Data lines not allowed in ASSEMBLY keyword."
-	      //		<< std::endl << readline << std::endl;
+	      //           << std::endl << readline << std::endl;
 	      return MB_FAILURE;
 	    }
 	  next_line_type = get_next_line_type();
@@ -467,11 +467,11 @@
 	{
 	case abq_instance_ambiguous:
 	  // std::cout << "\t\tIgnoring ambiguous INSTANCE parameter: " << (*thisParam).first
-	  //	    << "=" << (*thisParam).second << std::endl;
+	  //           << "=" << (*thisParam).second << std::endl;
 	  break;
 	default:
 	  // std::cout << "\t\tIgnoring unsupported INSTANCE parameter: " << (*thisParam).first
-	  //	    << "=" << (*thisParam).second << std::endl;
+	  // 	    << "=" << (*thisParam).second << std::endl;
 	  break;
 	}
     }
@@ -486,6 +486,10 @@
   bool end_instance = false;
   bool in_unsupported = false;
 
+  EntityHandle instance_set;
+  status = add_entity_set(assembly_set,ABQ_INSTANCE_SET,instance_name,instance_set);
+  MB_RETURN_IF_FAIL;
+
   while (next_line_type != abq_eof && !end_instance)
     {
       switch(next_line_type)
@@ -496,14 +500,31 @@
 	    {
 	    case abq_end_instance:
 	      end_instance = true;