ForkMaster/netgenplugin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge from V5_1_5_BR branch 12/11/2010

Browse Source
This commit is contained in:
vsr 2010-11-12 14:31:36 +00:00
parent 0876b5d15c
commit 1a27740bd3
5 changed files with 5735 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
adm_local/unix/config_files/check_NETGEN.m4
View File

@ -94,8 +94,8 @@ if test "x$NETGEN_HOME" != "x"; then
CPPFLAGS_old="$CPPFLAGS" CPPFLAGS_old="$CPPFLAGS"
CXXFLAGS_old="$CXXFLAGS" CXXFLAGS_old="$CXXFLAGS"
CPPFLAGS="$NETGEN_INCLUDES $CAS_CPPFLAGS $CPPFLAGS" CPPFLAGS="$CAS_CPPFLAGS $NETGEN_INCLUDES $CPPFLAGS"
CXXFLAGS="$NETGEN_INCLUDES $CAS_CPPFLAGS $CXXFLAGS" CXXFLAGS="$CAS_CPPFLAGS $NETGEN_INCLUDES $CXXFLAGS"
AC_MSG_CHECKING(for Netgen header file) AC_MSG_CHECKING(for Netgen header file)

17
configure.ac
View File

@ -29,7 +29,7 @@
# Reorganization for usage of autotools # Reorganization for usage of autotools
# Created from configure.in.base # Created from configure.in.base
# #
AC_INIT([Salome2 Project NETGENPLUGIN module], [5.1.4], [webmaster.salome@opencascade.com], [SalomeNETGENPLUGIN]) AC_INIT([Salome2 Project NETGENPLUGIN module], [5.1.5], [webmaster.salome@opencascade.com], [SalomeNETGENPLUGIN])
AC_CONFIG_AUX_DIR(adm_local/unix/config_files) AC_CONFIG_AUX_DIR(adm_local/unix/config_files)
AC_CANONICAL_HOST AC_CANONICAL_HOST
AC_CANONICAL_TARGET AC_CANONICAL_TARGET
@ -405,6 +405,19 @@ echo
# chmod +x ./bin/salome/*; # chmod +x ./bin/salome/*;
#]) #])
AC_CONFIG_COMMANDS([hack_libtool],[
sed -i "s%^CC=\"\(.*\)\"%hack_libtool (){ \n\
if test \"\$(echo \$[@] | grep -E '\\\-L/usr/lib(/../lib)?(64)? ')\" == \"\" \n\
then\n\
cmd=\"\1 \$[@]\"\n\
else\n\
cmd=\"\1 \"\`echo \$[@] | sed -r -e 's|(.*)-L/usr/lib(/../lib)?(64)? (.*)|\\\1\\\4 -L/usr/lib\\\3|g'\`\n\
fi\n\
\$cmd\n\
}\n\
CC=\"hack_libtool\"%g" libtool
],[])
# This list is initiated using autoscan and must be updated manually # This list is initiated using autoscan and must be updated manually
# when adding a new file <filename>.in to manage. When you execute # when adding a new file <filename>.in to manage. When you execute
# autoscan, the Makefile list is generated in the output file configure.scan. # autoscan, the Makefile list is generated in the output file configure.scan.
@ -424,5 +437,3 @@ AC_OUTPUT([ \
idl/Makefile \ idl/Makefile \
Makefile \ Makefile \
]) ])
AC_HACK_LIBTOOL

2
src/GUI/Makefile.am
View File

@ -49,9 +49,9 @@ nodist_libNETGENPluginGUI_la_SOURCES= \
# additionnal information to compil and link file # additionnal information to compil and link file
libNETGENPluginGUI_la_CPPFLAGS = \ libNETGENPluginGUI_la_CPPFLAGS = \
$(CAS_CPPFLAGS) \
$(NETGEN_INCLUDES) \ $(NETGEN_INCLUDES) \
$(QT_INCLUDES) \ $(QT_INCLUDES) \
$(CAS_CPPFLAGS) \
$(PYTHON_INCLUDES) \ $(PYTHON_INCLUDES) \
$(KERNEL_CXXFLAGS) \ $(KERNEL_CXXFLAGS) \
$(GUI_CXXFLAGS) \ $(GUI_CXXFLAGS) \

5813
src/NETGEN/netgen45ForSalome.patch
View File

File diff suppressed because it is too large Load Diff

4
src/NETGENPlugin/NETGENPlugin_Mesher.cxx
View File

@ -493,6 +493,10 @@ bool NETGENPlugin_Mesher::fillNgMesh(const netgen::OCCGeometry& occgeom,
seg.si = faceID; // = geom.fmap.FindIndex (face); seg.si = faceID; // = geom.fmap.FindIndex (face);
seg.edgenr = ngMesh.GetNSeg() + 1; // segment id seg.edgenr = ngMesh.GetNSeg() + 1; // segment id
ngMesh.AddSegment (seg); ngMesh.AddSegment (seg);
netgen::Point3d ngP1(p1.node->X(), p1.node->Y(), p1.node->Z());
netgen::Point3d ngP2(p2.node->X(), p2.node->Y(), p2.node->Z());
ngMesh.RestrictLocalH( netgen::Center( ngP1,ngP2), Dist(ngP1,ngP2));
#ifdef DUMP_SEGMENTS #ifdef DUMP_SEGMENTS
cout << "Segment: " << seg.edgenr << " on SMESH face " << helper.GetMeshDS()->ShapeToIndex( face ) << endl cout << "Segment: " << seg.edgenr << " on SMESH face " << helper.GetMeshDS()->ShapeToIndex( face ) << endl
<< "\tface index: " << seg.si << endl << "\tface index: " << seg.si << endl