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

Merge branch 'V7_dev'

Browse Source
This commit is contained in:
vsr 2016-03-25 09:44:12 +03:00
commit c93498bd46
82 changed files with 258 additions and 135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
AUTHORS
View File

5
CMakeLists.txt
View File

@ -1,4 +1,4 @@
# Copyright (C) 2012-2015 CEA/DEN, EDF R&D, OPEN CASCADE
# Copyright (C) 2012-2016 CEA/DEN, EDF R&D, OPEN CASCADE
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
@ -71,7 +71,8 @@ OPTION(SALOME_BUILD_GUI "Enable GUI" ON)
##
# Python
FIND_PACKAGE(SalomePython REQUIRED)
FIND_PACKAGE(SalomePythonInterp REQUIRED)
FIND_PACKAGE(SalomePythonLibs REQUIRED)
# Boost
FIND_PACKAGE(SalomeBoost REQUIRED)
# CORBA

0
ChangeLog
View File

1
INSTALL
View File

@ -1 +0,0 @@
SALOME2 : NETGENPLUGIN module (SMESH plugin)

2
NETGENPLUGIN_version.h.in
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE
// Copyright (C) 2007-2016 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

0
NEWS
View File

113
README
View File

@ -0,0 +1,113 @@
***************************
About SALOME Netgen plug-in
***************************
SALOME Netgen plug-in is destined for:
- Meshing 1D, 2D and 3D geometric entities.
- Splitting faces into triangular elements (quad-dominant mesh is also possible).
- Splitting solids into tetrahedral elements (pyramids are constructed as a
transition from quadrangles to tetrahedra).
- Generating 3D meshes from 2D meshes, working without geometrical objects.
SALOME Netgen plug-in is integrated into SALOME platform via the SALOME Mesh
module.
For more information please visit the SALOME platform web site:
<http://www.salome-platform.org/>
=======
License
=======
SALOME platform is distributed under the GNU Lesser General Public License.
See COPYING file for more details.
Also, additional information can be found at SALOME platform web site:
<http://www.salome-platform.org/downloads/license/>
============
Installation
============
--------------
Pre-requisites
--------------
SALOME platform relies on a set of third-party softwares; some of them are needed
at build time only, while other ones are needed in runtime also.
For more information about the pre-requisites please visit SALOME platform web
site:
* Check Release Notes and Software Requirements of the latest SALOME release at
<http://www.salome-platform.org/downloads/current-version/>
* Pre-requisites page at SALOME web site:
<http://www.salome-platform.org/downloads/license/>
Note: SALOME Netgen plug-in needs SALOME KERNEL, SALOME GUI, SALOME Geometry and
SALOME Mesh as pre-requisites.
------------------
Basic Installation
------------------
The build procedure of the SALOME platform is implemented with CMake.
In order to build the plug-in you have to do the following actions:
1. Set up environment for pre-requisites (see "Pre-requisites" section above).
2. Create a build directory:
% mkdir NETGENPLUGIN_BUILD
3. Configure the build procedure:
% cd NETGENPLUGIN_BUILD
% cmake -DCMAKE_BUILD_TYPE=<mode> -DCMAKE_INSTALL_PREFIX=<installation_directory> <path_to_src_dir>
where
- <mode> is either Release or Debug (default: Release);
- <installation_directory> is a destination folder to install SALOME Netgen
plug-in (default: /usr);
- <path_to_src_dir> is a path to the SALOME Netgen plug-in sources directory.
Note: by default (if CMAKE_INSTALL_PREFIX option is not given), SALOME Netgen
plug-in will be configured for installation to the /usr directory that requires
root permissions to complete the installation.
4. Build and install:
% make
% make install
This will install SALOME Netgen plug-in to the <installation_directory>
specified to cmake command on the previous step.
-------------------
Custom installation
-------------------
SALOME Netgen plug-in supports a set of advanced configuration options;
for more details learn CMakeLists.txt file in the root source directory.
You can also use other options of cmake command to customize your installation.
Learn more about available options by typing
% cmake --help
=============
Documentation
=============
The directory doc contains additional documentation file of SALOME Netgen plug-in.
===============
Troubleshooting
===============
Please, send a mail to webmaster.salome@opencascade.com.

