From: vsr Date: Tue, 8 Dec 2009 13:11:42 +0000 (+0000) Subject: Merge from V5_1_3_BR branch (07/12/09) X-Git-Tag: V6_0_0~21 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=2daa321efae3d0c6ce41199fa5a2482630d505d9;p=modules%2Fsmesh.git Merge from V5_1_3_BR branch (07/12/09) --- diff --git a/adm_local/unix/config_files/check_qwt.m4 b/adm_local/unix/config_files/check_qwt.m4 index d80642511..bae22ac31 100644 --- a/adm_local/unix/config_files/check_qwt.m4 +++ b/adm_local/unix/config_files/check_qwt.m4 @@ -47,16 +47,18 @@ AC_ARG_WITH(qwt_inc, libqwt_name=qwt if test -z $QWTHOME; then AC_MSG_RESULT(QWTHOME not defined) + AC_MSG_NOTICE(Trying native Qwt...) exist_ok=no if test "x$exist_ok" = "xno"; then for d in /usr /usr/local ; do - for extension in qwt qwt-qt4; do + for extension in qwt-qt4 qwt; do AC_CHECK_FILE(${d}/lib${LIB_LOCATION_SUFFIX}/lib${extension}.so,exist_ok=yes,exist_ok=no) if test "x$exist_ok" = "xyes"; then QWTHOME=$d AC_MSG_RESULT(lib${extension}.so detected in $d/lib) libqwt_name=${extension} - dnl No break here, libqwt-qt4.so is choosen even if libqwt.so is present: if 2 are present, in most of cases, libqwt.so is Qt3 version. + dnl break, libqwt-qt4.so is choosen before libqwt.so since it is surely the Qt4 version. + break fi done if test "x$exist_ok" = "xyes"; then @@ -77,21 +79,22 @@ if test -z $QWTHOME; then fi if test "x$exist_ok" = "xyes"; then if test -z $QWT_INCDIR; then - QWT_INCDIR=$QWTHOME"/include/qwt" + QWT_INCDIR=$QWTHOME"/include/qwt-qt4" if test ! -f $QWT_INCDIR/qwt.h ; then - QWT_INCDIR=$QWTHOME"/include" + QWT_INCDIR=/usr/include/qwt fi if test ! -f $QWT_INCDIR/qwt.h ; then - QWT_INCDIR=/usr/lib/qt4/include/qwt + QWT_INCDIR=$QWTHOME"/include" fi if test ! -f $QWT_INCDIR/qwt.h ; then - QWT_INCDIR=/usr/include/qwt-qt4 + QWT_INCDIR=/usr/lib/qt4/include/qwt fi fi else qwt_ok=no fi else + AC_MSG_NOTICE(Trying Qwt from $QWTHOME ...) if test -z $QWT_INCDIR; then QWT_INCDIR="$QWTHOME/include" fi diff --git a/doc/salome/gui/SMESH/images/hypo_quad_params_2.png b/doc/salome/gui/SMESH/images/hypo_quad_params_2.png new file mode 100644 index 000000000..9f6fa251e Binary files /dev/null and b/doc/salome/gui/SMESH/images/hypo_quad_params_2.png differ diff --git a/doc/salome/gui/SMESH/images/hypo_quad_params_res_2.png b/doc/salome/gui/SMESH/images/hypo_quad_params_res_2.png new file mode 100644 index 000000000..6dc37e298 Binary files /dev/null and b/doc/salome/gui/SMESH/images/hypo_quad_params_res_2.png differ diff --git a/doc/salome/gui/SMESH/input/1d_meshing_hypo.doc b/doc/salome/gui/SMESH/input/1d_meshing_hypo.doc index c61d388a5..aba2b6598 100644 --- a/doc/salome/gui/SMESH/input/1d_meshing_hypo.doc +++ b/doc/salome/gui/SMESH/input/1d_meshing_hypo.doc @@ -199,31 +199,27 @@ minimum and maximum value of this parameter. \anchor fixed_points_1d_anchor

Fixed points 1D hypothesis

-Fixed points 1D hypothesis allows to split edges into segments -using set of fixed points given by normalized parameters on edge and -set of numbers of segments for splitting each sub-segment between -fixed points. Optionally it is possible to set flag -Same Nb. Segments for all intervals and -only one value for mentioned number of segments. - -The direction of the splitting is defined by the orientation of the +Fixed points 1D hypothesis allows splitting edges through a +set of points parameterized on the edge (from 1 to 0) and a number of segments for each +interval limited by the points. + +\image html hypo_fixedpnt_dlg.png + +It is possible to check in Same Nb. Segments for all intervals +option and to define one value for all intervals. + +The splitting direction is defined by the orientation of the underlying geometrical edge. "Reverse Edges" list box allows to specify the edges for which the splitting should be made in the -direction opposing to their orientation. This list box is enabled only -if the geometry object is selected for the meshing. In this case the -user can select edges to be reversed either directly picking them in -the 3D viewer or by selecting the edges or groups of edges in the +direction opposite to their orientation. This list box is enabled only +if the geometrical object is selected for meshing. In this case it is +possible to select the edges to be reversed either directly picking them in +the 3D viewer or selecting the edges or groups of edges in the Object browser. -Using of this hypothesis for quadrangle face where main mesh is -created using Quadrangle(Mapping) and NumberOfSegments -hypothesises. Creation hypothesis FixedPoint_1D for submesh on -one edge: +\image html mesh_fixedpnt.png "Example of a submesh on the edge built using Fixed points 1D hypothesis" -\image html hypo_fixedpnt_dlg.png - -Resulting 2D mesh: - -\image html mesh_fixedpnt.png +See Also a sample TUI Script of a +\ref tui_fixed_points "Defining Fixed Points" hypothesis operation. */ diff --git a/doc/salome/gui/SMESH/input/2d_meshing_hypo.doc b/doc/salome/gui/SMESH/input/2d_meshing_hypo.doc index c912c568f..dd42e9962 100644 --- a/doc/salome/gui/SMESH/input/2d_meshing_hypo.doc +++ b/doc/salome/gui/SMESH/input/2d_meshing_hypo.doc @@ -23,6 +23,8 @@ which will compose the mesh of these 2D faces. \image html a-maxelarea.png +\n + \image html max_el_area.png "In this example, Max. element area is very small compared to the 1D hypothesis" See Also a sample TUI Script of a @@ -52,6 +54,18 @@ used as a degenerated edge. \image html hypo_quad_params_res.png "The resulting mesh" +This hypothesis can be also used to mesh a segment of a circular face. +Please, consider that there is a limitation on the selectiion of the degenerated +vertex for the faces built with the angle > 180 degrees (see the picture). + +\image html hypo_quad_params_2.png "3/4 of a circular face" + +In this case, selection of a wrong vertex for the Quadrangle parameters +hypothesis will generate a wrong mesh. The picture below +shows the good (left) and the bad (right) results of meshing. + +\image html hypo_quad_params_res_2.png "The resulting meshes" +
\anchor quadrangle_preference_anchor

Quadrangle Preference

diff --git a/doc/salome/gui/SMESH/input/about_hypo.doc b/doc/salome/gui/SMESH/input/about_hypo.doc index 578823bd6..cc8f5fd52 100644 --- a/doc/salome/gui/SMESH/input/about_hypo.doc +++ b/doc/salome/gui/SMESH/input/about_hypo.doc @@ -28,6 +28,7 @@ them, you operate numerical values): diff --git a/doc/salome/gui/SMESH/input/basic_meshing_algos.doc b/doc/salome/gui/SMESH/input/basic_meshing_algos.doc index 9a0fd91f5..a83a64f9f 100644 --- a/doc/salome/gui/SMESH/input/basic_meshing_algos.doc +++ b/doc/salome/gui/SMESH/input/basic_meshing_algos.doc @@ -47,7 +47,7 @@ tetrahedral (pyramidal) elements. \image html image126.gif "Example of a hexahedral 3D mesh" -\Note that BLSURF and GHS3D are commercial meshers and require a +\note BLSURF and GHS3D are commercial meshers and require a license to be used within the Mesh module. There is also a number of more specific algorithms: diff --git a/doc/salome/gui/SMESH/input/blsurf_hypo.doc b/doc/salome/gui/SMESH/input/blsurf_hypo.doc index ed1843097..03c0fc594 100644 --- a/doc/salome/gui/SMESH/input/blsurf_hypo.doc +++ b/doc/salome/gui/SMESH/input/blsurf_hypo.doc @@ -207,22 +207,33 @@ String variables: \image html blsurf_parameters_sizemap.png -It is possible to define user sizes on faces, edges or verteces. +User sizes can be defined on faces, edges or vertices.
See Also a sample TUI Script of the \ref tui_blsurf "creation of a BLSurf hypothesis", including size map. \anchor blsurf_sizemap_computation

