January 2012 - cgma-dev - mailman3.cels.anl.gov

r5340 - cgm/trunk/geom/OCC
by jiangtao_ma＠yahoo.com 23 Jan '12

23 Jan '12

Author: janehu Date: 2012-01-23 12:35:17 -0600 (Mon, 23 Jan 2012) New Revision: 5340 Modified: cgm/trunk/geom/OCC/OCCQueryEngine.cpp cgm/trunk/geom/OCC/OCCQueryEngine.hpp Log: Change the code back to be compatible to Cubit interface and keep CGM a unitless system. Modified: cgm/trunk/geom/OCC/OCCQueryEngine.cpp =================================================================== --- cgm/trunk/geom/OCC/OCCQueryEngine.cpp 2012-01-23 18:15:39 UTC (rev 5339) +++ cgm/trunk/geom/OCC/OCCQueryEngine.cpp 2012-01-23 18:35:17 UTC (rev 5340) @@ -850,7 +850,6 @@ const char* file_name, const char* file_type, const CubitString &, - const char* unit, const char*) { if( strcmp( file_type, "OCC" ) != 0 && @@ -861,14 +860,16 @@ return CUBIT_FAILURE; } +/* char* name = "write.iges.unit"; Standard_CString orig_unit; + char* unit = "M"; if(strcmp( file_type, "IGES") == 0 && unit != NULL) { orig_unit = Interface_Static::CVal(name); Interface_Static::SetCVal (name, unit); } - +*/ DLIList<OCCBody*> OCC_bodies; DLIList<OCCSurface*> OCC_surfaces; DLIList<OCCCurve*> OCC_curves; @@ -931,10 +932,11 @@ status = write_topology( file_name, file_type, OCC_bodies, OCC_surfaces, OCC_curves, OCC_points ); +/* //set the unit back. if(strcmp( file_type, "IGES") == 0 && unit != NULL) Interface_Static::SetCVal (name,orig_unit); - +*/ if( status == CUBIT_FAILURE ) return CUBIT_FAILURE; if( free_body_count || free_surface_count || @@ -1477,8 +1479,7 @@ CubitBoolean import_surfaces, CubitBoolean import_curves, CubitBoolean import_vertices, - CubitBoolean free_surfaces, - const char* unit ) + CubitBoolean free_surfaces) {

1 0

r5339 - cgm/trunk/geom/virtual
by jiangtao_ma＠yahoo.com 23 Jan '12

23 Jan '12

Author: janehu Date: 2012-01-23 12:15:39 -0600 (Mon, 23 Jan 2012) New Revision: 5339 Modified: cgm/trunk/geom/virtual/VirtualQueryEngine.cpp cgm/trunk/geom/virtual/VirtualQueryEngine.hpp Log: Change the code back to be compatible to Cubit interface and keep CGM a unitless system. Modified: cgm/trunk/geom/virtual/VirtualQueryEngine.cpp =================================================================== --- cgm/trunk/geom/virtual/VirtualQueryEngine.cpp 2012-01-23 17:59:45 UTC (rev 5338) +++ cgm/trunk/geom/virtual/VirtualQueryEngine.cpp 2012-01-23 18:15:39 UTC (rev 5339) @@ -1652,7 +1652,6 @@ const char* , const char* , const CubitString &, - const char*, const char* ) { return CUBIT_FAILURE; @@ -1692,8 +1691,7 @@ CubitBoolean , CubitBoolean , CubitBoolean , - CubitBoolean , - const char* ) + CubitBoolean ) { PRINT_INFO("VirtualQueryEngine::import_solid_model\n"); Modified: cgm/trunk/geom/virtual/VirtualQueryEngine.hpp =================================================================== --- cgm/trunk/geom/virtual/VirtualQueryEngine.hpp 2012-01-23 17:59:45 UTC (rev 5338) +++ cgm/trunk/geom/virtual/VirtualQueryEngine.hpp 2012-01-23 18:15:39 UTC (rev 5339) @@ -357,7 +357,6 @@ const char* file_name, const char* file_type, const CubitString &cubit_version, - const char* unit = NULL, const char* logfile_name = NULL ); virtual CubitStatus export_solid_model( DLIList<TopologyBridge*>& bridge_list, @@ -387,8 +386,7 @@ CubitBoolean import_surfaces = CUBIT_TRUE, CubitBoolean import_curves = CUBIT_TRUE, CubitBoolean import_vertices = CUBIT_TRUE, - CubitBoolean free_surfaces = CUBIT_TRUE, - const char* unit = NULL ); + CubitBoolean free_surfaces = CUBIT_TRUE ); virtual CubitStatus import_solid_model(DLIList<TopologyBridge*> &imported_entities, const char* pBuffer,

1 0

r5338 - cgm/trunk/geom/facet
by jiangtao_ma＠yahoo.com 23 Jan '12

23 Jan '12

Author: janehu Date: 2012-01-23 11:59:45 -0600 (Mon, 23 Jan 2012) New Revision: 5338 Modified: cgm/trunk/geom/facet/FacetQueryEngine.cpp cgm/trunk/geom/facet/FacetQueryEngine.hpp Log: Change the code back to be compatible to Cubit interface and keep CGM a unitless system. Modified: cgm/trunk/geom/facet/FacetQueryEngine.cpp =================================================================== --- cgm/trunk/geom/facet/FacetQueryEngine.cpp 2012-01-23 17:56:39 UTC (rev 5337) +++ cgm/trunk/geom/facet/FacetQueryEngine.cpp 2012-01-23 17:59:45 UTC (rev 5338) @@ -702,7 +702,6 @@ const char* file_name, const char* file_type, const CubitString &, - const char*, const char*) { if( strcmp( file_type, "FACET" ) ) @@ -1752,8 +1751,7 @@ CubitBoolean import_surfaces, CubitBoolean import_curves, CubitBoolean import_vertices, - CubitBoolean free_surfaces, - const char* unit) //not used + CubitBoolean free_surfaces) { errno = 0; FILE *file_ptr = fopen(file_name, "rb"); Modified: cgm/trunk/geom/facet/FacetQueryEngine.hpp =================================================================== --- cgm/trunk/geom/facet/FacetQueryEngine.hpp 2012-01-23 17:56:39 UTC (rev 5337) +++ cgm/trunk/geom/facet/FacetQueryEngine.hpp 2012-01-23 17:59:45 UTC (rev 5338) @@ -249,7 +249,6 @@ const char* file_name, const char* file_type, const CubitString &cubit_version, - const char* unit = NULL, const char* logfile_name = NULL ); virtual CubitStatus export_solid_model( DLIList<TopologyBridge*>& bridge_list, @@ -278,9 +277,7 @@ CubitBoolean import_surfaces = CUBIT_TRUE, CubitBoolean import_curves = CUBIT_TRUE, CubitBoolean import_vertices = CUBIT_TRUE, - CubitBoolean free_surfaces = CUBIT_TRUE, - const char* unit = NULL - ); + CubitBoolean free_surfaces = CUBIT_TRUE ); virtual CubitStatus import_solid_model(DLIList<TopologyBridge*> &imported_entities, const char* pBuffer,