2
SalomeNETGENPLUGINConfig.cmake.in
View File

@ -5,7 +5,7 @@
#
###############################################################
# Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE
# Copyright (C) 2007-2016 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

2
adm_local/CMakeLists.txt
View File

@ -1,4 +1,4 @@
# Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE
# Copyright (C) 2007-2016 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

2
adm_local/cmake_files/CMakeLists.txt
View File

@ -1,4 +1,4 @@
# Copyright (C) 2012-2015 CEA/DEN, EDF R&D, OPEN CASCADE
# Copyright (C) 2012-2016 CEA/DEN, EDF R&D, OPEN CASCADE
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public

2
adm_local/cmake_files/FindNetgen.cmake
View File

@ -5,7 +5,7 @@
#
#########################################################################
# Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE
# Copyright (C) 2007-2016 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

2
adm_local/cmake_files/FindSalomeNETGENPLUGIN.cmake
View File

@ -1,4 +1,4 @@
# Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE
# Copyright (C) 2007-2016 CEA/DEN, EDF R&D, OPEN CASCADE
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public

2
adm_local/cmake_files/FindSalomeNetgen.cmake
View File

@ -1,4 +1,4 @@
# Copyright (C) 2013-2015 CEA/DEN, EDF R&D, OPEN CASCADE
# Copyright (C) 2013-2016 CEA/DEN, EDF R&D, OPEN CASCADE
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public

2
adm_local/unix/CMakeLists.txt
View File

@ -1,4 +1,4 @@
# Copyright (C) 2012-2015 CEA/DEN, EDF R&D, OPEN CASCADE
# Copyright (C) 2012-2016 CEA/DEN, EDF R&D, OPEN CASCADE
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public

2
adm_local/unix/config_files/CMakeLists.txt
View File

@ -1,4 +1,4 @@
# Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE
# Copyright (C) 2007-2016 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

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

@ -1,4 +1,4 @@
dnl Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE
dnl Copyright (C) 2007-2016 CEA/DEN, EDF R&D, OPEN CASCADE
dnl
dnl Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS

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

@ -1,4 +1,4 @@
dnl Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE
dnl Copyright (C) 2007-2016 CEA/DEN, EDF R&D, OPEN CASCADE
dnl
dnl Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS

2
bin/CMakeLists.txt
View File

@ -1,4 +1,4 @@
# Copyright (C) 2012-2015 CEA/DEN, EDF R&D, OPEN CASCADE
# Copyright (C) 2012-2016 CEA/DEN, EDF R&D, OPEN CASCADE
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public

2
doc/CMakeLists.txt
View File

@ -1,4 +1,4 @@
# Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE
# Copyright (C) 2007-2016 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

2
doc/salome/CMakeLists.txt
View File

@ -1,4 +1,4 @@
# Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE
# Copyright (C) 2007-2016 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

2
doc/salome/examples/CMakeLists.txt
View File

@ -1,4 +1,4 @@
# Copyright (C) 2013-2015 CEA/DEN, EDF R&D, OPEN CASCADE
# Copyright (C) 2013-2016 CEA/DEN, EDF R&D, OPEN CASCADE
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public

2
doc/salome/gui/CMakeLists.txt
View File

@ -1,4 +1,4 @@
# Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE
# Copyright (C) 2007-2016 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

2
doc/salome/gui/NETGENPLUGIN/CMakeLists.txt
View File

@ -1,4 +1,4 @@
# Copyright (C) 2012-2015 CEA/DEN, EDF R&D, OPEN CASCADE
# Copyright (C) 2012-2016 CEA/DEN, EDF R&D, OPEN CASCADE
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public

2
doc/salome/gui/NETGENPLUGIN/doxyfile.in
View File

@ -1,4 +1,4 @@
# Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE
# Copyright (C) 2007-2016 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

2
doc/salome/gui/NETGENPLUGIN/doxyfile_py.in
View File

