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

Re: [cgma-dev] Make check errors...
by Stuart Slattery 26 Sep '12

26 Sep '12

On 09/26/2012 01:57 PM, Paul Wilson wrote: > Hi everyone, > > Sorry if I've missed this discussed elsewhere (or forgotten the answer > that once knew).... > > I get the following errors when I try to "make check" on CGM built > against cubit 12.2: > > wilsonp@todlaw ~/UW/research/fathom/cgm/dagmc_bld/test > > LD_LIBRARY_PATH=/opt/cubit/12.2/bin make check > make init sheet webcut brick_acis merge_acis > make[1]: Entering directory > `/home/wilsonp/UW/research/fathom/cgm/dagmc_bld/test' > make[1]: `init' is up to date. > /bin/bash ../libtool --tag=CXX --mode=link g++ -Wall -pipe > -pedantic -O2 -DNDEBUG -L/opt/cubit/12.2/bin > -R/opt/cubit/12.2/bin -o sheet sheet.o ../libcgm.la -lm > libtool: link: g++ -Wall -pipe -pedantic -O2 -DNDEBUG -o > .libs/sheet sheet.o -L/opt/cubit/12.2/bin ../.libs/libcgm.so -lm > -Wl,-rpath -Wl,/home/wilsonp/opt/lib -Wl,-rpath > -Wl,/opt/cubit/12.2/bin > /usr/bin/ld: sheet.o: undefined reference to symbol > 'Body::is_sheet_body()' > /usr/bin/ld: note: 'Body::is_sheet_body()' is defined in DSO > /opt/cubit/12.2/bin/libcubiti19.so so try adding it to the linker > command line > /opt/cubit/12.2/bin/libcubiti19.so: could not read symbols: > Invalid operation > collect2: ld returned 1 exit status > make[1]: *** [sheet] Error 1 > make[1]: Leaving directory > `/home/wilsonp/UW/research/fathom/cgm/dagmc_bld/test' > make: *** [check-am] Error 2 > > I've configured with: --enable-optimize --disable-debug > --enable-shared --with-cubit=/opt/cubit/12.2 --prefix=/home/wilsonp/opt > > Should there be a -lcubit19 in the linker flags here? > > Paul > > -- > -- ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ -- > Paul Wilson ~ UW-Madison ~ 608-263-0807 ~ cal:http://bit.ly/pphw-cal > Associate Professor, Engineering Physics. ~http://cnerg.engr.wisc.edu > Chair, Energy Analysis & Policy Program ~http://nelson.wisc.edu/eap Hi Paul Try adding cubit to your LPATH as well as your LD_LIBRARY_PATH. Stuart -- Stuart Slattery Nuclear Regulatory Commission Fellow Computational Nuclear Engineering Research Group Department of Engineering Physics University of Wisconsin - Madison 434 Engineering Research Building 1500 Engineering Drive Madison, WI 53706 email : sslattery(a)wisc.edu cell : 608.843.5871 url : http://cnerg.engr.wisc.edu

1 0

Re: [cgma-dev] Make check errors...
by Iulian Grindeanu 26 Sep '12

26 Sep '12

