[MOAB-dev] r3947 - in MOAB/trunk: MeshFiles src/io tools

[tautges at mcs.anl.gov]

Author: tautges
Date: 2010-05-25 08:54:03 -0500 (Tue, 25 May 2010)
New Revision: 3947

Modified:
   MOAB/trunk/MeshFiles/Makefile.am
   MOAB/trunk/src/io/ReadCCMIO.cpp
   MOAB/trunk/src/io/ReadCCMIO.hpp
   MOAB/trunk/tools/size.cpp
Log:
Some more fixes for CCMIO reader.

Fixing typo in Makefile.am causing last night's test to die.

Fixing output of size.cpp to refer to "neumann sets", etc, instead of "sidesets", etc.



Modified: MOAB/trunk/MeshFiles/Makefile.am
===================================================================
--- MOAB/trunk/MeshFiles/Makefile.am	2010-05-24 21:40:26 UTC (rev 3946)
+++ MOAB/trunk/MeshFiles/Makefile.am	2010-05-25 13:54:03 UTC (rev 3947)
@@ -1,2 +1,2 @@
 SUBDIRS = unittest
-EXTRA_DIST = singlecyl.cub cinglecyl.h5m README
+EXTRA_DIST = singlecyl.cub singlecyl.h5m README

Modified: MOAB/trunk/src/io/ReadCCMIO.cpp
===================================================================
--- MOAB/trunk/src/io/ReadCCMIO.cpp	2010-05-24 21:40:26 UTC (rev 3946)
+++ MOAB/trunk/src/io/ReadCCMIO.cpp	2010-05-25 13:54:03 UTC (rev 3947)
@@ -182,7 +182,7 @@
   }
 
     // load some meta-data
-  rval = load_metadata(rootID, problemID, file_set);
+  rval = load_metadata(rootID, problemID, stateID, processorID, file_set);
   CHKERR(rval,NULL);
 
     // now, put all this into the file set, if there is one
@@ -214,13 +214,14 @@
 }
 
 ErrorCode ReadCCMIO::load_metadata(CCMIOID rootID, CCMIOID problemID,
-                                     const EntityHandle *file_set) 
+                                   CCMIOID stateID, CCMIOID processorID,
+                                   const EntityHandle *file_set) 
 {
     // Read the simulation title.
   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);
@@ -228,13 +229,12 @@
     if (NULL != name && strlen(name) != 0) {
         // make a tag for it and tag the read set
       Tag simname;
-      rval = mbImpl->tag_get_handle("SimulationName", simname);
+      rval = mbImpl->tag_get_handle("Title", simname);
       if (MB_TAG_NOT_FOUND == rval) {
-        rval = mbImpl->tag_create("SimulationName", strlen(name), MB_TAG_SPARSE, 
+        rval = mbImpl->tag_create("Title", strlen(name), MB_TAG_SPARSE, 
                                   MB_TYPE_OPAQUE, simname, NULL);
         CHKERR(rval, "Simulation name tag not found or created.");
       }