1 0

r5337 - cgm/trunk/geom/ACIS_SRC
by jiangtao_ma＠yahoo.com 23 Jan '12

23 Jan '12

Author: janehu Date: 2012-01-23 11:56:39 -0600 (Mon, 23 Jan 2012) New Revision: 5337 Modified: cgm/trunk/geom/ACIS_SRC/AcisQueryEngine.cpp cgm/trunk/geom/ACIS_SRC/AcisQueryEngine.hpp Log: Change the code back to be compatible to Cubit interface and keep CGM a unitless system. Modified: cgm/trunk/geom/ACIS_SRC/AcisQueryEngine.cpp =================================================================== --- cgm/trunk/geom/ACIS_SRC/AcisQueryEngine.cpp 2012-01-23 17:35:46 UTC (rev 5336) +++ cgm/trunk/geom/ACIS_SRC/AcisQueryEngine.cpp 2012-01-23 17:56:39 UTC (rev 5337) @@ -340,7 +340,6 @@ const char* filename, const char* filetype, const CubitString &cubit_version, - const char* unit, const char* logfile_name) { // Check to make sure we are exporting valid types @@ -883,8 +882,7 @@ CubitBoolean import_surfaces, CubitBoolean import_curves, CubitBoolean import_vertices, - CubitBoolean free_surfaces, - const char* unit) //not used here + CubitBoolean free_surfaces) { CpuTimer import_solid_model_timer; CubitBoolean step_import = CUBIT_FALSE; Modified: cgm/trunk/geom/ACIS_SRC/AcisQueryEngine.hpp =================================================================== --- cgm/trunk/geom/ACIS_SRC/AcisQueryEngine.hpp 2012-01-23 17:35:46 UTC (rev 5336) +++ cgm/trunk/geom/ACIS_SRC/AcisQueryEngine.hpp 2012-01-23 17:56:39 UTC (rev 5337) @@ -178,7 +178,6 @@ const char* file_name, const char* file_type, const CubitString &cubit_version, - const char* unit = NULL, const char* logfile_name = NULL ) ; //R CubitStatus //R- CUBIT_SUCCESS/CUBIT_FAILURE @@ -233,8 +232,7 @@ CubitBoolean import_surfaces = CUBIT_TRUE, CubitBoolean import_curves = CUBIT_TRUE, CubitBoolean import_vertices = CUBIT_TRUE, - CubitBoolean free_surfaces = CUBIT_TRUE , - const char* unit = NULL); + CubitBoolean free_surfaces = CUBIT_TRUE ) ; //R CubitStatus //R- CUBIT_SUCCESS/CUBIT_FAILURE //I file_ptr

1 0

r5336 - cgm/trunk/geom
by jiangtao_ma＠yahoo.com 23 Jan '12

23 Jan '12

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,

1 0

r5335 - cgm/trunk/test
by jiangtao_ma＠yahoo.com 23 Jan '12

23 Jan '12

Author: janehu Date: 2012-01-23 11:26:45 -0600 (Mon, 23 Jan 2012) New Revision: 5335 Removed: cgm/trunk/test/cduct.igs Modified: cgm/trunk/test/Makefile.am cgm/trunk/test/merge_test.cpp cgm/trunk/test/r_w.cpp Log: Reverse back fix for unit problemin read/write iges files. CGM is a unitless system, and we won't support unit differences. Modified: cgm/trunk/test/Makefile.am =================================================================== --- cgm/trunk/test/Makefile.am 2012-01-22 04:50:31 UTC (rev 5334) +++ cgm/trunk/test/Makefile.am 2012-01-23 17:26:45 UTC (rev 5335) @@ -145,9 +145,6 @@ bricks2.occ \ bricks22.occ \ bricks23.occ \ - cduct_exp.iges \ - diffuser_exp.iges \ - diffuser.occ \ mmgr.log Deleted: cgm/trunk/test/cduct.igs =================================================================== --- cgm/trunk/test/cduct.igs 2012-01-22 04:50:31 UTC (rev 5334) +++ cgm/trunk/test/cduct.igs 2012-01-23 17:26:45 UTC (rev 5335) @@ -1,1217 +0,0 @@ -Data from Parasolid IGES Translator, Copyright (c) 2006 UGS Corp. All RS 1 -ights Reserved. S 2 -1H,,1H;,6HNoname,9Hcduct.igs,13H By UGS Corp.,22HXPlus GENERIC/IGES 3.0,G 1 -32,38, 6,308,15,6HNoname,1.000,6,1HM,1,1.000,15H20120116.155256,1.0e-08,G 2 -0.00,6HNoname,6HNoname,11,0,15H20120116.155256; G 3 - 128 1 0 1 0 0 0 000010001D 1 - 128 1 0 148 0 0 0 0D 2 - 126 149 0 1 0 0 0 000010501D 3 - 126 1 0 2 0 0 0 0D 4 - 126 151 0 1 0 0 0 000010501D 5 - 126 1 0 2 0 0 0 0D 6 - 126 153 0 1 0 0 0 000010501D 7 - 126 1 0 2 0 0 0 0D 8 - 126 155 0 1 0 0 0 000010501D 9 - 126 1 0 2 0 0 0 0D 10 - 102 157 0 1 0 0 0 000010501D 11 - 102 1 0 1 0 0 0 0D 12 - 126 158 0 1 0 0 0 000010001D 13 - 126 1 0 2 0 0 0 0D 14 - 126 160 0 1 0 0 0 000010001D 15 - 126 1 0 43 0 0 0 0D 16 - 126 203 0 1 0 0 0 000010001D 17 - 126 1 0 2 0 0 0 0D 18 - 126 205 0 1 0 0 0 000010001D 19 - 126 1 0 43 0 0 0 0D 20 - 102 248 0 1 0 0 0 000010001D 21 - 102 1 0 1 0 0 0 0D 22 - 142 249 0 1 0 0 0 000010001D 23 - 142 1 0 1 0 0 0 0D 24 - 144 250 0 1 0 0 0 000000001D 25 - 144 1 0 1 0 0 0 0D 26

1 0

buildbot failure in cgm-distcheck: failed compile
by cgma-dev＠mcs.anl.gov 23 Jan '12

23 Jan '12

1 0

buildbot failure in cgm-cubit: failed compile test
by cgma-dev＠mcs.anl.gov 23 Jan '12

23 Jan '12

1 0

buildbot failure in cgm-occ: failed compile test
by cgma-dev＠mcs.anl.gov 23 Jan '12

23 Jan '12

1 0

buildbot failure in cgm-shared: failed compile test
by cgma-dev＠mcs.anl.gov 23 Jan '12

23 Jan '12

1 0