From: vsr Date: Tue, 5 Jun 2012 12:35:04 +0000 (+0000) Subject: Merge from V6_5_BR 05/06/2012 X-Git-Tag: V6_6_0a1~31 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=2151c72c19ff7fc1e30ddeb0319f145ad2aca919;p=plugins%2Fblsurfplugin.git Merge from V6_5_BR 05/06/2012 --- diff --git a/AUTHORS b/AUTHORS index 3af3c9e..7bdd20e 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2011 CEA/DEN, EDF R&D +# Copyright (C) 2007-2012 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/BLSURFPLUGIN_version.h.in b/BLSURFPLUGIN_version.h.in index cbb14f5..facaf9b 100644 --- a/BLSURFPLUGIN_version.h.in +++ b/BLSURFPLUGIN_version.h.in @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2011 CEA/DEN, EDF R&D +// Copyright (C) 2007-2012 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 5a12c08..edde3d3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2011 CEA/DEN, EDF R&D +# Copyright (C) 2007-2012 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 index afb4d45..9b0b3a0 100644 --- a/INSTALL +++ b/INSTALL @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2011 CEA/DEN, EDF R&D +# Copyright (C) 2007-2012 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/Makefile.am b/Makefile.am index ed6b931..d70863f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2011 CEA/DEN, EDF R&D +# Copyright (C) 2007-2012 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/NEWS b/NEWS index 350f9cd..d22503a 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2011 CEA/DEN, EDF R&D +# Copyright (C) 2007-2012 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/Makefile.am b/adm_local/Makefile.am index 81e73b0..6b3c7d7 100644 --- a/adm_local/Makefile.am +++ b/adm_local/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2011 CEA/DEN, EDF R&D +# Copyright (C) 2007-2012 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/FindBLSURF.cmake b/adm_local/cmake_files/FindBLSURF.cmake index 3b9020d..5fea852 100644 --- a/adm_local/cmake_files/FindBLSURF.cmake +++ b/adm_local/cmake_files/FindBLSURF.cmake @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2011 CEA/DEN, EDF R&D +# Copyright (C) 2007-2012 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/Makefile.am b/adm_local/cmake_files/Makefile.am index 09bbd50..b21e68d 100644 --- a/adm_local/cmake_files/Makefile.am +++ b/adm_local/cmake_files/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2011 CEA/DEN, EDF R&D +# Copyright (C) 2007-2012 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/Makefile.am b/adm_local/unix/Makefile.am index a5eb286..55a47ce 100644 --- a/adm_local/unix/Makefile.am +++ b/adm_local/unix/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2011 CEA/DEN, EDF R&D +# Copyright (C) 2007-2012 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/Makefile.am b/adm_local/unix/config_files/Makefile.am index c4fff6e..01174b3 100644 --- a/adm_local/unix/config_files/Makefile.am +++ b/adm_local/unix/config_files/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2011 CEA/DEN, EDF R&D +# Copyright (C) 2007-2012 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_BLSURF.m4 b/adm_local/unix/config_files/check_BLSURF.m4 index cf519a3..ae7bab8 100644 --- a/adm_local/unix/config_files/check_BLSURF.m4 +++ b/adm_local/unix/config_files/check_BLSURF.m4 @@ -1,4 +1,4 @@ -dnl Copyright (C) 2007-2011 CEA/DEN, EDF R&D +dnl Copyright (C) 2007-2012 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/adm_local/unix/config_files/check_BLSURFPLUGIN.m4 b/adm_local/unix/config_files/check_BLSURFPLUGIN.m4 index 70e1d0d..767c9f2 100644 --- a/adm_local/unix/config_files/check_BLSURFPLUGIN.m4 +++ b/adm_local/unix/config_files/check_BLSURFPLUGIN.m4 @@ -1,4 +1,4 @@ -dnl Copyright (C) 2007-2011 CEA/DEN, EDF R&D +dnl Copyright (C) 2007-2012 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/adm_local/unix/make_common_starter.am b/adm_local/unix/make_common_starter.am index 5a589b0..623dfe5 100644 --- a/adm_local/unix/make_common_starter.am +++ b/adm_local/unix/make_common_starter.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2011 CEA/DEN, EDF R&D +# Copyright (C) 2007-2012 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/bin/Makefile.am b/bin/Makefile.am index 7ac401f..24e249a 100644 --- a/bin/Makefile.am +++ b/bin/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2011 CEA/DEN, EDF R&D +# Copyright (C) 2007-2012 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/build_cmake b/build_cmake index c49c681..2a9a278 100755 --- a/build_cmake +++ b/build_cmake @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (C) 2007-2011 CEA/DEN, EDF R&D +# Copyright (C) 2007-2012 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/build_cmake.bat b/build_cmake.bat index b2ecc04..de8ae03 100644 --- a/build_cmake.bat +++ b/build_cmake.bat @@ -1,4 +1,4 @@ -@REM Copyright (C) 2007-2011 CEA/DEN, EDF R&D +@REM Copyright (C) 2007-2012 CEA/DEN, EDF R&D @REM @REM This library is free software; you can redistribute it and/or @REM modify it under the terms of the GNU Lesser General Public diff --git a/build_configure b/build_configure index 3d0cf73..1b0e6de 100755 --- a/build_configure +++ b/build_configure @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (C) 2007-2011 CEA/DEN, EDF R&D +# Copyright (C) 2007-2012 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/clean_configure b/clean_configure index 493b6fd..d117926 100755 --- a/clean_configure +++ b/clean_configure @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (C) 2007-2011 CEA/DEN, EDF R&D +# Copyright (C) 2007-2012 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 @@ -26,24 +26,6 @@ rm -rf autom4te.cache aclocal.m4 configure make_config find . -name "*~" -print -exec rm {} \; find . -name "*.pyc" -print -exec rm {} \; +find . -name Makefile.in | xargs rm -f +( cd adm_local/unix/config_files && rm -f config.* depcomp install-sh l*.m4 ltmain.sh missing py-compile ) -# ... - -find bin -name Makefile.in | xargs rm -f -find doc -name Makefile.in | xargs rm -f -find idl -name Makefile.in | xargs rm -f -find resources -name Makefile.in | xargs rm -f -find adm_local -name Makefile.in | xargs rm -f -find src -name Makefile.in | xargs rm -f -rm -f adm_local/unix/config_files/config* -rm -f adm_local/unix/config_files/depcomp -rm -f adm_local/unix/config_files/install-sh -rm -f adm_local/unix/config_files/libtool.m4 -rm -f adm_local/unix/config_files/ltmain.sh -rm -f adm_local/unix/config_files/ltoptions.m4 -rm -f adm_local/unix/config_files/ltsugar.m4 -rm -f adm_local/unix/config_files/ltversion.m4 -rm -f adm_local/unix/config_files/lt~obsolete.m4 -rm -f adm_local/unix/config_files/missing -rm -f Makefile.in -rm -Rf salome_adm diff --git a/configure.ac b/configure.ac index 40efd7b..a8d2a7e 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (C) 2007-2011 CEA/DEN, EDF R&D +# Copyright (C) 2007-2012 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 @@ -23,7 +23,7 @@ # Author : Vadim SANDLER, Open CASCADE S.A.S (vadim.sandler@opencascade.com) # --- # -AC_INIT([Salome2 Project BLSURFPLUGIN module], [6.4.0], [webmaster.salome@opencascade.com], [SalomeBLSURFPLUGIN]) +AC_INIT([Salome2 Project BLSURFPLUGIN module], [6.5.0], [webmaster.salome@opencascade.com], [SalomeBLSURFPLUGIN]) AC_CONFIG_AUX_DIR(adm_local/unix/config_files) AC_CANONICAL_HOST AC_CANONICAL_TARGET diff --git a/doc/Makefile.am b/doc/Makefile.am index 2ac8a35..7c206a5 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2011 CEA/DEN, EDF R&D +# Copyright (C) 2007-2012 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/salome/Makefile.am b/doc/salome/Makefile.am index b41092e..f5de046 100644 --- a/doc/salome/Makefile.am +++ b/doc/salome/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2011 CEA/DEN, EDF R&D +# Copyright (C) 2007-2012 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/salome/gui/BLSURFPLUGIN/Makefile.am b/doc/salome/gui/BLSURFPLUGIN/Makefile.am index 70a5302..1746a98 100644 --- a/doc/salome/gui/BLSURFPLUGIN/Makefile.am +++ b/doc/salome/gui/BLSURFPLUGIN/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2011 CEA/DEN, EDF R&D +# Copyright (C) 2007-2012 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/salome/gui/BLSURFPLUGIN/doxyfile.in b/doc/salome/gui/BLSURFPLUGIN/doxyfile.in index a977637..1a8f9a5 100755 --- a/doc/salome/gui/BLSURFPLUGIN/doxyfile.in +++ b/doc/salome/gui/BLSURFPLUGIN/doxyfile.in @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2011 CEA/DEN, EDF R&D +# Copyright (C) 2007-2012 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/salome/gui/BLSURFPLUGIN/doxyfile_py.in b/doc/salome/gui/BLSURFPLUGIN/doxyfile_py.in index 71047e7..68057ba 100755 --- a/doc/salome/gui/BLSURFPLUGIN/doxyfile_py.in +++ b/doc/salome/gui/BLSURFPLUGIN/doxyfile_py.in @@ -1,7 +1,4 @@ -# Copyright (C) 2007-2011 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-2012 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/salome/gui/BLSURFPLUGIN/input/blsurf_hypo.doc b/doc/salome/gui/BLSURFPLUGIN/input/blsurf_hypo.doc index 94c1697..1964dbe 100644 --- a/doc/salome/gui/BLSURFPLUGIN/input/blsurf_hypo.doc +++ b/doc/salome/gui/BLSURFPLUGIN/input/blsurf_hypo.doc @@ -3,443 +3,456 @@ \page blsurf_hypo_page BLSURF Parameters hypothesis \anchor blsurf_top -\n BLSURF Parameters hypothesis works only with BLSURF 2d -algorithm. This algorithm is a commercial software. -\n To get a licence, visit http://www.distene.com/corp/eval-distene.html - -
    -
  1. \ref blsurf_general_parameters "General parameters"
    2. -
  2. \ref blsurf_advanced_parameters "Advanced parameters"
    3. -
  3. \ref blsurf_local_size "Local size"
    4. -
      -
    1. \ref blsurf_sizemap_computation "Computation of the physical size"
      2. -
    2. \ref blsurf_attractor "Advanced maps"
      3. -
    3. \ref blsurf_attractor_computation "Computation of attractors"
      4. -
    -
  4. \ref blsurf_enforced_elements "Enforced vertices"
    5. -
  5. \ref blsurf_limitations "Limitations"
    6. -
