Author: kraftche Date: 2010-12-17 09:49:43 -0600 (Fri, 17 Dec 2010) New Revision: 4382 Added: cgm/branches/merge-cubit12/KNOWN_ISSUES cgm/branches/merge-cubit12/geom/OCC/occ_patches cgm/branches/merge-cubit12/geom/parallel/CGMFileOptions.cpp cgm/branches/merge-cubit12/geom/parallel/CGMFileOptions.hpp cgm/branches/merge-cubit12/geom/parallel/CGMReadParallel.cpp cgm/branches/merge-cubit12/geom/parallel/CGMReadParallel.hpp cgm/branches/merge-cubit12/test/merge_test.cpp cgm/branches/merge-cubit12/test/subtract.cpp Removed: cgm/branches/merge-cubit12/geom/parallel/ParallelGeomTool.cpp cgm/branches/merge-cubit12/geom/parallel/ParallelGeomTool.hpp Modified: cgm/branches/merge-cubit12/ cgm/branches/merge-cubit12/Makefile.am cgm/branches/merge-cubit12/README.OCC cgm/branches/merge-cubit12/cgm.make.in cgm/branches/merge-cubit12/cgm_apps/Makefile.am cgm/branches/merge-cubit12/cgm_apps/examples/Makefile.am cgm/branches/merge-cubit12/cgm_apps/examples/driverc++/Makefile.am cgm/branches/merge-cubit12/cgm_apps/examples/facetdriver/Makefile.am cgm/branches/merge-cubit12/configure.ac cgm/branches/merge-cubit12/geom/ cgm/branches/merge-cubit12/geom/ACIS_SRC/ cgm/branches/merge-cubit12/geom/ACIS_SRC/Makefile.am cgm/branches/merge-cubit12/geom/ACIS_SRC/gtcAttrib/ cgm/branches/merge-cubit12/geom/ACIS_SRC/gtcAttrib/incl/ cgm/branches/merge-cubit12/geom/ACIS_SRC/gtcAttrib/src/ cgm/branches/merge-cubit12/geom/AllocMemManagersGeom.cpp cgm/branches/merge-cubit12/geom/AnalyticGeometryTool.cpp cgm/branches/merge-cubit12/geom/AnalyticGeometryTool.hpp cgm/branches/merge-cubit12/geom/AutoMidsurfaceTool.cpp cgm/branches/merge-cubit12/geom/AutoMidsurfaceTool.hpp cgm/branches/merge-cubit12/geom/BasicTopologyEntity.cpp cgm/branches/merge-cubit12/geom/BasicTopologyEntity.hpp cgm/branches/merge-cubit12/geom/Body.cpp cgm/branches/merge-cubit12/geom/Body.hpp cgm/branches/merge-cubit12/geom/BodySM.cpp cgm/branches/merge-cubit12/geom/BodySM.hpp cgm/branches/merge-cubit12/geom/BoundingBoxTool.cpp cgm/branches/merge-cubit12/geom/BoundingBoxTool.hpp cgm/branches/merge-cubit12/geom/BridgeManager.cpp cgm/branches/merge-cubit12/geom/BridgeManager.hpp cgm/branches/merge-cubit12/geom/CAActuateSet.cpp cgm/branches/merge-cubit12/geom/CAActuateSet.hpp cgm/branches/merge-cubit12/geom/CADeferredAttrib.cpp cgm/branches/merge-cubit12/geom/CADeferredAttrib.hpp cgm/branches/merge-cubit12/geom/CADefines.hpp cgm/branches/merge-cubit12/geom/CAEntityColor.cpp cgm/branches/merge-cubit12/geom/CAEntityColor.hpp cgm/branches/merge-cubit12/geom/CAEntityId.cpp cgm/branches/merge-cubit12/geom/CAEntityId.hpp cgm/branches/merge-cubit12/geom/CAEntityName.cpp cgm/branches/merge-cubit12/geom/CAEntityName.hpp cgm/branches/merge-cubit12/geom/CAGroup.cpp cgm/branches/merge-cubit12/geom/CAGroup.hpp cgm/branches/merge-cubit12/geom/CAMergePartner.cpp cgm/branches/merge-cubit12/geom/CAMergePartner.hpp cgm/branches/merge-cubit12/geom/CAMergeStatus.cpp cgm/branches/merge-cubit12/geom/CAMergeStatus.hpp cgm/branches/merge-cubit12/geom/CASourceFeature.cpp cgm/branches/merge-cubit12/geom/CASourceFeature.hpp cgm/branches/merge-cubit12/geom/CAUniqueId.cpp cgm/branches/merge-cubit12/geom/CAUniqueId.hpp cgm/branches/merge-cubit12/geom/CGMApp.cpp cgm/branches/merge-cubit12/geom/CGMApp.hpp cgm/branches/merge-cubit12/geom/CGMEngineDynamicLoader.cpp cgm/branches/merge-cubit12/geom/CGMEngineDynamicLoader.hpp cgm/branches/merge-cubit12/geom/CGMHistory.cpp cgm/branches/merge-cubit12/geom/CGMHistory.hpp cgm/branches/merge-cubit12/geom/CMakeLists.txt cgm/branches/merge-cubit12/geom/Chain.cpp cgm/branches/merge-cubit12/geom/Chain.hpp cgm/branches/merge-cubit12/geom/Cholla/ cgm/branches/merge-cubit12/geom/Cholla/Makefile.am cgm/branches/merge-cubit12/geom/CoEdge.cpp cgm/branches/merge-cubit12/geom/CoEdge.hpp cgm/branches/merge-cubit12/geom/CoEdgeSM.cpp cgm/branches/merge-cubit12/geom/CoEdgeSM.hpp cgm/branches/merge-cubit12/geom/CoFace.cpp cgm/branches/merge-cubit12/geom/CoFace.hpp cgm/branches/merge-cubit12/geom/CoVertex.cpp cgm/branches/merge-cubit12/geom/CoVertex.hpp cgm/branches/merge-cubit12/geom/CoVolume.cpp cgm/branches/merge-cubit12/geom/CoVolume.hpp cgm/branches/merge-cubit12/geom/CollectionEntity.cpp cgm/branches/merge-cubit12/geom/CollectionEntity.hpp cgm/branches/merge-cubit12/geom/CompositeCombineEvent.hpp cgm/branches/merge-cubit12/geom/CubitAttrib.cpp cgm/branches/merge-cubit12/geom/CubitAttrib.hpp cgm/branches/merge-cubit12/geom/CubitAttribManager.cpp cgm/branches/merge-cubit12/geom/CubitAttribManager.hpp cgm/branches/merge-cubit12/geom/CubitAttribUser.cpp cgm/branches/merge-cubit12/geom/CubitAttribUser.hpp cgm/branches/merge-cubit12/geom/CubitEvaluator.hpp cgm/branches/merge-cubit12/geom/CubitGeomConfigure.h cgm/branches/merge-cubit12/geom/CubitGeomConfigure.h.in cgm/branches/merge-cubit12/geom/CubitPolygon.cpp cgm/branches/merge-cubit12/geom/CubitPolygon.hpp cgm/branches/merge-cubit12/geom/CubitSimpleAttrib.cpp cgm/branches/merge-cubit12/geom/CubitSimpleAttrib.hpp cgm/branches/merge-cubit12/geom/Curve.cpp cgm/branches/merge-cubit12/geom/Curve.hpp cgm/branches/merge-cubit12/geom/CurveOverlapFacet.cpp cgm/branches/merge-cubit12/geom/CurveOverlapFacet.hpp cgm/branches/merge-cubit12/geom/CurveSM.cpp cgm/branches/merge-cubit12/geom/CurveSM.hpp cgm/branches/merge-cubit12/geom/CylinderEvaluator.cpp cgm/branches/merge-cubit12/geom/CylinderEvaluator.hpp cgm/branches/merge-cubit12/geom/DAG.cpp cgm/branches/merge-cubit12/geom/DAG.hpp cgm/branches/merge-cubit12/geom/DagDrawingTool.cpp cgm/branches/merge-cubit12/geom/DagDrawingTool.hpp cgm/branches/merge-cubit12/geom/DagType.hpp cgm/branches/merge-cubit12/geom/GSaveOpen.cpp cgm/branches/merge-cubit12/geom/GSaveOpen.hpp cgm/branches/merge-cubit12/geom/GeomDataObserver.cpp cgm/branches/merge-cubit12/geom/GeomDataObserver.hpp cgm/branches/merge-cubit12/geom/GeomMeasureTool.cpp cgm/branches/merge-cubit12/geom/GeomMeasureTool.hpp cgm/branches/merge-cubit12/geom/GeomPoint.hpp cgm/branches/merge-cubit12/geom/GeomSeg.hpp cgm/branches/merge-cubit12/geom/GeometryEntity.cpp cgm/branches/merge-cubit12/geom/GeometryEntity.hpp cgm/branches/merge-cubit12/geom/GeometryFeatureEngine.cpp cgm/branches/merge-cubit12/geom/GeometryFeatureEngine.hpp cgm/branches/merge-cubit12/geom/GeometryFeatureTool.cpp cgm/branches/merge-cubit12/geom/GeometryFeatureTool.hpp cgm/branches/merge-cubit12/geom/GeometryHealerEngine.cpp cgm/branches/merge-cubit12/geom/GeometryHealerEngine.hpp cgm/branches/merge-cubit12/geom/GeometryHealerTool.cpp cgm/branches/merge-cubit12/geom/GeometryHealerTool.hpp cgm/branches/merge-cubit12/geom/GeometryModifyEngine.cpp cgm/branches/merge-cubit12/geom/GeometryModifyEngine.hpp cgm/branches/merge-cubit12/geom/GeometryModifyTool.cpp cgm/branches/merge-cubit12/geom/GeometryModifyTool.hpp cgm/branches/merge-cubit12/geom/GeometryQueryEngine.cpp cgm/branches/merge-cubit12/geom/GeometryQueryEngine.hpp cgm/branches/merge-cubit12/geom/GeometryQueryTool.cpp cgm/branches/merge-cubit12/geom/GeometryQueryTool.hpp cgm/branches/merge-cubit12/geom/GeometryUtil.cpp cgm/branches/merge-cubit12/geom/GeometryUtil.hpp cgm/branches/merge-cubit12/geom/GfxPreview.cpp cgm/branches/merge-cubit12/geom/GfxPreview.hpp cgm/branches/merge-cubit12/geom/GroupingEntity.cpp cgm/branches/merge-cubit12/geom/GroupingEntity.hpp cgm/branches/merge-cubit12/geom/IntermediateGeomEngine.hpp cgm/branches/merge-cubit12/geom/Loop.cpp cgm/branches/merge-cubit12/geom/Loop.hpp cgm/branches/merge-cubit12/geom/LoopSM.cpp cgm/branches/merge-cubit12/geom/LoopSM.hpp cgm/branches/merge-cubit12/geom/Lump.cpp cgm/branches/merge-cubit12/geom/Lump.hpp cgm/branches/merge-cubit12/geom/LumpSM.cpp cgm/branches/merge-cubit12/geom/LumpSM.hpp cgm/branches/merge-cubit12/geom/Makefile.am cgm/branches/merge-cubit12/geom/MedialTool2D.cpp cgm/branches/merge-cubit12/geom/MedialTool2D.hpp cgm/branches/merge-cubit12/geom/MedialTool3D.cpp cgm/branches/merge-cubit12/geom/MedialTool3D.hpp cgm/branches/merge-cubit12/geom/MergeTool.cpp cgm/branches/merge-cubit12/geom/MergeTool.hpp cgm/branches/merge-cubit12/geom/MergeToolAssistant.cpp cgm/branches/merge-cubit12/geom/MergeToolAssistant.hpp cgm/branches/merge-cubit12/geom/MidPlaneTool.cpp cgm/branches/merge-cubit12/geom/MidPlaneTool.hpp cgm/branches/merge-cubit12/geom/ModelEntity.cpp cgm/branches/merge-cubit12/geom/ModelEntity.hpp cgm/branches/merge-cubit12/geom/ModelQueryEngine.cpp cgm/branches/merge-cubit12/geom/ModelQueryEngine.hpp cgm/branches/merge-cubit12/geom/OCC/ cgm/branches/merge-cubit12/geom/OCC/Makefile.am cgm/branches/merge-cubit12/geom/OCC/OCCBody.cpp cgm/branches/merge-cubit12/geom/OCC/OCCBody.hpp cgm/branches/merge-cubit12/geom/OCC/OCCCurve.cpp cgm/branches/merge-cubit12/geom/OCC/OCCCurve.hpp cgm/branches/merge-cubit12/geom/OCC/OCCDrawTool.cpp cgm/branches/merge-cubit12/geom/OCC/OCCLoop.hpp cgm/branches/merge-cubit12/geom/OCC/OCCLump.cpp cgm/branches/merge-cubit12/geom/OCC/OCCLump.hpp cgm/branches/merge-cubit12/geom/OCC/OCCModifyEngine.cpp cgm/branches/merge-cubit12/geom/OCC/OCCPoint.cpp cgm/branches/merge-cubit12/geom/OCC/OCCPoint.hpp cgm/branches/merge-cubit12/geom/OCC/OCCQueryEngine.cpp cgm/branches/merge-cubit12/geom/OCC/OCCQueryEngine.hpp cgm/branches/merge-cubit12/geom/OCC/OCCShell.cpp cgm/branches/merge-cubit12/geom/OCC/OCCShell.hpp cgm/branches/merge-cubit12/geom/OCC/OCCSurface.cpp cgm/branches/merge-cubit12/geom/OCC/OCCSurface.hpp cgm/branches/merge-cubit12/geom/OffsetSplitTool.cpp cgm/branches/merge-cubit12/geom/OffsetSplitTool.hpp cgm/branches/merge-cubit12/geom/OldUnmergeCode.cpp cgm/branches/merge-cubit12/geom/OldUnmergeCode.hpp cgm/branches/merge-cubit12/geom/PeriodicParamTool.cpp cgm/branches/merge-cubit12/geom/PeriodicParamTool.hpp cgm/branches/merge-cubit12/geom/Point.cpp cgm/branches/merge-cubit12/geom/Point.hpp cgm/branches/merge-cubit12/geom/PointSM.cpp cgm/branches/merge-cubit12/geom/PointSM.hpp cgm/branches/merge-cubit12/geom/RefCollection.cpp cgm/branches/merge-cubit12/geom/RefCollection.hpp cgm/branches/merge-cubit12/geom/RefEdge.cpp cgm/branches/merge-cubit12/geom/RefEdge.hpp cgm/branches/merge-cubit12/geom/RefEntity.cpp cgm/branches/merge-cubit12/geom/RefEntity.hpp cgm/branches/merge-cubit12/geom/RefEntityFactory.cpp cgm/branches/merge-cubit12/geom/RefEntityFactory.hpp cgm/branches/merge-cubit12/geom/RefEntityName.cpp cgm/branches/merge-cubit12/geom/RefEntityName.hpp cgm/branches/merge-cubit12/geom/RefEntityNameMap.hpp cgm/branches/merge-cubit12/geom/RefFace.cpp cgm/branches/merge-cubit12/geom/RefFace.hpp cgm/branches/merge-cubit12/geom/RefGroup.cpp cgm/branches/merge-cubit12/geom/RefGroup.hpp cgm/branches/merge-cubit12/geom/RefVertex.cpp cgm/branches/merge-cubit12/geom/RefVertex.hpp cgm/branches/merge-cubit12/geom/RefVolume.cpp cgm/branches/merge-cubit12/geom/RefVolume.hpp cgm/branches/merge-cubit12/geom/SenseEntity.cpp cgm/branches/merge-cubit12/geom/SenseEntity.hpp cgm/branches/merge-cubit12/geom/Shell.cpp cgm/branches/merge-cubit12/geom/Shell.hpp cgm/branches/merge-cubit12/geom/ShellSM.cpp cgm/branches/merge-cubit12/geom/ShellSM.hpp cgm/branches/merge-cubit12/geom/SolidWorks/ cgm/branches/merge-cubit12/geom/SphereEvaluator.cpp cgm/branches/merge-cubit12/geom/SphereEvaluator.hpp cgm/branches/merge-cubit12/geom/SplitSurfaceTool.cpp cgm/branches/merge-cubit12/geom/SplitSurfaceTool.hpp cgm/branches/merge-cubit12/geom/SurfParamTool.cpp cgm/branches/merge-cubit12/geom/SurfParamTool.hpp cgm/branches/merge-cubit12/geom/Surface.cpp cgm/branches/merge-cubit12/geom/Surface.hpp cgm/branches/merge-cubit12/geom/SurfaceOverlapFacet.cpp cgm/branches/merge-cubit12/geom/SurfaceOverlapFacet.hpp cgm/branches/merge-cubit12/geom/SurfaceOverlapTool.cpp cgm/branches/merge-cubit12/geom/SurfaceOverlapTool.hpp cgm/branches/merge-cubit12/geom/SurfaceSM.cpp cgm/branches/merge-cubit12/geom/SurfaceSM.hpp cgm/branches/merge-cubit12/geom/TBOwner.hpp cgm/branches/merge-cubit12/geom/TBOwnerSet.hpp cgm/branches/merge-cubit12/geom/TDCAGE.cpp cgm/branches/merge-cubit12/geom/TDCAGE.hpp cgm/branches/merge-cubit12/geom/TDCompare.hpp cgm/branches/merge-cubit12/geom/TDSourceFeature.cpp cgm/branches/merge-cubit12/geom/TDSourceFeature.hpp cgm/branches/merge-cubit12/geom/TDSplitSurface.cpp cgm/branches/merge-cubit12/geom/TDSplitSurface.hpp cgm/branches/merge-cubit12/geom/TDSurfaceOverlap.cpp cgm/branches/merge-cubit12/geom/TDSurfaceOverlap.hpp cgm/branches/merge-cubit12/geom/TDUniqueId.cpp cgm/branches/merge-cubit12/geom/TDUniqueId.hpp cgm/branches/merge-cubit12/geom/TopologyBridge.cpp cgm/branches/merge-cubit12/geom/TopologyBridge.hpp cgm/branches/merge-cubit12/geom/TopologyEntity.cpp cgm/branches/merge-cubit12/geom/TopologyEntity.hpp cgm/branches/merge-cubit12/geom/UnMergeEvent.hpp cgm/branches/merge-cubit12/geom/facet/ cgm/branches/merge-cubit12/geom/facet/Makefile.am cgm/branches/merge-cubit12/geom/facetbool/ cgm/branches/merge-cubit12/geom/facetbool/Makefile.am cgm/branches/merge-cubit12/geom/libcubit_geom.dsp cgm/branches/merge-cubit12/geom/parallel/ cgm/branches/merge-cubit12/geom/parallel/CABodies.cpp cgm/branches/merge-cubit12/geom/parallel/CABodies.hpp cgm/branches/merge-cubit12/geom/parallel/CGMParallelComm.cpp cgm/branches/merge-cubit12/geom/parallel/CGMParallelComm.hpp cgm/branches/merge-cubit12/geom/parallel/CGMProcConfig.hpp cgm/branches/merge-cubit12/geom/parallel/Makefile.am cgm/branches/merge-cubit12/geom/parallel/TDParallel.cpp cgm/branches/merge-cubit12/geom/parallel/TDParallel.hpp cgm/branches/merge-cubit12/geom/testing/ cgm/branches/merge-cubit12/geom/virtual/ cgm/branches/merge-cubit12/geom/virtual/Makefile.am cgm/branches/merge-cubit12/init/InitCGMA.cpp cgm/branches/merge-cubit12/init/InitCGMA.hpp cgm/branches/merge-cubit12/init/Makefile.am cgm/branches/merge-cubit12/itaps/Makefile.am cgm/branches/merge-cubit12/itaps/iBase.h cgm/branches/merge-cubit12/itaps/iGeom-Defs.inc.in cgm/branches/merge-cubit12/itaps/iGeom.h cgm/branches/merge-cubit12/itaps/iGeom_CGMA.cc cgm/branches/merge-cubit12/itaps/partest.cpp cgm/branches/merge-cubit12/m4/compiler.m4 cgm/branches/merge-cubit12/test/ cgm/branches/merge-cubit12/test/Makefile.am cgm/branches/merge-cubit12/test/makept.cpp cgm/branches/merge-cubit12/test/modify.cpp cgm/branches/merge-cubit12/test/operation.cpp cgm/branches/merge-cubit12/test/r_w.cpp cgm/branches/merge-cubit12/util/Makefile.am Log: merge recent changes from trunk into merge-cubit12 branch Property changes on: cgm/branches/merge-cubit12 ___________________________________________________________________ Modified: svn:mergeinfo - /cgm/branches/cubit:1041-3427 /cgm/trunk:3424-3493 + /cgm/branches/cubit:1041-3427 /cgm/trunk:3424-4340 Copied: cgm/branches/merge-cubit12/KNOWN_ISSUES (from rev 4340, cgm/trunk/KNOWN_ISSUES) =================================================================== --- cgm/branches/merge-cubit12/KNOWN_ISSUES (rev 0) +++ cgm/branches/merge-cubit12/KNOWN_ISSUES 2010-12-17 15:49:43 UTC (rev 4382) @@ -0,0 +1,27 @@ +This is a list of the known issues with CGM on OCC.For more details please see +the online ticket system at the MOAB website: + https://trac.mcs.anl.gov/projects/ITAPS/wiki + + + +ID Severity Summary/Details +=== ======== =================================================================== +175 critical imprint special cases fail with crash. + +176 minor CGM memory leak + +177 minor 3-D scale with different scale factors doesn't work. + +178 major Unite function doesn't unite smoothly connected surfaces. + +179 major mcnp2cad test suite lat1-7 not working, needs debugging. + +180 major There are lots new functions or added functions to exsisting + functions requirements to port OCC to cubit12. + +181 minor Lack of good cases for testing purpose. + +182 minor Dirty geometry/imported geometry is not tested for read/repair yet +183 minor Don't have proper tool to visualize the TopoDS_Shapes, debugging + process is long preparing for graphics to understand the issue + Modified: cgm/branches/merge-cubit12/Makefile.am =================================================================== --- cgm/branches/merge-cubit12/Makefile.am 2010-12-17 15:04:25 UTC (rev 4381) +++ cgm/branches/merge-cubit12/Makefile.am 2010-12-17 15:49:43 UTC (rev 4382) @@ -1,5 +1,4 @@ AUTOMAKE_OPTIONS = foreign -SUBDIRS = compat util geom init . itaps test cgm_apps # Don't loose the autoconf include path ACLOCAL_AMFLAGS = -I m4