[MOAB-dev] r4219 - in MOAB/trunk: src/io tools/dagmc

[bmsmith6 at wisc.edu]

Author: bmsmith
Date: 2010-10-14 08:56:12 -0500 (Thu, 14 Oct 2010)
New Revision: 4219

Modified:
   MOAB/trunk/src/io/ReadNCDF.cpp
   MOAB/trunk/tools/dagmc/cub2h5m.cc
   MOAB/trunk/tools/dagmc/quads_to_tris.cpp
Log:
Last set of changes for space reactor project's DAGMC geometry initialization.

quads_to_tris: When splitting the quad into tris, create better tris by
  minimizing the diagonal length.
cub2h5m: Change variable name for consistency.
ReadNCDF: Debug output.
 


Modified: MOAB/trunk/src/io/ReadNCDF.cpp
===================================================================
--- MOAB/trunk/src/io/ReadNCDF.cpp	2010-10-13 20:56:20 UTC (rev 4218)
+++ MOAB/trunk/src/io/ReadNCDF.cpp	2010-10-14 13:56:12 UTC (rev 4219)
@@ -2204,6 +2204,7 @@
           int to_dim = CN::Dimension(mb_type);
           rval = mdbImpl->get_adjacencies( cub_nodes, to_dim, false, cub_elem);
           if(MB_SUCCESS != rval) {
+	    std::cout << "ReadNCDF: could not get dead cub element" << std::endl;
             delete[] exo_conn;
             return rval;
           }

Modified: MOAB/trunk/tools/dagmc/cub2h5m.cc
===================================================================
--- MOAB/trunk/tools/dagmc/cub2h5m.cc	2010-10-13 20:56:20 UTC (rev 4218)
+++ MOAB/trunk/tools/dagmc/cub2h5m.cc	2010-10-14 13:56:12 UTC (rev 4219)
@@ -346,11 +346,11 @@
     // Get the sense of the face wrt the element
     EntityType elem_type = MBI->type_from_handle(adj_elem.front());
     EntityType face_type = MBI->type_from_handle(*i);
-    int side_num, offset;
+    int face_num, offset;
     int sense = 0; 
     const int face_dim = CN::Dimension(face_type); 
     int rval = CN::SideNumber( elem_type, elem_conn, face_conn, face_n_nodes, 
-                             face_dim, side_num, sense, offset );
+                             face_dim, face_num, sense, offset );
     if(0 != rval) return MB_FAILURE;
 
     // If the face is not oriented outward wrt the element, reverse it

Modified: MOAB/trunk/tools/dagmc/quads_to_tris.cpp
===================================================================
--- MOAB/trunk/tools/dagmc/quads_to_tris.cpp	2010-10-13 20:56:20 UTC (rev 4218)
+++ MOAB/trunk/tools/dagmc/quads_to_tris.cpp	2010-10-14 13:56:12 UTC (rev 4219)
@@ -14,7 +14,7 @@
 */
 
 #include "quads_to_tris.hpp"
-
+#include "moab/CartVect.hpp"
 using namespace moab;
 
 // Generic function to create two tris from a quad. This can be improved later.
@@ -28,12 +28,37 @@
   const EntityHandle *quad_conn;
   int n_verts=0;
   result = MBI->get_connectivity( quad, quad_conn, n_verts );
-    assert( 4 == n_verts );
-    assert( MB_SUCCESS == result);