[cgma-dev] r4305 - cgm/trunk/test

[jiangtao_ma at yahoo.com]

Author: janehu
Date: 2010-11-30 08:45:38 -0600 (Tue, 30 Nov 2010)
New Revision: 4305

Modified:
   cgm/trunk/test/modify.cpp
Log:
Error message re-managing according to code changes in OCC.

Modified: cgm/trunk/test/modify.cpp
===================================================================
--- cgm/trunk/test/modify.cpp	2010-11-30 14:43:59 UTC (rev 4304)
+++ cgm/trunk/test/modify.cpp	2010-11-30 14:45:38 UTC (rev 4305)
@@ -56,7 +56,7 @@
      PRINT_INFO("Operation Failed");
 
   int ret_val = ( CubitMessage::instance()->error_count() );
-  if ( ret_val != 9 )
+  if ( ret_val != 7 )
   {
     PRINT_ERROR("Errors found during Mergechk session.\n");
   }
@@ -128,8 +128,7 @@
     if(max-11. < 0.000001 && max-11. > -0.000001 &&
        min-11. < 0.000001 && min-11. > -0.000001)
       test_ref_faces2.append(test_ref_faces.get());
-    else
-      test_ref_faces.step();
+    test_ref_faces.step();
   }
   sweep_direction.set(0,0,-6);
   all_bodies.clean_out();
@@ -576,15 +575,6 @@
 
   new_bodies.clean_out();
   face_list.clean_out();
-  cp_from_body2->ref_faces(face_list);
-  for(int i = 0; i < size; i++)
-  {
-    CubitVector v = face_list.get()->center_point();
-    if(!v.about_equal(vv))
-      face_list.remove();
-    else
-      face_list.step();
-  }
 
   //imprint a point on an edge, split it
   CubitVector pp1(10,1,8);
@@ -601,6 +591,16 @@
 
   n = new_bodies.get()->num_ref_edges();//n = 17
   assert( n == 17);
+
+  new_bodies.get()->ref_faces(face_list);
+  for(int i = 0; i < size; i++)
+  {
+    CubitVector v = face_list.get()->center_point();
+    if(!v.about_equal(vv))
+      face_list.remove();
+    else