[cgma-dev] r5336 - cgm/trunk/geom

[jiangtao_ma at yahoo.com]

Author: janehu
Date: 2012-01-23 11:35:46 -0600 (Mon, 23 Jan 2012)
New Revision: 5336

Modified:
   cgm/trunk/geom/CubitCompat.cpp
   cgm/trunk/geom/CubitCompat.hpp
   cgm/trunk/geom/GeometryQueryEngine.hpp
   cgm/trunk/geom/GeometryQueryTool.cpp
   cgm/trunk/geom/GeometryQueryTool.hpp
Log:
Change back to previous version, CGM is going to be kept in unitless system.

Modified: cgm/trunk/geom/CubitCompat.cpp
===================================================================
--- cgm/trunk/geom/CubitCompat.cpp	2012-01-23 17:26:45 UTC (rev 5335)
+++ cgm/trunk/geom/CubitCompat.cpp	2012-01-23 17:35:46 UTC (rev 5336)
@@ -49,7 +49,6 @@
 CubitCompat_import_solid_model( const char* file_name,
                                 const char* file_type,
                                 const char* logfile_name,
-                                const char* unit,
                                 CubitBoolean heal_step,
                                 CubitBoolean import_bodies,
                                 CubitBoolean import_surfaces,
@@ -71,9 +70,9 @@
                                         free_surfaces,
                                         merge_globally,
                                         no_assembly_level_features,
-                                        logfile_name ? logfile_name : ""};
+                                        logfile_name ? logfile_name : "" };
 #else 
-  #define CubitCompat_opts logfile_name, unit ? unit : "", heal_step, \
+  #define CubitCompat_opts logfile_name, heal_step, \
                            import_bodies, import_surfaces, \
                            import_curves, import_vertices, \
                            free_surfaces
@@ -92,8 +91,7 @@
                                 const char * filetype,
                                 int &num_ents_exported,
                                 const CubitString &cubit_version,
-                                const char* logfile_name,
-                                const char* unit )
+                                const char* logfile_name )
 {
   return GeometryQueryTool::instance()->export_solid_model(
            ref_entity_list,
@@ -101,6 +99,5 @@
            CubitCompat_file_type(filetype),
            num_ents_exported,
            cubit_version,
-           logfile_name,
-           unit );
+           logfile_name );
 }

Modified: cgm/trunk/geom/CubitCompat.hpp
===================================================================
--- cgm/trunk/geom/CubitCompat.hpp	2012-01-23 17:26:45 UTC (rev 5335)
+++ cgm/trunk/geom/CubitCompat.hpp	2012-01-23 17:35:46 UTC (rev 5336)
@@ -11,7 +11,6 @@
 CubitCompat_import_solid_model( const char* file_name,
                                 const char* file_type,
                                 const char* logfile_name = NULL,