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

Merge from V5_1_main 14/05/2010

Browse Source
This commit is contained in:
vsr 2010-05-14 15:49:35 +00:00
parent b6d4daa757
commit 91c1d3465a
69 changed files with 1822 additions and 758 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile.am
View File

@ -1,7 +1,4 @@
# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE # Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
#
# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
# #
# This library is free software; you can redistribute it and/or # This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public # modify it under the terms of the GNU Lesser General Public
@ -19,6 +16,7 @@
# #
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
# #
# -* Makefile *- # -* Makefile *-
# Author : Patrick GOLDBRONN (CEA) # Author : Patrick GOLDBRONN (CEA)
# Date : 28/06/2001 # Date : 28/06/2001

3
NETGENPLUGIN_version.h.in
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE // Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
// //
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, // Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@ -19,6 +19,7 @@
// //
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
// //
// File : NETGENPLUGIN_version.h // File : NETGENPLUGIN_version.h
// Author : Vadim SANDLER // Author : Vadim SANDLER
// Module : SALOME // Module : SALOME

6
adm_local/Makefile.am
View File

@ -1,7 +1,4 @@
# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE # Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
#
# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
# #
# This library is free software; you can redistribute it and/or # This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public # modify it under the terms of the GNU Lesser General Public
@ -19,6 +16,7 @@
# #
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
# #
include $(top_srcdir)/adm_local/unix/make_common_starter.am include $(top_srcdir)/adm_local/unix/make_common_starter.am
SUBDIRS = unix SUBDIRS = unix

7
adm_local/cmake_files/FindNETGEN.cmake
View File

@ -1,7 +1,4 @@
# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE # Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
#
# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
# #
# This library is free software; you can redistribute it and/or # This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public # modify it under the terms of the GNU Lesser General Public
@ -48,3 +45,5 @@ SET(NETGEN_LIBS ${NETGEN_LIBS} ${NETGEN_LIB_nginterface})
SET(NETGEN_LIBS ${NETGEN_LIBS} ${NETGEN_LIB_occ}) SET(NETGEN_LIBS ${NETGEN_LIBS} ${NETGEN_LIB_occ})
SET(NETGEN_LIBS ${NETGEN_LIBS} ${NETGEN_LIB_opti}) SET(NETGEN_LIBS ${NETGEN_LIBS} ${NETGEN_LIB_opti})
SET(NETGEN_LIBS ${NETGEN_LIBS} ${NETGEN_LIB_stlgeom}) SET(NETGEN_LIBS ${NETGEN_LIBS} ${NETGEN_LIB_stlgeom})
SET(CMAKE_BUILD 1)

6
adm_local/unix/Makefile.am
View File

@ -1,7 +1,4 @@
# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE # Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
#
# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
# #
# This library is free software; you can redistribute it and/or # This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public # modify it under the terms of the GNU Lesser General Public
@ -19,6 +16,7 @@
# #
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
# #
include $(top_srcdir)/adm_local/unix/make_common_starter.am include $(top_srcdir)/adm_local/unix/make_common_starter.am
SUBDIRS = config_files SUBDIRS = config_files

6
adm_local/unix/config_files/Makefile.am
View File

@ -1,7 +1,4 @@
# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE # Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
#
# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
# #
# This library is free software; you can redistribute it and/or # This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public # modify it under the terms of the GNU Lesser General Public
@ -19,6 +16,7 @@
# #
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
# #
include $(top_srcdir)/adm_local/unix/make_common_starter.am include $(top_srcdir)/adm_local/unix/make_common_starter.am
dist_admlocalm4_DATA = \ dist_admlocalm4_DATA = \

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

