From: Christian Van Wambeke Date: Mon, 15 Sep 2014 13:43:03 +0000 (+0200) Subject: from V730 to V7master and add LayersOnAllWrap option X-Git-Tag: V7_5_0rc1~3 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=54a8851d5ae0667e752c651813c902341af5b6c8;p=plugins%2Fhybridplugin.git from V730 to V7master and add LayersOnAllWrap option --- diff --git a/.gitignore b/.gitignore index 8800449..4ead76e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,19 @@ +# Compiled source +################# +*.pyc +*.pyo + +# Edition bak +################# *~ *.bak -*.pyc +*.old +*_old + .nfs* + +# AUTOTOOLS +################# Makefile.in aclocal.m4 adm_local/unix/config_files/l*m4 diff --git a/AUTHORS b/AUTHORS index e69de29..793f190 100644 --- a/AUTHORS +++ b/AUTHORS @@ -0,0 +1,45 @@ +# Copyright (C) 2007-2014 CEA/DEN, EDF R&D +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +# --- +# +# File : AUTHORS +# Author : Vadim SANDLER, Open CASCADE S.A.S (vadim.sandler@opencascade.com) +# +# --- +# +# The format of this file was inspired by the Linux kernel CREDITS file. +# +# Authors and contributors are listed alphabetically. +# +# The fields are: name (N), email (E), web-address (W), CVS account login (C), +# PGP key ID and fingerprint (P), description (D), and snail-mail address (S). +# +# --- + +N: Christian VAN WAMBEKE (CEA) +D: Initial development + +N: Edward AGAPOV, Open CASCADE S.A.S +E: edward.agapov@opencascade.com +D: Debug, improve meshing algorithms + +N: Vadim SANDLER, Open CASCADE S.A.S +E: vadim.sandler@opencascade.com +D: Porting to automake, porting to SALOME series 5x diff --git a/CMakeLists.txt b/CMakeLists.txt index 45e3786..e155ae9 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,9 +1,9 @@ -# Copyright (C) 2012-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2012-2014 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 # License as published by the Free Software Foundation; either -# version 2.1 of the License. +# version 2.1 of the License, or (at your option) any later version. # # This library is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -28,11 +28,11 @@ CMAKE_POLICY(SET CMP0003 NEW) STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC) SET(${PROJECT_NAME_UC}_MAJOR_VERSION 7) -SET(${PROJECT_NAME_UC}_MINOR_VERSION 3) -SET(${PROJECT_NAME_UC}_PATCH_VERSION 0) +SET(${PROJECT_NAME_UC}_MINOR_VERSION 4) +SET(${PROJECT_NAME_UC}_PATCH_VERSION 1) SET(${PROJECT_NAME_UC}_VERSION ${${PROJECT_NAME_UC}_MAJOR_VERSION}.${${PROJECT_NAME_UC}_MINOR_VERSION}.${${PROJECT_NAME_UC}_PATCH_VERSION}) -SET(${PROJECT_NAME_UC}_VERSION_DEV 0) +SET(${PROJECT_NAME_UC}_VERSION_DEV 1) # Find KERNEL # =========== @@ -57,7 +57,7 @@ SET(BUILD_SHARED_LIBS TRUE) # Local macros: LIST(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/adm_local/cmake_files") -# User options +# User options # ============ OPTION(SALOME_BUILD_TESTS "Build SALOME tests" ON) OPTION(SALOME_BUILD_DOC "Generate SALOME HYBRIDPLUGIN documentation" ON) @@ -95,6 +95,7 @@ IF(SALOME_BUILD_GUI) IF(EXISTS ${GUI_ROOT_DIR}) LIST(APPEND CMAKE_MODULE_PATH "${GUI_ROOT_DIR}/adm_local/cmake_files") FIND_PACKAGE(SalomeGUI) + FULL_GUI(TRUE) # check whether GUI builded in full mode and with CORBA ADD_DEFINITIONS(${GUI_DEFINITIONS}) INCLUDE_DIRECTORIES(${GUI_INCLUDE_DIRS}) ELSE(EXISTS ${GUI_ROOT_DIR}) @@ -106,15 +107,16 @@ ENDIF(SALOME_BUILD_GUI) ## ## From GUI: ## - IF(SALOME_BUILD_GUI) # Qt4 FIND_PACKAGE(SalomeQt4 REQUIRED COMPONENTS QtCore QtGui) + INCLUDE(${QT_USE_FILE}) ENDIF(SALOME_BUILD_GUI) + +# VTK +FIND_PACKAGE(SalomeVTK 6.1 REQUIRED) # OCCT FIND_PACKAGE(SalomeCAS REQUIRED) -# VTK -FIND_PACKAGE(SalomeVTK 6.0 REQUIRED) # Find GEOM # =========== @@ -129,7 +131,6 @@ ENDIF(EXISTS ${GEOM_ROOT_DIR}) # Find SMESH # =========== - SET(SMESH_ROOT_DIR $ENV{SMESH_ROOT_DIR} CACHE PATH "Path to the Salome SMESH") IF(EXISTS ${SMESH_ROOT_DIR}) LIST(APPEND CMAKE_MODULE_PATH "${SMESH_ROOT_DIR}/adm_local/cmake_files") @@ -150,6 +151,8 @@ IF(EXISTS ${SMESH_ROOT_DIR}) ELSE(EXISTS ${SMESH_ROOT_DIR}) MESSAGE(FATAL_ERROR "We absolutely need a Salome SMESH, please define SMESH_ROOT_DIR") ENDIF(EXISTS ${SMESH_ROOT_DIR}) +# MEDFile +FIND_PACKAGE(SalomeMEDFile REQUIRED) # Detection summary: SALOME_PACKAGE_REPORT_AND_CHECK() @@ -194,8 +197,9 @@ MARK_AS_ADVANCED(SALOME_HYBRIDPLUGIN_INSTALL_RES_DATA) # Accumulate environment variables for HYBRIDPLUGIN module SALOME_ACCUMULATE_ENVIRONMENT(PYTHONPATH NOCHECK ${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_BINS} - ${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_PYTHON}) + ${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_PYTHON}) SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH NOCHECK ${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_LIBS}) + # Sources # ======== diff --git a/ChangeLog b/ChangeLog index e69de29..a838317 100644 --- a/ChangeLog +++ b/ChangeLog @@ -0,0 +1,45 @@ +# Copyright (C) 2007-2014 CEA/DEN, EDF R&D +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +# --- +# +# File : ChangeLog +# Author : Vadim SANDLER, Open CASCADE S.A.S (vadim.sandler@opencascade.com) +# +# --- +# +# Changes are listed by modification time in the descending order, +# i.e. newer changes are listed at the top of the file. +# +# Each record lists the modification date, author and short description of +# the made changes. +# +# --- + +2008-08-29 Vadim SANDLER + + * Porting to automake, porting to SALOME series 5x + +2007-2008 Edward AGAPOV + + * Debug, improve meshing algorithms + +2007 Christian VAN WAMBEKE (CEA) + + * Initial development diff --git a/HYBRIDPLUGIN_version.h.in b/HYBRIDPLUGIN_version.h.in index 7ca46bf..f9b3742 100644 --- a/HYBRIDPLUGIN_version.h.in +++ b/HYBRIDPLUGIN_version.h.in @@ -1,9 +1,9 @@ -// Copyright (C) 2004-2013 CEA/DEN, EDF R&D +// Copyright (C) 2007-2014 CEA/DEN, EDF R&D // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public // License as published by the Free Software Foundation; either -// version 2.1 of the License. +// version 2.1 of the License, or (at your option) any later version. // // This library is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/INSTALL b/INSTALL index 837878e..7076bfe 100644 --- a/INSTALL +++ b/INSTALL @@ -1 +1,30 @@ +# Copyright (C) 2007-2014 CEA/DEN, EDF R&D +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +# --- +# +# File : INSTALL +# Author : Vadim SANDLER, Open CASCADE S.A.S (vadim.sandler@opencascade.com) +# +# --- + SALOME2 : HYBRIDPLUGIN module (SMESH plugin) + +For installation instructions and other information, please refer to +the README file. diff --git a/NEWS b/NEWS index e69de29..1e69cde 100644 --- a/NEWS +++ b/NEWS @@ -0,0 +1,30 @@ +# Copyright (C) 2007-2014 CEA/DEN, EDF R&D +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +# --- +# +# File : NEWS +# Author : Vadim SANDLER, Open CASCADE S.A.S (vadim.sandler@opencascade.com) +# +# --- +# +# Changes are listed by modification time in the descending order, +# i.e. newer changes are listed at the top of the file. +# +# --- diff --git a/README b/README index e69de29..71b5b7f 100644 --- a/README +++ b/README @@ -0,0 +1,111 @@ +SALOME platform +HYBRID meshing plugin +------------------------------ + +Contents: + +1. Pre-requisites +2. Installation +3. Launch SALOME with HYBRIDPLUGIN +4. HYBRIDPLUGIN plugin usage + +----------------- +1. Pre-requisites +----------------- + +The information in this file assumes that: + +* The SALOME platform is installed to the directory +* The HYBRID (Tepal) product is installed to the directory /hybridprl + +--------------- +2. Installation +--------------- + +2.1. Unpack HYBRIDPLUGIN module sources + +cd +tar zxf HYBRIDPLUGIN_SRC.tgz + +2.2. Build HYBRIDPLUGIN module + +* set environment + +bash +cd +source env_build.sh + +* cmake build procedure + +mkdir HYBRIDPLUGIN_BUILD +cd HYBRIDPLUGIN_BUILD +cmake -DCMAKE_BUILD_TYPE= -DCMAKE_INSTALL_PREFIX= ../HYBRIDPLUGIN_SRC + +,where is build mode (Release or Debug), + is a destination folder to install +HYBRIDPLUGIN module of SALOME. + +Verify that all pre-requisites required for the successful compilation +of HYBRIDPLUGIN module have been found. + +* compile and install plugin module + +make +make install + +exit + +If the compilation is finished successfully (make and make install +steps are finished without errors) the HYBRIDPLUGIN meshing module +should be installed in the directory . + +---------------------------------- +3. Launch SALOME with HYBRIDPLUGIN +---------------------------------- + +* set environment + +bash +cd +source env_products.sh + +export HYBRIDPLUGIN_ROOT_DIR= +export SalomeAppConfig=${HYBRIDPLUGIN_ROOT_DIR}/share/salome/resources/hybridprlplugin +export PATH=/hybridprl:${PATH + +* run SALOME + +runSalome + +---------------------------- +4. HYBRIDPLUGIN plugin usage +---------------------------- + +* Create new study + +* Activate Geometry module and create simple geometry object + +* Activate Mesh module + +* Invoke menu "Mesh/Create Mesh" + +* Select previously created geometry object by clicking it with the +mouse in the Object Browser + +* In the "Create mesh" dialog box: +- activate "3D" page +- In the "Algorithm" combo box select "HYBRID" +- Click on the button at the right of the "Hypothesis" combo box and +select "HYBRID parameters" item in the drop-down menu + +* In the "Hypothesis Construction" dialog box set parameters of HYBRID + meshing algorithm and click "OK" button + +* In the "Create mesh" dialog box Click "Apply & Close" button to + define mesh and close the dialog box + +* In the Object Browser select "Mesh_1" object, invoke context popup +menu for it by clicking right mouse button and select "Compute" item + +The resulting mesh created with HYBRID plugin will be shown in the 3D +viewer. diff --git a/SalomeHYBRIDPLUGINConfig.cmake.in b/SalomeHYBRIDPLUGINConfig.cmake.in index 8fdd4dc..86f8e65 100644 --- a/SalomeHYBRIDPLUGINConfig.cmake.in +++ b/SalomeHYBRIDPLUGINConfig.cmake.in @@ -1,32 +1,27 @@ -# - Config file for the @PROJECT_NAME@ package -# It defines the following variables. -# Specific to the pacakge @PROJECT_NAME@ itself: -# @PROJECT_NAME_UC@_ROOT_DIR_EXP - the root path of the installation providing this CMake file +# Copyright (C) 2013-2014 CEA/DEN, EDF R&D, OPEN CASCADE # - -############################################################### -# Copyright (C) 2007-2013 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 +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. # -# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. # -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +# - Config file for the @PROJECT_NAME@ package +# It defines the following variables. +# Specific to the pacakge @PROJECT_NAME@ itself: +# @PROJECT_NAME_UC@_ROOT_DIR_EXP - the root path of the installation providing this CMake file # -# See http://www.salome-platform.org/ or -# email : webmaster.salome@opencascade.com -############################################################### ### Initialisation performed by CONFIGURE_PACKAGE_CONFIG_FILE: @PACKAGE_INIT@ diff --git a/adm_local/CMakeLists.txt b/adm_local/CMakeLists.txt index 84d97c2..3d0a1fd 100755 --- a/adm_local/CMakeLists.txt +++ b/adm_local/CMakeLists.txt @@ -1,12 +1,9 @@ -# Copyright (C) 2007-2013 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 +# Copyright (C) 2007-2014 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 # License as published by the Free Software Foundation; either -# version 2.1 of the License. +# version 2.1 of the License, or (at your option) any later version. # # This library is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/adm_local/cmake_files/CMakeLists.txt b/adm_local/cmake_files/CMakeLists.txt index 6d726fd..11f50b2 100755 --- a/adm_local/cmake_files/CMakeLists.txt +++ b/adm_local/cmake_files/CMakeLists.txt @@ -1,9 +1,9 @@ -# Copyright (C) 2012-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2012-2014 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 # License as published by the Free Software Foundation; either -# version 2.1 of the License. +# version 2.1 of the License, or (at your option) any later version. # # This library is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -23,6 +23,7 @@ # These files are data, module or lib files SET(_adm_data + FindHYBRIDPLUGIN.cmake FindSalomeHYBRIDPLUGIN.cmake ) INSTALL(FILES ${_adm_data} DESTINATION ${SALOME_INSTALL_CMAKE_LOCAL}) diff --git a/adm_local/cmake_files/FindHYBRIDPLUGIN.cmake b/adm_local/cmake_files/FindHYBRIDPLUGIN.cmake new file mode 100644 index 0000000..24fb5c6 --- /dev/null +++ b/adm_local/cmake_files/FindHYBRIDPLUGIN.cmake @@ -0,0 +1,24 @@ +# Copyright (C) 2007-2014 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 +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +SET(HYBRIDPLUGIN_CXXFLAGS -I${HYBRIDPLUGIN_ROOT_DIR}/include/salome) + +FIND_LIBRARY(HYBRIDEngine HYBRIDEngine ${HYBRIDPLUGIN_ROOT_DIR}/lib/salome) +FIND_LIBRARY(HYBRIDPluginGUI HYBRIDPluginGUI ${HYBRIDPLUGIN_ROOT_DIR}/lib/salome) +FIND_LIBRARY(SalomeIDLHYBRIDPLUGIN SalomeIDLHYBRIDPLUGIN ${HYBRIDPLUGIN_ROOT_DIR}/lib/salome) diff --git a/adm_local/cmake_files/FindSalomeHYBRIDPLUGIN.cmake b/adm_local/cmake_files/FindSalomeHYBRIDPLUGIN.cmake index cde4e8c..3c80ea7 100644 --- a/adm_local/cmake_files/FindSalomeHYBRIDPLUGIN.cmake +++ b/adm_local/cmake_files/FindSalomeHYBRIDPLUGIN.cmake @@ -1,9 +1,9 @@ -# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2014 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 # License as published by the Free Software Foundation; either -# version 2.1 of the License. +# version 2.1 of the License, or (at your option) any later version. # # This library is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -16,7 +16,6 @@ # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -# IF(NOT SalomeHYBRIDPLUGIN_FIND_QUIETLY) MESSAGE(STATUS "Looking for Salome HYBRIDPLUGIN ...") @@ -32,4 +31,4 @@ ENDIF() FOREACH(_res ${SalomeHYBRIDPLUGIN_EXTRA_ENV}) SALOME_ACCUMULATE_ENVIRONMENT(${_res} "${SalomeHYBRIDPLUGIN_EXTRA_ENV_${_res}}") -ENDFOREACH() \ No newline at end of file +ENDFOREACH() diff --git a/adm_local/unix/CMakeLists.txt b/adm_local/unix/CMakeLists.txt index 2f895ae..eb508c1 100755 --- a/adm_local/unix/CMakeLists.txt +++ b/adm_local/unix/CMakeLists.txt @@ -1,9 +1,9 @@ -# Copyright (C) 2012-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2012-2014 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 # License as published by the Free Software Foundation; either -# version 2.1 of the License. +# version 2.1 of the License, or (at your option) any later version. # # This library is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/adm_local/unix/config_files/CMakeLists.txt b/adm_local/unix/config_files/CMakeLists.txt index 2e06ad0..a860881 100755 --- a/adm_local/unix/config_files/CMakeLists.txt +++ b/adm_local/unix/config_files/CMakeLists.txt @@ -1,12 +1,9 @@ -# Copyright (C) 2007-2013 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 +# Copyright (C) 2007-2014 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 # License as published by the Free Software Foundation; either -# version 2.1 of the License. +# version 2.1 of the License, or (at your option) any later version. # # This library is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/adm_local/unix/config_files/check_HYBRID.m4 b/adm_local/unix/config_files/check_HYBRID.m4 index aa2159a..2764b6b 100644 --- a/adm_local/unix/config_files/check_HYBRID.m4 +++ b/adm_local/unix/config_files/check_HYBRID.m4 @@ -1,35 +1,84 @@ -dnl Copyright (C) 2004-2013 CEA/DEN, EDF R&D -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library; if not, write to the Free Software -dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -dnl -dnl See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -dnl +# Copyright (C) 2007-2014 CEA/DEN, EDF R&D +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +# --- +# +# File : check_HYBRID.m4 +# Author : Vadim SANDLER, Open CASCADE S.A.S (vadim.sandler@opencascade.com) +# +# --- AC_DEFUN([CHECK_HYBRID],[ -HYBRID_ok=no +AC_REQUIRE([AC_PROG_CXX])dnl +AC_REQUIRE([AC_PROG_CXXCPP])dnl + +AC_CHECKING(for HYBRID(MG_hybrid) commercial product) -AC_EXEEXT -AC_CHECK_PROG(HYBRID, hybrid$EXEEXT,found) +AC_LANG_SAVE +AC_LANG_CPLUSPLUS + +AC_ARG_WITH(, + [ --with-hybrid=DIR root directory path of HYBRID (MG_hybrid) installation]) + +HYBRID_ok=no -if test "x$HYBRID" == x ; then - AC_MSG_WARN(hybrid program not found in PATH variable) +if test "$with_hybrid" == "no" ; then + AC_MSG_WARN(You have choosen building plugin without HYBRID) else - HYBRID_ok=yes + if test "$with_hybrid" == "yes" || test "$with_hybrid" == "auto"; then + HYBRID_HOME="" + else + HYBRID_HOME="$with_hybrid" + fi + + if test "$HYBRID_HOME" == "" ; then + if test "x$HYBRIDHOME" != "x" ; then + HYBRID_HOME=$HYBRIDHOME + else + AC_MSG_WARN(Build plugin without HYBRID) + fi + fi + + if test "x$HYBRID_HOME" != "x"; then + + echo + echo ------------------------------------------------- + echo You are about to choose to use somehow the + echo "HYBRID(MG-hybrid) commercial product to generate 3D tetra-hexahedral mesh." + echo + + AC_CHECKING(for HYBRID(MG-hybrid) executable) + + AC_CHECK_PROG(HYBRID,MG-hybrid,found) + + if test "x$HYBRID" == x ; then + AC_MSG_WARN(MG-hybrid program not found in PATH variable) + AC_MSG_WARN(Build plugin without HYBRID) + else + HYBRID_ok=yes + fi + + fi fi AC_MSG_RESULT(for HYBRID: $HYBRID_ok) +AC_LANG_RESTORE ])dnl diff --git a/adm_local/unix/config_files/check_HYBRIDPLUGIN.m4 b/adm_local/unix/config_files/check_HYBRIDPLUGIN.m4 index fb37f83..0eb286b 100755 --- a/adm_local/unix/config_files/check_HYBRIDPLUGIN.m4 +++ b/adm_local/unix/config_files/check_HYBRIDPLUGIN.m4 @@ -1,78 +1,70 @@ -dnl Copyright (C) 2004-2013 CEA/DEN, EDF R&D -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library; if not, write to the Free Software -dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -dnl -dnl See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -dnl +# Copyright (C) 2007-2014 CEA/DEN, EDF R&D +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# -# Check availability of HYBRIDPLUGIN binary distribution +# --- # -# Author : Marc Tajchman (CEA, 2002) -#------------------------------------------------------------ +# File : check_HYBRIDPLUGIN.m4 +# Author : Vadim SANDLER, Open CASCADE S.A.S (vadim.sandler@opencascade.com) +# +# --- AC_DEFUN([CHECK_HYBRIDPLUGIN],[ -HYBRIDPLUGIN_LDFLAGS="" -HYBRIDPLUGIN_CXXFLAGS="" - -AC_CHECKING(for HYBRIDPlugin) +AC_CHECKING(for HYBRID mesh plugin) -HYBRIDPlugin_ok=no +HYBRIDplugin_ok=no -AC_ARG_WITH(ghs, - --with-hybridPlugin=DIR root directory path of HYBRIDPLUGIN build or installation, - HYBRIDPLUGIN_DIR="$withval",HYBRIDPLUGIN_DIR="") - -if test "x$HYBRIDPLUGIN_DIR" = "x" ; then - -# no --with-gui-dir option used - - if test "x$HYBRIDPLUGIN_ROOT_DIR" != "x" ; then - - # SALOME_ROOT_DIR environment variable defined - HYBRIDPLUGIN_DIR=$HYBRIDPLUGIN_ROOT_DIR +HYBRIDPLUGIN_LDFLAGS="" +HYBRIDPLUGIN_CXXFLAGS="" - else +AC_ARG_WITH(HYBRIDplugin, + [ --with-HYBRIDplugin=DIR root directory path of HYBRID mesh plugin installation ]) - # search Salome binaries in PATH variable - AC_PATH_PROG(TEMP, libHYBRIDEngine.so) - if test "x$TEMP" != "x" ; then - HYBRIDPLUGIN_DIR=`dirname $TEMP` +if test "$with_HYBRIDplugin" != "no" ; then + if test "$with_HYBRIDplugin" == "yes" || test "$with_HYBRIDplugin" == "auto"; then + if test "x$HYBRIDPLUGIN_ROOT_DIR" != "x" ; then + HYBRIDPLUGIN_DIR=$HYBRIDPLUGIN_ROOT_DIR + fi + else + HYBRIDPLUGIN_DIR="$with_HYBRIDplugin" fi - fi - + if test "x$HYBRIDPLUGIN_DIR" != "x" ; then + if test -f ${HYBRIDPLUGIN_DIR}/lib${LIB_LOCATION_SUFFIX}/salome/libHYBRIDEngine.so ; then + HYBRIDplugin_ok=yes + AC_MSG_RESULT(Using HYBRID mesh plugin distribution in ${HYBRIDPLUGIN_DIR}) + HYBRIDPLUGIN_ROOT_DIR=${HYBRIDPLUGIN_DIR} + HYBRIDPLUGIN_LDFLAGS=-L${HYBRIDPLUGIN_DIR}/lib${LIB_LOCATION_SUFFIX}/salome + HYBRIDPLUGIN_CXXFLAGS=-I${HYBRIDPLUGIN_DIR}/include/salome + else + AC_MSG_WARN("Cannot find compiled HYBRID mesh plugin distribution") + fi + else + AC_MSG_WARN("Cannot find compiled HYBRID mesh plugin distribution") + fi fi -if test -f ${HYBRIDPLUGIN_DIR}/lib/salome/libHYBRIDEngine.so ; then - HYBRIDPlugin_ok=yes - AC_MSG_RESULT(Using HYBRIDPLUGIN module distribution in ${HYBRIDPLUGIN_DIR}) +AC_MSG_RESULT(for HYBRID mesh plugin: $HYBRIDplugin_ok) - if test "x$HYBRIDPLUGIN_ROOT_DIR" == "x" ; then - HYBRIDPLUGIN_ROOT_DIR=${HYBRIDPLUGIN_DIR} - fi - HYBRIDPLUGIN_CXXFLAGS+=-I${HYBRIDPLUGIN_ROOT_DIR}/include/salome - HYBRIDPLUGIN_LDFLAGS+=-L${HYBRIDPLUGIN_ROOT_DIR}/lib${LIB_LOCATION_SUFFIX}/salome - AC_SUBST(HYBRIDPLUGIN_ROOT_DIR) - AC_SUBST(HYBRIDPLUGIN_LDFLAGS) - AC_SUBST(HYBRIDPLUGIN_CXXFLAGS) -else - AC_MSG_WARN("Cannot find compiled HYBRIDPLUGIN module distribution") -fi - -AC_MSG_RESULT(for HYBRIDPLUGIN: $HYBRIDPlugin_ok) +AC_SUBST(HYBRIDPLUGIN_ROOT_DIR) +AC_SUBST(HYBRIDPLUGIN_LDFLAGS) +AC_SUBST(HYBRIDPLUGIN_CXXFLAGS) ])dnl diff --git a/bin/CMakeLists.txt b/bin/CMakeLists.txt index 96b328d..c790e36 100755 --- a/bin/CMakeLists.txt +++ b/bin/CMakeLists.txt @@ -1,9 +1,9 @@ -# Copyright (C) 2012-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2012-2014 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 # License as published by the Free Software Foundation; either -# version 2.1 of the License. +# version 2.1 of the License, or (at your option) any later version. # # This library is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,16 +19,14 @@ SALOME_CONFIGURE_FILE(VERSION.in VERSION INSTALL ${SALOME_INSTALL_BINS}) - # scripts / static / binaries # temporary standalone project version of mg-hybrid.exe SET(_bin_SCRIPTS - essai.bash mg-hybrid.bash mg-hybrid.exe_Linux_64_avril2014 mg-hybrid.exe_Linux_64_juillet2014 + createGroupsOnEntitiesFromGMFFile.py ) - # --- rules --- SALOME_INSTALL_SCRIPTS("${_bin_SCRIPTS}" ${SALOME_INSTALL_BINS}) diff --git a/bin/createGroupsOnEntitiesFromGMFFile.py b/bin/createGroupsOnEntitiesFromGMFFile.py new file mode 100644 index 0000000..39e6bb9 --- /dev/null +++ b/bin/createGroupsOnEntitiesFromGMFFile.py @@ -0,0 +1,68 @@ +# -*- coding: iso-8859-1 -*- + +""" +to create Groups On Entities From GMFFile /tmp/tmp.mesh +""" + +import sys +import salome + +salome.salome_init() +theStudy = salome.myStudy + +import salome_notebook +notebook = salome_notebook.NoteBook(theStudy) +#sys.path.insert( 0, r'/somewhere') + +### +### GEOM component +### + +import GEOM +from salome.geom import geomBuilder +import math +import SALOMEDS +import SMESH, SALOMEDS + +from salome.smesh import smeshBuilder + +smesh = smeshBuilder.New(theStudy) + + +nameFile = None +the_mesh = None + +nameFile = r'/tmp/tmp.mesh' + +if nameFile != None: + #do not work (the_mesh, error) = smesh.CreateMeshesFromMED(nameFile) + (the_mesh, error) = smesh.CreateMeshesFromGMF(nameFile) + + +#print "the_mesh", the_mesh + +if the_mesh != None: + blue = SALOMEDS.Color(0,0,1) + red = SALOMEDS.Color(1,0,0) + green = SALOMEDS.Color(0,1,0) + yellow = SALOMEDS.Color(1,1,0) + + for i in dir(SMESH): + if "Entity_" in i: print i + + entities = [("Tetra", SMESH.Entity_Tetra, blue), + ("Pyramid", SMESH.Entity_Pyramid, red), + ("Prism", SMESH.Entity_Penta, yellow), + ("Hexa", SMESH.Entity_Hexa, green)] + + for name, entity, color in entities: + aCriteria = [] + aCriterion = smesh.GetCriterion(SMESH.VOLUME,SMESH.FT_EntityType,SMESH.FT_Undefined,entity) + aCriteria.append(aCriterion) + aFilter = smesh.GetFilterFromCriteria(aCriteria) + aFilter.SetMesh(the_mesh.GetMesh()) + Group = the_mesh.GroupOnFilter( SMESH.VOLUME, name, aFilter ) + Group.SetColor( color ) + + if salome.sg.hasDesktop(): + salome.sg.updateObjBrowser(1) diff --git a/bin/essai.bash b/bin/essai.bash deleted file mode 100755 index b2e8e59..0000000 --- a/bin/essai.bash +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -echo "hello essai" diff --git a/bin/mg-hybrid.bash b/bin/mg-hybrid.bash index 9630a65..0094743 100755 --- a/bin/mg-hybrid.bash +++ b/bin/mg-hybrid.bash @@ -6,6 +6,27 @@ #and also assume licence file set to overriding licence file of other distene products ( HEXOTIC, GHS3D, etc... ) #all that for for only one call of mg-hybrid.bash from salome plugin HYBRIDPLUGIN +function findOutFile { +#find --out parameter result in $resFindOutFile +while test $# -gt 0; do + case "$1" in + -o|--out) + if [ -z "$2" ] # $String is null + then + resFindOutFile="None" + else + resFindOutFile=$2 + fi + return + ;; + *) + shift + ;; + esac +done +resFindOutFile="None" +} + #echo "mg-hybrid.bash initial parameters are:" $1 $2 $3 $4 echo "mg-hybrid.bash initial parameters are:" $* #$0 is ignored @@ -30,17 +51,22 @@ echo "HOST" $HOST # export DLIM8VAR="dlim8 1:1:29030@132.166.151.49/84c419b8::87af196ab2a936ab31363624539bff8096fbe1f3c83028c8f6b399b0a904ef85" #fi -echo "mg-hybrid.bash juillet2014 assume licence file set:" +echo "mg-hybrid.bash assume licence file set:" env | grep DLIM +findOutFile $* +echo "result output File is:" $resFindOutFile + #mg-hybrid.exe_Linux_64_avril2014 --help #mg-hybrid.exe_Linux_64_avril2014 $* mg-hybrid.exe_Linux_64_juillet2014 $* +#to EZ and direct debug visualization (with gui salome load script createGroupsOnEntitiesFromGMFFile.py) +cp -f $resFindOutFile /tmp/tmp.mesh + #ldd `which mg-hybrid.exe_Linux_64_avril2014` # linux-vdso.so.1 => (0x00007fff3bfff000) # libpthread.so.0 => /lib64/libpthread.so.0 (0x000000358b400000) # libm.so.6 => /lib64/libm.so.6 (0x000000358a800000) # libc.so.6 => /lib64/libc.so.6 (0x000000358ac00000) # /lib64/ld-linux-x86-64.so.2 (0x000000358a400000) - diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index cedf656..a24f08f 100755 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -1,12 +1,9 @@ -# Copyright (C) 2007-2013 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 +# Copyright (C) 2007-2014 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 # License as published by the Free Software Foundation; either -# version 2.1 of the License. +# version 2.1 of the License, or (at your option) any later version. # # This library is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/doc/file.mesh.pdf b/doc/file.mesh.pdf new file mode 100644 index 0000000..c0f071e Binary files /dev/null and b/doc/file.mesh.pdf differ diff --git a/doc/salome/CMakeLists.txt b/doc/salome/CMakeLists.txt index b5d9cf0..293a680 100755 --- a/doc/salome/CMakeLists.txt +++ b/doc/salome/CMakeLists.txt @@ -1,12 +1,9 @@ -# Copyright (C) 2007-2013 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 +# Copyright (C) 2007-2014 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 # License as published by the Free Software Foundation; either -# version 2.1 of the License. +# version 2.1 of the License, or (at your option) any later version. # # This library is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -21,4 +18,4 @@ # ADD_SUBDIRECTORY(examples) -ADD_SUBDIRECTORY(gui) \ No newline at end of file +ADD_SUBDIRECTORY(gui) diff --git a/doc/salome/gui/CMakeLists.txt b/doc/salome/gui/CMakeLists.txt index d1667cd..84a43cf 100755 --- a/doc/salome/gui/CMakeLists.txt +++ b/doc/salome/gui/CMakeLists.txt @@ -1,12 +1,9 @@ -# Copyright (C) 2007-2013 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 +# Copyright (C) 2007-2014 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 # License as published by the Free Software Foundation; either -# version 2.1 of the License. +# version 2.1 of the License, or (at your option) any later version. # # This library is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/doc/salome/gui/HYBRIDPLUGIN/CMakeLists.txt b/doc/salome/gui/HYBRIDPLUGIN/CMakeLists.txt index dbff9d4..fd73d37 100755 --- a/doc/salome/gui/HYBRIDPLUGIN/CMakeLists.txt +++ b/doc/salome/gui/HYBRIDPLUGIN/CMakeLists.txt @@ -1,9 +1,9 @@ -# Copyright (C) 2012-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2012-2014 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 # License as published by the Free Software Foundation; either -# version 2.1 of the License. +# version 2.1 of the License, or (at your option) any later version. # # This library is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -24,11 +24,11 @@ SALOME_CONFIGURE_FILE(static/header_py.html.in ${CMAKE_CURRENT_BINARY_DIR}/stati SET(DOC_SMESH_MeshersList HYBRIDPlugin) SET(smesh_file "$(SMESH_ROOT_DIR)/bin/salome/collect_mesh_methods.py") -SET(kernel_file "$ENV{KERNEL_ROOT_DIR}/bin/salome/prepare_generating_doc.py") +SET(kernel_file "${KERNEL_ROOT_DIR}/bin/salome/prepare_generating_doc.py") SALOME_ACCUMULATE_ENVIRONMENT(SMESH_MeshersList NOCHECK ${DOC_SMESH_MeshersList}) -SET(_cmd_options ${smesh_file} -d -o tmp/smeshBuilder.py HYBRIDPlugin) +SET(_cmd_options ${smesh_file} -d -o tmp/smeshBuilder.py HYBRIDPlugin) SALOME_GENERATE_ENVIRONMENT_SCRIPT(_cmd env_script "${PYTHON_EXECUTABLE}" "${_cmd_options}") ADD_CUSTOM_TARGET(usr_docs ${CMAKE_COMMAND} -E make_directory tmp @@ -37,13 +37,13 @@ ADD_CUSTOM_TARGET(usr_docs ${CMAKE_COMMAND} -E make_directory tmp COMMAND ${_cmd} COMMAND ${DOXYGEN_EXECUTABLE} doxyfile_py COMMAND ${DOXYGEN_EXECUTABLE} doxyfile - COMMAND ${CMAKE_COMMAND} -E remove_directory tmp + COMMAND ${CMAKE_COMMAND} -E remove_directory tmp VERBATIM WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} ) INSTALL(CODE "EXECUTE_PROCESS(COMMAND \"${CMAKE_COMMAND}\" --build ${PROJECT_BINARY_DIR} --target usr_docs)") -INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/HYBRIDPLUGIN DESTINATION ${SALOME_INSTALL_DOC}/gui/) +INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/HYBRIDPLUGIN DESTINATION ${SALOME_INSTALL_DOC}/gui) INSTALL(FILES images/head.png DESTINATION ${SALOME_INSTALL_DOC}/gui/HYBRIDPLUGIN) INSTALL(FILES images/head.png DESTINATION ${SALOME_INSTALL_DOC}/gui/HYBRIDPLUGIN/hybridpluginpy_doc) diff --git a/doc/salome/gui/HYBRIDPLUGIN/doxyfile.in b/doc/salome/gui/HYBRIDPLUGIN/doxyfile.in index 0eda78c..57dcfe5 100755 --- a/doc/salome/gui/HYBRIDPLUGIN/doxyfile.in +++ b/doc/salome/gui/HYBRIDPLUGIN/doxyfile.in @@ -1,9 +1,9 @@ -# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2014 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 # License as published by the Free Software Foundation; either -# version 2.1 of the License. +# version 2.1 of the License, or (at your option) any later version. # # This library is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/doc/salome/gui/HYBRIDPLUGIN/doxyfile_py.in b/doc/salome/gui/HYBRIDPLUGIN/doxyfile_py.in index 8a96847..3f7b01b 100755 --- a/doc/salome/gui/HYBRIDPLUGIN/doxyfile_py.in +++ b/doc/salome/gui/HYBRIDPLUGIN/doxyfile_py.in @@ -1,9 +1,9 @@ -# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2014 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 # License as published by the Free Software Foundation; either -# version 2.1 of the License. +# version 2.1 of the License, or (at your option) any later version. # # This library is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/doc/salome/gui/HYBRIDPLUGIN/images/hybrid_hypothesis_layers.png b/doc/salome/gui/HYBRIDPLUGIN/images/hybrid_hypothesis_layers.png index bee06f9..030594d 100644 Binary files a/doc/salome/gui/HYBRIDPLUGIN/images/hybrid_hypothesis_layers.png and b/doc/salome/gui/HYBRIDPLUGIN/images/hybrid_hypothesis_layers.png differ diff --git a/doc/salome/gui/HYBRIDPLUGIN/input/additional_hypo.doc b/doc/salome/gui/HYBRIDPLUGIN/input/additional_hypo.doc index 814c56b..7d8c25c 100644 --- a/doc/salome/gui/HYBRIDPLUGIN/input/additional_hypo.doc +++ b/doc/salome/gui/HYBRIDPLUGIN/input/additional_hypo.doc @@ -8,7 +8,7 @@ This hypothesis allows creation of layers of highly stretched hexahedra, prisms, and tetrahedra) near mesh boundary (onto the wrap), which is beneficial for high quality viscous computations. The elements constructed on the layer mesh faces are -actually hexahedra or prisms or tetraheda. +actually hexahedra and prisms and tetraheda. For more detailed description of the this additional hypothesis please refer Distene MG-hybrid User's Guide diff --git a/doc/salome/gui/HYBRIDPLUGIN/input/hybrid_hypo.doc b/doc/salome/gui/HYBRIDPLUGIN/input/hybrid_hypo.doc index 36f1c37..bc7937b 100644 --- a/doc/salome/gui/HYBRIDPLUGIN/input/hybrid_hypo.doc +++ b/doc/salome/gui/HYBRIDPLUGIN/input/hybrid_hypo.doc @@ -202,11 +202,12 @@ for hybrid argument from "mg-hybrid.exe help", and future advanced options... \image html hybrid_hypothesis_layers.png -HYBRID algorithm mesh layers on groups of faces. Pay attention: theses groups should be defined +HYBRID algorithm mesh layers on groups of faces. If Mesh layers on all wrap +is checked, all wrap is meshed as layers (as boundary_layers_surface_ids 5), else +only submeshes selected an added are meshed as layers (as boundary_layers_surface_ids 6). +Pay attention: theses groups should be defined into the shell mesh from a previous group defined in the geometry. -- If a group is added, their faces will be source to generate layers -the group.
See Also a sample TUI Script of the \ref tui_hybrid "creation of a MG-Hybrid hypothesis". diff --git a/doc/salome/gui/HYBRIDPLUGIN/static/footer.html b/doc/salome/gui/HYBRIDPLUGIN/static/footer.html index 37dbff9..f01e506 100755 --- a/doc/salome/gui/HYBRIDPLUGIN/static/footer.html +++ b/doc/salome/gui/HYBRIDPLUGIN/static/footer.html @@ -4,7 +4,7 @@
    $navpath
  • - Copyright © 2007-2013 CEA/DEN, EDF R&D
    + Copyright © 2007-2014 CEA/DEN, EDF R&D
