Changeset 2771 for ddriv

Timestamp:

03/27/09 14:13:54 (12 months ago)

Author:

kraftche

Message:

add missing tag_tag_handle function(s) in OptUtils?

Location:

ddriv/trunk

Files:

• DdrivDerivs.hpp (modified) (1 diff)
• OptUtils.cpp (modified) (4 diffs)
• OptUtils.hpp (modified) (2 diffs)
• SmoothUtils.cpp (modified) (2 diffs)

ddriv/trunk/DdrivDerivs.hpp

@@ -81 +81 @@
 
     // mesquite mesh and geometry objects
-  Mesquite::MeshTSTT* msqMesh;
-  Mesquite::GeomTSTT* msqDomain;
+  //Mesquite::MeshTSTT* msqMesh;
+  //Mesquite::GeomTSTT* msqDomain;
   
   unsigned int *adj_cv_s, *infl_scl_p, *infl_cv_p;

ddriv/trunk/OptUtils.cpp

@@ -324 +324 @@
 {
   if (0 == origCoordsTag && create_if_missing) {
-    origCoordsTag = OptUtils::get_tag_handle(myMesh, ORIG_COORDS_TAG_NAME.c_str(),
-                                             3, iBase_DOUBLE);
+    origCoordsTag = get_imesh_tag( ORIG_COORDS_TAG_NAME.c_str(), 3, iBase_DOUBLE);
   }
   
@@ -335 +334 @@
 {
   if (0 == normalTag && create_if_missing) {
-    normalTag = OptUtils::get_tag_handle(myMesh, NORMAL_TAG_NAME.c_str(),
-                                         3, iBase_DOUBLE);
+    normalTag = get_imesh_tag( NORMAL_TAG_NAME.c_str(), 3, iBase_DOUBLE);
   }
   
@@ -346 +344 @@
 {
   if (0 == dndxTag && create_if_missing) {
-    dndxTag = OptUtils::get_tag_handle(myMesh, DNDX_TAG_NAME.c_str(),
-                                        9, iBase_DOUBLE);
+    dndxTag = get_imesh_tag( DNDX_TAG_NAME.c_str(), 9, iBase_DOUBLE);
   }
   
@@ -741 +738 @@
 }
 
-
+  
+iBase_TagHandle OptUtils::get_tag_handle( iMesh_Instance myMesh,
+                                          const char* tag_name,
+                                          int tag_size,
+                                          iBase_TagValueType tag_type )
+{
+  int ierr;
+  iBase_TagHandle tag;
+  iMesh_getTagHandle( myMesh, tag_name, &tag, &ierr, strlen(tag_name) );
+  if (iBase_SUCCESS == ierr) {
+    if (tag_size > 0) {
+      int size;
+      iMesh_getTagSizeValues( myMesh, tag, &size, &ierr );
+      if (ierr) {
+        std::cerr << "Error " << ierr << " retreiving size for tag: " << tag_name << std::endl;
+        tag = 0;
+      }
+      else if (size != tag_size) {
+        std::cerr << "Unexpectes size (" << size << ") for tag: " << tag_name << std::endl;
+        tag = 0;
+      }
+    }
+    if (iBase_BYTES != tag_type) {
+      int type;
+      iMesh_getTagType( myMesh, tag, &type, &ierr );
+      if (ierr) {
+        std::cerr << "Error " << ierr << " retreiving type for tag: " << tag_name << std::endl;
+        tag = 0;
+      }
+      else if (type != tag_type) {
+        std::cerr << "Unexpectes type (" << type << ") for tag: " << tag_name << std::endl;
+        tag = 0;
+      }
+    }
+  }
+  else if (iBase_TAG_NOT_FOUND == ierr && tag_size > 0) {
+    iMesh_createTag( myMesh, tag_name, tag_size, tag_type, &tag, &ierr, strlen(tag_name) );
+    if (iBase_SUCCESS != ierr) {
+      std::cerr << "Error " << ierr << " creating tag: " << tag_name << std::endl;
+      tag = 0;
+    }
+  }
+  else {
+    std::cerr << "Error " << ierr << " retreiving handle for tag: " << tag_name << std::endl;
+    tag = 0;
+  }
+  
+  return tag;
+}
+
+iBase_TagHandle OptUtils::get_tag_handle( iGeom_Instance myGeom,
+                                          const char* tag_name,
+                                          int tag_size,
+                                          iBase_TagValueType tag_type )
+{
+  int ierr;
+  iBase_TagHandle tag;
+  iGeom_getTagHandle( myGeom, tag_name, &tag, &ierr, strlen(tag_name) );
+  if (iBase_SUCCESS == ierr) {
+    if (tag_size > 0) {
+      int size;
+      iGeom_getTagSizeValues( myGeom, tag, &size, &ierr );
+      if (ierr) {
+        std::cerr << "Error " << ierr << " retreiving size for tag: " << tag_name << std::endl;
+        tag = 0;
+      }
+      else if (size != tag_size) {
+        std::cerr << "Unexpectes size (" << size << ") for tag: " << tag_name << std::endl;
+        tag = 0;
+      }
+    }
+    if (iBase_BYTES != tag_type) {
+      int type;
+      iGeom_getTagType( myGeom, tag, &type, &ierr );
+      if (ierr) {
+        std::cerr << "Error " << ierr << " retreiving type for tag: " << tag_name << std::endl;
+        tag = 0;
+      }
+      else if (type != tag_type) {
+        std::cerr << "Unexpectes type (" << type << ") for tag: " << tag_name << std::endl;
+        tag = 0;
+      }
+    }
+  }
+  else if (iBase_TAG_NOT_FOUND == ierr && tag_size > 0) {
+    iGeom_createTag( myGeom, tag_name, tag_size, tag_type, &tag, &ierr, strlen(tag_name) );
+    if (iBase_SUCCESS != ierr) {
+      std::cerr << "Error " << ierr << " creating tag: " << tag_name << std::endl;
+      tag = 0;
+    }
+  }
+  else {
+    std::cerr << "Error " << ierr << " retreiving handle for tag: " << tag_name << std::endl;
+    tag = 0;
+  }
+  
+  return tag;
+}
+
+

ddriv/trunk/OptUtils.hpp

@@ -27 +27 @@
 #include <string>
 
-namespace Mesquite 
-{
-  class MeshTSTT;
-  class GeomTSTT;
-}
-
 class OptUtils 
 {
@@ -45 +39 @@
   bool reset_relation(const bool create_new);
   
-  static iBase_TagHandle get_tag_handle(iBase_Instance tag_iface,
-                                       const char* tag_name,
-                                       int tag_size = -1,
-                                       iBase_TagValueType tag_type = iBase_BYTES);
+  iBase_TagHandle get_imesh_tag(const char* tag_name,
+                                int tag_size = -1,
+                                iBase_TagValueType tag_type = iBase_BYTES)
+  { return get_tag_handle( myMesh, tag_name, tag_size, tag_type ); }
+  
+  iBase_TagHandle get_igeom_tag(const char* tag_name,
+                                int tag_size = -1,
+                                iBase_TagValueType tag_type = iBase_BYTES)
+  { return get_tag_handle( myGeom, tag_name, tag_size, tag_type ); }
+  
+  static iBase_TagHandle get_tag_handle( iMesh_Instance mesh, 
+                                         const char* tag_name,
+                                         int tag_size = -1,
+                                         iBase_TagValueType tag_type = iBase_BYTES);
+  
+  static iBase_TagHandle get_tag_handle( iGeom_Instance geom,
+                                         const char* tag_name,
+                                         int tag_size = -1,
+                                         iBase_TagValueType tag_type = iBase_BYTES);
   
   iBase_TagHandle get_mesh_tag_handle( iMesh_Instance instance,

ddriv/trunk/SmoothUtils.cpp

@@ -865 +865 @@
 
     // store these as tags
-  iBase_TagHandle vert_targs = myOu.get_tag_handle( myOu.myMesh, "VERTEX_TARGETS", 1, iBase_DOUBLE );
+  iBase_TagHandle vert_targs = myOu.get_imesh_tag( "VERTEX_TARGETS", 1, iBase_DOUBLE );
   if (!vert_targs)
     return false;
@@ -979 +979 @@
   int result;
   
-  iBase_TagHandle tag = OptUtils::get_tag_handle( myOu.myMesh, VERTEX_FIXED_TAG_NAME, 
+  iBase_TagHandle tag = myOu.get_imesh_tag( VERTEX_FIXED_TAG_NAME, 
                                                   1, iBase_INTEGER );
   if (!tag)