Computation of the physical size

-Here is the detail on the calculation of the size (from BLSurf documentation). \n -The 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 whether point P is internal to a surface, internal to a curve, or at the end of several curves: +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: @@ -98,9 +100,9 @@ for ghs3d. This allows the input of advanced options in a free from. \image html ghs3d_enforced_vertices.png -GHS3D algorithm can locally raffine the mesh. It is possible to define enforced vertices in the volume where the mesh will be raffined. +GHS3D algorithm can locally make the mesh finer. It is possible to define enforced vertices in the volume where the mesh will be detailed. -A node will be created at the enforced vertex coordinates. There is no need to create a vertex in the CAD. +A node will be created at the enforced vertex coordinates. There is no need to create a vertex in CAD. An enforced vertex is defined by: @@ -32,12 +28,12 @@ The created groups can be later: An important tool, providing filters for creation of \b Standalone -groups is \subpage selection_filter_library_page. +groups is \subpage selection_filter_library_page. */ diff --git a/doc/salome/gui/SMESH/input/make_2dmesh_from_3d.doc b/doc/salome/gui/SMESH/input/make_2dmesh_from_3d.doc index 5f07f993c..f4b5b2ba5 100644 --- a/doc/salome/gui/SMESH/input/make_2dmesh_from_3d.doc +++ b/doc/salome/gui/SMESH/input/make_2dmesh_from_3d.doc @@ -2,21 +2,21 @@ \page make_2dmesh_from_3d_page Generate the skin elements (2D) of a mesh having 3D elements -\n This functionality allows you to generate 2D mesh elements as skin -on existing 3D mesh elements +\n This functionality allows to generate 2D mesh elements as a skin +on the existing 3D mesh elements. To generate 2D mesh:
    -
  1. From the Modification menu choose the "Create 2D mesh from 3D" -Mesh item, or invoke from popup menu. +
  2. From the Modification menu choose "Create 2D mesh from 3D" +item, or choose from the popup menu. \image html 2d_from_3d_menu.png The algorithm detects boundary volume faces without connections to -other volumes and create 2D mesh elements on face nodes. If mesh -already contains 2D elements on detected nodes - no new element -created. The result dialog shows mesh information statistic about new -created 2D mesh elements. +other volumes and creates 2D mesh elements on face nodes. If the mesh +already contains 2D elements on the detected nodes, new elements are not +created. The the resulting dialog shows mesh information statistics +about the newly created 2D mesh elements.