@ -1,4 +1,4 @@
# Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE
# Copyright (C) 2007-2016 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

2
doc/salome/gui/NETGENPLUGIN/static/footer.html
View File

@ -4,7 +4,7 @@
<ul>
$navpath
<li class="footer">
Copyright &copy; 2007-2015 CEA/DEN, EDF R&amp;D, OPEN CASCADE<br>
Copyright &copy; 2007-2016 CEA/DEN, EDF R&amp;D, OPEN CASCADE<br>
Copyright &copy; 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, CEDRAT, EDF R&amp;D, LEG, PRINCIPIA R&amp;D, BUREAU VERITAS<br>
</li>
</ul>

2
idl/CMakeLists.txt
View File

@ -1,4 +1,4 @@
# Copyright (C) 2012-2015 CEA/DEN, EDF R&D, OPEN CASCADE
# Copyright (C) 2012-2016 CEA/DEN, EDF R&D, OPEN CASCADE
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public

2
idl/NETGENPlugin_Algorithm.idl
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE
// Copyright (C) 2007-2016 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

2
resources/CMakeLists.txt
View File

@ -1,4 +1,4 @@
# Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE
# Copyright (C) 2007-2016 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

2
resources/NETGENPlugin.xml
View File

@ -1,7 +1,7 @@
<?xml version='1.0' encoding='us-ascii'?>
<!DOCTYPE meshers PUBLIC "" "desktop.dtd">
<!--
Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE
Copyright (C) 2007-2016 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

2
resources/SalomeApp.xml
View File

@ -1,5 +1,5 @@
<!--
Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE
Copyright (C) 2007-2016 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

2
src/CMakeLists.txt
View File

@ -1,4 +1,4 @@
# Copyright (C) 2012-2015 CEA/DEN, EDF R&D, OPEN CASCADE
# Copyright (C) 2012-2016 CEA/DEN, EDF R&D, OPEN CASCADE
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public

2
src/GUI/CMakeLists.txt
View File

@ -1,4 +1,4 @@
# Copyright (C) 2012-2015 CEA/DEN, EDF R&D, OPEN CASCADE
# Copyright (C) 2012-2016 CEA/DEN, EDF R&D, OPEN CASCADE
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public

2
src/GUI/NETGENPluginGUI.cxx
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE
// Copyright (C) 2007-2016 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

2
src/GUI/NETGENPluginGUI.h
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE
// Copyright (C) 2007-2016 CEA/DEN, EDF R&D, OPEN CASCADE
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public

2
src/GUI/NETGENPluginGUI_HypothesisCreator.cxx
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE
// Copyright (C) 2007-2016 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

2
src/GUI/NETGENPluginGUI_HypothesisCreator.h
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE
// Copyright (C) 2007-2016 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

2
src/GUI/NETGENPluginGUI_SimpleCreator.cxx
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE
// Copyright (C) 2007-2016 CEA/DEN, EDF R&D, OPEN CASCADE
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public

2
src/GUI/NETGENPluginGUI_SimpleCreator.h
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE
// Copyright (C) 2007-2016 CEA/DEN, EDF R&D, OPEN CASCADE
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public

2
src/NETGENPlugin/CMakeLists.txt
View File

@ -1,4 +1,4 @@
# Copyright (C) 2012-2015 CEA/DEN, EDF R&D, OPEN CASCADE
# Copyright (C) 2012-2016 CEA/DEN, EDF R&D, OPEN CASCADE
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public

2
src/NETGENPlugin/NETGENPluginBuilder.py
View File

@ -1,4 +1,4 @@
# Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE
# Copyright (C) 2007-2016 CEA/DEN, EDF R&D, OPEN CASCADE
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public

2
src/NETGENPlugin/NETGENPlugin_Defs.hxx
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE
// Copyright (C) 2007-2016 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

2
src/NETGENPlugin/NETGENPlugin_Hypothesis.cxx
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE
// Copyright (C) 2007-2016 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