@ -1,4 +1,4 @@
dnl Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE dnl Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
dnl dnl
dnl Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, dnl Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@ -19,6 +19,7 @@ dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
dnl dnl
dnl See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com dnl See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
dnl dnl
AC_DEFUN([CHECK_NETGEN],[ AC_DEFUN([CHECK_NETGEN],[
AC_REQUIRE([AC_PROG_CXX])dnl AC_REQUIRE([AC_PROG_CXX])dnl
@ -219,7 +220,7 @@ namespace nglib {
if test "x$Netgen_ok" == xno ; then if test "x$Netgen_ok" == xno ; then
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
AC_MSG_ERROR(Netgen is not properly installed) AC_MSG_ERROR(Netgen is not properly installed. Read NETGENPLUGIN_SRC/src/NETGEN/ReadMeForNgUsers for details.)
fi fi
NETGEN_LIBS="-L${NETGEN_LIBS_DIR} -lnglib" NETGEN_LIBS="-L${NETGEN_LIBS_DIR} -lnglib"
@ -234,10 +235,15 @@ namespace nglib {
if test "x$Netgen_ok" == xno ; then if test "x$Netgen_ok" == xno ; then
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
AC_MSG_WARN(Netgen libraries not found or not properly installed) AC_MSG_ERROR(Netgen libraries not found or not properly installed)
else else
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
fi fi
else
AC_MSG_ERROR(Netgen libraries not found. Please define NETGENHOME or use --with-netgen option)
fi fi
AC_SUBST(NETGEN_INCLUDES) AC_SUBST(NETGEN_INCLUDES)

3
adm_local/unix/config_files/check_NETGENPLUGIN.m4
View File

@ -1,4 +1,4 @@
dnl Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE dnl Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
dnl dnl
dnl Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, dnl Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@ -19,6 +19,7 @@ dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
dnl dnl
dnl See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com dnl See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
dnl dnl
#------------------------------------------------------------ #------------------------------------------------------------
# Check availability of Salome NETGEN mesh plugin module # Check availability of Salome NETGEN mesh plugin module
# distribution # distribution

6
adm_local/unix/make_common_starter.am
View File

@ -1,7 +1,4 @@
# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE # Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
#
# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
# #
# This library is free software; you can redistribute it and/or # This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public # modify it under the terms of the GNU Lesser General Public
@ -24,6 +21,7 @@
# The following is to avoid PACKAGE_... env variable # The following is to avoid PACKAGE_... env variable
# redefinition compilation warnings # redefinition compilation warnings
# ============================================================ # ============================================================
#
AM_CXXFLAGS = @KERNEL_CXXFLAGS@ -include SALOMEconfig.h AM_CXXFLAGS = @KERNEL_CXXFLAGS@ -include SALOMEconfig.h
AM_CPPFLAGS = @KERNEL_CXXFLAGS@ -include SALOMEconfig.h AM_CPPFLAGS = @KERNEL_CXXFLAGS@ -include SALOMEconfig.h

6
bin/Makefile.am
View File

@ -1,7 +1,4 @@
# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE # Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
#
# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
# #
# This library is free software; you can redistribute it and/or # This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public # modify it under the terms of the GNU Lesser General Public
@ -19,6 +16,7 @@
# #
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
# #
# -* Makefile *- # -* Makefile *-
# Author : Guillaume Boulant (CSSI) # Author : Guillaume Boulant (CSSI)
# Module : KERNEL # Module : KERNEL

5
build_cmake
View File

@ -1,8 +1,5 @@
#!/bin/sh #!/bin/sh
# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE # Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
#
# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
# #
# This library is free software; you can redistribute it and/or # This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public # modify it under the terms of the GNU Lesser General Public

20
build_cmake.bat
View File

@ -1,2 +1,20 @@
@REM Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
@REM
@REM This library is free software; you can redistribute it and/or
@REM modify it under the terms of the GNU Lesser General Public
@REM License as published by the Free Software Foundation; either
@REM version 2.1 of the License.
@REM
@REM This library is distributed in the hope that it will be useful,
@REM but WITHOUT ANY WARRANTY; without even the implied warranty of
@REM MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
@REM Lesser General Public License for more details.
@REM
@REM You should have received a copy of the GNU Lesser General Public
@REM License along with this library; if not, write to the Free Software
@REM Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
@REM
@REM See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
@REM
%PYTHONBIN% %KERNEL_ROOT_DIR%\salome_adm\cmake_files\am2cmake.py --netgenplugin %PYTHONBIN% %KERNEL_ROOT_DIR%\salome_adm\cmake_files\am2cmake.py --netgenplugin

3
build_configure
View File

@ -1,5 +1,5 @@
#!/bin/bash #!/bin/bash
# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE # Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
# #
# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, # Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@ -20,6 +20,7 @@
# #
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
# #
# Tool for updating list of .in file for the SALOME project # Tool for updating list of .in file for the SALOME project
# and regenerating configure script # and regenerating configure script
# Author : Marc Tajchman - CEA # Author : Marc Tajchman - CEA

6
clean_configure
View File

@ -1,8 +1,5 @@
#!/bin/sh #!/bin/sh
# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE # Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
#
# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
# #
# This library is free software; you can redistribute it and/or # This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public # modify it under the terms of the GNU Lesser General Public
@ -20,6 +17,7 @@
# #
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
# #
rm -rf autom4te.cache aclocal.m4 configure make_config rm -rf autom4te.cache aclocal.m4 configure make_config
find . -name "*~" -print -exec rm {} \; find . -name "*~" -print -exec rm {} \;
find . -name "*.pyc" -print -exec rm {} \; find . -name "*.pyc" -print -exec rm {} \;

9
configure.ac
View File

@ -1,7 +1,4 @@
# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE # Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
#
# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
# #
# This library is free software; you can redistribute it and/or # This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public # modify it under the terms of the GNU Lesser General Public
@ -19,6 +16,7 @@
# #
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
# #
# PLEASE DO NOT MODIFY configure.in FILE # PLEASE DO NOT MODIFY configure.in FILE
# ALL CHANGES WILL BE DISCARDED BY THE NEXT # ALL CHANGES WILL BE DISCARDED BY THE NEXT
# build_configure COMMAND # build_configure COMMAND
@ -31,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.3], [webmaster.salome@opencascade.com], [SalomeNETGENPLUGIN]) AC_INIT([Salome2 Project NETGENPLUGIN module], [5.1.4], [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
@ -361,6 +359,7 @@ echo Summary
echo --------------------------------------------- echo ---------------------------------------------
echo echo
AM_CONDITIONAL(CMAKE_BUILD, 0)
#AM_CONDITIONAL( USE_GFORTRAN, [test "$F77" = "gfortran"]) #AM_CONDITIONAL( USE_GFORTRAN, [test "$F77" = "gfortran"])
echo Configure echo Configure

6
idl/Makefile.am
View File

@ -1,7 +1,4 @@
# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE # Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
#
# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
# #
# This library is free software; you can redistribute it and/or # This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public # modify it under the terms of the GNU Lesser General Public
@ -19,6 +16,7 @@
# #
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
# #
# This Makefile is responsible of generating the client and server # This Makefile is responsible of generating the client and server
# implementation of IDL interfaces for both C++ and python usage. # implementation of IDL interfaces for both C++ and python usage.
# The building process of the C++ files is in charge of each source # The building process of the C++ files is in charge of each source

3
idl/NETGENPlugin_Algorithm.idl
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE // Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
// //
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, // Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@ -19,6 +19,7 @@
// //
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
// //
// File : NETGENPlugin_Algorithm.idl // File : NETGENPlugin_Algorithm.idl
// Author : Julia DOROVSKIKH // Author : Julia DOROVSKIKH
// $Header$ // $Header$

6
resources/Makefile.am
View File

@ -1,7 +1,4 @@
# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE # Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
#
# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
# #
# This library is free software; you can redistribute it and/or # This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public # modify it under the terms of the GNU Lesser General Public
@ -19,6 +16,7 @@
# #
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
# #
# -* Makefile *- # -* Makefile *-
# Author : Patrick GOLDBRONN (CEA) # Author : Patrick GOLDBRONN (CEA)
# Date : 28/06/2001 # Date : 28/06/2001

2
resources/NETGENPlugin.xml
View File

@ -1,7 +1,7 @@
<?xml version='1.0' encoding='us-ascii'?> <?xml version='1.0' encoding='us-ascii'?>
<!DOCTYPE meshers PUBLIC "" "desktop.dtd"> <!DOCTYPE meshers PUBLIC "" "desktop.dtd">
<!-- <!--
Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS

2
resources/SalomeApp.xml
View File

@ -1,5 +1,5 @@
<!-- <!--
Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS

6
src/GUI/Makefile.am
View File

@ -1,7 +1,4 @@
# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE # Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
#
# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
# #
# This library is free software; you can redistribute it and/or # This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public # modify it under the terms of the GNU Lesser General Public
@ -19,6 +16,7 @@
# #
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
# #
# File : Makefile.in # File : Makefile.in
# Author : Michael Sazonov # Author : Michael Sazonov
# Modified by : Alexander BORODIN (OCN) - autotools usage # Modified by : Alexander BORODIN (OCN) - autotools usage

3
src/GUI/NETGENPluginGUI.cxx
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE // Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
// //
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, // Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@ -19,6 +19,7 @@
// //
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
// //
// NETGENPlugin GUI: GUI for plugged-in mesher NETGENPlugin // NETGENPlugin GUI: GUI for plugged-in mesher NETGENPlugin
// File : NETGENPluginGUI.cxx // File : NETGENPluginGUI.cxx
// Author : Michael Zorin // Author : Michael Zorin

6
src/GUI/NETGENPluginGUI.h
View File

@ -1,7 +1,4 @@
// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE // Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
// //
// This library is free software; you can redistribute it and/or // This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public // modify it under the terms of the GNU Lesser General Public
@ -19,6 +16,7 @@
// //
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
// //
// NETGENPlugin GUI: GUI for plugged-in mesher NETGENPlugin // NETGENPlugin GUI: GUI for plugged-in mesher NETGENPlugin
// File : NETGENPluginGUI.h // File : NETGENPluginGUI.h
// Author : Alexander A. BORODIN // Author : Alexander A. BORODIN

29
src/GUI/NETGENPluginGUI_HypothesisCreator.cxx
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE // Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
// //
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, // Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@ -19,6 +19,7 @@
// //
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
// //
// NETGENPlugin GUI: GUI for plugged-in mesher NETGENPlugin // NETGENPlugin GUI: GUI for plugged-in mesher NETGENPlugin
// File : NETGENPluginGUI_HypothesisCreator.cxx // File : NETGENPluginGUI_HypothesisCreator.cxx
// Author : Michael Zorin // Author : Michael Zorin
@ -30,6 +31,7 @@
#include <SMESHGUI_Utils.h> #include <SMESHGUI_Utils.h>
#include <SMESHGUI_HypothesesUtils.h> #include <SMESHGUI_HypothesesUtils.h>
#include <SMESHGUI.h> #include <SMESHGUI.h>
#include <SMESHGUI_SpinBox.h>
#include CORBA_SERVER_HEADER(NETGENPlugin_Algorithm) #include CORBA_SERVER_HEADER(NETGENPlugin_Algorithm)
@ -38,8 +40,6 @@
#include <SalomeApp_Tools.h> #include <SalomeApp_Tools.h>
#include <SalomeApp_DoubleSpinBox.h>
#include <QComboBox> #include <QComboBox>
#include <QLabel> #include <QLabel>
#include <QGroupBox> #include <QGroupBox>
@ -110,11 +110,8 @@ QFrame* NETGENPluginGUI_HypothesisCreator::buildFrame()
} }
aGroupLayout->addWidget( new QLabel( tr( "NETGEN_MAX_SIZE" ), GroupC1 ), row, 0 ); aGroupLayout->addWidget( new QLabel( tr( "NETGEN_MAX_SIZE" ), GroupC1 ), row, 0 );
myMaxSize = new SalomeApp_DoubleSpinBox( GroupC1 ); myMaxSize = new SMESHGUI_SpinBox( GroupC1 );
myMaxSize->setDecimals( 7 ); myMaxSize->RangeStepAndValidator( 1e-07, 1e+06, 10., "length_precision" );
myMaxSize->setMinimum( 1e-07 );
myMaxSize->setMaximum( 1e+06 );
myMaxSize->setSingleStep( 10 );
aGroupLayout->addWidget( myMaxSize, row, 1 ); aGroupLayout->addWidget( myMaxSize, row, 1 );
row++; row++;
@ -132,26 +129,22 @@ QFrame* NETGENPluginGUI_HypothesisCreator::buildFrame()
row++; row++;
aGroupLayout->addWidget( new QLabel( tr( "NETGEN_GROWTH_RATE" ), GroupC1 ), row, 0 ); aGroupLayout->addWidget( new QLabel( tr( "NETGEN_GROWTH_RATE" ), GroupC1 ), row, 0 );
myGrowthRate = new SalomeApp_DoubleSpinBox( GroupC1 ); myGrowthRate = new SMESHGUI_SpinBox( GroupC1 );
myGrowthRate->setMinimum( 0.1 ); myGrowthRate->RangeStepAndValidator( .1, 10., .1, "parametric_precision" );
myGrowthRate->setMaximum( 10 );
myGrowthRate->setSingleStep( 0.1 );
aGroupLayout->addWidget( myGrowthRate, row, 1 ); aGroupLayout->addWidget( myGrowthRate, row, 1 );
row++; row++;
const double VALUE_MAX = 1.0e+6; const double VALUE_MAX = 1.0e+6;
aGroupLayout->addWidget( new QLabel( tr( "NETGEN_SEG_PER_EDGE" ), GroupC1 ), row, 0 ); aGroupLayout->addWidget( new QLabel( tr( "NETGEN_SEG_PER_EDGE" ), GroupC1 ), row, 0 );
myNbSegPerEdge = new SalomeApp_DoubleSpinBox( GroupC1 ); myNbSegPerEdge = new SMESHGUI_SpinBox( GroupC1 );
myNbSegPerEdge->setMinimum( 0.2 ); myNbSegPerEdge->RangeStepAndValidator( .2, VALUE_MAX, .1, "parametric_precision" );
myNbSegPerEdge->setMaximum( VALUE_MAX ); // (PAL14890) max value in native netgen gui is 5
aGroupLayout->addWidget( myNbSegPerEdge, row, 1 ); aGroupLayout->addWidget( myNbSegPerEdge, row, 1 );
row++; row++;
aGroupLayout->addWidget( new QLabel( tr( "NETGEN_SEG_PER_RADIUS" ), GroupC1 ), row, 0 ); aGroupLayout->addWidget( new QLabel( tr( "NETGEN_SEG_PER_RADIUS" ), GroupC1 ), row, 0 );
myNbSegPerRadius = new SalomeApp_DoubleSpinBox( GroupC1 ); myNbSegPerRadius = new SMESHGUI_SpinBox( GroupC1 );
myNbSegPerRadius->setMinimum( 0.2 ); myNbSegPerRadius->RangeStepAndValidator( .2, VALUE_MAX, .1, "parametric_precision" );
myNbSegPerRadius->setMaximum( VALUE_MAX ); // (PAL14890) max value in native netgen gui is 5
aGroupLayout->addWidget( myNbSegPerRadius, row, 1 ); aGroupLayout->addWidget( myNbSegPerRadius, row, 1 );
row++; row++;

13
src/GUI/NETGENPluginGUI_HypothesisCreator.h
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE // Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
// //
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, // Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@ -19,6 +19,7 @@
// //
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
// //
// NETGENPlugin GUI: GUI for plugged-in mesher NETGENPlugin // NETGENPlugin GUI: GUI for plugged-in mesher NETGENPlugin
// File : NETGENPluginGUI_HypothesisCreator.h // File : NETGENPluginGUI_HypothesisCreator.h
// Author : Michael Zorin // Author : Michael Zorin
@ -32,7 +33,7 @@
#include <SMESHGUI_Hypotheses.h> #include <SMESHGUI_Hypotheses.h>
class SalomeApp_DoubleSpinBox; class SMESHGUI_SpinBox;
class QComboBox; class QComboBox;
class QCheckBox; class QCheckBox;
class QLineEdit; class QLineEdit;
@ -79,13 +80,13 @@ private:
private: private:
QLineEdit* myName; QLineEdit* myName;
SalomeApp_DoubleSpinBox* myMaxSize; SMESHGUI_SpinBox* myMaxSize;
QCheckBox* mySecondOrder; QCheckBox* mySecondOrder;
QCheckBox* myOptimize; QCheckBox* myOptimize;
QComboBox* myFineness; QComboBox* myFineness;
SalomeApp_DoubleSpinBox* myGrowthRate; SMESHGUI_SpinBox* myGrowthRate;
SalomeApp_DoubleSpinBox* myNbSegPerEdge; SMESHGUI_SpinBox* myNbSegPerEdge;
SalomeApp_DoubleSpinBox* myNbSegPerRadius; SMESHGUI_SpinBox* myNbSegPerRadius;
QCheckBox* myAllowQuadrangles; QCheckBox* myAllowQuadrangles;
bool myIs2D; bool myIs2D;

12
src/GUI/NETGENPluginGUI_SimpleCreator.cxx
View File

@ -1,7 +1,4 @@
// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE // Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
// //
// This library is free software; you can redistribute it and/or // This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public // modify it under the terms of the GNU Lesser General Public
@ -19,6 +16,7 @@
// //
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
// //
// File : NETGENPluginGUI_SimpleCreator.cxx // File : NETGENPluginGUI_SimpleCreator.cxx
// Author : Open CASCADE S.A.S. // Author : Open CASCADE S.A.S.
// SMESH includes // SMESH includes
@ -151,7 +149,7 @@ QFrame* NETGENPluginGUI_SimpleCreator::buildFrame()
// * local length // * local length
myLengthRadioBut = new QRadioButton( tr( "SMESH_LOCAL_LENGTH_HYPOTHESIS" ), dimGroup ); myLengthRadioBut = new QRadioButton( tr( "SMESH_LOCAL_LENGTH_HYPOTHESIS" ), dimGroup );
myLength = new SMESHGUI_SpinBox( dimGroup ); myLength = new SMESHGUI_SpinBox( dimGroup );
myLength->RangeStepAndValidator( VALUE_SMALL, VALUE_MAX, 0.1, 6 ); myLength->RangeStepAndValidator( VALUE_SMALL, VALUE_MAX, 0.1, "length_precision" );
myLength->setValue( 1. ); myLength->setValue( 1. );
dimLay->addWidget( myLengthRadioBut, dimRow, 0 ); dimLay->addWidget( myLengthRadioBut, dimRow, 0 );
dimLay->addWidget( myLength, dimRow, 1 ); dimLay->addWidget( myLength, dimRow, 1 );
@ -178,7 +176,7 @@ QFrame* NETGENPluginGUI_SimpleCreator::buildFrame()
// * max area // * max area
dimLay->addWidget( new QLabel( tr( "SMESH_MAX_ELEMENT_AREA_HYPOTHESIS" ), dimGroup), dimRow, 0); dimLay->addWidget( new QLabel( tr( "SMESH_MAX_ELEMENT_AREA_HYPOTHESIS" ), dimGroup), dimRow, 0);
myArea = new SMESHGUI_SpinBox( dimGroup ); myArea = new SMESHGUI_SpinBox( dimGroup );
myArea->RangeStepAndValidator( VALUE_SMALL_2, VALUE_MAX_2, 0.1, 6 ); myArea->RangeStepAndValidator( VALUE_SMALL_2, VALUE_MAX_2, 0.1, "area_precision" );
myArea->setValue( 1. ); myArea->setValue( 1. );
dimLay->addWidget( myArea, dimRow, 1 ); dimLay->addWidget( myArea, dimRow, 1 );
dimRow++; dimRow++;
@ -205,7 +203,7 @@ QFrame* NETGENPluginGUI_SimpleCreator::buildFrame()
// * max volume // * max volume
dimLay->addWidget(new QLabel( tr("SMESH_MAX_ELEMENT_VOLUME_HYPOTHESIS"), dimGroup), dimRow, 0); dimLay->addWidget(new QLabel( tr("SMESH_MAX_ELEMENT_VOLUME_HYPOTHESIS"), dimGroup), dimRow, 0);
myVolume = new SMESHGUI_SpinBox( dimGroup ); myVolume = new SMESHGUI_SpinBox( dimGroup );
myVolume->RangeStepAndValidator( VALUE_SMALL_3, VALUE_MAX_3, 0.1, 6 ); myVolume->RangeStepAndValidator( VALUE_SMALL_3, VALUE_MAX_3, 0.1, "volume_precision" );
myVolume->setValue( 1. ); myVolume->setValue( 1. );
dimLay->addWidget( myVolume, dimRow, 1 ); dimLay->addWidget( myVolume, dimRow, 1 );
dimRow++; dimRow++;

6
src/GUI/NETGENPluginGUI_SimpleCreator.h
View File

@ -1,7 +1,4 @@
// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE // Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
// //
// This library is free software; you can redistribute it and/or // This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public // modify it under the terms of the GNU Lesser General Public
@ -19,6 +16,7 @@
// //
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
// //
// File : NETGENPluginGUI_SimpleCreator.h // File : NETGENPluginGUI_SimpleCreator.h
// Author : Open CASCADE S.A.S. // Author : Open CASCADE S.A.S.
// //

2
src/GUI/NETGENPlugin_images.ts
View File

@ -1,6 +1,6 @@
<!DOCTYPE TS> <!DOCTYPE TS>
<!-- <!--
Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS

2
src/GUI/NETGENPlugin_msg_en.ts
View File

@ -1,6 +1,6 @@
<!DOCTYPE TS> <!DOCTYPE TS>
<!-- <!--
Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS

12
src/Makefile.am
View File

@ -1,7 +1,4 @@
# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE # Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
#
# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
# #
# This library is free software; you can redistribute it and/or # This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public # modify it under the terms of the GNU Lesser General Public
@ -19,6 +16,7 @@
# #
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
# #
# File : Makefile.in # File : Makefile.in
# Author : Patrick GOLDBRONN (CEA) # Author : Patrick GOLDBRONN (CEA)
# Modified by : Alexander BORODIN (OCN) - autotools usage # Modified by : Alexander BORODIN (OCN) - autotools usage
@ -28,9 +26,13 @@
include $(top_srcdir)/adm_local/unix/make_common_starter.am include $(top_srcdir)/adm_local/unix/make_common_starter.am
SUBDIRS = SUBDIRS =
if ! NETGEN_NEW if CMAKE_BUILD
else
if NETGEN_NEW
else
SUBDIRS += NETGEN SUBDIRS += NETGEN
endif endif
endif
SUBDIRS += NETGENPlugin SUBDIRS += NETGENPlugin
if NETGENPLUGIN_ENABLE_GUI if NETGENPLUGIN_ENABLE_GUI

6
src/NETGEN/Makefile.am
View File

@ -1,7 +1,4 @@
# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE # Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
#
# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
# #
# This library is free software; you can redistribute it and/or # This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public # modify it under the terms of the GNU Lesser General Public
@ -19,6 +16,7 @@
# #
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
# #
# -* Makefile *- # -* Makefile *-
# Author : Edward AGAPOV (OCC) # Author : Edward AGAPOV (OCC)
# Modified by : Alexander BORODIN (OCN) - autotools usage # Modified by : Alexander BORODIN (OCN) - autotools usage

8
src/NETGEN/ReadMeForNgUsers
View File

@ -9,13 +9,13 @@ Netgen can be find at http://www.hpfem.jku.at/netgen/
1. How to build Netgen for Netgen Plugin 1. How to build Netgen for Netgen Plugin
------------------------------ ------------------------------
1.1. Download Netgen archive (here netgen-4.9.11.tar.gz) and unpack it 1.1. Download Netgen archive (here netgen-4.9.12.tar.gz) and unpack it
1.2. Configure the netgen compilation. The "good" options are 1.2. Configure the netgen compilation. The "good" options are
../netgen-4.9.11/configure \ ../netgen-4.9.12/configure \
--prefix=THE_INSTALLATION_PATH \ --prefix=THE_INSTALLATION_PATH \
--enable-occ --enable-nglib --with-occ=${CASROOT} \ --with-occ=${CASROOT} \
CXXFLAGS="-DOCCGEOMETRY -I${CASROOT}/inc -DHAVE_IOSTREAM -DHAVE_LIMITS -DHAVE_LIMITS_H -DHAVE_IOMANIP -I${TOGL_HOME}/include" \ CXXFLAGS="-I${TOGL_HOME}/include" \
LDFLAGS="-L${TOGL_HOME}/lib/Togl1.7" LDFLAGS="-L${TOGL_HOME}/lib/Togl1.7"
1.3. Compile the netgen product 1.3. Compile the netgen product

7
src/NETGENPlugin/Makefile.am
View File

@ -1,7 +1,4 @@
# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE # Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
#
# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
# #
# This library is free software; you can redistribute it and/or # This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public # modify it under the terms of the GNU Lesser General Public
@ -19,6 +16,7 @@
# #
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
# #
# -* Makefile *- # -* Makefile *-
# Author : Edward AGAPOV (OCC) # Author : Edward AGAPOV (OCC)
# Modified by : Alexander BORODIN (OCN) - autotools usage # Modified by : Alexander BORODIN (OCN) - autotools usage
@ -93,5 +91,6 @@ endif
libNETGENEngine_la_LDFLAGS += \ libNETGENEngine_la_LDFLAGS += \
../../idl/libSalomeIDLNETGENPLUGIN.la \ ../../idl/libSalomeIDLNETGENPLUGIN.la \
$(CAS_LDPATH) -lTKernel -lTKBRep -lTKShHealing -lTKSTEP -lTKXSBase -lTKIGES -lTKMesh -lTKSTL -lTKG3d -lTKTopAlgo -lTKG2d -lTKBool -lTKGeomAlgo -lTKOffset -lTKGeomBase -lTKBO \ $(CAS_LDPATH) -lTKernel -lTKBRep -lTKShHealing -lTKSTEP -lTKXSBase -lTKIGES -lTKMesh -lTKSTL -lTKG3d -lTKTopAlgo -lTKG2d -lTKBool -lTKGeomAlgo -lTKOffset -lTKGeomBase -lTKBO \
$(MED_LDFLAGS) -lSalomeIDLMED \
$(SMESH_LDFLAGS) -lSMESHimpl -lSMESHEngine -lStdMeshersEngine -lStdMeshers -lSMESHDS -lSMDS -lSMESHControls \ $(SMESH_LDFLAGS) -lSMESHimpl -lSMESHEngine -lStdMeshersEngine -lStdMeshers -lSMESHDS -lSMDS -lSMESHControls \
$(KERNEL_LDFLAGS) -lSalomeGenericObj -lSALOMELocalTrace -lOpUtil $(KERNEL_LDFLAGS) -lSalomeGenericObj -lSALOMELocalTrace -lOpUtil

3
src/NETGENPlugin/NETGENPlugin_Defs.hxx
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE // Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
// //
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, // Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@ -19,6 +19,7 @@
// //
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
// //
//============================================================================= //=============================================================================
// File : NETGENPlugin_Defs.hxx // File : NETGENPlugin_Defs.hxx
// Author : Alexander A. BORODIN // Author : Alexander A. BORODIN

3
src/NETGENPlugin/NETGENPlugin_Hypothesis.cxx
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE // Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
// //
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, // Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@ -19,6 +19,7 @@
// //
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
// //
// NETGENPlugin : C++ implementation // NETGENPlugin : C++ implementation
// File : NETGENPlugin_Hypothesis.cxx // File : NETGENPlugin_Hypothesis.cxx
// Author : Michael Sazonov (OCN) // Author : Michael Sazonov (OCN)

3
src/NETGENPlugin/NETGENPlugin_Hypothesis.hxx
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE // Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
// //
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, // Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@ -19,6 +19,7 @@
// //
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
// //
// NETGENPlugin : C++ implementation // NETGENPlugin : C++ implementation
// File : NETGENPlugin_Hypothesis.hxx // File : NETGENPlugin_Hypothesis.hxx
// Author : Michael Sazonov (OCN) // Author : Michael Sazonov (OCN)

3
src/NETGENPlugin/NETGENPlugin_Hypothesis_2D.cxx
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE // Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
// //
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, // Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@ -19,6 +19,7 @@
// //
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
// //
// NETGENPlugin : C++ implementation // NETGENPlugin : C++ implementation
// File : NETGENPlugin_Hypothesis_2D.cxx // File : NETGENPlugin_Hypothesis_2D.cxx
// Author : Michael Sazonov (OCN) // Author : Michael Sazonov (OCN)

3
src/NETGENPlugin/NETGENPlugin_Hypothesis_2D.hxx
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE // Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
// //
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, // Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@ -19,6 +19,7 @@
// //
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
// //
// NETGENPlugin : C++ implementation // NETGENPlugin : C++ implementation
// File : NETGENPlugin_Hypothesis_2D.hxx // File : NETGENPlugin_Hypothesis_2D.hxx
// Author : Michael Sazonov (OCN) // Author : Michael Sazonov (OCN)

3
src/NETGENPlugin/NETGENPlugin_Hypothesis_2D_i.cxx
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE // Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
// //
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, // Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@ -19,6 +19,7 @@
// //
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
// //
// NETGENPlugin : C++ implementation // NETGENPlugin : C++ implementation
// File : NETGENPlugin_Hypothesis_2D_i.cxx // File : NETGENPlugin_Hypothesis_2D_i.cxx
// Author : Michael Sazonov (OCN) // Author : Michael Sazonov (OCN)

3
src/NETGENPlugin/NETGENPlugin_Hypothesis_2D_i.hxx
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE // Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
// //
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, // Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@ -19,6 +19,7 @@
// //
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
// //
// NETGENPlugin : C++ implementation // NETGENPlugin : C++ implementation
// File : NETGENPlugin_Hypothesis_2D_i.hxx // File : NETGENPlugin_Hypothesis_2D_i.hxx
// Author : Michael Sazonov (OCN) // Author : Michael Sazonov (OCN)

3
src/NETGENPlugin/NETGENPlugin_Hypothesis_i.cxx
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE // Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
// //
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, // Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@ -19,6 +19,7 @@
// //
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
// //
// NETGENPlugin : C++ implementation // NETGENPlugin : C++ implementation
// File : NETGENPlugin_Hypothesis_i.cxx // File : NETGENPlugin_Hypothesis_i.cxx
// Author : Michael Sazonov (OCN) // Author : Michael Sazonov (OCN)

3
src/NETGENPlugin/NETGENPlugin_Hypothesis_i.hxx
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE // Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
// //
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, // Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@ -19,6 +19,7 @@
// //
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
// //
// NETGENPlugin : C++ implementation // NETGENPlugin : C++ implementation
// File : NETGENPlugin_Hypothesis_i.hxx // File : NETGENPlugin_Hypothesis_i.hxx
// Author : Michael Sazonov (OCN) // Author : Michael Sazonov (OCN)

1545
src/NETGENPlugin/NETGENPlugin_Mesher.cxx
View File

File diff suppressed because it is too large Load Diff

125
src/NETGENPlugin/NETGENPlugin_Mesher.hxx
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE // Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
// //
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, // Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@ -19,6 +19,7 @@
// //
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
// //
// NETGENPlugin : C++ implementation // NETGENPlugin : C++ implementation
// File : NETGENPlugin_Mesher.hxx // File : NETGENPlugin_Mesher.hxx
// Author : Michael Sazonov (OCN) // Author : Michael Sazonov (OCN)
@ -30,15 +31,26 @@
#include "NETGENPlugin_Defs.hxx" #include "NETGENPlugin_Defs.hxx"
#include "StdMeshers_FaceSide.hxx" #include "StdMeshers_FaceSide.hxx"
#include "SMDS_MeshElement.hxx"
#include "SMESH_Algo.hxx"
namespace nglib {
#include <nglib.h>
}
#include <map> #include <map>
#include <vector>
#include <set>
class SMESH_Mesh; class SMESH_Mesh;
class SMESH_Comment; class SMESH_Comment;
class SMESHDS_Mesh; class SMESHDS_Mesh;
class TopoDS_Shape; class TopoDS_Shape;
class TopTools_DataMapOfShapeShape; class TopTools_DataMapOfShapeShape;
class TopTools_IndexedMapOfShape;
class NETGENPlugin_Hypothesis; class NETGENPlugin_Hypothesis;
class NETGENPlugin_SimpleHypothesis_2D; class NETGENPlugin_SimpleHypothesis_2D;
class NETGENPlugin_Internals;
namespace netgen { namespace netgen {
class OCCGeometry; class OCCGeometry;
class Mesh; class Mesh;
@ -69,7 +81,7 @@ class NETGENPLUGIN_EXPORT NETGENPlugin_Mesher
NETGENPlugin_Mesher (SMESH_Mesh* mesh, const TopoDS_Shape& aShape, NETGENPlugin_Mesher (SMESH_Mesh* mesh, const TopoDS_Shape& aShape,
const bool isVolume); const bool isVolume);
void SetParameters(const NETGENPlugin_Hypothesis* hyp); void SetParameters(const NETGENPlugin_Hypothesis* hyp);
void SetParameters(const NETGENPlugin_SimpleHypothesis_2D* hyp); void SetParameters(const NETGENPlugin_SimpleHypothesis_2D* hyp);
bool Compute(); bool Compute();
@ -80,24 +92,40 @@ class NETGENPLUGIN_EXPORT NETGENPlugin_Mesher
const TopoDS_Shape& shape, const TopoDS_Shape& shape,
SMESH_Mesh& mesh, SMESH_Mesh& mesh,
std::list< SMESH_subMesh* > * meshedSM=0, std::list< SMESH_subMesh* > * meshedSM=0,
TopTools_DataMapOfShapeShape* internalE2F=0); NETGENPlugin_Internals* internalShapes=0);
static int FillSMesh(const netgen::OCCGeometry& occgeom, static int FillSMesh(const netgen::OCCGeometry& occgeom,
const netgen::Mesh& ngMesh, const netgen::Mesh& ngMesh,
const NETGENPlugin_ngMeshInfo& initState, const NETGENPlugin_ngMeshInfo& initState,
SMESH_Mesh& sMesh, SMESH_Mesh& sMesh,
std::vector<SMDS_MeshNode*>& nodeVec, std::vector<const SMDS_MeshNode*>& nodeVec,
SMESH_Comment& comment); SMESH_Comment& comment);
bool fillNgMesh(netgen::OCCGeometry& occgeom, bool fillNgMesh(const netgen::OCCGeometry& occgeom,
netgen::Mesh& ngMesh, netgen::Mesh& ngMesh,
std::vector<SMDS_MeshNode*>& nodeVec, std::vector<const SMDS_MeshNode*>& nodeVec,
const std::list< SMESH_subMesh* > & meshedSM); const std::list< SMESH_subMesh* > & meshedSM);
static void fixIntFaces(const netgen::OCCGeometry& occgeom,
netgen::Mesh& ngMesh,
NETGENPlugin_Internals& internalShapes);
static void addIntVerticesInFaces(const netgen::OCCGeometry& occgeom,
netgen::Mesh& ngMesh,
std::vector<const SMDS_MeshNode*>& nodeVec,
NETGENPlugin_Internals& internalShapes);
static void addIntVerticesInSolids(const netgen::OCCGeometry& occgeom,
netgen::Mesh& ngMesh,
std::vector<const SMDS_MeshNode*>& nodeVec,
NETGENPlugin_Internals& internalShapes);
void defaultParameters(); void defaultParameters();
static void RemoveTmpFiles(); static void RemoveTmpFiles();
static SMESH_ComputeErrorPtr readErrors(const std::vector< const SMDS_MeshNode* >& nodeVec);
private: private:
SMESH_Mesh* _mesh; SMESH_Mesh* _mesh;
const TopoDS_Shape& _shape; const TopoDS_Shape& _shape;
@ -108,4 +136,89 @@ class NETGENPLUGIN_EXPORT NETGENPlugin_Mesher
std::map< int, std::pair<int,int> > _faceDescriptors; std::map< int, std::pair<int,int> > _faceDescriptors;
}; };
//=============================================================================
/*!
* \brief Container of info needed to solve problems with internal shapes.
*
* Issue 0020676. It is made up as a class to be ready to extract from NETGEN
* and put in SMESH as soon as the same solution is needed somewhere else.
* The approach is to precompute internal edges in 2D and internal faces in 3D
* and put their mesh correctly (twice) into netgen mesh.
* In 2D, this class finds internal edges in faces and their vertices.
* In 3D, it additionally finds internal faces, their edges shared with other faces,
* and their vertices shared by several internal edges. Nodes built on the found
* shapes and mesh faces built on the found internal faces are to be doubled in
* netgen mesh to emulate a "crack"
*
* For internal faces a more simple solution is found, which is just to duplicate
* mesh faces on internal geom faces without modeling a "real crack". For this
* reason findBorderElements() is no more used anywhere.
*/
//=============================================================================
class NETGENPLUGIN_EXPORT NETGENPlugin_Internals
{
SMESH_Mesh& _mesh;
bool _is3D;
//2D
std::map<int,int> _e2face;//!<edges and their vertices in faces where they are TopAbs_INTERNAL
std::map<int,std::list<int> > _f2v;//!<faces with internal vertices
// 3D
std::set<int> _intShapes;
std::set<int> _borderFaces; //!< non-intrnal faces sharing the internal edge
std::map<int,std::list<int> > _s2v;//!<solids with internal vertices
public:
NETGENPlugin_Internals( SMESH_Mesh& mesh, const TopoDS_Shape& shape, bool is3D );
SMESH_Mesh& getMesh() const;
bool isShapeToPrecompute(const TopoDS_Shape& s);
// 2D meshing
// edges
bool hasInternalEdges() const { return !_e2face.empty(); }
bool isInternalEdge( int id ) const { return _e2face.count( id ); }
const std::map<int,int>& getEdgesAndVerticesWithFaces() const { return _e2face; }
void getInternalEdges( TopTools_IndexedMapOfShape& fmap,
TopTools_IndexedMapOfShape& emap,
TopTools_IndexedMapOfShape& vmap,
std::list< SMESH_subMesh* >& smToPrecompute);
// vertices
bool hasInternalVertexInFace() const { return !_f2v.empty(); }
const std::map<int,std::list<int> >& getFacesWithVertices() const { return _f2v; }
// 3D meshing
// faces
bool hasInternalFaces() const { return !_intShapes.empty(); }
bool isInternalShape( int id ) const { return _intShapes.count( id ); }
void findBorderElements( std::set< const SMDS_MeshElement*, TIDCompare > & borderElems );
bool isBorderFace( int faceID ) const { return _borderFaces.count( faceID ); }
void getInternalFaces( TopTools_IndexedMapOfShape& fmap,
TopTools_IndexedMapOfShape& emap,
std::list< SMESH_subMesh* >& facesSM,
std::list< SMESH_subMesh* >& boundarySM);
// vertices
bool hasInternalVertexInSolid() const { return !_s2v.empty(); }
bool hasInternalVertexInSolid(int soID ) const { return _s2v.count(soID); }
const std::map<int,std::list<int> >& getSolidsWithVertices() const { return _s2v; }
};
//================================================================================
/*!
* \brief It correctly initializes netgen library at constructor and
* correctly finishes using netgen library at destructor
*/
//================================================================================
struct NETGENPLUGIN_EXPORT NETGENPlugin_NetgenLibWrapper
{
nglib::Ng_Mesh * _ngMesh;
NETGENPlugin_NetgenLibWrapper();
~NETGENPlugin_NetgenLibWrapper();
void setMesh( nglib::Ng_Mesh* mesh );
};
#endif #endif

3
src/NETGENPlugin/NETGENPlugin_NETGEN_2D.cxx
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE // Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
// //
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, // Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@ -19,6 +19,7 @@
// //
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
// //
// NETGENPlugin : C++ implementation // NETGENPlugin : C++ implementation
// File : NETGENPlugin_NETGEN_2D.cxx // File : NETGENPlugin_NETGEN_2D.cxx
// Author : Michael Sazonov (OCN) // Author : Michael Sazonov (OCN)

3
src/NETGENPlugin/NETGENPlugin_NETGEN_2D.hxx
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE // Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
// //
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, // Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@ -19,6 +19,7 @@
// //
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
// //
// NETGENPlugin : C++ implementation // NETGENPlugin : C++ implementation
// File : NETGENPlugin_NETGEN_2D.hxx // File : NETGENPlugin_NETGEN_2D.hxx
// Author : Michael Sazonov (OCN) // Author : Michael Sazonov (OCN)

3
src/NETGENPlugin/NETGENPlugin_NETGEN_2D3D.cxx
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE // Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
// //
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, // Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@ -19,6 +19,7 @@
// //
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
// //
// NETGENPlugin : C++ implementation // NETGENPlugin : C++ implementation
// File : NETGENPlugin_NETGEN_2D3D.cxx // File : NETGENPlugin_NETGEN_2D3D.cxx
// Author : Michael Sazonov (OCN) // Author : Michael Sazonov (OCN)

3
src/NETGENPlugin/NETGENPlugin_NETGEN_2D3D.hxx
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE // Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
// //
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, // Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@ -19,6 +19,7 @@
// //
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
// //
// NETGENPlugin : C++ implementation // NETGENPlugin : C++ implementation
// File : NETGENPlugin_NETGEN_2D3D.hxx // File : NETGENPlugin_NETGEN_2D3D.hxx
// Author : Michael Sazonov (OCN) // Author : Michael Sazonov (OCN)

3
src/NETGENPlugin/NETGENPlugin_NETGEN_2D3D_i.cxx
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE // Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
// //
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, // Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@ -19,6 +19,7 @@
// //
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
// //
// NETGENPlugin : idl implementation // NETGENPlugin : idl implementation
// File : NETGENPlugin_NETGEN_2D3D_i.cxx // File : NETGENPlugin_NETGEN_2D3D_i.cxx
// Author : Michael Sazonov (OCN) // Author : Michael Sazonov (OCN)

3
src/NETGENPlugin/NETGENPlugin_NETGEN_2D3D_i.hxx
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE // Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
// //
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, // Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@ -19,6 +19,7 @@
// //
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
// //
// NETGENPlugin : idl implementation // NETGENPlugin : idl implementation
// File : NETGENPlugin_NETGEN_2D3D_i.hxx // File : NETGENPlugin_NETGEN_2D3D_i.hxx
// Author : Michael Sazonov (OCN) // Author : Michael Sazonov (OCN)

146
src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.cxx
View File

@ -1,7 +1,4 @@
// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE // Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
// //
// This library is free software; you can redistribute it and/or // This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public // modify it under the terms of the GNU Lesser General Public
@ -19,6 +16,7 @@
// //
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
// //
// File : NETGENPlugin_NETGEN_2D_ONLY.cxx // File : NETGENPlugin_NETGEN_2D_ONLY.cxx
// Author : Edward AGAPOV (OCC) // Author : Edward AGAPOV (OCC)
// Project : SALOME // Project : SALOME
@ -61,13 +59,15 @@ namespace nglib {
//#include <meshtype.hpp> //#include <meshtype.hpp>
namespace netgen { namespace netgen {
extern int OCCGenerateMesh (OCCGeometry&, Mesh*&, int, int, char*); extern int OCCGenerateMesh (OCCGeometry&, Mesh*&, int, int, char*);
/*extern*/ MeshingParameters mparam; extern MeshingParameters mparam;
} }
using namespace std; using namespace std;
using namespace netgen; using namespace netgen;
using namespace nglib; using namespace nglib;
//#define DUMP_SEGMENTS
//============================================================================= //=============================================================================
/*! /*!
* *
@ -174,6 +174,7 @@ static TError AddSegmentsToMesh(netgen::Mesh& ngMesh,
// Check wires and count nodes // Check wires and count nodes
// ---------------------------- // ----------------------------
int nbNodes = 0; int nbNodes = 0;
double totalLength = 0;
for ( int iW = 0; iW < wires.size(); ++iW ) for ( int iW = 0; iW < wires.size(); ++iW )
{ {
StdMeshers_FaceSidePtr wire = wires[ iW ]; StdMeshers_FaceSidePtr wire = wires[ iW ];
@ -187,7 +188,8 @@ static TError AddSegmentsToMesh(netgen::Mesh& ngMesh,
(new SMESH_ComputeError(COMPERR_BAD_INPUT_MESH, (new SMESH_ComputeError(COMPERR_BAD_INPUT_MESH,
SMESH_Comment("Unexpected nb of points on wire ") << iW SMESH_Comment("Unexpected nb of points on wire ") << iW
<< ": " << uvPtVec.size()<<" != "<<wire->NbPoints())); << ": " << uvPtVec.size()<<" != "<<wire->NbPoints()));
nbNodes += wire->NbSegments(); nbNodes += wire->NbPoints();
totalLength += wire->Length();
} }
nodeVec.reserve( nbNodes ); nodeVec.reserve( nbNodes );
@ -199,43 +201,59 @@ static TError AddSegmentsToMesh(netgen::Mesh& ngMesh,
// bb.Increase (bb.Diam()/10); // bb.Increase (bb.Diam()/10);
// ngMesh.SetLocalH (bb.PMin(), bb.PMax(), 0.5); // set grading // ngMesh.SetLocalH (bb.PMin(), bb.PMax(), 0.5); // set grading
// map for nodes on vertices since they can be shared between wires
// ( issue 0020676, face_int_box.brep)
map<const SMDS_MeshNode*, int > node2ngID;
const int faceID = 1, solidID = 0; const int faceID = 1, solidID = 0;
ngMesh.AddFaceDescriptor (FaceDescriptor(faceID, solidID, solidID, 0)); if ( ngMesh.GetNFD() < 1 )
ngMesh.AddFaceDescriptor (FaceDescriptor(faceID, solidID, solidID, 0));
for ( int iW = 0; iW < wires.size(); ++iW ) for ( int iW = 0; iW < wires.size(); ++iW )
{ {
StdMeshers_FaceSidePtr wire = wires[ iW ]; StdMeshers_FaceSidePtr wire = wires[ iW ];
const vector<UVPtStruct>& uvPtVec = wire->GetUVPtStruct(); const vector<UVPtStruct>& uvPtVec = wire->GetUVPtStruct();
const int nbSegments = wire->NbPoints() - 1;
int firstPointID = ngMesh.GetNP() + 1;
int edgeID = 1, posID = -2; int edgeID = 1, posID = -2;
bool isInternalEdge = false; bool isInternalWire = false;
for ( int i = 0; i < wire->NbSegments(); ++i ) // loop on segments for ( int i = 0; i < nbSegments; ++i ) // loop on segments
{ {
// Add the first point of a segment // Add the first point of a segment
const SMDS_MeshNode * n = uvPtVec[ i ].node; const SMDS_MeshNode * n = uvPtVec[ i ].node;
const int posShapeID = n->GetPosition()->GetShapeId(); const int posShapeID = n->GetPosition()->GetShapeId();
bool onVertex = ( n->GetPosition()->GetTypeOfPosition() == SMDS_TOP_VERTEX );
// skip nodes on degenerated edges // skip nodes on degenerated edges
if ( helper.IsDegenShape( posShapeID ) && if ( helper.IsDegenShape( posShapeID ) &&
helper.IsDegenShape( uvPtVec[ i+1 ].node->GetPosition()->GetShapeId() )) helper.IsDegenShape( uvPtVec[ i+1 ].node->GetPosition()->GetShapeId() ))
continue; continue;
nodeVec.push_back( n ); int ngID1 = ngMesh.GetNP() + 1, ngID2 = ngID1+1;
if ( onVertex )
MeshPoint mp( Point<3> (n->X(), n->Y(), n->Z()) ); ngID1 = node2ngID.insert( make_pair( n, ngID1 )).first->second;
ngMesh.AddPoint ( mp, 1, EDGEPOINT ); if ( ngID1 > ngMesh.GetNP() )
{
MeshPoint mp( Point<3> (n->X(), n->Y(), n->Z()) );
ngMesh.AddPoint ( mp, 1, EDGEPOINT );
nodeVec.push_back( n );
}
else
{
ngID2 = ngMesh.GetNP() + 1;
if ( i > 0 ) // prev segment belongs to same wire
{
Segment& prevSeg = ngMesh.LineSegment( ngMesh.GetNSeg() );
prevSeg[1] = ngID1;
}
}
// Add the segment // Add the segment
Segment seg; Segment seg;
#ifdef NETGEN_NEW seg[0] = ngID1; // ng node id
seg.pnums[0] = ngMesh.GetNP(); // ng node id seg[1] = ngID2; // ng node id
seg.pnums[1] = seg.pnums[0] + 1; // ng node id
#else
seg.p1 = ngMesh.GetNP(); // ng node id
seg.p2 = seg.p1 + 1; // ng node id
#endif
seg.edgenr = ngMesh.GetNSeg() + 1;// segment id seg.edgenr = ngMesh.GetNSeg() + 1;// segment id
seg.si = faceID; // = geom.fmap.FindIndex (face); seg.si = faceID; // = geom.fmap.FindIndex (face);
@ -248,7 +266,7 @@ static TError AddSegmentsToMesh(netgen::Mesh& ngMesh,
seg.epgeominfo[ iEnd ].v = pnt.v; seg.epgeominfo[ iEnd ].v = pnt.v;
// find out edge id and node parameter on edge // find out edge id and node parameter on edge
bool onVertex = ( pnt.node->GetPosition()->GetTypeOfPosition() == SMDS_TOP_VERTEX ); onVertex = ( pnt.node->GetPosition()->GetTypeOfPosition() == SMDS_TOP_VERTEX );
if ( onVertex || posShapeID != posID ) if ( onVertex || posShapeID != posID )
{ {
// get edge id // get edge id
@ -258,7 +276,7 @@ static TError AddSegmentsToMesh(netgen::Mesh& ngMesh,
const TopoDS_Edge& edge = wire->Edge( wire->EdgeIndex( normParam )); const TopoDS_Edge& edge = wire->Edge( wire->EdgeIndex( normParam ));
edgeID = geom.emap.FindIndex( edge ); edgeID = geom.emap.FindIndex( edge );
posID = posShapeID; posID = posShapeID;
isInternalEdge = ( edge.Orientation() == TopAbs_INTERNAL ); isInternalWire = ( edge.Orientation() == TopAbs_INTERNAL );
if ( onVertex ) // param on curve is different on each of two edges if ( onVertex ) // param on curve is different on each of two edges
seg.epgeominfo[ iEnd ].dist = helper.GetNodeU( edge, pnt.node ); seg.epgeominfo[ iEnd ].dist = helper.GetNodeU( edge, pnt.node );
} }
@ -267,52 +285,55 @@ static TError AddSegmentsToMesh(netgen::Mesh& ngMesh,
ngMesh.AddSegment (seg); ngMesh.AddSegment (seg);
// cout << "Segment: " << seg.edgenr << endl #ifdef DUMP_SEGMENTS
// << "\tp1: " << seg.p1 << endl cout << "Segment: " << seg.edgenr << endl
// << "\tp2: " << seg.p2 << endl << "\tp1: " << seg[0] << endl
// << "\tp0 param: " << seg.epgeominfo[ 0 ].dist << endl << "\tp2: " << seg[1] << endl
// << "\tp0 uv: " << seg.epgeominfo[ 0 ].u <<", "<< seg.epgeominfo[ 0 ].v << endl << "\tp0 param: " << seg.epgeominfo[ 0 ].dist << endl
// << "\tp0 edge: " << seg.epgeominfo[ 0 ].edgenr << endl << "\tp0 uv: " << seg.epgeominfo[ 0 ].u <<", "<< seg.epgeominfo[ 0 ].v << endl
// << "\tp1 param: " << seg.epgeominfo[ 1 ].dist << endl << "\tp0 edge: " << seg.epgeominfo[ 0 ].edgenr << endl
// << "\tp1 uv: " << seg.epgeominfo[ 1 ].u <<", "<< seg.epgeominfo[ 1 ].v << endl << "\tp1 param: " << seg.epgeominfo[ 1 ].dist << endl
// << "\tp1 edge: " << seg.epgeominfo[ 1 ].edgenr << endl; << "\tp1 uv: " << seg.epgeominfo[ 1 ].u <<", "<< seg.epgeominfo[ 1 ].v << endl
<< "\tp1 edge: " << seg.epgeominfo[ 1 ].edgenr << endl;
if ( isInternalEdge )
{
#ifdef NETGEN_NEW
swap (seg.pnums[0], seg.pnums[1]);
#else
swap (seg.p1, seg.p2);
#endif #endif
if ( isInternalWire )
{
swap (seg[0], seg[1]);
swap( seg.epgeominfo[0], seg.epgeominfo[1] ); swap( seg.epgeominfo[0], seg.epgeominfo[1] );
seg.edgenr = ngMesh.GetNSeg() + 1; // segment id seg.edgenr = ngMesh.GetNSeg() + 1; // segment id
ngMesh.AddSegment (seg); ngMesh.AddSegment (seg);
#ifdef DUMP_SEGMENTS
cout << "Segment: " << seg.edgenr << endl << "\tis REVRESE of the previous one" << endl;
#endif
} }
} // loop on segments on a wire } // loop on segments on a wire
// close chain of segments // close chain of segments
bool isClosedWire = ( wire->FirstVertex().IsSame( wire->LastVertex() )); if ( nbSegments > 0 )
if ( isClosedWire )
{ {
Segment& seg = ngMesh.LineSegment( ngMesh.GetNSeg() ); Segment& lastSeg = ngMesh.LineSegment( ngMesh.GetNSeg() - int( isInternalWire));
#ifdef NETGEN_NEW const SMDS_MeshNode * lastNode = uvPtVec.back().node;
seg.pnums[1] = firstPointID; lastSeg[1] = node2ngID.insert( make_pair( lastNode, lastSeg[1] )).first->second;
#else if ( lastSeg[1] > ngMesh.GetNP() )
seg.p2 = firstPointID; {
#endif MeshPoint mp( Point<3> (lastNode->X(), lastNode->Y(), lastNode->Z()) );
} ngMesh.AddPoint ( mp, 1, EDGEPOINT );
else // INTERNAL wire (Issue 0020676) nodeVec.push_back( lastNode );
{ }
const SMDS_MeshNode * n = uvPtVec.back().node; if ( isInternalWire )
nodeVec.push_back( n ); {
Segment& realLastSeg = ngMesh.LineSegment( ngMesh.GetNSeg() );
MeshPoint mp( Point<3> (n->X(), n->Y(), n->Z()) ); realLastSeg[0] = lastSeg[1];
ngMesh.AddPoint ( mp, 1, EDGEPOINT ); }
} }
} // loop on wires of a face } // loop on wires of a face
ngMesh.CalcSurfacesOfNode(); // add a segment instead of internal vertex
NETGENPlugin_Internals intShapes( *helper.GetMesh(), helper.GetSubShape(), /*is3D=*/false );
NETGENPlugin_Mesher::addIntVerticesInFaces( geom, ngMesh, nodeVec, intShapes );
ngMesh.CalcSurfacesOfNode();
return TError(); return TError();
} }
@ -355,8 +376,8 @@ bool NETGENPlugin_NETGEN_2D_ONLY::Compute(SMESH_Mesh& aMesh,
// Make input netgen mesh // Make input netgen mesh
// ------------------------- // -------------------------
Ng_Init(); NETGENPlugin_NetgenLibWrapper ngLib;
netgen::Mesh * ngMesh = new netgen::Mesh (); netgen::Mesh * ngMesh = (netgen::Mesh*) ngLib._ngMesh;
netgen::OCCGeometry occgeo; netgen::OCCGeometry occgeo;
NETGENPlugin_Mesher::PrepareOCCgeometry( occgeo, F, aMesh ); NETGENPlugin_Mesher::PrepareOCCgeometry( occgeo, F, aMesh );
@ -365,10 +386,8 @@ bool NETGENPlugin_NETGEN_2D_ONLY::Compute(SMESH_Mesh& aMesh,
vector< const SMDS_MeshNode* > nodeVec; vector< const SMDS_MeshNode* > nodeVec;
problem = AddSegmentsToMesh( *ngMesh, occgeo, wires, helper, nodeVec ); problem = AddSegmentsToMesh( *ngMesh, occgeo, wires, helper, nodeVec );
if ( problem && !problem->IsOK() ) { if ( problem && !problem->IsOK() )
delete ngMesh; Ng_Exit();
return error( problem ); return error( problem );
}
// -------------------- // --------------------
// compute edge length // compute edge length
@ -479,11 +498,6 @@ bool NETGENPlugin_NETGEN_2D_ONLY::Compute(SMESH_Mesh& aMesh,
face = helper.AddFace(nodes[0],nodes[1],nodes[2],nodes[3]); face = helper.AddFace(nodes[0],nodes[1],nodes[2],nodes[3]);
} }
Ng_DeleteMesh((nglib::Ng_Mesh*)ngMesh);
Ng_Exit();
NETGENPlugin_Mesher::RemoveTmpFiles();
return !err; return !err;
} }

