ForkMaster/netgen
1
0
Fork 0
mirror of https://github.com/NGSolve/netgen.git synced 2024-12-26 05:50:32 +05:00
Code Issues Packages Projects Releases Wiki Activity

occ fixes

Browse Source
This commit is contained in:
Joachim Schoeberl 2014-09-03 13:27:28 +00:00
parent decfd9cd03
commit baa67899a9
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -43,7 +43,7 @@ AC_ARG_WITH([occ],
if test a$occon = atrue ; then if test a$occon = atrue ; then
AC_SUBST([OCCFLAGS], ["-DOCCGEOMETRY -I$occdir/inc -I/usr/include/opencascade"]) AC_SUBST([OCCFLAGS], ["-DOCCGEOMETRY -I$occdir/inc -I/usr/include/oce"])
AC_SUBST([OCCLIBS], ["-L$occdir/lib -lTKernel -lTKGeomBase -lTKMath -lTKG2d -lTKG3d -lTKXSBase -lTKOffset -lTKFillet -lTKShHealing -lTKMesh -lTKMeshVS -lTKTopAlgo -lTKGeomAlgo -lTKBool -lTKPrim -lTKBO -lTKIGES -lTKBRep -lTKSTEPBase -lTKSTEP -lTKSTL -lTKSTEPAttr -lTKSTEP209 -lTKXDESTEP -lTKXDEIGES -lTKXCAF -lTKLCAF -lFWOSPlugin"]) AC_SUBST([OCCLIBS], ["-L$occdir/lib -lTKernel -lTKGeomBase -lTKMath -lTKG2d -lTKG3d -lTKXSBase -lTKOffset -lTKFillet -lTKShHealing -lTKMesh -lTKMeshVS -lTKTopAlgo -lTKGeomAlgo -lTKBool -lTKPrim -lTKBO -lTKIGES -lTKBRep -lTKSTEPBase -lTKSTEP -lTKSTL -lTKSTEPAttr -lTKSTEP209 -lTKXDESTEP -lTKXDEIGES -lTKXCAF -lTKLCAF -lFWOSPlugin"])
# -lTKDCAF # -lTKDCAF

4
libsrc/occ/Partition_Loop2d.cxx
View File

@ -210,7 +210,7 @@ static Standard_Boolean SelectEdge(const BRepAdaptor_Surface& Surf,
Cc->D1(uc, PC, CTg1); Cc->D1(uc, PC, CTg1);
if (!isForward) CTg1.Reverse(); if (!isForward) CTg1.Reverse();
Standard_Real anglemin = 3 * PI, tolAng = 1.e-8; Standard_Real anglemin = 3 * M_PI, tolAng = 1.e-8;
// select an edge whose first derivative is most left of CTg1 // select an edge whose first derivative is most left of CTg1
// ie an angle between Tg1 and CTg1 is least // ie an angle between Tg1 and CTg1 is least
@ -234,7 +234,7 @@ static Standard_Boolean SelectEdge(const BRepAdaptor_Surface& Surf,
// -PI < angle < PI // -PI < angle < PI
Standard_Real angle = Tg1.Angle(CTg1); Standard_Real angle = Tg1.Angle(CTg1);
if (PI - Abs(angle) <= tolAng) if (M_PI - Abs(angle) <= tolAng)
{ {
// an angle is too close to PI; assure that an angle sign really // an angle is too close to PI; assure that an angle sign really
// reflects an edge position: +PI - an edge is worst, // reflects an edge position: +PI - an edge is worst,

2
m4/tcl.m4
View File

@ -139,6 +139,7 @@ AC_DEFUN([TEA_PATH_TCLCONFIG], [
`ls -d /usr/local/lib 2>/dev/null` \ `ls -d /usr/local/lib 2>/dev/null` \
`ls -d /usr/contrib/lib 2>/dev/null` \ `ls -d /usr/contrib/lib 2>/dev/null` \
`ls -d /usr/lib 2>/dev/null` \ `ls -d /usr/lib 2>/dev/null` \
`ls -d /usr/lib/tcl8.5 2>/dev/null` \
`ls -d /usr/lib64 2>/dev/null` \ `ls -d /usr/lib64 2>/dev/null` \
; do ; do
if test -f "$i/tclConfig.sh" ; then if test -f "$i/tclConfig.sh" ; then
@ -279,6 +280,7 @@ AC_DEFUN([TEA_PATH_TKCONFIG], [
`ls -d /usr/local/lib 2>/dev/null` \ `ls -d /usr/local/lib 2>/dev/null` \
`ls -d /usr/contrib/lib 2>/dev/null` \ `ls -d /usr/contrib/lib 2>/dev/null` \
`ls -d /usr/lib 2>/dev/null` \ `ls -d /usr/lib 2>/dev/null` \
`ls -d /usr/lib/tk8.5 2>/dev/null` \
`ls -d /usr/lib64 2>/dev/null` \ `ls -d /usr/lib64 2>/dev/null` \
; do ; do
if test -f "$i/tkConfig.sh" ; then if test -f "$i/tkConfig.sh" ; then