2
src/NETGENPlugin/NETGENPlugin_Hypothesis.hxx
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE
// Copyright (C) 2007-2016 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

2
src/NETGENPlugin/NETGENPlugin_Hypothesis_2D.cxx
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE
// Copyright (C) 2007-2016 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

2
src/NETGENPlugin/NETGENPlugin_Hypothesis_2D.hxx
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE
// Copyright (C) 2007-2016 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

2
src/NETGENPlugin/NETGENPlugin_Hypothesis_2D_ONLY_i.cxx
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE
// Copyright (C) 2007-2016 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

2
src/NETGENPlugin/NETGENPlugin_Hypothesis_2D_ONLY_i.hxx
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE
// Copyright (C) 2007-2016 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

2
src/NETGENPlugin/NETGENPlugin_Hypothesis_2D_i.cxx
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE
// Copyright (C) 2007-2016 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

2
src/NETGENPlugin/NETGENPlugin_Hypothesis_2D_i.hxx
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE
// Copyright (C) 2007-2016 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

2
src/NETGENPlugin/NETGENPlugin_Hypothesis_3D_i.cxx
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE
// Copyright (C) 2007-2016 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

2
src/NETGENPlugin/NETGENPlugin_Hypothesis_3D_i.hxx
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE
// Copyright (C) 2007-2016 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

2
src/NETGENPlugin/NETGENPlugin_Hypothesis_i.cxx
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE
// Copyright (C) 2007-2016 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

2
src/NETGENPlugin/NETGENPlugin_Hypothesis_i.hxx
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE
// Copyright (C) 2007-2016 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

