[MOAB-dev] r4928 - in MOAB/trunk/tools: mcnpmit refiner

[kraftche at cae.wisc.edu]

Author: kraftche
Date: 2011-06-02 13:34:59 -0500 (Thu, 02 Jun 2011)
New Revision: 4928

Modified:
   MOAB/trunk/tools/mcnpmit/main.cpp
   MOAB/trunk/tools/mcnpmit/mcnpmit.cpp
   MOAB/trunk/tools/refiner/RefinerTagManager.cpp
Log:
fix build errors

Modified: MOAB/trunk/tools/mcnpmit/main.cpp
===================================================================
--- MOAB/trunk/tools/mcnpmit/main.cpp	2011-06-02 15:58:34 UTC (rev 4927)
+++ MOAB/trunk/tools/mcnpmit/main.cpp	2011-06-02 18:34:59 UTC (rev 4928)
@@ -64,8 +64,8 @@
   moab::AdaptiveKDTree::Settings settings;
   settings.candidatePlaneSet = moab::AdaptiveKDTree::SUBDIVISION;
 
-  MBI->tag_create("CoordTag", 1, moab::MB_TYPE_INTEGER, coord_tag, moab::MB_TAG_DENSE|moab::MB_TAG_CREAT);
-  MBI->tag_create("RotationTag", 16, moab::MB_TYPE_DOUBLE, rotation_tag, moab::MB_TAG_DENSE|moab::MB_TAG_CREAT );
+  MBI->tag_get_handle("CoordTag", 1, moab::MB_TYPE_INTEGER, coord_tag, moab::MB_TAG_DENSE|moab::MB_TAG_CREAT);
+  MBI->tag_get_handle("RotationTag", 16, moab::MB_TYPE_DOUBLE, rotation_tag, moab::MB_TAG_DENSE|moab::MB_TAG_CREAT );
 
   if (skip_build) {
     MBresult = MBI->load_mesh(h5m_filename.c_str());

Modified: MOAB/trunk/tools/mcnpmit/mcnpmit.cpp
===================================================================
--- MOAB/trunk/tools/mcnpmit/mcnpmit.cpp	2011-06-02 15:58:34 UTC (rev 4927)
+++ MOAB/trunk/tools/mcnpmit/mcnpmit.cpp	2011-06-02 18:34:59 UTC (rev 4928)
@@ -317,8 +317,8 @@
 
       moab::ErrorCode rval;
 
-      rval = MBI->tag_create(TALLY_TAG, 1, moab::MB_TYPE_DOUBLE, tally_tag, moab::MB_TAG_DENSE|moab::MB_TAG_CREAT);
-      rval = MBI->tag_create(ERROR_TAG, 1, moab::MB_TYPE_DOUBLE, relerr_tag, moab::MB_TAG_DENSE|moab::MB_TAG_CREAT);
+      rval = MBI->tag_get_handle(TALLY_TAG, 1, moab::MB_TYPE_DOUBLE, tally_tag, moab::MB_TAG_DENSE|moab::MB_TAG_CREAT);
+      rval = MBI->tag_get_handle(ERROR_TAG, 1, moab::MB_TYPE_DOUBLE, relerr_tag, moab::MB_TAG_DENSE|moab::MB_TAG_CREAT);
 
       return MCNP_SUCCESS;
 

Modified: MOAB/trunk/tools/refiner/RefinerTagManager.cpp
===================================================================
--- MOAB/trunk/tools/refiner/RefinerTagManager.cpp	2011-06-02 15:58:34 UTC (rev 4927)
+++ MOAB/trunk/tools/refiner/RefinerTagManager.cpp	2011-06-02 18:34:59 UTC (rev 4928)
@@ -85,7 +85,7 @@
     throw new std::logic_error( "Unable to find input mesh global ID tag \"" GLOBAL_ID_TAG_NAME "\"" );
     }
   result = this->output_mesh->tag_get_handle(
-    GLOBAL_ID_TAG_NAME, MB_TYPE_INTEGER, this->tag_ogid, MB_TAG_DENSE|MB_TAG_CREAT, &zero );
+    GLOBAL_ID_TAG_NAME, 1, MB_TYPE_INTEGER, this->tag_ogid, MB_TAG_DENSE|MB_TAG_CREAT, &zero );
   if ( result != MB_SUCCESS )
     {
     throw new std::logic_error( "Unable to find/create output mesh global ID tag \"" GLOBAL_ID_TAG_NAME "\"" );
@@ -486,7 +486,7 @@
   this->input_mesh->tag_get_default_value( tag_in, (void*) &tag_default[0] );
   tag_default.resize( tag_size );
   ErrorCode res = this->output_mesh->tag_get_handle(
-    tag_name.c_str(), tag_size, tag_get_data_type, tag_rec.first, tag_type|MB_TAG_BYTES|MB_TAG_EXCL, &tag_default[0] );
+    tag_name.c_str(), tag_size, tag_data_type, tag_rec.first, tag_type|MB_TAG_BYTES|MB_TAG_EXCL, &tag_default[0] );