If you are on ubuntu 12.04, the current cgm will not build fine with --enable-shared try static, I would say. Or, specify lcubit..., as you suggest. I didn't commit my version, because I still hope that libtool will be able to figure out that the new "golden" link rules are needed. Iulian ----- Original Message ----- | Hi everyone, | Sorry if I've missed this discussed elsewhere (or forgotten the answer | that once knew).... | I get the following errors when I try to "make check" on CGM built | against cubit 12.2: | | wilsonp@todlaw ~/UW/research/fathom/cgm/dagmc_bld/test > | | LD_LIBRARY_PATH=/opt/cubit/12.2/bin make check | | make init sheet webcut brick_acis merge_acis | | make[1]: Entering directory | | `/home/wilsonp/UW/research/fathom/cgm/dagmc_bld/test' | | make[1]: `init' is up to date. | | /bin/bash ../libtool --tag=CXX --mode=link g++ -Wall -pipe -pedantic | | -O2 -DNDEBUG -L/opt/cubit/12.2/bin -R/opt/cubit/12.2/bin -o sheet | | sheet.o ../libcgm.la -lm | | libtool: link: g++ -Wall -pipe -pedantic -O2 -DNDEBUG -o .libs/sheet | | sheet.o -L/opt/cubit/12.2/bin ../.libs/libcgm.so -lm -Wl,-rpath | | -Wl,/home/wilsonp/opt/lib -Wl,-rpath -Wl,/opt/cubit/12.2/bin | | /usr/bin/ld: sheet.o: undefined reference to symbol | | 'Body::is_sheet_body()' | | /usr/bin/ld: note: 'Body::is_sheet_body()' is defined in DSO | | /opt/cubit/12.2/bin/libcubiti19.so so try adding it to the linker | | command line | | /opt/cubit/12.2/bin/libcubiti19.so: could not read symbols: Invalid | | operation | | collect2: ld returned 1 exit status | | make[1]: *** [sheet] Error 1 | | make[1]: Leaving directory | | `/home/wilsonp/UW/research/fathom/cgm/dagmc_bld/test' | | make: *** [check-am] Error 2 | I've configured with: --enable-optimize --disable-debug | --enable-shared --with-cubit=/opt/cubit/12.2 | --prefix=/home/wilsonp/opt | Should there be a -lcubit19 in the linker flags here? | Paul | -- | -- ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ | -- | Paul Wilson ~ UW-Madison ~ 608-263-0807 ~ cal: http://bit.ly/pphw-cal | Associate Professor, Engineering Physics. ~ http://cnerg.engr.wisc.edu | Chair, Energy Analysis & Policy Program ~ http://nelson.wisc.edu/eap

1 0

Make check errors...
by Paul Wilson 26 Sep '12

26 Sep '12

Hi everyone, Sorry if I've missed this discussed elsewhere (or forgotten the answer that once knew).... I get the following errors when I try to "make check" on CGM built against cubit 12.2: wilsonp@todlaw ~/UW/research/fathom/cgm/dagmc_bld/test > LD_LIBRARY_PATH=/opt/cubit/12.2/bin make check make init sheet webcut brick_acis merge_acis make[1]: Entering directory `/home/wilsonp/UW/research/fathom/cgm/dagmc_bld/test' make[1]: `init' is up to date. /bin/bash ../libtool --tag=CXX --mode=link g++ -Wall -pipe -pedantic -O2 -DNDEBUG -L/opt/cubit/12.2/bin -R/opt/cubit/12.2/bin -o sheet sheet.o ../libcgm.la -lm libtool: link: g++ -Wall -pipe -pedantic -O2 -DNDEBUG -o .libs/sheet sheet.o -L/opt/cubit/12.2/bin ../.libs/libcgm.so -lm -Wl,-rpath -Wl,/home/wilsonp/opt/lib -Wl,-rpath -Wl,/opt/cubit/12.2/bin /usr/bin/ld: sheet.o: undefined reference to symbol 'Body::is_sheet_body()' /usr/bin/ld: note: 'Body::is_sheet_body()' is defined in DSO /opt/cubit/12.2/bin/libcubiti19.so so try adding it to the linker command line /opt/cubit/12.2/bin/libcubiti19.so: could not read symbols: Invalid operation collect2: ld returned 1 exit status make[1]: *** [sheet] Error 1 make[1]: Leaving directory `/home/wilsonp/UW/research/fathom/cgm/dagmc_bld/test' make: *** [check-am] Error 2 I've configured with: --enable-optimize --disable-debug --enable-shared --with-cubit=/opt/cubit/12.2 --prefix=/home/wilsonp/opt Should there be a -lcubit19 in the linker flags here? Paul -- -- ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ -- Paul Wilson ~ UW-Madison ~ 608-263-0807 ~ cal: http://bit.ly/pphw-cal Associate Professor, Engineering Physics. ~ http://cnerg.engr.wisc.edu Chair, Energy Analysis & Policy Program ~ http://nelson.wisc.edu/eap

1 0

r5755 - cgm/trunk/geom
by janehu＠mcs.anl.gov 26 Sep '12

26 Sep '12