22
src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.hxx
View File

@ -1,7 +1,4 @@
// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE // Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
// //
// This library is free software; you can redistribute it and/or // This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public // modify it under the terms of the GNU Lesser General Public
@ -19,6 +16,7 @@
// //
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
// //
// File : NETGENPlugin_NETGEN_2D_ONLY.hxx // File : NETGENPlugin_NETGEN_2D_ONLY.hxx
// Project : SALOME // Project : SALOME
// Author : Edward AGAPOV (OCC) // Author : Edward AGAPOV (OCC)
@ -29,25 +27,9 @@
#include "SMESH_2D_Algo.hxx" #include "SMESH_2D_Algo.hxx"
#include "SMESH_Mesh.hxx" #include "SMESH_Mesh.hxx"
/*#define OCCGEOMETRY
#include <occgeom.hpp>
#include <meshing.hpp>//amv*/
class StdMeshers_MaxElementArea; class StdMeshers_MaxElementArea;
class StdMeshers_LengthFromEdges; class StdMeshers_LengthFromEdges;
class StdMeshers_QuadranglePreference; class StdMeshers_QuadranglePreference;
//class NETGENPlugin_Hypothesis;
/*namespace netgen {
class OCCGeometry;
}*/
/*namespace netgen {
class OCCGeometry;
extern int OCCGenerateMesh (OCCGeometry&, Mesh*&, int, int, char*);
extern MeshingParameters mparam;
}*/
//using namespace netgen;
/*! /*!
* \brief Mesher generating 2D elements on a geometrical face taking * \brief Mesher generating 2D elements on a geometrical face taking

6
src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY_i.cxx
View File

@ -1,7 +1,4 @@
// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE // Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
// //
// This library is free software; you can redistribute it and/or // This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public // modify it under the terms of the GNU Lesser General Public
@ -19,6 +16,7 @@
// //
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
// //
// SMESH SMESH_I : idl implementation based on 'SMESH' unit's calsses // SMESH SMESH_I : idl implementation based on 'SMESH' unit's calsses
// File : NETGENPlugin_NETGEN_2D_ONLY_i.cxx // File : NETGENPlugin_NETGEN_2D_ONLY_i.cxx
// Author : Edward AGAPOV (OCC) // Author : Edward AGAPOV (OCC)

6
src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY_i.hxx
View File

@ -1,7 +1,4 @@
// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE // Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
// //
// This library is free software; you can redistribute it and/or // This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public // modify it under the terms of the GNU Lesser General Public
@ -19,6 +16,7 @@
// //
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
// //
// SMESH SMESH_I : idl implementation based on 'SMESH' unit's calsses // SMESH SMESH_I : idl implementation based on 'SMESH' unit's calsses
// File : NETGENPlugin_NETGEN_2D_ONLY_i.cxx // File : NETGENPlugin_NETGEN_2D_ONLY_i.cxx
// Author : Edward AGAPOV (OCC) // Author : Edward AGAPOV (OCC)

3
src/NETGENPlugin/NETGENPlugin_NETGEN_2D_i.cxx
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE // Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
// //
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, // Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@ -19,6 +19,7 @@
// //
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
// //
// NETGENPlugin : idl implementation // NETGENPlugin : idl implementation
// File : NETGENPlugin_NETGEN_2D_i.cxx // File : NETGENPlugin_NETGEN_2D_i.cxx
// Author : Michael Sazonov (OCN) // Author : Michael Sazonov (OCN)

3
src/NETGENPlugin/NETGENPlugin_NETGEN_2D_i.hxx
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE // Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
// //
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, // Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@ -19,6 +19,7 @@
// //
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
// //
// NETGENPlugin : idl implementation // NETGENPlugin : idl implementation
// File : NETGENPlugin_NETGEN_2D_i.hxx // File : NETGENPlugin_NETGEN_2D_i.hxx
// Author : Michael Sazonov (OCN) // Author : Michael Sazonov (OCN)

384
src/NETGENPlugin/NETGENPlugin_NETGEN_3D.cxx
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE // Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
// //
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, // Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@ -19,6 +19,7 @@
// //
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
// //
//============================================================================= //=============================================================================
// File : NETGENPlugin_NETGEN_3D.cxx // File : NETGENPlugin_NETGEN_3D.cxx
// Moved here from SMESH_NETGEN_3D.cxx // Moved here from SMESH_NETGEN_3D.cxx
@ -42,11 +43,12 @@
#include "SMESH_MeshEditor.hxx" #include "SMESH_MeshEditor.hxx"
#include "StdMeshers_QuadToTriaAdaptor.hxx" #include "StdMeshers_QuadToTriaAdaptor.hxx"
#include <BRepGProp.hxx>
#include <BRep_Tool.hxx> #include <BRep_Tool.hxx>
#include <GProp_GProps.hxx> #include <GProp_GProps.hxx>
#include <BRepGProp.hxx>
#include <TopExp.hxx> #include <TopExp.hxx>
#include <TopExp_Explorer.hxx> #include <TopExp_Explorer.hxx>
#include <TopTools_ListIteratorOfListOfShape.hxx>
#include <TopoDS.hxx> #include <TopoDS.hxx>
#include <Standard_Failure.hxx> #include <Standard_Failure.hxx>
@ -62,6 +64,8 @@
Netgen include files Netgen include files
*/ */
#define OCCGEOMETRY
#include <occgeom.hpp>
namespace nglib { namespace nglib {
#include <nglib.h> #include <nglib.h>
} }
@ -107,10 +111,9 @@ NETGENPlugin_NETGEN_3D::~NETGENPlugin_NETGEN_3D()
*/ */
//============================================================================= //=============================================================================
bool NETGENPlugin_NETGEN_3D::CheckHypothesis bool NETGENPlugin_NETGEN_3D::CheckHypothesis (SMESH_Mesh& aMesh,
(SMESH_Mesh& aMesh, const TopoDS_Shape& aShape,
const TopoDS_Shape& aShape, Hypothesis_Status& aStatus)
SMESH_Hypothesis::Hypothesis_Status& aStatus)
{ {
MESSAGE("NETGENPlugin_NETGEN_3D::CheckHypothesis"); MESSAGE("NETGENPlugin_NETGEN_3D::CheckHypothesis");
@ -163,90 +166,126 @@ bool NETGENPlugin_NETGEN_3D::Compute(SMESH_Mesh& aMesh,
SMESHDS_Mesh* meshDS = aMesh.GetMeshDS(); SMESHDS_Mesh* meshDS = aMesh.GetMeshDS();
const int invalid_ID = -1;
SMESH::Controls::Area areaControl;
SMESH::Controls::TSequenceOfXYZ nodesCoords;
// -------------------------------------------------------------------
// get triangles on aShell and make a map of nodes to Netgen node IDs
// -------------------------------------------------------------------
SMESH_MesherHelper helper(aMesh); SMESH_MesherHelper helper(aMesh);
SMESH_MesherHelper* myTool = &helper; bool _quadraticMesh = helper.IsQuadraticSubMesh(aShape);
bool _quadraticMesh = myTool->IsQuadraticSubMesh(aShape); helper.SetElementsOnShape( true );
typedef map< const SMDS_MeshNode*, int, TIDCompare > TNodeToIDMap; int Netgen_NbOfNodes = 0;
TNodeToIDMap nodeToNetgenID; int Netgen_param2ndOrder = 0;
list< const SMDS_MeshElement* > triangles; double Netgen_paramFine = 1.;
list< bool > isReversed; // orientation of triangles double Netgen_paramSize = pow( 72, 1/6. ) * pow( _maxElementVolume, 1/3. );
TopAbs_ShapeEnum mainType = aMesh.GetShapeToMesh().ShapeType(); double Netgen_point[3];
bool checkReverse = ( mainType == TopAbs_COMPOUND || mainType == TopAbs_COMPSOLID ); int Netgen_triangle[3];
int Netgen_tetrahedron[4];
// for the degeneraged edge: ignore all but one node on it; NETGENPlugin_NetgenLibWrapper ngLib;
// map storing ids of degen edges and vertices and their netgen id: Ng_Mesh * Netgen_mesh = ngLib._ngMesh;
map< int, int* > degenShapeIdToPtrNgId;
map< int, int* >::iterator shId_ngId;
list< int > degenNgIds;
StdMeshers_QuadToTriaAdaptor Adaptor; // vector of nodes in which node index == netgen ID
Adaptor.Compute(aMesh,aShape); vector< const SMDS_MeshNode* > nodeVec;
for (TopExp_Explorer exp(aShape,TopAbs_FACE);exp.More();exp.Next())
{ {
const TopoDS_Shape& aShapeFace = exp.Current(); const int invalid_ID = -1;
const SMESHDS_SubMesh * aSubMeshDSFace = meshDS->MeshElements( aShapeFace );
if ( aSubMeshDSFace ) SMESH::Controls::Area areaControl;
SMESH::Controls::TSequenceOfXYZ nodesCoords;
// maps nodes to ng ID
typedef map< const SMDS_MeshNode*, int, TIDCompare > TNodeToIDMap;
typedef TNodeToIDMap::value_type TN2ID;
TNodeToIDMap nodeToNetgenID;
// find internal shapes
NETGENPlugin_Internals internals( aMesh, aShape, /*is3D=*/true );
// ---------------------------------
// Feed the Netgen with surface mesh
// ---------------------------------
TopAbs_ShapeEnum mainType = aMesh.GetShapeToMesh().ShapeType();
bool checkReverse = ( mainType == TopAbs_COMPOUND || mainType == TopAbs_COMPSOLID );
StdMeshers_QuadToTriaAdaptor Adaptor;
if ( aMesh.NbQuadrangles() > 0 )
Adaptor.Compute(aMesh,aShape);
for ( TopExp_Explorer exFa( aShape, TopAbs_FACE ); exFa.More(); exFa.Next())
{ {
const TopoDS_Shape& aShapeFace = exFa.Current();
int faceID = meshDS->ShapeToIndex( aShapeFace );
bool isInternalFace = internals.isInternalShape( faceID );
bool isRev = false; bool isRev = false;
if ( checkReverse && helper.NbAncestors(aShapeFace, aMesh, aShape.ShapeType()) > 1 ) if ( checkReverse && !isInternalFace &&
helper.NbAncestors(aShapeFace, aMesh, aShape.ShapeType()) > 1 )
// IsReversedSubMesh() can work wrong on strongly curved faces, // IsReversedSubMesh() can work wrong on strongly curved faces,
// so we use it as less as possible // so we use it as less as possible
isRev = SMESH_Algo::IsReversedSubMesh( TopoDS::Face(aShapeFace), meshDS ); isRev = SMESH_Algo::IsReversedSubMesh( TopoDS::Face(aShapeFace), meshDS );
const SMESHDS_SubMesh * aSubMeshDSFace = meshDS->MeshElements( aShapeFace );
if ( !aSubMeshDSFace ) continue;
SMDS_ElemIteratorPtr iteratorElem = aSubMeshDSFace->GetElements(); SMDS_ElemIteratorPtr iteratorElem = aSubMeshDSFace->GetElements();
while ( iteratorElem->more() ) // loop on elements on a face while ( iteratorElem->more() ) // loop on elements on a geom face
{ {
// check element // check mesh face
const SMDS_MeshElement* elem = iteratorElem->next(); const SMDS_MeshElement* elem = iteratorElem->next();
if ( !elem ) if ( !elem )
return error( COMPERR_BAD_INPUT_MESH, "Null element encounters"); return error( COMPERR_BAD_INPUT_MESH, "Null element encounters");
vector< const SMDS_MeshElement* > trias;
bool isTraingle = ( elem->NbNodes() == ( elem->IsQuadratic() ? 6 : 3 )); bool isTraingle = ( elem->NbNodes() == ( elem->IsQuadratic() ? 6 : 3 ));
if ( !isTraingle ) { if ( !isTraingle )
// using adaptor {
// use adaptor to convert quadrangle face into triangles
const list<const SMDS_FaceOfNodes*>* faces = Adaptor.GetTriangles(elem); const list<const SMDS_FaceOfNodes*>* faces = Adaptor.GetTriangles(elem);
if(faces==0) { if(faces==0)
return error( COMPERR_BAD_INPUT_MESH, return error( COMPERR_BAD_INPUT_MESH,
SMESH_Comment("No triangles in adaptor for element ")<<elem->GetID()); SMESH_Comment("No triangles in adaptor for element ")<<elem->GetID());
} trias.assign( faces->begin(), faces->end() );
list<const SMDS_FaceOfNodes*>::const_iterator itf = faces->begin();
for(; itf!=faces->end(); itf++ ) {
triangles.push_back( (*itf) );
isReversed.push_back( isRev );
// put triange's nodes to nodeToNetgenID map
SMDS_ElemIteratorPtr triangleNodesIt = (*itf)->nodesIterator();
while ( triangleNodesIt->more() ) {
const SMDS_MeshNode * node =
static_cast<const SMDS_MeshNode *>(triangleNodesIt->next());
if(myTool->IsMedium(node))
continue;
nodeToNetgenID.insert( make_pair( node, invalid_ID ));
}
}
} }
else { else
// keep a triangle {
triangles.push_back( elem ); trias.push_back( elem );
isReversed.push_back( isRev ); }
// put elem nodes to nodeToNetgenID map // Add nodes of triangles and triangles them-selves to netgen mesh
SMDS_ElemIteratorPtr triangleNodesIt = elem->nodesIterator();
while ( triangleNodesIt->more() ) { for ( int i = 0; i < trias.size(); ++i )
const SMDS_MeshNode * node = {
static_cast<const SMDS_MeshNode *>(triangleNodesIt->next()); // add three nodes of triangle
if(myTool->IsMedium(node)) bool hasDegen = false;
continue; for ( int iN = 0; iN < 3; ++iN )
nodeToNetgenID.insert( make_pair( node, invalid_ID )); {
const SMDS_MeshNode* node = trias[i]->GetNode( iN );
int shapeID = node->GetPosition()->GetShapeId();
if ( node->GetPosition()->GetTypeOfPosition() == SMDS_TOP_EDGE &&
helper.IsDegenShape( shapeID ))
{
// ignore all nodes on degeneraged edge and use node on its vertex instead
TopoDS_Shape vertex = TopoDS_Iterator( meshDS->IndexToShape( shapeID )).Value();
node = SMESH_Algo::VertexNode( TopoDS::Vertex( vertex ), meshDS );
hasDegen = true;
}
int& ngID = nodeToNetgenID.insert(TN2ID( node, invalid_ID )).first->second;
if ( ngID == invalid_ID )
{
ngID = ++Netgen_NbOfNodes;
Netgen_point [ 0 ] = node->X();
Netgen_point [ 1 ] = node->Y();
Netgen_point [ 2 ] = node->Z();
Ng_AddPoint(Netgen_mesh, Netgen_point);
}
Netgen_triangle[ isRev ? 2-iN : iN ] = ngID;
}
// add triangle
if ( hasDegen && (Netgen_triangle[0] == Netgen_triangle[1] ||
Netgen_triangle[0] == Netgen_triangle[2] ||
Netgen_triangle[2] == Netgen_triangle[1] ))
continue;
Ng_AddSurfaceElement(Netgen_mesh, NG_TRIG, Netgen_triangle);
if ( isInternalFace && isTraingle )
{
swap( Netgen_triangle[1], Netgen_triangle[2] );
Ng_AddSurfaceElement(Netgen_mesh, NG_TRIG, Netgen_triangle);
} }
} }
#ifdef _DEBUG_ #ifdef _DEBUG_
@ -257,91 +296,24 @@ bool NETGENPlugin_NETGEN_3D::Compute(SMESH_Mesh& aMesh,
MESSAGE( "Warning: Degenerated " << elem ); MESSAGE( "Warning: Degenerated " << elem );
} }
#endif #endif
} } // loop on elements on a face
// look for degeneraged edges and vetices } // loop on faces of a SOLID or SHELL
for (TopExp_Explorer expE(aShapeFace,TopAbs_EDGE);expE.More();expE.Next())
{
TopoDS_Edge aShapeEdge = TopoDS::Edge( expE.Current() );
if ( BRep_Tool::Degenerated( aShapeEdge ))
{
degenNgIds.push_back( invalid_ID );
int* ptrIdOnEdge = & degenNgIds.back();
// remember edge id
int edgeID = meshDS->ShapeToIndex( aShapeEdge );
degenShapeIdToPtrNgId.insert( make_pair( edgeID, ptrIdOnEdge ));
// remember vertex id
int vertexID = meshDS->ShapeToIndex( TopExp::FirstVertex( aShapeEdge ));
degenShapeIdToPtrNgId.insert( make_pair( vertexID, ptrIdOnEdge ));
}
}
}
}
// ---------------------------------
// Feed the Netgen with surface mesh
// ---------------------------------
int Netgen_NbOfNodes = 0; // insert old nodes into nodeVec
int Netgen_param2ndOrder = 0; nodeVec.resize( nodeToNetgenID.size() + 1, 0 );
double Netgen_paramFine = 1.; TNodeToIDMap::iterator n_id = nodeToNetgenID.begin();
double Netgen_paramSize = pow( 72, 1/6. ) * pow( _maxElementVolume, 1/3. ); for ( ; n_id != nodeToNetgenID.end(); ++n_id )
nodeVec[ n_id->second ] = n_id->first;
nodeToNetgenID.clear();
double Netgen_point[3]; if ( internals.hasInternalVertexInSolid() )
int Netgen_triangle[3];
int Netgen_tetrahedron[4];
Ng_Init();
Ng_Mesh * Netgen_mesh = Ng_NewMesh();
// set nodes and remember thier netgen IDs
bool isDegen = false, hasDegen = !degenShapeIdToPtrNgId.empty();
TNodeToIDMap::iterator n_id = nodeToNetgenID.begin();
for ( ; n_id != nodeToNetgenID.end(); ++n_id )
{
const SMDS_MeshNode* node = n_id->first;
// ignore nodes on degenerated edge
if ( hasDegen ) {
int shapeId = node->GetPosition()->GetShapeId();
shId_ngId = degenShapeIdToPtrNgId.find( shapeId );
isDegen = ( shId_ngId != degenShapeIdToPtrNgId.end() );
if ( isDegen && *(shId_ngId->second) != invalid_ID ) {
n_id->second = *(shId_ngId->second);
continue;
}
}
Netgen_point [ 0 ] = node->X();
Netgen_point [ 1 ] = node->Y();
Netgen_point [ 2 ] = node->Z();
Ng_AddPoint(Netgen_mesh, Netgen_point);
n_id->second = ++Netgen_NbOfNodes; // set netgen ID
if ( isDegen ) // all nodes on a degen edge get one netgen ID
*(shId_ngId->second) = n_id->second;
}
// set triangles
list< const SMDS_MeshElement* >::iterator tria = triangles.begin();
list< bool >::iterator reverse = isReversed.begin();
for ( ; tria != triangles.end(); ++tria, ++reverse )
{
int i = 0;
SMDS_ElemIteratorPtr triangleNodesIt = (*tria)->nodesIterator();
while ( triangleNodesIt->more() ) {
const SMDS_MeshNode * node =
static_cast<const SMDS_MeshNode *>(triangleNodesIt->next());
if(myTool->IsMedium(node))
continue;
Netgen_triangle[ *reverse ? 2 - i : i ] = nodeToNetgenID[ node ];
++i;
}
if ( !hasDegen ||
// ignore degenerated triangles, they have 2 or 3 same ids
(Netgen_triangle[0] != Netgen_triangle[1] &&
Netgen_triangle[0] != Netgen_triangle[2] &&
Netgen_triangle[2] != Netgen_triangle[1] ))
{ {
Ng_AddSurfaceElement(Netgen_mesh, NG_TRIG, Netgen_triangle); netgen::OCCGeometry occgeo;
NETGENPlugin_Mesher::addIntVerticesInSolids( occgeo,
(netgen::Mesh&) *Netgen_mesh,
nodeVec,
internals);
Netgen_NbOfNodes = Ng_GetNP(Netgen_mesh);
} }
} }
@ -352,8 +324,8 @@ bool NETGENPlugin_NETGEN_3D::Compute(SMESH_Mesh& aMesh,
Ng_Meshing_Parameters Netgen_param; Ng_Meshing_Parameters Netgen_param;
Netgen_param.secondorder = Netgen_param2ndOrder; Netgen_param.secondorder = Netgen_param2ndOrder;
Netgen_param.fineness = Netgen_paramFine; Netgen_param.fineness = Netgen_paramFine;
Netgen_param.maxh = Netgen_paramSize; Netgen_param.maxh = Netgen_paramSize;
Ng_Result status; Ng_Result status;
@ -382,8 +354,7 @@ bool NETGENPlugin_NETGEN_3D::Compute(SMESH_Mesh& aMesh,
} }
int Netgen_NbOfNodesNew = Ng_GetNP(Netgen_mesh); int Netgen_NbOfNodesNew = Ng_GetNP(Netgen_mesh);
int Netgen_NbOfTetra = Ng_GetNE(Netgen_mesh);
int Netgen_NbOfTetra = Ng_GetNE(Netgen_mesh);
MESSAGE("End of Volume Mesh Generation. status=" << status << MESSAGE("End of Volume Mesh Generation. status=" << status <<
", nb new nodes: " << Netgen_NbOfNodesNew - Netgen_NbOfNodes << ", nb new nodes: " << Netgen_NbOfNodesNew - Netgen_NbOfNodes <<
@ -393,49 +364,46 @@ bool NETGENPlugin_NETGEN_3D::Compute(SMESH_Mesh& aMesh,
// Feed back the SMESHDS with the generated Nodes and Volume Elements // Feed back the SMESHDS with the generated Nodes and Volume Elements
// ------------------------------------------------------------------- // -------------------------------------------------------------------
if ( status == NG_VOLUME_FAILURE )
{
SMESH_ComputeErrorPtr err = NETGENPlugin_Mesher::readErrors(nodeVec);
if ( err && !err->myBadElements.empty() )
error( err );
}
bool isOK = ( /*status == NG_OK &&*/ Netgen_NbOfTetra > 0 );// get whatever built bool isOK = ( /*status == NG_OK &&*/ Netgen_NbOfTetra > 0 );// get whatever built
if ( isOK ) if ( isOK )
{ {
// vector of nodes in which node index == netgen ID
vector< const SMDS_MeshNode* > nodeVec ( Netgen_NbOfNodesNew + 1 );
// insert old nodes into nodeVec
for ( n_id = nodeToNetgenID.begin(); n_id != nodeToNetgenID.end(); ++n_id ) {
nodeVec.at( n_id->second ) = n_id->first;
}
// create and insert new nodes into nodeVec // create and insert new nodes into nodeVec
nodeVec.resize( Netgen_NbOfNodesNew + 1, 0 );
int nodeIndex = Netgen_NbOfNodes + 1; int nodeIndex = Netgen_NbOfNodes + 1;
int shapeID = meshDS->ShapeToIndex( aShape );
for ( ; nodeIndex <= Netgen_NbOfNodesNew; ++nodeIndex ) for ( ; nodeIndex <= Netgen_NbOfNodesNew; ++nodeIndex )
{ {
Ng_GetPoint( Netgen_mesh, nodeIndex, Netgen_point ); Ng_GetPoint( Netgen_mesh, nodeIndex, Netgen_point );
SMDS_MeshNode * node = meshDS->AddNode(Netgen_point[0], nodeVec.at(nodeIndex) = helper.AddNode(Netgen_point[0], Netgen_point[1], Netgen_point[2]);
Netgen_point[1],
Netgen_point[2]);
meshDS->SetNodeInVolume(node, shapeID);
nodeVec.at(nodeIndex) = node;
} }
// create tetrahedrons // create tetrahedrons
for ( int elemIndex = 1; elemIndex <= Netgen_NbOfTetra; ++elemIndex ) for ( int elemIndex = 1; elemIndex <= Netgen_NbOfTetra; ++elemIndex )
{ {
Ng_GetVolumeElement(Netgen_mesh, elemIndex, Netgen_tetrahedron); Ng_GetVolumeElement(Netgen_mesh, elemIndex, Netgen_tetrahedron);
SMDS_MeshVolume * elt = myTool->AddVolume (nodeVec.at( Netgen_tetrahedron[0] ), helper.AddVolume (nodeVec.at( Netgen_tetrahedron[0] ),
nodeVec.at( Netgen_tetrahedron[1] ), nodeVec.at( Netgen_tetrahedron[1] ),
nodeVec.at( Netgen_tetrahedron[2] ), nodeVec.at( Netgen_tetrahedron[2] ),
nodeVec.at( Netgen_tetrahedron[3] )); nodeVec.at( Netgen_tetrahedron[3] ));
meshDS->SetMeshElementOnShape(elt, shapeID );
} }
} }
Ng_DeleteMesh(Netgen_mesh);
Ng_Exit();
NETGENPlugin_Mesher::RemoveTmpFiles();
return (status == NG_OK); return (status == NG_OK);
} }
bool NETGENPlugin_NETGEN_3D::Compute(SMESH_Mesh& aMesh, //================================================================================
/*!
* \brief Compute tetrahedral mesh from 2D mesh without geometry
*/
//================================================================================
bool NETGENPlugin_NETGEN_3D::Compute(SMESH_Mesh& aMesh,
SMESH_MesherHelper* aHelper) SMESH_MesherHelper* aHelper)
{ {
MESSAGE("NETGENPlugin_NETGEN_3D::Compute with maxElmentsize = " << _maxElementVolume); MESSAGE("NETGENPlugin_NETGEN_3D::Compute with maxElmentsize = " << _maxElementVolume);
@ -462,42 +430,32 @@ bool NETGENPlugin_NETGEN_3D::Compute(SMESH_Mesh& aMesh,
while( fIt->more()) sortedFaces.insert( fIt->next() ); while( fIt->more()) sortedFaces.insert( fIt->next() );
TIDSortedElemSet::iterator itFace = sortedFaces.begin(), fEnd = sortedFaces.end(); TIDSortedElemSet::iterator itFace = sortedFaces.begin(), fEnd = sortedFaces.end();
for ( ; itFace != fEnd; ++itFace ) { for ( ; itFace != fEnd; ++itFace )
{
// check element // check element
const SMDS_MeshElement* elem = *itFace; const SMDS_MeshElement* elem = *itFace;
if ( !elem ) if ( !elem )
return error( COMPERR_BAD_INPUT_MESH, "Null element encounters"); return error( COMPERR_BAD_INPUT_MESH, "Null element encounters");
vector< const SMDS_MeshElement* > trias;
bool isTraingle = ( elem->NbNodes() == ( elem->IsQuadratic() ? 6 : 3 )); bool isTraingle = ( elem->NbNodes() == ( elem->IsQuadratic() ? 6 : 3 ));
if ( !isTraingle ) { if ( !isTraingle ) {
// using adaptor // using adaptor
const list<const SMDS_FaceOfNodes*>* faces = Adaptor.GetTriangles(elem); const list<const SMDS_FaceOfNodes*>* faces = Adaptor.GetTriangles(elem);
if(faces==0) { if(faces==0)
continue; // Issue 0020682. There already can be 3d mesh continue; // Issue 0020682. There already can be 3d mesh
} trias.assign( faces->begin(), faces->end() );
list<const SMDS_FaceOfNodes*>::const_iterator itf = faces->begin();
for(; itf!=faces->end(); itf++ ) {
triangles.push_back( (*itf) );
// put triange's nodes to nodeToNetgenID map
SMDS_ElemIteratorPtr triangleNodesIt = (*itf)->nodesIterator();
while ( triangleNodesIt->more() ) {
const SMDS_MeshNode * node =
static_cast<const SMDS_MeshNode *>(triangleNodesIt->next());
if(aHelper->IsMedium(node))
continue;
nodeToNetgenID.insert( make_pair( node, invalid_ID ));
}
}
} }
else { else {
// keep a triangle trias.push_back( elem );
triangles.push_back( elem ); }
// put elem nodes to nodeToNetgenID map for ( int i = 0; i < trias.size(); ++i )
SMDS_ElemIteratorPtr triangleNodesIt = elem->nodesIterator(); {
while ( triangleNodesIt->more() ) { triangles.push_back( trias[i] );
const SMDS_MeshNode * node = for ( int iN = 0; iN < 3; ++iN )
static_cast<const SMDS_MeshNode *>(triangleNodesIt->next()); {
if(aHelper->IsMedium(node)) const SMDS_MeshNode* node = trias[i]->GetNode( iN );
continue; // put elem nodes to nodeToNetgenID map
nodeToNetgenID.insert( make_pair( node, invalid_ID )); nodeToNetgenID.insert( make_pair( node, invalid_ID ));
} }
} }
@ -516,11 +474,10 @@ bool NETGENPlugin_NETGEN_3D::Compute(SMESH_Mesh& aMesh,
int Netgen_triangle[3]; int Netgen_triangle[3];
int Netgen_tetrahedron[4]; int Netgen_tetrahedron[4];
Ng_Init(); NETGENPlugin_NetgenLibWrapper ngLib;
Ng_Mesh * Netgen_mesh = ngLib._ngMesh;
Ng_Mesh * Netgen_mesh = Ng_NewMesh(); // set nodes and remember thier netgen IDs
// set nodes and remember thier netgen IDs
TNodeToIDMap::iterator n_id = nodeToNetgenID.begin(); TNodeToIDMap::iterator n_id = nodeToNetgenID.begin();
for ( ; n_id != nodeToNetgenID.end(); ++n_id ) for ( ; n_id != nodeToNetgenID.end(); ++n_id )
@ -625,11 +582,6 @@ bool NETGENPlugin_NETGEN_3D::Compute(SMESH_Mesh& aMesh,
} }
} }
Ng_DeleteMesh(Netgen_mesh);
Ng_Exit();
NETGENPlugin_Mesher::RemoveTmpFiles();
return (status == NG_OK); return (status == NG_OK);
} }
@ -646,8 +598,8 @@ bool NETGENPlugin_NETGEN_3D::Evaluate(SMESH_Mesh& aMesh,
{ {
int nbtri = 0, nbqua = 0; int nbtri = 0, nbqua = 0;
double fullArea = 0.0; double fullArea = 0.0;
for (TopExp_Explorer exp(aShape, TopAbs_FACE); exp.More(); exp.Next()) { for (TopExp_Explorer expF(aShape, TopAbs_FACE); expF.More(); expF.Next()) {
TopoDS_Face F = TopoDS::Face( exp.Current() ); TopoDS_Face F = TopoDS::Face( expF.Current() );
SMESH_subMesh *sm = aMesh.GetSubMesh(F); SMESH_subMesh *sm = aMesh.GetSubMesh(F);
MapShapeNbElemsItr anIt = aResMap.find(sm); MapShapeNbElemsItr anIt = aResMap.find(sm);
if( anIt==aResMap.end() ) { if( anIt==aResMap.end() ) {
@ -669,12 +621,12 @@ bool NETGENPlugin_NETGEN_3D::Evaluate(SMESH_Mesh& aMesh,
bool IsQuadratic = false; bool IsQuadratic = false;
bool IsFirst = true; bool IsFirst = true;
TopTools_MapOfShape tmpMap; TopTools_MapOfShape tmpMap;
for (TopExp_Explorer exp(aShape, TopAbs_EDGE); exp.More(); exp.Next()) { for (TopExp_Explorer expF(aShape, TopAbs_EDGE); expF.More(); expF.Next()) {
TopoDS_Edge E = TopoDS::Edge(exp.Current()); TopoDS_Edge E = TopoDS::Edge(expF.Current());
if( tmpMap.Contains(E) ) if( tmpMap.Contains(E) )
continue; continue;
tmpMap.Add(E); tmpMap.Add(E);
SMESH_subMesh *aSubMesh = aMesh.GetSubMesh(exp.Current()); SMESH_subMesh *aSubMesh = aMesh.GetSubMesh(expF.Current());
MapShapeNbElemsItr anIt = aResMap.find(aSubMesh); MapShapeNbElemsItr anIt = aResMap.find(aSubMesh);
if( anIt==aResMap.end() ) { if( anIt==aResMap.end() ) {
SMESH_ComputeErrorPtr& smError = aSubMesh->GetComputeError(); SMESH_ComputeErrorPtr& smError = aSubMesh->GetComputeError();

3
src/NETGENPlugin/NETGENPlugin_NETGEN_3D.hxx
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE // Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
// //
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, // Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@ -19,6 +19,7 @@
// //
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
// //
//============================================================================= //=============================================================================
// File : NETGENPlugin_NETGEN_3D.hxx // File : NETGENPlugin_NETGEN_3D.hxx
// Moved here from SMESH_NETGEN_3D.hxx // Moved here from SMESH_NETGEN_3D.hxx

3
src/NETGENPlugin/NETGENPlugin_NETGEN_3D_i.cxx
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE // Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
// //
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, // Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@ -19,6 +19,7 @@
// //
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
// //
// SMESH SMESH_I : idl implementation based on 'SMESH' unit's calsses // SMESH SMESH_I : idl implementation based on 'SMESH' unit's calsses
// File : NETGENPlugin_NETGEN_3D_i.cxx // File : NETGENPlugin_NETGEN_3D_i.cxx
// Moved here from SMESH_NETGEN_3D_i.cxx // Moved here from SMESH_NETGEN_3D_i.cxx

3
src/NETGENPlugin/NETGENPlugin_NETGEN_3D_i.hxx
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE // Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
// //
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, // Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@ -19,6 +19,7 @@
// //
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
// //
// SMESH SMESH_I : idl implementation based on 'SMESH' unit's calsses // SMESH SMESH_I : idl implementation based on 'SMESH' unit's calsses
// File : NETGENPlugin_NETGEN_3D_i.hxx // File : NETGENPlugin_NETGEN_3D_i.hxx
// Moved here from SMESH_NETGEN_3D_i.hxx // Moved here from SMESH_NETGEN_3D_i.hxx

6
src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_2D.cxx
View File

@ -1,7 +1,4 @@
// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE // Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
// //
// This library is free software; you can redistribute it and/or // This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public // modify it under the terms of the GNU Lesser General Public
@ -19,6 +16,7 @@
// //
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
// //
// NETGENPlugin : C++ implementation // NETGENPlugin : C++ implementation
// File : NETGENPlugin_SimpleHypothesis_2D.cxx // File : NETGENPlugin_SimpleHypothesis_2D.cxx
// Author : Edward AGAPOV // Author : Edward AGAPOV

6
src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_2D.hxx
View File

@ -1,7 +1,4 @@
// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE // Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
// //
// This library is free software; you can redistribute it and/or // This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public // modify it under the terms of the GNU Lesser General Public
@ -19,6 +16,7 @@
// //
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
// //
// NETGENPlugin : C++ implementation // NETGENPlugin : C++ implementation
// File : NETGENPlugin_SimpleHypothesis_2D.hxx // File : NETGENPlugin_SimpleHypothesis_2D.hxx
// Author : Edward AGAPOV // Author : Edward AGAPOV

6
src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_2D_i.cxx
View File

@ -1,7 +1,4 @@
// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE // Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
// //
// This library is free software; you can redistribute it and/or // This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public // modify it under the terms of the GNU Lesser General Public
@ -19,6 +16,7 @@
// //
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
// //
// NETGENPlugin : C++ implementation // NETGENPlugin : C++ implementation
// File : NETGENPlugin_SimpleHypothesis_2D_i.cxx // File : NETGENPlugin_SimpleHypothesis_2D_i.cxx
// Author : Edward AGAPOV // Author : Edward AGAPOV

6
src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_2D_i.hxx
View File

@ -1,7 +1,4 @@
// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE // Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
// //
// This library is free software; you can redistribute it and/or // This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public // modify it under the terms of the GNU Lesser General Public
@ -19,6 +16,7 @@
// //
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
// //
// NETGENPlugin : C++ implementation // NETGENPlugin : C++ implementation
// File : NETGENPlugin_SimpleHypothesis_2D_i.hxx // File : NETGENPlugin_SimpleHypothesis_2D_i.hxx
// Author : Edward AGAPOV // Author : Edward AGAPOV

6
src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_3D.cxx
View File

@ -1,7 +1,4 @@
// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE // Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
// //
// This library is free software; you can redistribute it and/or // This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public // modify it under the terms of the GNU Lesser General Public
@ -19,6 +16,7 @@
// //
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
// //
// NETGENPlugin : C++ implementation // NETGENPlugin : C++ implementation
// File : NETGENPlugin_SimpleHypothesis_3D.cxx // File : NETGENPlugin_SimpleHypothesis_3D.cxx
// Author : Edward AGAPOV // Author : Edward AGAPOV

6
src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_3D.hxx
View File

@ -1,7 +1,4 @@
// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE // Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
// //
// This library is free software; you can redistribute it and/or // This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public // modify it under the terms of the GNU Lesser General Public
@ -19,6 +16,7 @@
// //
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
// //
// NETGENPlugin : C++ implementation // NETGENPlugin : C++ implementation
// File : NETGENPlugin_SimpleHypothesis_3D.hxx // File : NETGENPlugin_SimpleHypothesis_3D.hxx
// Author : Edward AGAPOV // Author : Edward AGAPOV

6
src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_3D_i.cxx
View File

@ -1,7 +1,4 @@
// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE // Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
// //
// This library is free software; you can redistribute it and/or // This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public // modify it under the terms of the GNU Lesser General Public
@ -19,6 +16,7 @@
// //
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
// //
// NETGENPlugin : C++ implementation // NETGENPlugin : C++ implementation
// File : NETGENPlugin_SimpleHypothesis_3D_i.cxx // File : NETGENPlugin_SimpleHypothesis_3D_i.cxx
// Author : Edward AGAPOV // Author : Edward AGAPOV

6
src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_3D_i.hxx
View File

@ -1,7 +1,4 @@
// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE // Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
// //
// This library is free software; you can redistribute it and/or // This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public // modify it under the terms of the GNU Lesser General Public
@ -19,6 +16,7 @@
// //
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
// //
// NETGENPlugin : C++ implementation // NETGENPlugin : C++ implementation
// File : NETGENPlugin_SimpleHypothesis_3D_i.hxx // File : NETGENPlugin_SimpleHypothesis_3D_i.hxx
// Author : Edward AGAPOV // Author : Edward AGAPOV

3
src/NETGENPlugin/NETGENPlugin_i.cxx
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE // Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
// //
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, // Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@ -19,6 +19,7 @@
// //
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
// //
// SMESH NETGENPlugin : implementaion of SMESH idl descriptions // SMESH NETGENPlugin : implementaion of SMESH idl descriptions
// File : NETGENPlugin.cxx // File : NETGENPlugin.cxx
// Author : Julia DOROVSKIKH // Author : Julia DOROVSKIKH