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

[tautges at mcs.anl.gov]

Author: tautges
Date: 2012-03-20 09:20:53 -0500 (Tue, 20 Mar 2012)
New Revision: 5431

Modified:
   MOAB/trunk/src/io/WriteDamsel.cpp
Log:
Make container addresses different.



Modified: MOAB/trunk/src/io/WriteDamsel.cpp
===================================================================
--- MOAB/trunk/src/io/WriteDamsel.cpp	2012-03-15 19:44:06 UTC (rev 5430)
+++ MOAB/trunk/src/io/WriteDamsel.cpp	2012-03-20 14:20:53 UTC (rev 5431)
@@ -212,7 +212,7 @@
                      DAMSEL_HANDLE_COLLECTION_TYPE_VECTOR);
 
       // make a damsel collection
-    dseth = DMSLcoll_create(dmslModel, (damsel_handle_ptr)&seth, coll_type);
+    dseth = DMSLcontainer_tree_create(dmslModel, (damsel_handle_ptr)&seth, coll_type);
     if (DAMSEL_CONTAINER_INVALID == dseth) CHK_MB_ERR_2(MB_FAILURE, "Bad handle returned by Damsel for meshset %lu.", seth);
 
       // get all the entities & add
@@ -220,7 +220,7 @@
     rval = mbImpl->get_entities_by_handle(seth, ents);
     CHK_MB_ERR_2(rval, "get_entities_by_handle failed for set %lu.", seth);
     if (!ents.empty()) {
-      err = DMSLcoll_add_fast(dseth, (damsel_handle_ptr)&ents[0], ents.size());
+      err = DMSLcontainer_tree_add_fast(dseth, (damsel_handle_ptr)&ents[0], ents.size());
       CHK_DMSL_ERR_2(err, "DMSLcoll_add_fast failed for meshset %lu.", seth);
     }
 
@@ -388,7 +388,7 @@
     xcoords_dtag = dmslXcoord = DMSLtag_define(dmslModel, (damsel_handle_ptr)&tmp_handle,
                                                DAMSEL_DATA_TYPE_DOUBLE, "XCOORDS");
     if (DAMSEL_TAG_INVALID == xcoords_dtag) rval = MB_FAILURE;
-    tag_cont = DMSLhandle_create_vector(dmslModel, (damsel_handle) &tag_cont,
+    tag_cont = DMSLhandle_create_vector(dmslModel, (damsel_handle) &xcoords_dtag,
                                         1, (damsel_handle*)&tmp_handle);
     err = DMSLmodel_map_handles_inventing_file_handles(tag_cont);
     CHK_DMSL_ERR(err, "Problem in DMSLmodel_map_handles_inventing_file_handles.");
@@ -401,7 +401,7 @@
                                                "YCOORDS");
     if (DAMSEL_TAG_INVALID == ycoords_dtag) rval = MB_FAILURE;
 
-    tag_cont = DMSLhandle_create_vector(dmslModel, (damsel_handle) &tag_cont,
+    tag_cont = DMSLhandle_create_vector(dmslModel, (damsel_handle) &ycoords_dtag,
                                         1, (damsel_handle*)&tmp_handle);
     err = DMSLmodel_map_handles_inventing_file_handles(tag_cont);
     CHK_DMSL_ERR(err, "Problem in DMSLmodel_map_handles_inventing_file_handles.");
@@ -413,7 +413,7 @@
                                                DAMSEL_DATA_TYPE_DOUBLE,
                                                "ZCOORDS");
     if (DAMSEL_TAG_INVALID == zcoords_dtag) rval = MB_FAILURE;
-    tag_cont = DMSLhandle_create_vector(dmslModel, (damsel_handle) &tag_cont,
+    tag_cont = DMSLhandle_create_vector(dmslModel, (damsel_handle) &zcoords_dtag,
                                         1, (damsel_handle*)&tmp_handle);
     err = DMSLmodel_map_handles_inventing_file_handles(tag_cont);
     CHK_DMSL_ERR(err, "Problem in DMSLmodel_map_handles_inventing_file_handles.");