Author: janehu Date: 2012-09-26 10:38:58 -0500 (Wed, 26 Sep 2012) New Revision: 5755 Modified: cgm/trunk/geom/CADefines.hpp cgm/trunk/geom/CubitGeomConfigure.h Log: Chaman didn't change in cgm directory for the new FTGL build of OCC, confirmed with him, and change it back. Modified: cgm/trunk/geom/CADefines.hpp =================================================================== --- cgm/trunk/geom/CADefines.hpp 2012-09-26 15:25:19 UTC (rev 5754) +++ cgm/trunk/geom/CADefines.hpp 2012-09-26 15:38:58 UTC (rev 5755) @@ -51,7 +51,8 @@ // attribute type (eg. for the last index in a loop) CA_ASSEMBLY_DATA, CA_SIZING_FUNCTION_SKELETON, - CA_SOURCE_FEATURE + CA_SOURCE_FEATURE, + CA_ITAPS_TAG #ifdef CAT ,CA_PRO_WELD #endif Modified: cgm/trunk/geom/CubitGeomConfigure.h =================================================================== --- cgm/trunk/geom/CubitGeomConfigure.h 2012-09-26 15:25:19 UTC (rev 5754) +++ cgm/trunk/geom/CubitGeomConfigure.h 2012-09-26 15:38:58 UTC (rev 5755) @@ -1,26 +1 @@ - -#ifndef CUBIT_GEOM_CONFIGURE_H -#define CUBIT_GEOM_CONFIGURE_H - -/* #undef CUBIT_GEOM_BUILD_SHARED_LIBS */ - -#if defined(CUBIT_GEOM_BUILD_SHARED_LIBS) -#if defined(cubit_geom_EXPORTS) -# if defined(WIN32) -# define CUBIT_GEOM_EXPORT __declspec(dllexport) -# elif defined(__GNUC__) && __GNUC__ >= 4 -# define CUBIT_GEOM_EXPORT __attribute__ ((visibility("default"))) -# endif -#else -# if defined(WIN32) -# define CUBIT_GEOM_EXPORT __declspec(dllimport) -# endif -#endif -#endif - -#ifndef CUBIT_GEOM_EXPORT #define CUBIT_GEOM_EXPORT -#endif - -#endif -

1 0

r5754 - cgm/branches/merge-cubit13.1/geom/OCC/patches653
by csverma＠mcs.anl.gov 26 Sep '12

26 Sep '12

Author: csverma Date: 2012-09-26 10:25:19 -0500 (Wed, 26 Sep 2012) New Revision: 5754 Added: cgm/branches/merge-cubit13.1/geom/OCC/patches653/OpenGl_FontMgr.cxx_patch cgm/branches/merge-cubit13.1/geom/OCC/patches653/README Log: Passed CGM make check with new FTGL Added: cgm/branches/merge-cubit13.1/geom/OCC/patches653/OpenGl_FontMgr.cxx_patch =================================================================== --- cgm/branches/merge-cubit13.1/geom/OCC/patches653/OpenGl_FontMgr.cxx_patch (rev 0) +++ cgm/branches/merge-cubit13.1/geom/OCC/patches653/OpenGl_FontMgr.cxx_patch 2012-09-26 15:25:19 UTC (rev 5754) @@ -0,0 +1,15 @@ +--- OpenGl_FontMgr.cxx 2012-04-13 07:39:02.000000000 -0500 ++++ ../../../rosnew/src/OpenGl/OpenGl_FontMgr.cxx 2012-09-25 13:57:29.461257744 -0500 +@@ -17,9 +17,9 @@ + + #include <OpenGl_FontMgr.hxx> + +-#include <FTGLTextureFont.h> +-#include <FTLibrary.h> +-#include <FTFace.h> ++#include <FTGL/FTGLTextureFont.h> ++#include <FTGL/FTLibrary.h> ++#include <FTGL/FTFace.h> + #include <Standard_Stream.hxx> + + #undef TRACE Added: cgm/branches/merge-cubit13.1/geom/OCC/patches653/README =================================================================== --- cgm/branches/merge-cubit13.1/geom/OCC/patches653/README (rev 0) +++ cgm/branches/merge-cubit13.1/geom/OCC/patches653/README 2012-09-26 15:25:19 UTC (rev 5754) @@ -0,0 +1,15 @@ +When you install ftgl library on Ubuntu12.04, some of the header +files are not correctly copied to the standard location. The new +FTGL expects them to be /usr/include/FTGL directory. + +Go to the source code of the new ftgl and copy all the *.h files +to the /usr/include/FTGL directory. + +Also in the source code of OCC, you need to change the header files +to FTGL/FTFont.h instead of FTFont.h and this is being done in the +given patch file. + +All the test cases of CGM passed through these changes, so assuming +that everything was fine, but no rigrous testing was carried out for +these changes. +