38
src/NETGENPlugin/NETGENPlugin_Mesher.cxx
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE
// Copyright (C) 2007-2016 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
@ -83,6 +83,12 @@ namespace netgen {
extern MeshingParameters mparam;
extern volatile multithreadt multithread;
extern bool merge_solids;
// values used for occgeo.facemeshstatus
enum EFaceMeshStatus { FACE_NOT_TREATED = 0,
FACE_FAILED = -1,
FACE_MESHED_OK = 1,
};
}
#include <vector>
@ -260,8 +266,6 @@ void NETGENPlugin_Mesher::SetParameters(const NETGENPlugin_Hypothesis* hyp)
// create elements of second order
mparams.secondorder = hyp->GetSecondOrder() ? 1 : 0;
// quad-dominated surface meshing
// only triangles are allowed for volumic mesh (before realizing IMP 0021676)
//if (!_isVolume)
mparams.quad = hyp->GetQuadAllowed() ? 1 : 0;
_optimize = hyp->GetOptimize();
_fineness = hyp->GetFineness();
@ -282,16 +286,13 @@ void NETGENPlugin_Mesher::SetParameters(const NETGENPlugin_Hypothesis* hyp)
double val = (*it).second;
// --
GEOM::GEOM_Object_var aGeomObj;
TopoDS_Shape S = TopoDS_Shape();
SALOMEDS::SObject_var aSObj = myStudy->FindObjectID( entry.c_str() );
if ( !aSObj->_is_nil() ) {
CORBA::Object_var obj = aSObj->GetObject();
aGeomObj = GEOM::GEOM_Object::_narrow(obj);
aSObj->UnRegister();
}
if ( !aGeomObj->_is_nil() )
S = smeshGen_i->GeomObjectToShape( aGeomObj.in() );
// --
TopoDS_Shape S = smeshGen_i->GeomObjectToShape( aGeomObj.in() );
SetLocalSize(S, val);
}
}
@ -594,6 +595,8 @@ void NETGENPlugin_Mesher::PrepareOCCgeometry(netgen::OCCGeometry& occgeo,
rootSM.push_back( mesh.GetSubMesh( it.Value() ));
}
int totNbFaces = 0;
// add subshapes of empty submeshes
list< SMESH_subMesh* >::iterator rootIt = rootSM.begin(), rootEnd = rootSM.end();
for ( ; rootIt != rootEnd; ++rootIt ) {
@ -607,6 +610,7 @@ void NETGENPlugin_Mesher::PrepareOCCgeometry(netgen::OCCGeometry& occgeo,
{
SMESH_subMesh* sm = smIt->next();
TopoDS_Shape shape = sm->GetSubShape();
totNbFaces += ( shape.ShapeType() == TopAbs_FACE );
if ( intern && intern->isShapeToPrecompute( shape ))
continue;
if ( !meshedSM || sm->IsEmpty() )
@ -631,11 +635,11 @@ void NETGENPlugin_Mesher::PrepareOCCgeometry(netgen::OCCGeometry& occgeo,
}
}
}
occgeo.facemeshstatus.SetSize (occgeo.fmap.Extent());
occgeo.facemeshstatus.SetSize (totNbFaces);
occgeo.facemeshstatus = 0;
occgeo.face_maxh_modified.SetSize(occgeo.fmap.Extent());
occgeo.face_maxh_modified.SetSize(totNbFaces);
occgeo.face_maxh_modified = 0;
occgeo.face_maxh.SetSize(occgeo.fmap.Extent());
occgeo.face_maxh.SetSize(totNbFaces);
occgeo.face_maxh = netgen::mparam.maxh;
}
@ -951,14 +955,20 @@ bool NETGENPlugin_Mesher::FillNgMesh(netgen::OCCGeometry& occgeom,
// if second oreder is required, even already meshed faces must be passed to NETGEN
int fID = occgeom.fmap.Add( geomFace );
if ( occgeom.facemeshstatus.Size() < fID ) occgeom.facemeshstatus.SetSize( fID );
occgeom.facemeshstatus[ fID-1 ] = netgen::FACE_MESHED_OK;
while ( fID < faceNgID ) // geomFace is already in occgeom.fmap, add a copy
{
fID = occgeom.fmap.Add( BRepBuilderAPI_Copy( geomFace, /*copyGeom=*/false ));
if ( occgeom.facemeshstatus.Size() < fID ) occgeom.facemeshstatus.SetSize( fID );
occgeom.facemeshstatus[ fID-1 ] = netgen::FACE_MESHED_OK;
}
// Problem with the second order in a quadrangular mesh remains.
// 1) All quadrangles generated by NETGEN are moved to an inexistent face
// by FillSMesh() (find "AddFaceDescriptor")
// 2) Temporary triangles generated by StdMeshers_QuadToTriaAdaptor
// are on faces where quadrangles were.
// Due to these 2 points, wrong geom faces are used while conversion to qudratic
// Due to these 2 points, wrong geom faces are used while conversion to quadratic
// of the mentioned above quadrangles and triangles
// Orient the face correctly in solidID1 (issue 0020206)
@ -2129,7 +2139,7 @@ int NETGENPlugin_Mesher::FillSMesh(const netgen::OCCGeometry& occgeo,
for (i = nbInitFac+1; i <= nbFac; ++i )
{
const netgen::Element2d& elem = ngMesh.SurfaceElement(i);
int aGeomFaceInd = elem.GetIndex();
const int aGeomFaceInd = elem.GetIndex();
TopoDS_Face aFace;
if (aGeomFaceInd > 0 && aGeomFaceInd <= occgeo.fmap.Extent())
aFace = TopoDS::Face(occgeo.fmap(aGeomFaceInd));
@ -2987,11 +2997,11 @@ bool NETGENPlugin_Mesher::Compute()
bool pb2D = false, pb3D = false;
for (int i = 1; i <= occgeo.fmap.Extent(); i++) {
int status = occgeo.facemeshstatus[i-1];
if (status == 1 ) continue;
if (status == netgen::FACE_MESHED_OK ) continue;
if ( SMESH_subMesh* sm = _mesh->GetSubMeshContaining( occgeo.fmap( i ))) {
SMESH_ComputeErrorPtr& smError = sm->GetComputeError();
if ( !smError || smError->IsOK() ) {
if ( status == -1 )
if ( status == netgen::FACE_FAILED )
smError.reset( new SMESH_ComputeError( *error ));
else
smError.reset( new SMESH_ComputeError( COMPERR_ALGO_FAILED, "Ignored" ));

2
src/NETGENPlugin/NETGENPlugin_Mesher.hxx
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE
// Copyright (C) 2007-2016 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

2
src/NETGENPlugin/NETGENPlugin_NETGEN_2D.cxx
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE
// Copyright (C) 2007-2016 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

2
src/NETGENPlugin/NETGENPlugin_NETGEN_2D.hxx
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE
// Copyright (C) 2007-2016 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

2
src/NETGENPlugin/NETGENPlugin_NETGEN_2D3D.cxx
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE
// Copyright (C) 2007-2016 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

2
src/NETGENPlugin/NETGENPlugin_NETGEN_2D3D.hxx
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE
// Copyright (C) 2007-2016 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

2
src/NETGENPlugin/NETGENPlugin_NETGEN_2D3D_i.cxx
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE
// Copyright (C) 2007-2016 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

2
src/NETGENPlugin/NETGENPlugin_NETGEN_2D3D_i.hxx
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE
// Copyright (C) 2007-2016 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

2
src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.cxx
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE
// Copyright (C) 2007-2016 CEA/DEN, EDF R&D, OPEN CASCADE
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public

2
src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.hxx
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE
// Copyright (C) 2007-2016 CEA/DEN, EDF R&D, OPEN CASCADE
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public

2
src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY_i.cxx
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE
// Copyright (C) 2007-2016 CEA/DEN, EDF R&D, OPEN CASCADE
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public

2
src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY_i.hxx
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE
// Copyright (C) 2007-2016 CEA/DEN, EDF R&D, OPEN CASCADE
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public

2
src/NETGENPlugin/NETGENPlugin_NETGEN_2D_i.cxx
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE
// Copyright (C) 2007-2016 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

2
src/NETGENPlugin/NETGENPlugin_NETGEN_2D_i.hxx
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE
// Copyright (C) 2007-2016 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

2
src/NETGENPlugin/NETGENPlugin_NETGEN_3D.cxx
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE
// Copyright (C) 2007-2016 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

2
src/NETGENPlugin/NETGENPlugin_NETGEN_3D.hxx
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE
// Copyright (C) 2007-2016 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

2
src/NETGENPlugin/NETGENPlugin_NETGEN_3D_i.cxx
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE
// Copyright (C) 2007-2016 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

2
src/NETGENPlugin/NETGENPlugin_NETGEN_3D_i.hxx
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE
// Copyright (C) 2007-2016 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

2
src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_2D.cxx
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE
// Copyright (C) 2007-2016 CEA/DEN, EDF R&D, OPEN CASCADE
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public

2
src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_2D.hxx
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE
// Copyright (C) 2007-2016 CEA/DEN, EDF R&D, OPEN CASCADE
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public

2
src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_2D_i.cxx
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE
// Copyright (C) 2007-2016 CEA/DEN, EDF R&D, OPEN CASCADE
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public

2
src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_2D_i.hxx
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE
// Copyright (C) 2007-2016 CEA/DEN, EDF R&D, OPEN CASCADE
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public

2
src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_3D.cxx
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE
// Copyright (C) 2007-2016 CEA/DEN, EDF R&D, OPEN CASCADE
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public

2
src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_3D.hxx
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE
// Copyright (C) 2007-2016 CEA/DEN, EDF R&D, OPEN CASCADE
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public

2
src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_3D_i.cxx
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE
// Copyright (C) 2007-2016 CEA/DEN, EDF R&D, OPEN CASCADE
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public

2
src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_3D_i.hxx
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE
// Copyright (C) 2007-2016 CEA/DEN, EDF R&D, OPEN CASCADE
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public

2
src/NETGENPlugin/NETGENPlugin_i.cxx
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE
// Copyright (C) 2007-2016 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

2
src/NETGENPlugin/__init__.py
View File

@ -1,4 +1,4 @@
# Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE
# Copyright (C) 2007-2016 CEA/DEN, EDF R&D, OPEN CASCADE
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public