diff --git a/idl/CMakeLists.txt b/idl/CMakeLists.txt index 8304ec1..9894660 100755 --- a/idl/CMakeLists.txt +++ b/idl/CMakeLists.txt @@ -1,9 +1,9 @@ -# Copyright (C) 2012-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2012-2014 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 # License as published by the Free Software Foundation; either -# version 2.1 of the License. +# version 2.1 of the License, or (at your option) any later version. # # This library is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/idl/HYBRIDPlugin_Algorithm.idl b/idl/HYBRIDPlugin_Algorithm.idl index f54103d..aebabc2 100644 --- a/idl/HYBRIDPlugin_Algorithm.idl +++ b/idl/HYBRIDPlugin_Algorithm.idl @@ -1,9 +1,9 @@ -// Copyright (C) 2004-2013 CEA/DEN, EDF R&D +// Copyright (C) 2007-2014 CEA/DEN, EDF R&D // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public // License as published by the Free Software Foundation; either -// version 2.1 of the License. +// version 2.1 of the License, or (at your option) any later version. // // This library is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -17,8 +17,10 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// File : HYBRID_Algorithm.idl -// Author : Julia DOROVSKIKH +// --- +// File : HYBRIDPlugin_Algorithm.idl +// Author : Christian VAN WAMBEKE (CEA) +// --- // #ifndef _HYBRID_Algorithm_IDL_ #define _HYBRID_Algorithm_IDL_ @@ -54,7 +56,7 @@ module HYBRIDPlugin typedef sequence HYBRIDEnforcedMeshList; /*! - * HYBRIDPlugin_HYBRID: interface of "Tetrahedron (HYBRID)" algorithm + * HYBRIDPlugin_HYBRID: interface of "Tetra-hexahedron (HYBRID)" algorithm */ interface HYBRIDPlugin_HYBRID : SMESH::SMESH_3D_Algo { @@ -62,7 +64,7 @@ module HYBRIDPlugin }; /*! - * Parameters of "Tetrahedron (HYBRID)" algorithm + * Parameters of "Tetra-hexahedron (HYBRID)" algorithm */ interface HYBRIDPlugin_Hypothesis : SMESH::SMESH_Hypothesis { @@ -71,6 +73,11 @@ module HYBRIDPlugin */ void SetToMeshHoles(in boolean toMesh); boolean GetToMeshHoles(); + /*! + * To mesh layers on all wrap Default is yes. + */ + void SetLayersOnAllWrap(in boolean toMesh); + boolean GetLayersOnAllWrap(); /*! * To make groups of volumes of different domains when mesh is generated from skin. * Default is to make groups. diff --git a/resources/CMakeLists.txt b/resources/CMakeLists.txt index 2bbea7a..e840270 100755 --- a/resources/CMakeLists.txt +++ b/resources/CMakeLists.txt @@ -1,12 +1,9 @@ -# Copyright (C) 2007-2013 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 +# Copyright (C) 2007-2014 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 # License as published by the Free Software Foundation; either -# version 2.1 of the License. +# version 2.1 of the License, or (at your option) any later version. # # This library is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/resources/HYBRIDPlugin.xml b/resources/HYBRIDPlugin.xml index 562bb00..0816fb0 100644 --- a/resources/HYBRIDPlugin.xml +++ b/resources/HYBRIDPlugin.xml @@ -1,12 +1,12 @@ - + diff --git a/resources/SalomeApp.xml b/resources/SalomeApp.xml index e2378e0..6f9b3e4 100644 --- a/resources/SalomeApp.xml +++ b/resources/SalomeApp.xml @@ -1,10 +1,10 @@