1 0

r5753 - in cgm/trunk: . geom util
by csverma＠mcs.anl.gov 26 Sep '12

26 Sep '12

Author: csverma Date: 2012-09-26 10:00:18 -0500 (Wed, 26 Sep 2012) New Revision: 5753 Modified: cgm/trunk/configure.ac cgm/trunk/geom/CubitGeomConfigure.h cgm/trunk/util/CubitUtilConfigure.h Log: OCC works with freetype2 and new ftgl on Ubuntu12.04 Modified: cgm/trunk/configure.ac =================================================================== --- cgm/trunk/configure.ac 2012-09-25 18:33:05 UTC (rev 5752) +++ cgm/trunk/configure.ac 2012-09-26 15:00:18 UTC (rev 5753) @@ -533,7 +533,7 @@ AC_LINK_IFELSE( [AC_LANG_PROGRAM([#include "Standard_Mutex.hxx"], [Standard_Mutex mutex; mutex.TryLock();])], [AC_MSG_RESULT([yes]); OCC_LIBS="$OCC_LIBS -lpthread"], - [AC_MSG_ERROR([Cannot link libTKKernel with Standard_Mutex])] + [AC_MSG_ERROR([Cannot link libTKernel with Standard_Mutex])] )]) Modified: cgm/trunk/geom/CubitGeomConfigure.h =================================================================== --- cgm/trunk/geom/CubitGeomConfigure.h 2012-09-25 18:33:05 UTC (rev 5752) +++ cgm/trunk/geom/CubitGeomConfigure.h 2012-09-26 15:00:18 UTC (rev 5753) @@ -1 +1,26 @@ + +#ifndef CUBIT_GEOM_CONFIGURE_H +#define CUBIT_GEOM_CONFIGURE_H + +/* #undef CUBIT_GEOM_BUILD_SHARED_LIBS */ + +#if defined(CUBIT_GEOM_BUILD_SHARED_LIBS) +#if defined(cubit_geom_EXPORTS) +# if defined(WIN32) +# define CUBIT_GEOM_EXPORT __declspec(dllexport) +# elif defined(__GNUC__) && __GNUC__ >= 4 +# define CUBIT_GEOM_EXPORT __attribute__ ((visibility("default"))) +# endif +#else +# if defined(WIN32) +# define CUBIT_GEOM_EXPORT __declspec(dllimport) +# endif +#endif +#endif + +#ifndef CUBIT_GEOM_EXPORT #define CUBIT_GEOM_EXPORT +#endif + +#endif + Modified: cgm/trunk/util/CubitUtilConfigure.h =================================================================== --- cgm/trunk/util/CubitUtilConfigure.h 2012-09-25 18:33:05 UTC (rev 5752) +++ cgm/trunk/util/CubitUtilConfigure.h 2012-09-26 15:00:18 UTC (rev 5753) @@ -1 +1,26 @@

1 0

r5751 - in cgm/branches/merge-cubit13.1/geom/OCC: . patches653
by janehu＠mcs.anl.gov 25 Sep '12

25 Sep '12

Author: janehu Date: 2012-09-25 12:53:15 -0500 (Tue, 25 Sep 2012) New Revision: 5751 Added: cgm/branches/merge-cubit13.1/geom/OCC/patches653/ cgm/branches/merge-cubit13.1/geom/OCC/patches653/BOP_FaceBuilder.cxx_patch cgm/branches/merge-cubit13.1/geom/OCC/patches653/BRepBuilderAPI_Collect.cxx_patch cgm/branches/merge-cubit13.1/geom/OCC/patches653/Extrema_ExtPElS.cxx_patch cgm/branches/merge-cubit13.1/geom/OCC/patches653/Extrema_ExtPS.cxx_patch cgm/branches/merge-cubit13.1/geom/OCC/patches653/TopOpeBRep_EdgesIntersector_1.cxx_patch Removed: cgm/branches/merge-cubit13.1/geom/OCC/BOP_FaceBuilder.cxx_patch cgm/branches/merge-cubit13.1/geom/OCC/BRepBuilderAPI_Collect.cxx_patch cgm/branches/merge-cubit13.1/geom/OCC/Extrema_ExtPElS.cxx_patch cgm/branches/merge-cubit13.1/geom/OCC/Extrema_ExtPS.cxx_patch cgm/branches/merge-cubit13.1/geom/OCC/TopOpeBRep_EdgesIntersector_1.cxx_patch Log: Rearrange the files into patches653 folder. Deleted: cgm/branches/merge-cubit13.1/geom/OCC/BOP_FaceBuilder.cxx_patch =================================================================== --- cgm/branches/merge-cubit13.1/geom/OCC/BOP_FaceBuilder.cxx_patch 2012-09-25 17:42:54 UTC (rev 5750) +++ cgm/branches/merge-cubit13.1/geom/OCC/BOP_FaceBuilder.cxx_patch 2012-09-25 17:53:15 UTC (rev 5751) @@ -1,422 +0,0 @@ ---- a/src/BOP/BOP_FaceBuilder.cxx 2012-04-13 07:38:39.000000000 -0500 -+++ b/src/BOP/BOP_FaceBuilder.cxx 2012-09-25 12:32:16.000000000 -0500 -@@ -23,9 +23,15 @@ - #include <Geom_Surface.hxx> - #include <Geom_Curve.hxx> - -+#include <Geom2dInt_Geom2dCurveTool.hxx> -+ - #include <BRep_Builder.hxx> - #include <BRep_Tool.hxx> -+ -+#include <BRepLib.hxx> -+ - #include <BRepAdaptor_Surface.hxx> -+#include <BRepAdaptor_Curve2d.hxx> - - #include <TopAbs_Orientation.hxx> - -@@ -36,6 +42,9 @@ - #include <TopTools_ListOfShape.hxx> - #include <TopTools_IndexedDataMapOfShapeListOfShape.hxx> - #include <TopTools_ListIteratorOfListOfShape.hxx> -+#include <TopTools_DataMapOfShapeShape.hxx> -+#include <TopTools_DataMapOfShapeListOfShape.hxx> -+#include <TopTools_DataMapIteratorOfDataMapOfShapeListOfShape.hxx> - - #include <TopoDS.hxx> - #include <TopoDS_Face.hxx> -@@ -60,13 +69,8 @@ - #include <BOP_BuilderTools.hxx> - #include <BOP_ListIteratorOfListOfConnexityBlock.hxx> - #include <BOP_ConnexityBlock.hxx> -+#include <BRepBuilderAPI_Copy.hxx> - --//modified by NIZNHY-PKV Wed Feb 29 10:04:56 2012t --#include <TopTools_DataMapOfShapeShape.hxx> --#include <TopTools_DataMapOfShapeListOfShape.hxx> --#include <TopTools_DataMapIteratorOfDataMapOfShapeListOfShape.hxx> --#include <BRepAdaptor_Curve2d.hxx> --#include <Geom2dInt_Geom2dCurveTool.hxx> - - static - Standard_Boolean IsGrowthWire(const TopoDS_Shape& theWire, -@@ -78,7 +82,6 @@ - Standard_Boolean IsInside(const TopoDS_Shape& theHole, - const TopoDS_Shape& theF2,

1 0

r5750 - cgm/branches/merge-cubit13.1/geom/OCC
by janehu＠mcs.anl.gov 25 Sep '12

25 Sep '12

Author: janehu Date: 2012-09-25 12:42:54 -0500 (Tue, 25 Sep 2012) New Revision: 5750 Added: cgm/branches/merge-cubit13.1/geom/OCC/BOP_FaceBuilder.cxx_patch cgm/branches/merge-cubit13.1/geom/OCC/BRepBuilderAPI_Collect.cxx_patch cgm/branches/merge-cubit13.1/geom/OCC/Extrema_ExtPElS.cxx_patch cgm/branches/merge-cubit13.1/geom/OCC/Extrema_ExtPS.cxx_patch cgm/branches/merge-cubit13.1/geom/OCC/TopOpeBRep_EdgesIntersector_1.cxx_patch Removed: cgm/branches/merge-cubit13.1/geom/OCC/occ_patches_6.5.3 Log: Rewrite the patches into 5 files, the put-them-together doesn't always work fully. Works now in my machine, and Chaman will double check when this is in. Added: cgm/branches/merge-cubit13.1/geom/OCC/BOP_FaceBuilder.cxx_patch =================================================================== --- cgm/branches/merge-cubit13.1/geom/OCC/BOP_FaceBuilder.cxx_patch (rev 0) +++ cgm/branches/merge-cubit13.1/geom/OCC/BOP_FaceBuilder.cxx_patch 2012-09-25 17:42:54 UTC (rev 5750) @@ -0,0 +1,422 @@ +--- a/src/BOP/BOP_FaceBuilder.cxx 2012-04-13 07:38:39.000000000 -0500 ++++ b/src/BOP/BOP_FaceBuilder.cxx 2012-09-25 12:32:16.000000000 -0500 +@@ -23,9 +23,15 @@ + #include <Geom_Surface.hxx> + #include <Geom_Curve.hxx> + ++#include <Geom2dInt_Geom2dCurveTool.hxx> ++ + #include <BRep_Builder.hxx> + #include <BRep_Tool.hxx> ++ ++#include <BRepLib.hxx> ++ + #include <BRepAdaptor_Surface.hxx> ++#include <BRepAdaptor_Curve2d.hxx> + + #include <TopAbs_Orientation.hxx> + +@@ -36,6 +42,9 @@ + #include <TopTools_ListOfShape.hxx> + #include <TopTools_IndexedDataMapOfShapeListOfShape.hxx> + #include <TopTools_ListIteratorOfListOfShape.hxx> ++#include <TopTools_DataMapOfShapeShape.hxx> ++#include <TopTools_DataMapOfShapeListOfShape.hxx> ++#include <TopTools_DataMapIteratorOfDataMapOfShapeListOfShape.hxx> + + #include <TopoDS.hxx> + #include <TopoDS_Face.hxx> +@@ -60,13 +69,8 @@ + #include <BOP_BuilderTools.hxx> + #include <BOP_ListIteratorOfListOfConnexityBlock.hxx> + #include <BOP_ConnexityBlock.hxx> ++#include <BRepBuilderAPI_Copy.hxx> + +-//modified by NIZNHY-PKV Wed Feb 29 10:04:56 2012t +-#include <TopTools_DataMapOfShapeShape.hxx> +-#include <TopTools_DataMapOfShapeListOfShape.hxx> +-#include <TopTools_DataMapIteratorOfDataMapOfShapeListOfShape.hxx> +-#include <BRepAdaptor_Curve2d.hxx> +-#include <Geom2dInt_Geom2dCurveTool.hxx> + + static + Standard_Boolean IsGrowthWire(const TopoDS_Shape& theWire, +@@ -78,7 +82,6 @@ + Standard_Boolean IsInside(const TopoDS_Shape& theHole, + const TopoDS_Shape& theF2,

1 0

r5748 - cgm/branches/merge-cubit13.1/geom/OCC
by janehu＠mcs.anl.gov 24 Sep '12

24 Sep '12

Author: janehu Date: 2012-09-24 12:25:39 -0500 (Mon, 24 Sep 2012) New Revision: 5748 Modified: cgm/branches/merge-cubit13.1/geom/OCC/OCCCurve.cpp cgm/branches/merge-cubit13.1/geom/OCC/OCCModifyEngine.cpp Log: Remove check for IsMin, found that it's not the correct indication whether the result is a Minimal extreme. Corrected the mcnp2cad/rec testcase, not takes 6-8s instead of 20 minutes and gives wrong results. Passed make check for cgm/test. Modified: cgm/branches/merge-cubit13.1/geom/OCC/OCCCurve.cpp =================================================================== --- cgm/branches/merge-cubit13.1/geom/OCC/OCCCurve.cpp 2012-09-24 00:27:43 UTC (rev 5747) +++ cgm/branches/merge-cubit13.1/geom/OCC/OCCCurve.cpp 2012-09-24 17:25:39 UTC (rev 5748) @@ -462,14 +462,12 @@ double sqr_dist = CUBIT_DBL_MAX; double pparam; for (int i = 1; i <= ext.NbExt(); ++i) { - if (ext.IsMin(i)) { double new_sqr_dist = p.SquareDistance( ext.Point(i).Value() ); if (new_sqr_dist < sqr_dist) { sqr_dist = new_sqr_dist; newP = ext.Point(i).Value(); pparam = ext.Point(i).Parameter(); } - } } // if we didn't find any minimum... Modified: cgm/branches/merge-cubit13.1/geom/OCC/OCCModifyEngine.cpp =================================================================== --- cgm/branches/merge-cubit13.1/geom/OCC/OCCModifyEngine.cpp 2012-09-24 00:27:43 UTC (rev 5747) +++ cgm/branches/merge-cubit13.1/geom/OCC/OCCModifyEngine.cpp 2012-09-24 17:25:39 UTC (rev 5748) @@ -3276,27 +3276,23 @@ // At this time, there must be a intersection point at least. if (ext.IsDone() && (ext.NbExt() > 0)) { for ( int i = 1 ; i <= ext.NbExt() ; i++ ) { - if ( ext.IsMin(i) ) { - newVal = ext.Point(i).Parameter(); - if ((newVal-lower_bound) >= -TOL && - (upper_bound - newVal) >= -TOL) - { - Extrema_ExtPC ext(p_test, acurve2, Precision::Approximation()); - if (ext.IsDone() && (ext.NbExt() > 0)) { - for ( int k = 1 ; k <= ext.NbExt() ; k++ ) { - if ( ext.IsMin(i) ) { - newVal = ext.Point(i).Parameter(); - if ((newVal-lower_bound2) >= -TOL && - (upper_bound2 - newVal) >= -TOL) - { - newP[count_intersection] = p_test; - count_intersection ++; - break; - } - } + newVal = ext.Point(i).Parameter(); + if ((newVal-lower_bound) >= -TOL && + (upper_bound - newVal) >= -TOL) + { + Extrema_ExtPC ext(p_test, acurve2, Precision::Approximation());

1 0

r5746 - cgm/branches/merge-cubit13.1/geom/OCC
by janehu＠mcs.anl.gov 21 Sep '12

21 Sep '12

Author: janehu Date: 2012-09-21 12:40:02 -0500 (Fri, 21 Sep 2012) New Revision: 5746 Modified: cgm/branches/merge-cubit13.1/geom/OCC/OCCModifyEngine.cpp Log: Re-logic on check_intersection function, solved the problem in hexlat test under mcnp2cad, before, it only imprints 9 out of 25 tubes and now it imprints all 25 tubes onto the outside box. Now with this change, lat4,holes used to pass, and it failed. Need to check it out. Still out of 47 testcases in mcnp2cad, passes 39 and 8 failed. Rec test took longer and generates more curves, but passes here, need to check out too. Modified: cgm/branches/merge-cubit13.1/geom/OCC/OCCModifyEngine.cpp =================================================================== --- cgm/branches/merge-cubit13.1/geom/OCC/OCCModifyEngine.cpp 2012-09-21 17:34:04 UTC (rev 5745) +++ cgm/branches/merge-cubit13.1/geom/OCC/OCCModifyEngine.cpp 2012-09-21 17:40:02 UTC (rev 5746) @@ -2339,13 +2339,16 @@ &cutter, keep_old); else { +/* if(!keep_old) OCCQueryEngine::instance()->delete_solid_model_entities(from_body); from_shape->Nullify(); +*/ + from_shape = NULL; } int stat; - if(!has_changed && !from_shape->IsNull()) + if(!has_changed && from_shape && !from_shape->IsNull()) { //Add imprint code here DLIList<TopoDS_Face*> face_list; @@ -2363,9 +2366,9 @@ } //ok, we're done with all cuts, construct new Body' - if (count < tool_bodies_copy.size() && !from_shape->IsNull()) + if (count < tool_bodies_copy.size() && from_shape && !from_shape->IsNull()) tbs += OCCQueryEngine::instance()->populate_topology_bridge(*from_shape); - else if (!from_shape->IsNull()) + else if (from_shape && !from_shape->IsNull()) { PRINT_INFO("The %d body did not change because cutting tools are not interscting with it.\n", i+1); from_bodies.change_to(NULL); @@ -2906,7 +2909,7 @@ face_created = CUBIT_FALSE; } DLIList<DLIList<TopoDS_Edge*>*> edge_lists; - if ( total_edges >= 1) + if ( total_edges >= 1) { CubitStatus stat = CUBIT_SUCCESS; if(curve_list.size() > 0) @@ -3243,8 +3246,7 @@ { int count_intersection = 0; - gp_Pnt pt1(0,0,0), pt2(0,0,0); - gp_Pnt intsec_pnt[2] = {pt1, pt2} ; + gp_Pnt newP[2] , p_test ; for(int kk = 0; kk < edge_list->size(); kk++)

1 0