- -\anchor blsurf_general_parameters -

General parameters

+BLSURF Parameters hypothesis works only with \b DISTENE \b BLSurf 2d +algorithm. This algorithm is a commercial software. To obtain a +licence, visit http://www.distene.com/corp/eval-distene.html + +\tableofcontents + +\section blsurf_general_parameters General parameters \image html blsurf_parameters.png - +- Allow Quadrangles - if checked, allows the creation of + quadrilateral elements. + +- Patch independent - if checked, geometrical edges are not +respected and all geometrical faces are meshed as one hyper-face. \ref blsurf_top "Back to top" -\anchor blsurf_advanced_parameters -

Advanced parameters

+\section blsurf_advanced_parameters Advanced parameters -The notion of diag used in the descriptions means the diagonal of the bounding box of the -geometrical object to mesh. +The notion of diag used in the descriptions means the diagonal +of the bounding box of the geometrical object to mesh. \image html blsurf_parameters_advanced.png -
  • Verbosity level - Defines the percentage of "verbosity" of -BLSURF [0-100].
    • +- Verbosity level - defines the percentage of "verbosity" of +BLSURF [0-100]. + +- Topology - allows creation of a conform mesh on a shell of +not sewed faces. The following choices are allowed: -
  • Topology - allows creation of a conform mesh on a shell of -not sewed faces. - - -
  • ExportGMF - saves the computed mesh into a GMF file (.mesh or .meshb).
    • - -
  • Add option - provides the choice of multiple PreCAD and BLSURF -advanced options, which appear, if selected, in a table where it is -possible to input the value of the option and to edit it later.
    • -
  • Clear option - removes the option selected in the table.
    • + - Complete missing or inadequate CAD descriptions. + + - Perform topology reconstruction and specific geometry + enhancement for mesh generation. + + \n This module requires a specific licence. The following PreCAD + options are the most significant and important ones: - + - Merge Edges - allows PreCAD to optimize the geometry by merging some + edges. This option is 0 by default. -\n -The following BLSURF options are commonly usable. + - Remove nano edges - allows PreCAD to optimize the geometry by removing + the nano edges whenever possible. This option is 0 by default. - +- \b refs (integer) - reference of a surface, used when exporting +files. Default is 1. -\n The following PreCAD options are commonly usable. - +option is \f$10^{-4}\f$. -\n The following advanced options are not documented and you can use them at your own risk. -\n\n Integer variables: - -Real variables: - -String variables: - + +- Integer variables: + - addsurf_ivertex + - anisotropic + - background + - coiter + - communication + - decim + - export_flag + - file_h + - gridnu + - gridnv + - intermedfile + - memory + - normals + - optim + - pardom_flag + - pinch + - rigid + - surforient + - tconf + - topo_collapse +- Real variables: + - addsurf_angle + - addsurf_R + - addsurf_H + - addsurf_FG + - addsurf_r + - addsurf_PA + - angle_compcurv + - angle_ridge + - anisotropic_ratio + - eps_pardom +- String variables: + - export_format + - export_option + - import_option \ref blsurf_top "Back to top" -\anchor blsurf_local_size -

    Local size

    - -Local sizes can be defined on faces, edges or vertices. - +\section blsurf_local_size Local size + +Local sizes can be defined on faces, edges or vertices: + +- The faces, edges and vertices can belong to the meshed geometrical +object or to its sub-shapes (created using Explode command). + +- Groups of faces, edges and vertices are also handled. + +- It is possible to attribute the same size to several geometries using multi-selection. + +- The sizes are constant values or python functions. + +- In case of a python function, the following rules must be respected: + + - The name of the function is f. + + - If geometry is a face or a group of faces, the function is f(u,v). + + - If geometry is an edge or a group of edges, the function is f(t). + + - If geometry is a vertex or a group of vertices, the function is f(). + + - The function must return a double. 3 different types of size maps can be defined: -
      -
    1. \ref blsurf_sizemap_computation "Computation of the physical size"
      2. -
    2. \ref blsurf_attractor "Advanced maps"
      3. -
    3. \ref blsurf_attractor_computation "Computation of attractors"
      4. -
    + +-# \ref blsurf_sizemap_computation "Computation of the physical size" +-# \ref blsurf_attractor "Advanced maps" +-# \ref blsurf_attractor_computation "Computation of attractors" \ref blsurf_top "Back to top" -\anchor blsurf_sizemap_computation -

    Computation of the physical size

    +\subsection blsurf_sizemap_computation Computation of the physical size + \image html blsurf_parameters_sizemap1.png -The physical size is obtained by querying sizemap functions associated to the input CAD object for surfaces, curves and points. +The physical size is obtained by querying sizemap functions associated +to the input CAD object for surfaces, curves and points. Each function can either return a value h (which is then trimmed between the two bounds hphymin and hphymax), or "no answer" (by not assigning a value to h), thus providing great flexibility in the -specification of the sizes. The computation depends on whether point P is internal to a surface, internal to a curve, or at the end of several curves: - -In order to compute the mean of several values, the arithmetic mean is used by default, but this can be modified by the parameter \ref blsurf_hmean_flag "hmean flag". In the same way, in order to interpolate two values, a linear interpolation is used by default, but this can be modified by \ref blsurf_hinterpol_flag "hinterpol flag". - -\ref blsurf_local_size "Back to \"Local size\"" \n +specification of the sizes. The computation depends on whether point P +is internal to a surface, internal to a curve, or at the end of +several curves: + +- If point P is internal to a surface, the CAD surface size function +is queried. If no answer is returned, one interpolates with the values +at the vertices of the discretized interface curves. + +- If point P is internal to a curve, the CAD curve size function is +queried first. If no answer is returned, the surface size function is +queried for every adjacent surface and the mean value of the returned +values is computed. If no answer is returned, sizes h1 and h2 at both +ends of the curve are considered (see next item) and the interpolated +value is computed. + +- If point P is at the extremity of several curves, the CAD point size +function is queried first. If no answer is returned, the curve size +function is queried for every adjacent curve and the mean value of the +returned values is computed. If no answer is returned, the surface +size function is queried for every adjacent surface and the mean value +of the returned values is computed. If there is still no answer +returned, the default value hphydef is kept. + +In order to compute the mean of several values, the arithmetic mean is +used by default, but this can be modified by the parameter +\ref blsurf_hmean_flag "hmean flag". In the same way, in order to +interpolate two values, a linear interpolation is used by default, but +this can be modified by \ref blsurf_hinterpol_flag "hinterpol flag". + +\ref blsurf_local_size "Back to \"Local size\""\n \ref blsurf_top "Back to top" -\anchor blsurf_attractor -

    Advanced maps

    -\n +\subsection blsurf_attractor Advanced maps + \image html blsurf_parameters_sizemap2.png -\n + More specific size maps can be defined on faces. - + + - If the two options are combined the size will remain constant + until the distance specified in "constant over" and grow then as + prescribed by the attractor function. + + - Else the growing is only controled by the standard arguments of + BLSURF (gradation ...). \image html blsurf_const_size_near_shape2.png "Example of size map with constant size option, the size is kept constant on the left side of the surface until a certain distance" -Remark : The validation of the hypothesis might take a few seconds if +\note The validation of the hypothesis might take a few seconds if attractors are defined or the "constant size" option is used because a map of distances has to be built on the whole surface for each face where such a hypothesis has been defined. -
    See Also a sample TUI Script of the \ref tui_blsurf "creation of a BLSurf hypothesis", including size map. +\sa Sample TUI Script of the \ref tui_blsurf "creation of a BLSurf hypothesis", including size map. -\ref blsurf_local_size "Back to \"Local size\"" \n +\ref blsurf_local_size "Back to \"Local size\""\n \ref blsurf_top "Back to top" -\anchor blsurf_attractor_computation -

    Computation of attractors

    -\n +\subsection blsurf_attractor_computation Computation of attractors + The size grows exponentially following the equation : \f$h(d) = \mathrm{User Size} + (\mathrm{h\_start} - \mathrm{User Size}) \times e ^ { - \left( \frac{d}{R} \right) ^ {2} }\f$ -\n + Where : - + +- h_start is the desired size on the given attractor shape + +- d is the distance of the current point from the attractor +shape. The distance is the geodesic distance (i.e. calculated by following the surface to be meshed) + +- R is called the distance of influence and allows controlling the growth rate of the mesh \image html blsurf_attractors2.png "Example of mesh created using attractors, the attractors here are the side edges and the size grows from the side of the surface towards the apex" -\ref blsurf_local_size "Back to \"Local size\"" \n +\ref blsurf_local_size "Back to \"Local size\""\n \ref blsurf_top "Back to top" -\anchor blsurf_enforced_elements -

    Enforced vertices

    +\section blsurf_enforced_elements Enforced vertices \image html blsurf_parameters_enforced_vertices.png It is possible to define some enforced vertices to BLSurf algorithm. An enforced vertex is defined on a Face or a Compound by - + +- selecting an existing Vertex or Compound, + +- or creating a new vertex given its coordinates. + The enforced vertex is the projection of a point defined by its (x,y,z) coordinates on the selected face. - -
    See Also a sample TUI Script of the \ref tui_blsurf "creation of a BLSurf hypothesis", including enforced vertices. +- It is possible to define several enforced vertices on a face or a group of faces. + +- If the projected point is on the boundary or outside of the face, it will be ignored. + +- If a group name is specified, the enforced nodes will be added in the group. If the group does not exist it will be created. + +\sa Sample TUI Script of the \ref tui_blsurf "creation of a BLSurf hypothesis", including enforced vertices. \ref blsurf_top "Back to top" -\anchor blsurf_limitations -

    Limitations

    +\section blsurf_limitations Limitations Currently BLSURF plugin has the following limitations. - +- BLSURF algorithm cannot be used as a local algorithm (on +sub-meshes) or as a provider of a low-level +mesh for some 3D algorithms, because the BLSURF mesher (and +consequently plugin) does not provide the information on node +parameters on edges (U) and faces (U,V). For example the +following combinations of algorithms are impossible: + + - global MEFISTO or Quadrangle(mapping) + local BLSURF; + + - BLSURF + Projection 2D from faces meshed by BLSURF; + + - local BLSURF + Extrusion 3D; + \ref blsurf_top "Back to top" */ diff --git a/doc/salome/gui/BLSURFPLUGIN/input/blsurfplugin_python_interface.doc b/doc/salome/gui/BLSURFPLUGIN/input/blsurfplugin_python_interface.doc index 0f605e9..0d3efc1 100644 --- a/doc/salome/gui/BLSURFPLUGIN/input/blsurfplugin_python_interface.doc +++ b/doc/salome/gui/BLSURFPLUGIN/input/blsurfplugin_python_interface.doc @@ -9,8 +9,10 @@ Documentation for BLSURFPlugin package is available in linear form grouped by cl Below you can see an example of usage of the BLSURFPlugin package for mesh generation: \anchor tui_blsurf -

    Construction of Mesh using BLSurf algorithm

    -

    Basic hypothesis

    + +\section blsurf_construct_mesh Construction of Mesh using BLSurf algorithm + +\subsection blsurf_construct_mesh_basic_hypo Basic hypothesis \code import geompy import smesh @@ -46,7 +48,7 @@ algo2d = blsurfMesh.Triangle(algo=smesh.BLSURF) # End of script \endcode -

    Adding sizemaps

    +\subsection blsurf_construct_mesh_sizemaps Adding sizemaps \code # optional - set physical mesh to 2 = Size Map algo2d.SetPhysicalMesh( 2 ) @@ -67,9 +69,8 @@ blsurfMesh.Compute() # End of script \endcode -

    Adding enforced vertices

    +\subsection blsurf_construct_mesh_enforced_vertices Adding enforced vertices \code - # Add enforced vertex for Face_1 on (50, 50, 50) # The projection coordinates will be (50, 50, 0) algo2d.SetEnforcedVertex(Face_1, 50, 50, 50) @@ -101,12 +102,10 @@ algo2d.UnsetEnforcedVertices(Face_1) blsurfMesh.Compute() # End of script - \endcode -

    Adding an attractor

    +\subsection blsurf_construct_mesh_attractor Adding an attractor \code - # Add an attractor on Face_2, which shape is Wire_1 # The size on Wire_1 is 1 and will grow until a maximum of 36.641 (physical size set above) @@ -122,12 +121,10 @@ algo2d.SetGradation( 2.5 ) blsurfMesh.Compute() # End of script - \endcode -

    Using internal vertices

    +\subsection blsurf_construct_mesh_internal_vertices Using internal vertices \code - # Creating a geometry containing internal vertices Face_3 = geompy.MakeFaceHW(1, 1, 1) Vertex_2 = geompy.MakeVertex(0.2, 0.2, 0) diff --git a/doc/salome/gui/BLSURFPLUGIN/input/index.doc b/doc/salome/gui/BLSURFPLUGIN/input/index.doc index 8f8fdeb..3a35d84 100644 --- a/doc/salome/gui/BLSURFPLUGIN/input/index.doc +++ b/doc/salome/gui/BLSURFPLUGIN/input/index.doc @@ -2,18 +2,19 @@ \mainpage Introduction to BLSURFPLUGIN -\note BLSURFPLUGI plugin used BLSURF commercial mesher and require a -license to be used within the Mesh module. +\b BLSURFPLUGIN SALOME module represents a meshing plug-in that can be +used within the SALOME Mesh module for generation of 2D mesh. -\n \b BLSURFPLUGIN plugin is destined for: +\note BLSURFPLUGIN plugin uses DISTENE BLSurf commercial meshing +software and requires a license at the run time (to work within the +Mesh module). - +\b BLSURFPLUGIN plugin is destined for: +- Meshing of the 2D geometric entities. -To manage parameters of the BLSURFPLUGIN use \subpage blsurf_hypo_page. +To manage parameters of the BLSURFPLUGIN, use \subpage blsurf_hypo_page. -Also all BLSURFPLUGIN functionalities are accessible via +Also, all BLSURFPLUGIN functionalities are accessible via the \subpage blsurfplugin_python_interface_page "BLSURFPLUGIN Python interface". */ diff --git a/doc/salome/gui/BLSURFPLUGIN/static/footer.html b/doc/salome/gui/BLSURFPLUGIN/static/footer.html index b344790..4c89a2b 100755 --- a/doc/salome/gui/BLSURFPLUGIN/static/footer.html +++ b/doc/salome/gui/BLSURFPLUGIN/static/footer.html @@ -3,7 +3,7 @@
    - Copyright © 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
    + Copyright © 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE
    Copyright © 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
    diff --git a/doc/salome/gui/Makefile.am b/doc/salome/gui/Makefile.am index b7f9d9e..fab0fec 100644 --- a/doc/salome/gui/Makefile.am +++ b/doc/salome/gui/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2011 CEA/DEN, EDF R&D +# Copyright (C) 2007-2012 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/salome/tui/Makefile.am b/doc/salome/tui/Makefile.am index a657b9f..c0aef17 100644 --- a/doc/salome/tui/Makefile.am +++ b/doc/salome/tui/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2011 CEA/DEN, EDF R&D +# Copyright (C) 2007-2012 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/salome/tui/doxyfile.in b/doc/salome/tui/doxyfile.in index 54bbfc4..e553b43 100755 --- a/doc/salome/tui/doxyfile.in +++ b/doc/salome/tui/doxyfile.in @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2011 CEA/DEN, EDF R&D +# Copyright (C) 2007-2012 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/salome/tui/static/footer.html b/doc/salome/tui/static/footer.html index 5c42746..29e07ad 100755 --- a/doc/salome/tui/static/footer.html +++ b/doc/salome/tui/static/footer.html @@ -4,7 +4,7 @@
    -
    Copyright © 2007-2011 CEA DEN, EDF R&D
    +
    Copyright © 2007-2012 CEA DEN, EDF R&D
    diff --git a/idl/BLSURFPlugin_Algorithm.idl b/idl/BLSURFPlugin_Algorithm.idl index 6082e52..d26ce56 100644 --- a/idl/BLSURFPlugin_Algorithm.idl +++ b/idl/BLSURFPlugin_Algorithm.idl @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2011 CEA/DEN, EDF R&D +// Copyright (C) 2007-2012 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/Makefile.am b/idl/Makefile.am index 3de4d2b..e9e3d92 100644 --- a/idl/Makefile.am +++ b/idl/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2011 CEA/DEN, EDF R&D +# Copyright (C) 2007-2012 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 @@ -30,6 +30,8 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am BASEIDL_FILES = BLSURFPlugin_Algorithm.idl +BASEIDL_FILES_PY=$(BASEIDL_FILES:%.idl=%_idl.py) + # This variable defines the files to be installed dist_salomeidl_DATA = $(BASEIDL_FILES) @@ -92,9 +94,15 @@ install-exec-local: $(BASEIDL_FILES:%=$(top_srcdir)/idl/%) $(OMNIORB_IDL) $(IDLPYFLAGS) -C$(DESTDIR)$(salomepythondir) $$file ; \ done -# uninstall-local removes too much, but it works in distcheck +# we want to remove only staff generated for IDL files and nothing more uninstall-local: - rm -rf $(DESTDIR)$(salomepythondir)/* + @for modulen in BLSURFPlugin ; do \ + test -d $(DESTDIR)$(salomepythondir)/$${modulen} && echo "Removing $(DESTDIR)$(salomepythondir)/$${modulen}" && rm -rf $(DESTDIR)$(salomepythondir)/$${modulen} ; \ + test -d $(DESTDIR)$(salomepythondir)/$${modulen}__POA && echo "Removing $(DESTDIR)$(salomepythondir)/$${modulen}__POA" && rm -rf $(DESTDIR)$(salomepythondir)/$${modulen}__POA ; \ + done ; \ + for filen in $(BASEIDL_FILES_PY) ; do \ + echo "Removing $(DESTDIR)$(salomepythondir)/$${filen}" && rm -f $(DESTDIR)$(salomepythondir)/$${filen}* ; \ + done mostlyclean-local: -rm -f *.hh *.cc .depidl diff --git a/resources/BLSURFPlugin.xml b/resources/BLSURFPlugin.xml index 8729833..ff40d4c 100644 --- a/resources/BLSURFPlugin.xml +++ b/resources/BLSURFPlugin.xml @@ -1,7 +1,7 @@