From: vsr Date: Mon, 21 Mar 2016 16:22:19 +0000 (+0300) Subject: Copyright update: 2016 X-Git-Tag: V7_8_0b1 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=ead54a2dc9af8542a2fbed935beaf525b9943a95;p=plugins%2Fhybridplugin.git Copyright update: 2016 --- diff --git a/AUTHORS b/AUTHORS index 4e30419..7c1a10c 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2015 CEA/DEN, EDF R&D +# Copyright (C) 2007-2016 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 diff --git a/CMakeLists.txt b/CMakeLists.txt index 24ca9a7..fb3986d 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2012-2015 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2012-2016 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 diff --git a/ChangeLog b/ChangeLog index 871456a..09f361e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2015 CEA/DEN, EDF R&D +# Copyright (C) 2007-2016 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 diff --git a/HYBRIDPLUGIN_version.h.in b/HYBRIDPLUGIN_version.h.in index 9cfd9a6..a053e32 100644 --- a/HYBRIDPLUGIN_version.h.in +++ b/HYBRIDPLUGIN_version.h.in @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2015 CEA/DEN, EDF R&D +// Copyright (C) 2007-2016 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 diff --git a/INSTALL b/INSTALL deleted file mode 100644 index 4d69f00..0000000 --- a/INSTALL +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright (C) 2007-2015 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 deleted file mode 100644 index 8d1b02a..0000000 --- a/NEWS +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright (C) 2007-2015 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 71b5b7f..0942a85 100644 --- a/README +++ b/README @@ -1,111 +1,149 @@ -SALOME platform -HYBRID meshing plugin ------------------------------- +*************************** +About SALOME Hybrid plug-in +*************************** -Contents: +SALOME Hybrid plug-in adds DISTENE MG-Hybrid meshing algorithm to the +SALOME Mesh module. -1. Pre-requisites -2. Installation -3. Launch SALOME with HYBRIDPLUGIN -4. HYBRIDPLUGIN plugin usage +Hybrid plugin is designed for: +- Meshing of 3D geometric closed entities: volumes are split into tetrahedra, + pyramids, prisms and hexahedra elements. +- Generating of 3D meshes from 2D meshes of a wrap (triangles and quadrangles), + working with geometrical objects for setting and meshing layers. ------------------ -1. Pre-requisites ------------------ +For more information please visit the SALOME platform web site: -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 +======= +License +======= ---------------- -2. Installation ---------------- +SALOME platform is distributed under the GNU Lesser General Public License. +See COPYING file for more details. -2.1. Unpack HYBRIDPLUGIN module sources +Also, additional information can be found at SALOME platform web site: -cd -tar zxf HYBRIDPLUGIN_SRC.tgz + -2.2. Build HYBRIDPLUGIN module +============ +Installation +============ -* set environment +-------------- +Pre-requisites +-------------- -bash -cd -source env_build.sh +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. -* cmake build procedure +For more information about the pre-requisites please visit SALOME platform web +site: -mkdir HYBRIDPLUGIN_BUILD -cd HYBRIDPLUGIN_BUILD -cmake -DCMAKE_BUILD_TYPE= -DCMAKE_INSTALL_PREFIX= ../HYBRIDPLUGIN_SRC +* Check Release Notes and Software Requirements of the latest SALOME release at -,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. +* Pre-requisites page at SALOME web site: -* compile and install plugin module + -make -make install +Note: SALOME Hybrid plug-in needs SALOME KERNEL, SALOME GUI, +SALOME Geometry and SALOME Mesh as pre-requisites. -exit +------------------ +Basic Installation +------------------ -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 . +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: ----------------------------------- -3. Launch SALOME with HYBRIDPLUGIN ----------------------------------- +1. Set up environment for pre-requisites (see "Pre-requisites" section above). -* set environment +2. Create a build directory: -bash -cd -source env_products.sh + % mkdir HYBRIDPLUGIN_BUILD -export HYBRIDPLUGIN_ROOT_DIR= -export SalomeAppConfig=${HYBRIDPLUGIN_ROOT_DIR}/share/salome/resources/hybridprlplugin -export PATH=/hybridprl:${PATH +3. Configure the build procedure: -* run SALOME + % cd HYBRIDPLUGIN_BUILD + % cmake -DCMAKE_BUILD_TYPE= -DCMAKE_INSTALL_PREFIX= -runSalome + where + - is either Release or Debug (default: Release); + - is a destination folder to install SALOME Hybrid + plug-in (default: /usr); + - is a path to the SALOME Hybrid plug-in sources + directory. ----------------------------- -4. HYBRIDPLUGIN plugin usage ----------------------------- + Note: by default (if CMAKE_INSTALL_PREFIX option is not given), SALOME Hybrid + plug-in will be configured for installation to the /usr directory that + requires root permissions to complete the installation. -* Create new study +4. Build and install: -* Activate Geometry module and create simple geometry object + % make + % make install -* Activate Mesh module + This will install SALOME Hybrid plug-in to the + specified to cmake command on the previous step. -* Invoke menu "Mesh/Create Mesh" +------------------- +Custom installation +------------------- + +SALOME Hybrid 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 + +===== +Usage +===== + +* Start SALOME. + +* 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 + 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 + - Activate "3D" page; + - In the "Algorithm" combo box select "Tetrahedron etc... (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 "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 + 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 + 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 +The resulting mesh created with Hybrid plugin will be shown in the 3D viewer. + +============= +Documentation +============= + +The directory doc contains additional documentation file of SALOME Hybrid +plug-in. + +=============== +Troubleshooting +=============== + +Please, send a mail to webmaster.salome@opencascade.com. diff --git a/SalomeHYBRIDPLUGINConfig.cmake.in b/SalomeHYBRIDPLUGINConfig.cmake.in index b1b80b9..e5f9714 100644 --- a/SalomeHYBRIDPLUGINConfig.cmake.in +++ b/SalomeHYBRIDPLUGINConfig.cmake.in @@ -1,4 +1,4 @@ -# Copyright (C) 2013-2015 CEA/DEN, EDF R&D +# Copyright (C) 2013-2016 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 diff --git a/adm_local/CMakeLists.txt b/adm_local/CMakeLists.txt index bf1c7c5..907360e 100755 --- a/adm_local/CMakeLists.txt +++ b/adm_local/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2016 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 diff --git a/adm_local/cmake_files/CMakeLists.txt b/adm_local/cmake_files/CMakeLists.txt index feba847..c5ce569 100755 --- a/adm_local/cmake_files/CMakeLists.txt +++ b/adm_local/cmake_files/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2012-2015 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2012-2016 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 diff --git a/adm_local/cmake_files/FindHYBRIDPLUGIN.cmake b/adm_local/cmake_files/FindHYBRIDPLUGIN.cmake index 73333cd..8839b1f 100644 --- a/adm_local/cmake_files/FindHYBRIDPLUGIN.cmake +++ b/adm_local/cmake_files/FindHYBRIDPLUGIN.cmake @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2015 CEA/DEN, EDF R&D +# Copyright (C) 2007-2016 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 diff --git a/adm_local/cmake_files/FindSalomeHYBRIDPLUGIN.cmake b/adm_local/cmake_files/FindSalomeHYBRIDPLUGIN.cmake index 9ced6ed..0e22795 100644 --- a/adm_local/cmake_files/FindSalomeHYBRIDPLUGIN.cmake +++ b/adm_local/cmake_files/FindSalomeHYBRIDPLUGIN.cmake @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2015 CEA/DEN, EDF R&D +# Copyright (C) 2007-2016 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 diff --git a/adm_local/unix/CMakeLists.txt b/adm_local/unix/CMakeLists.txt index 0e75219..90c9fba 100755 --- a/adm_local/unix/CMakeLists.txt +++ b/adm_local/unix/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2012-2015 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2012-2016 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 diff --git a/adm_local/unix/config_files/CMakeLists.txt b/adm_local/unix/config_files/CMakeLists.txt index 0a1173a..928d40e 100755 --- a/adm_local/unix/config_files/CMakeLists.txt +++ b/adm_local/unix/config_files/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2016 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 diff --git a/adm_local/unix/config_files/check_HYBRID.m4 b/adm_local/unix/config_files/check_HYBRID.m4 index 14f5308..8a63387 100644 --- a/adm_local/unix/config_files/check_HYBRID.m4 +++ b/adm_local/unix/config_files/check_HYBRID.m4 @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2015 CEA/DEN, EDF R&D +# Copyright (C) 2007-2016 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 diff --git a/adm_local/unix/config_files/check_HYBRIDPLUGIN.m4 b/adm_local/unix/config_files/check_HYBRIDPLUGIN.m4 index a67178d..bf179b7 100755 --- a/adm_local/unix/config_files/check_HYBRIDPLUGIN.m4 +++ b/adm_local/unix/config_files/check_HYBRIDPLUGIN.m4 @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2015 CEA/DEN, EDF R&D +# Copyright (C) 2007-2016 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 diff --git a/adm_local/unix/config_files/check_MESHGEMS_TETRA.m4 b/adm_local/unix/config_files/check_MESHGEMS_TETRA.m4 index e5e7b37..7d64f08 100644 --- a/adm_local/unix/config_files/check_MESHGEMS_TETRA.m4 +++ b/adm_local/unix/config_files/check_MESHGEMS_TETRA.m4 @@ -1,4 +1,4 @@ -dnl Copyright (C) 2004-2015 CEA/DEN, EDF R&D +dnl Copyright (C) 2004-2016 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 diff --git a/bin/CMakeLists.txt b/bin/CMakeLists.txt index fc8a6e8..705dcd8 100755 --- a/bin/CMakeLists.txt +++ b/bin/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2012-2015 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2012-2016 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 diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index ad29b36..b39cf0a 100755 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -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 diff --git a/doc/salome/CMakeLists.txt b/doc/salome/CMakeLists.txt index 5185ff5..f09de24 100755 --- a/doc/salome/CMakeLists.txt +++ b/doc/salome/CMakeLists.txt @@ -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 diff --git a/doc/salome/examples/CMakeLists.txt b/doc/salome/examples/CMakeLists.txt index b8fc310..d6ad89a 100644 --- a/doc/salome/examples/CMakeLists.txt +++ b/doc/salome/examples/CMakeLists.txt @@ -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 diff --git a/doc/salome/gui/CMakeLists.txt b/doc/salome/gui/CMakeLists.txt index b31f8b8..d1be8bc 100755 --- a/doc/salome/gui/CMakeLists.txt +++ b/doc/salome/gui/CMakeLists.txt @@ -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 diff --git a/doc/salome/gui/HYBRIDPLUGIN/CMakeLists.txt b/doc/salome/gui/HYBRIDPLUGIN/CMakeLists.txt index 3792f0a..e148db7 100755 --- a/doc/salome/gui/HYBRIDPLUGIN/CMakeLists.txt +++ b/doc/salome/gui/HYBRIDPLUGIN/CMakeLists.txt @@ -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 diff --git a/doc/salome/gui/HYBRIDPLUGIN/doxyfile.in b/doc/salome/gui/HYBRIDPLUGIN/doxyfile.in index c25fd2e..b8905d2 100755 --- a/doc/salome/gui/HYBRIDPLUGIN/doxyfile.in +++ b/doc/salome/gui/HYBRIDPLUGIN/doxyfile.in @@ -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 diff --git a/doc/salome/gui/HYBRIDPLUGIN/doxyfile_py.in b/doc/salome/gui/HYBRIDPLUGIN/doxyfile_py.in index 25892b0..7988f89 100755 --- a/doc/salome/gui/HYBRIDPLUGIN/doxyfile_py.in +++ b/doc/salome/gui/HYBRIDPLUGIN/doxyfile_py.in @@ -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 diff --git a/doc/salome/gui/HYBRIDPLUGIN/static/footer.html b/doc/salome/gui/HYBRIDPLUGIN/static/footer.html index 505961c..de6db6a 100755 --- a/doc/salome/gui/HYBRIDPLUGIN/static/footer.html +++ b/doc/salome/gui/HYBRIDPLUGIN/static/footer.html @@ -4,7 +4,7 @@
    $navpath
  • - Copyright © 2007-2015 CEA/DEN, EDF R&D
    + Copyright © 2007-2016 CEA/DEN, EDF R&D
diff --git a/idl/CMakeLists.txt b/idl/CMakeLists.txt index e245902..7c9a9d5 100755 --- a/idl/CMakeLists.txt +++ b/idl/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2012-2015 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2012-2016 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 diff --git a/idl/HYBRIDPlugin_Algorithm.idl b/idl/HYBRIDPlugin_Algorithm.idl index 89921d6..3125bf2 100644 --- a/idl/HYBRIDPlugin_Algorithm.idl +++ b/idl/HYBRIDPlugin_Algorithm.idl @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2015 CEA/DEN, EDF R&D +// Copyright (C) 2007-2016 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 diff --git a/resources/CMakeLists.txt b/resources/CMakeLists.txt index 22c4ed9..333973c 100755 --- a/resources/CMakeLists.txt +++ b/resources/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2016 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 diff --git a/resources/HYBRIDPlugin.xml b/resources/HYBRIDPlugin.xml index 525748a..39e540a 100644 --- a/resources/HYBRIDPlugin.xml +++ b/resources/HYBRIDPlugin.xml @@ -1,7 +1,7 @@