[MOAB-dev] r4958 - in MOAB/trunk: src test

[iulian at mcs.anl.gov]

Author: iulian
Date: 2011-06-06 17:25:06 -0500 (Mon, 06 Jun 2011)
New Revision: 4958

Modified:
   MOAB/trunk/src/FBEngine.cpp
   MOAB/trunk/test/mbfacet_test.cpp
Log:
 control face points were not deleted, not sure why
 also, modify the test/tool so it allows just cropping, it stops after
  writing the file with the cropped boundary


Modified: MOAB/trunk/src/FBEngine.cpp
===================================================================
--- MOAB/trunk/src/FBEngine.cpp	2011-06-06 19:33:35 UTC (rev 4957)
+++ MOAB/trunk/src/FBEngine.cpp	2011-06-06 22:25:06 UTC (rev 4958)
@@ -392,13 +392,13 @@
   if (rval != MB_TAG_NOT_FOUND)
     smoothTags.push_back(tag_handle);
 
-  rval = _mbImpl->tag_get_handle( "CONTROLEDGE", 18, MB_TYPE_DOUBLE, tag_handle );
+  rval = _mbImpl->tag_get_handle( "CONTROLEDGE", 9, MB_TYPE_DOUBLE, tag_handle );
   if (rval != MB_TAG_NOT_FOUND)
     smoothTags.push_back(tag_handle);
 
-  //rval = _mbImpl->tag_get_handle( "CONTROLFACE", 0, MB_TYPE_DOUBLE, tag_handle );
-  //if (rval != MB_TAG_NOT_FOUND)
-  //  smoothTags.push_back(tag_handle);
+  rval = _mbImpl->tag_get_handle( "CONTROLFACE", 18, MB_TYPE_DOUBLE, tag_handle );
+  if (rval != MB_TAG_NOT_FOUND)
+    smoothTags.push_back(tag_handle);
 
   rval = _mbImpl->tag_get_handle( "CONTROLEDGEFACE", 27, MB_TYPE_DOUBLE, tag_handle );
   if (rval != MB_TAG_NOT_FOUND)

Modified: MOAB/trunk/test/mbfacet_test.cpp
===================================================================
--- MOAB/trunk/test/mbfacet_test.cpp	2011-06-06 19:33:35 UTC (rev 4957)
+++ MOAB/trunk/test/mbfacet_test.cpp	2011-06-06 22:25:06 UTC (rev 4958)
@@ -87,12 +87,16 @@
   quads_file = TestDir + "/quads.h5m";
 
   keep_output = false;
-
+  bool only_cropping = false;
   if (argc == 1) {
     std::cout << "Using default input files: " << filename << " " << polygon_file_name <<
-        " " << std::endl;
+        " " << filename_out << " " << quads_file << std::endl;
     std::cout << "    default output file: " << filename_out << " will be deleted \n";
-    std::cout << "    quads test file: " << quads_file << "\n";
+  } else if (argc == 4) {
+    only_cropping = true;
+    filename = argv[1];
+    polygon_file_name = argv[2];
+    filename_out = argv[3];
   } else if (argc >=5) {
     filename = argv[1];
     polygon_file_name = argv[2];
@@ -159,6 +163,8 @@
   handle_error_code(rval, number_tests_failed, number_tests_successful);
   std::cout << "\n";