*/ diff --git a/doc/salome/gui/SMESH/input/mesh_infos.doc b/doc/salome/gui/SMESH/input/mesh_infos.doc index 75b934c2e..7b855c42c 100644 --- a/doc/salome/gui/SMESH/input/mesh_infos.doc +++ b/doc/salome/gui/SMESH/input/mesh_infos.doc @@ -44,11 +44,6 @@ The following information will be displayed: \image html advanced_mesh_infos.png -In case you get Mesh Infos via a \ref tui_viewing_mesh_infos "TUI script", -the information is displayed in Python Console. - -\image html b-mesh_infos.png -
\anchor mesh_element_info_anchor

Mesh Element Info

@@ -61,4 +56,7 @@ the Viewer. \image html eleminfo2.png +In case you get Mesh Infos via a TUI script the information is displayed in Python Console. +See the \ref tui_viewing_mesh_infos "TUI Example", + */ \ No newline at end of file diff --git a/doc/salome/gui/SMESH/input/netgen_2d_3d_hypo.doc b/doc/salome/gui/SMESH/input/netgen_2d_3d_hypo.doc index 0c872d32b..bbb7c59ff 100644 --- a/doc/salome/gui/SMESH/input/netgen_2d_3d_hypo.doc +++ b/doc/salome/gui/SMESH/input/netgen_2d_3d_hypo.doc @@ -2,7 +2,7 @@ \page netgen_2d_3d_hypo_page Netgen 2D and 3D hypotheses -\n Netgen 2D and Netgen 3D hypotheses work only with Netgen 1D-2D and +Netgen 2D and Netgen 3D hypotheses work only with Netgen 1D-2D and Netgen 1D-2D-3D algorithms. These algorithms do not require definition of lower-level hypotheses and algorithms (2D and 1D for meshing 3D objects and 1D for meshing 2D objects). They prove to be @@ -11,68 +11,64 @@ of the meshed object. \image html netgen2d.png - +not possible. +- Optimize - if this box is checked in, the algorithm will try to +create regular (possessing even sides) elements. \image html netgen3d_simple.png -Netgen 2D simple parameters and Netgen 3D simple parameters allow defining the size of elements for each dimension.
+Netgen 2D simple parameters and Netgen 3D simple +parameters allow defining the size of elements for each +dimension. \b 1D group allows defining the size of 1D elements in either of two ways: - +equidistant distribution. +- Average Length has the same sense as \ref +average_length_anchor "Average Length" hypothesis. \b 2D group allows defining the size of 2D elements - +- Length from edges if checked in, acts like \ref +length_from_edges_anchor "Length from Edges" hypothesis, else +- Max. Element Area defines the maximum element area like \ref +max_element_area_anchor "Max Element Area" hypothesis. \b 3D groups allows defining the size of 3D elements. -