From: abd Date: Wed, 18 Apr 2007 15:44:59 +0000 (+0000) Subject: Merging from V3_2_6pre4 X-Git-Tag: V4_0~16 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=358f8ddd54e7ed553eecc22ca665575e4019e3a0;p=modules%2Fsmesh.git Merging from V3_2_6pre4 --- diff --git a/adm_local/unix/config_files/check_Platform.m4 b/adm_local/unix/config_files/check_Platform.m4 new file mode 100755 index 000000000..b4cd3d875 --- /dev/null +++ b/adm_local/unix/config_files/check_Platform.m4 @@ -0,0 +1,117 @@ +dnl Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +dnl +dnl +dnl + +AC_DEFUN([CHECK_PLATFORM],[ +AC_REQUIRE([AC_PROG_CC])dnl +AC_REQUIRE([AC_PROG_CPP])dnl + +AC_CHECKING(for Platform) + +AC_SUBST(PLATFORM_INCLUDES) + +PLATFORM_INCLUDES="PCLINUX" +SUFFIXES="" + +f77int="F77INT32" +case $host_os in + irix5.* | irix6.* | osf4.* | osf5.* | linux* ) + + linux64="true" + expr "$host_os" : 'linux' >/dev/null && test ! x"$host_cpu" = x"x86_64" && linux64="false" + if test ! x"$linux64" = "xfalse" ; then + echo "$as_me:$LINENO: checking for 64bits integers size in F77/F90" >&5 +echo $ECHO_N "checking for 64bits integers size in F77/F90... $ECHO_C" >&6 + # Check whether --enable-int64 or --disable-int64 was given. +if test "${enable_int64+set}" = set; then + enableval="$enable_int64" + +fi; + case "X-$enable_int64" in + X-no) + echo "$as_me:$LINENO: result: \"disabled\"" >&5 +echo "${ECHO_T}\"disabled\"" >&6 + SUFFIXES="_32" + ;; + *) + echo "$as_me:$LINENO: result: \"enabled\"" >&5 +echo "${ECHO_T}\"enabled\"" >&6 + SUFFIXES="" + f77int="F77INT64" + ;; + esac + fi + ;; + *) + ;; +esac + +case $host_os in + linux*) + test x"$linux64" = x"true" && \ + MACHINE="PCLINUX64${SUFFIXES}" || \ + MACHINE=PCLINUX + ;; + hpux*) + MACHINE=HP9000 + ;; + aix4.*) + MACHINE=RS6000 + host_os_novers=aix4.x + ;; + irix5.*) + MACHINE="IRIX64${SUFFIXES}" + host_os_novers=irix5.x + ;; + irix6.*) + MACHINE="IRIX64${SUFFIXES}" + host_os_novers=irix6.x + ;; + osf4.*) + MACHINE="OSF1${SUFFIXES}" + host_os_novers=osf4.x + ;; + osf5.*) + MACHINE="OSF1${SUFFIXES}" + host_os_novers=osf5.x + ;; + solaris2.*) + MACHINE=SUN4SOL2 + host_os_novers=solaris2.x + ;; + uxpv*) + MACHINE=VPP5000 + ;; + *) + MACHINE= + host_os_novers=$host_os + ;; +esac + +case $host_cpu in + ia64*) + MACHINE="PCLINUX64" + ;; +esac + +PLATFORM_INCLUDES=" -D$MACHINE " + +])dnl diff --git a/configure.in.base b/configure.in.base deleted file mode 100644 index 7be9e6e53..000000000 --- a/configure.in.base +++ /dev/null @@ -1,427 +0,0 @@ -# -# PLEASE DO NOT MODIFY configure.in FILE -# -# ALL CHANGES WILL BE DISCARDED BY THE NEXT -# build_configure COMMAND -# -# CHANGES MUST BE MADE IN configure.in.base FILE -# -# -# Author : Marc Tajchman (CEA) -# Date : 28/06/2001 -# Modified by : Patrick GOLDBRONN (CEA) -# Modified by : Marc Tajchman (CEA) -# -# Created from configure.in.base -# - -AC_INIT(src) -AC_CONFIG_AUX_DIR(${KERNEL_ROOT_DIR}/salome_adm/unix/config_files) -AC_CANONICAL_HOST - -PACKAGE=salome -AC_SUBST(PACKAGE) - -VERSION=4.0.0 -XVERSION=0x040000 -AC_SUBST(VERSION) -AC_SUBST(XVERSION) - -# set up MODULE_NAME variable for dynamic construction of directories (resources, etc.) -MODULE_NAME=smesh -AC_SUBST(MODULE_NAME) - -dnl -dnl Initialize source and build root directories -dnl - -ROOT_BUILDDIR=`pwd` -ROOT_SRCDIR=`echo $0 | sed -e "s,[[^/]]*$,,;s,/$,,;s,^$,.,"` -cd $ROOT_SRCDIR -ROOT_SRCDIR=`pwd` -cd $ROOT_BUILDDIR - -AC_SUBST(ROOT_SRCDIR) -AC_SUBST(ROOT_BUILDDIR) - -echo -echo Source root directory : $ROOT_SRCDIR -echo Build root directory : $ROOT_BUILDDIR -echo -echo - -if test -z "$AR"; then - AC_CHECK_PROGS(AR,ar xar,:,$PATH) -fi -AC_SUBST(AR) - -dnl Export the AR macro so that it will be placed in the libtool file -dnl correctly. -export AR - -echo -echo --------------------------------------------- -echo testing make -echo --------------------------------------------- -echo - -AC_PROG_MAKE_SET -AC_PROG_INSTALL -dnl -dnl libtool macro check for CC, LD, NM, LN_S, RANLIB, STRIP + pour les librairies dynamiques ! - -AC_ENABLE_DEBUG(yes) -AC_DISABLE_PRODUCTION - -echo --------------------------------------------- -echo testing libtool -echo --------------------------------------------- - -dnl first, we set static to no! -dnl if we want it, use --enable-static -AC_ENABLE_STATIC(no) - -AC_LIBTOOL_DLOPEN -AC_PROG_LIBTOOL - -dnl Fix up the INSTALL macro if it s a relative path. We want the -dnl full-path to the binary instead. -case "$INSTALL" in - *install-sh*) - INSTALL='\${KERNEL_ROOT_DIR}'/salome_adm/unix/config_files/install-sh - ;; -esac - -echo -echo --------------------------------------------- -echo testing C/C++ -echo --------------------------------------------- -echo - -cc_ok=no -dnl inutil car libtool -dnl AC_PROG_CC -AC_PROG_CXX -AC_DEPEND_FLAG -# AC_CC_WARNINGS([ansi]) -cc_ok=yes - -dnl Library libdl : -AC_CHECK_LIB(dl,dlopen) - -dnl add library libm : -AC_CHECK_LIB(m,ceil) - -dnl -dnl Well we use sstream which is not in gcc pre-2.95.3 -dnl We must test if it exists. If not, add it in include ! -dnl - -AC_CXX_HAVE_SSTREAM - - - -dnl -dnl --------------------------------------------- -dnl testing MPICH -dnl --------------------------------------------- -dnl - -CHECK_MPICH - -echo -echo --------------------------------------------- -echo testing LEX \& YACC -echo --------------------------------------------- -echo - -lex_yacc_ok=no -AC_PROG_YACC -AC_PROG_LEX -lex_yacc_ok=yes - -echo -echo --------------------------------------------- -echo testing python -echo --------------------------------------------- -echo - -CHECK_PYTHON - -echo -echo --------------------------------------------- -echo Testing qwt -echo --------------------------------------------- -echo - -CHECK_QWT - -dnl echo -dnl echo --------------------------------------------- -dnl echo testing java -dnl echo --------------------------------------------- -dnl echo - -dnl CHECK_JAVA - -echo -echo --------------------------------------------- -echo testing swig -echo --------------------------------------------- -echo - -CHECK_SWIG - -echo -echo --------------------------------------------- -echo testing threads -echo --------------------------------------------- -echo - -ENABLE_PTHREADS - -echo -echo --------------------------------------------- -echo testing omniORB -echo --------------------------------------------- -echo - -CHECK_OMNIORB - -dnl echo -dnl echo --------------------------------------------- -dnl echo testing mico -dnl echo --------------------------------------------- -dnl echo - -dnl CHECK_MICO - -echo -echo --------------------------------------------- -echo default ORB : omniORB -echo --------------------------------------------- -echo - -DEFAULT_ORB=omniORB -CHECK_CORBA - -AC_SUBST_FILE(CORBA) -corba=make_$ORB -CORBA=adm_local/unix/$corba - -echo -echo --------------------------------------------- -echo testing openGL -echo --------------------------------------------- -echo - -CHECK_OPENGL - -echo -echo --------------------------------------------- -echo testing QT -echo --------------------------------------------- -echo - -CHECK_QT - -echo -echo --------------------------------------------- -echo testing MSG2QM -echo --------------------------------------------- -echo - -CHECK_MSG2QM - -echo -echo --------------------------------------------- -echo testing VTK -echo --------------------------------------------- -echo - -CHECK_VTK - -echo -echo --------------------------------------------- -echo testing HDF5 -echo --------------------------------------------- -echo - -CHECK_HDF5 - -echo -echo --------------------------------------------- -echo BOOST Library -echo --------------------------------------------- -echo - -CHECK_BOOST - -echo -echo --------------------------------------------- -echo Testing OpenCascade -echo --------------------------------------------- -echo - -CHECK_CAS - -echo -echo --------------------------------------------- -echo Testing html generators -echo --------------------------------------------- -echo - -CHECK_HTML_GENERATORS - -echo -echo --------------------------------------------- -echo Testing GUI -echo --------------------------------------------- -echo - -CHECK_SALOME_GUI - -echo -echo --------------------------------------------- -echo Testing full GUI -echo --------------------------------------------- -echo - -CHECK_CORBA_IN_GUI -if test "x${CORBA_IN_GUI}" != "xyes"; then - echo "failed : For configure SMESH module necessary full GUI !" - exit -fi - -echo -echo --------------------------------------------- -echo Testing Kernel -echo --------------------------------------------- -echo - -CHECK_KERNEL - -echo -echo --------------------------------------------- -echo Testing Geom -echo --------------------------------------------- -echo - -CHECK_GEOM - -echo -echo --------------------------------------------- -echo Testing Med -echo --------------------------------------------- -echo - -CHECK_MED - -echo -echo --------------------------------------------- -echo Summary -echo --------------------------------------------- -echo - -echo Configure -variables="cc_ok boost_ok lex_yacc_ok python_ok swig_ok threads_ok OpenGL_ok qt_ok vtk_ok hdf5_ok omniORB_ok occ_ok doxygen_ok graphviz_ok qwt_ok Kernel_ok Geom_ok Med_ok" - -for var in $variables -do - printf " %10s : " `echo \$var | sed -e "s,_ok,,"` - eval echo \$$var -done - -echo -echo "Default ORB : $DEFAULT_ORB" -echo - -dnl generals files which could be included in every makefile - -AC_SUBST_FILE(COMMENCE) COMMENCE=adm_local/unix/make_commence -AC_SUBST_FILE(CONCLUDE) CONCLUDE=adm_local/unix/make_conclude -AC_SUBST_FILE(MODULE) MODULE=salome_adm/unix/make_module - -dnl les dependences -AC_SUBST_FILE(DEPEND) DEPEND=salome_adm/unix/depend - -dnl We don t need to say when we re entering directories if we re using -dnl GNU make becuase make does it for us. -if test "X$GMAKE" = "Xyes"; then - AC_SUBST(SETX) SETX=":" -else - AC_SUBST(SETX) SETX="set -x" -fi - -# make other build directories -for rep in salome_adm adm_local doc bin/salome include/salome lib${LIB_LOCATION_SUFFIX}/salome share/salome/resources/${MODULE_NAME} idl -do -# if test ! -d $rep ; then -# eval mkdir $rep -# fi - $INSTALL -d $rep -done - -echo -echo --------------------------------------------- -echo copying resource files, shell scripts, and -echo xml files -echo --------------------------------------------- -echo - - -dnl copy resources directories - -#for i in `find $ROOT_SRCDIR -name 'resources' -print` -#do -# local_res=`echo $i | sed -e "s,$ROOT_SRCDIR,.,"` -# local_res_dir=`echo $local_res | sed -e "s,[[^/]]*$,,;s,/$,,;s,^$,.,"` -# mkdir -p $local_res_dir -# cd $local_res_dir -# ln -fs $i -# echo $local_res -# cd $ROOT_BUILDDIR -#done - -dnl copy shells and utilities contained in the bin directory -dnl excluding .in files (treated in AC-OUTPUT below) and CVS -dnl directory - -mkdir -p bin/salome -cd bin/salome -for i in $ROOT_SRCDIR/bin/* -do - local_bin=`echo $i | sed -e "s,$ROOT_SRCDIR,.,"` - case "$local_bin" in - *.in | *~) ;; - ./bin/CVS | ./bin/salome) ;; - *) /usr/bin/install $i .; echo $local_bin ;; - esac -done -cd $ROOT_BUILDDIR - -AC_SUBST_FILE(ENVSCRIPT) ENVSCRIPT=salome_adm/unix/envScript - -dnl copy xml files to the build tree (lib directory) -dnl pourquoi ???? - -#cd lib -#for i in `find $ROOT_SRCDIR -name "*.xml" -print` -#do -# ln -fs $i -# echo `echo $i | sed -e "s,$ROOT_SRCDIR,.,"` -#done -#cd $ROOT_BUILDDIR - - -echo -echo --------------------------------------------- -echo generating Makefiles and configure files -echo --------------------------------------------- -echo - -AC_OUTPUT_COMMANDS([ \ - chmod +x ./bin/* \ -]) - -## do not delete this line diff --git a/doc/salome/gui/SMESH/about_viewing_meshes.htm b/doc/salome/gui/SMESH/about_viewing_meshes.htm index d47aa94f8..fcddab5db 100755 --- a/doc/salome/gui/SMESH/about_viewing_meshes.htm +++ b/doc/salome/gui/SMESH/about_viewing_meshes.htm @@ -15,10 +15,11 @@ if (navigator.appName !="Netscape") + + + + + + + + + +

Building Compounds

+ +

Compound Mesh is a combination of several meshes.

+ +

 To + Build a compound:

+ +

From the Mesh + menu select Build Compound or + click button in the toolbar. The following dialog box will + appear:

+ +

+ + + +

Example:

+ +

+ +

 

+ + + + diff --git a/doc/salome/gui/SMESH/files/about_meshing_algorithms.htm b/doc/salome/gui/SMESH/files/about_meshing_algorithms.htm index 5444163bc..ab45f9183 100755 --- a/doc/salome/gui/SMESH/files/about_meshing_algorithms.htm +++ b/doc/salome/gui/SMESH/files/about_meshing_algorithms.htm @@ -16,34 +16,35 @@ if (navigator.appName !="Netscape") - - - - - - - - - -

VTK 3D Viewer

- -

VTK - 3D viewer is the default viewer for Mesh Module, allowing to visualize - meshes. It is also used in Post-Pro module for all 3D presentations except - for Gauss Points.

- -

 

- -

The functionalities of - VTK viewer are available via its Viewer Toolbar. Buttons marked with small - downward triangles have extended functionality which can be accessed by - locking on them with left mouse button.  

- -

 

- -

- - - -

- -

 

- -

By default the rotation point is located - in the Center of the bounding box of an object.

- -

 

- -

- -

 

- -

Unchecking Use - Bounding Box Center box allows you to define the coordinates of - the rotation point manually.

- -

 

- -

Set to - Origin button restores the default rotation point coordinates.

- -

Select - Point from View button allows to select the rotation point in the - 3D Viewer

- - - -

 

- -

- - - - - - diff --git a/doc/salome/gui/SMESH/image159.gif b/doc/salome/gui/SMESH/image159.gif new file mode 100755 index 000000000..45a024ec7 Binary files /dev/null and b/doc/salome/gui/SMESH/image159.gif differ diff --git a/doc/salome/gui/SMESH/image160.gif b/doc/salome/gui/SMESH/image160.gif new file mode 100755 index 000000000..6baffdb30 Binary files /dev/null and b/doc/salome/gui/SMESH/image160.gif differ diff --git a/doc/salome/gui/SMESH/image161.gif b/doc/salome/gui/SMESH/image161.gif new file mode 100755 index 000000000..54364d260 Binary files /dev/null and b/doc/salome/gui/SMESH/image161.gif differ diff --git a/doc/salome/gui/SMESH/mesh_through_point.htm b/doc/salome/gui/SMESH/mesh_through_point.htm new file mode 100755 index 000000000..bf8e6f4ab --- /dev/null +++ b/doc/salome/gui/SMESH/mesh_through_point.htm @@ -0,0 +1,132 @@ + + + + + +Mesh through point + + + + + + + + + + + +

Mesh through point

+ +

In mesh you can define a node at a certain point either by creation + of a new node, by movement of the node closest to the point or by movement + of any node to the point.

+ +

To create a mesh passing through a point:

+ +

1. From the Modification + menu choose the Mesh through point + item or click button in the toolbar. The following + dialog box shall appear:

+ +

+ +

2. Enter the coordinates of the point

+ +

3. Choose one of several methods: you can + either Create a new node at the + indicated point or Move the existing node to the point. In the latter + case you can check in Automatic search + of the closest node or select the necessary node manually. Preview + check-box allows to see the results of the operation.

+ +

4. Click the Apply + or OK button.

+ +

 See + Also a sample TUI Script of a Mesh + through point operation.  

+ +

 

+ +

 

+ +

 

+ +

 

+ + + + diff --git a/doc/salome/gui/SMESH/modifying_meshes.htm b/doc/salome/gui/SMESH/modifying_meshes.htm index 7ed7089df..e33ea8c4b 100755 --- a/doc/salome/gui/SMESH/modifying_meshes.htm +++ b/doc/salome/gui/SMESH/modifying_meshes.htm @@ -18,13 +18,14 @@ p.whs3 { margin-top:0pt; margin-bottom:0pt; } h4.whs4 { margin-top:0pt; margin-bottom:0pt; } p.whs5 { margin-top:0.5pt; margin-bottom:0pt; font-family:'Lucida Console' , monospace; } p.whs6 { margin-top:0.5pt; margin-bottom:0pt; } -p.whs7 { margin-top:0.5pt; margin-bottom:0pt; font-family:'Times New Roman' , serif; } -p.whs8 { font-family:'Lucida Console' , monospace; } -p.whs9 { font-family:'Times New Roman' , serif; } -p.whs10 { margin-left:36px; font-family:'Lucida Console' , monospace; } -p.whs11 { margin-left:36px; } -p.whs12 { margin-left:0px; font-family:'Times New Roman' , serif; } -p.whs13 { font-family:'Lucida Console' , monospace; margin-left:0px; } +p.whs7 { margin-top:0pt; margin-bottom:0pt; font-family:'Times New Roman' , serif; font-weight:bold; font-size:13.5pt; } +p.whs8 { margin-top:0.5pt; margin-bottom:0pt; font-family:'Times New Roman' , serif; } +p.whs9 { font-family:'Lucida Console' , monospace; } +p.whs10 { font-family:'Times New Roman' , serif; } +p.whs11 { margin-left:36px; font-family:'Lucida Console' , monospace; } +p.whs12 { margin-left:36px; } +p.whs13 { margin-left:0px; font-family:'Times New Roman' , serif; } +p.whs14 { font-family:'Lucida Console' , monospace; margin-left:0px; } --> -

Prism 3D Algorithm

+

3D extrusion meshing algorithm

-

Prism 3D algorithm can be used for meshing prisms, i.e. 3D - Shapes defined by two opposing - faces having the same number of vertices and edges and meshed using the +

3D extrusion algorithm can be used for meshing prisms, i.e. +3D Shapes defined by + two opposing faces having the same number of vertices and edges and meshed using the 2D Projection algorithm. These - two faces should be connected by quadrangle "side" faces.

+ two faces should be connected by quadrangle "side" faces.

The opposing faces can be meshed with either quadrangles or triangles, while the side faces should be meshed - with quadranglees only.

+ with quadrangles only.

 

-

As you can see, the Prism3D +

As you can see, the 3D extrusion algorithm permits to build and to have in the same 3D mesh such elements as hexahedrons, prisms and polyhedrons.

diff --git a/doc/salome/gui/SMESH/segments_around_vertex_algorithm.htm b/doc/salome/gui/SMESH/segments_around_vertex_algorithm.htm new file mode 100755 index 000000000..7e73af218 --- /dev/null +++ b/doc/salome/gui/SMESH/segments_around_vertex_algorithm.htm @@ -0,0 +1,98 @@ + + + + + +Segments around Vertex Algorithm + + + + + + + + + + +

Segments around Vertex

+ +

Segments around Vertex algorithm + is considered to be a 0D + meshing algorithm, but, of course, it doesn't mesh nodes. It allows to + define the local size of the elements in the neighborhood of a certain + node. If we choose an object of higher dimension, it applies to all its + tops, i.e. corners of a box.  The + 0D algorithm combines with the algorithms of higher dimensions, but it + is not necessarily required for their successful implementation.

+ +

This algorithm allows only one hypothesis.

+ +

+ +

 

+ +

 

+ + + + diff --git a/doc/salome/gui/SMESH/smesh.log b/doc/salome/gui/SMESH/smesh.log index 08ce66a7c..4222c00a5 100755 --- a/doc/salome/gui/SMESH/smesh.log +++ b/doc/salome/gui/SMESH/smesh.log @@ -120,6 +120,7 @@ adding_quadratic_nodes_and_elements.htm aspect_ratio_3d.htm borders_at_multi-connection.htm borders_at_multiconnection_2d.htm +building_compounds.htm clipping.htm constructing_meshes.htm convert_to_from_quadratic_mesh.htm @@ -176,13 +177,18 @@ grouping_elements.htm length.htm merge_elements.htm mesh.htm +mesh_through_point.htm modifying_meshes.htm namespacesmesh.html netgen_2d_and_3d_hypotheses.htm pattern_mapping.htm presentation.htm +prism_3d_algorithm.htm +projection_algorithms.htm quality_controls.htm +radial_prism.htm revolution.htm +segments_around_vertex_algorithm.htm selection_filter_library.htm smesh.py_introduction.htm transforming_meshes.htm @@ -193,36 +199,46 @@ ehelp.xml texture_horiz_ltbluebubbles.jpg index.glo default.css -pics\add_node.png +pics\curvi_simple_after.png +pics\image89.gif +pics\image100.gif +pics\image78.gif +pics\image23.gif +pics\b-mesh_infos.png pics\remove_nodes2.png -pics\merging_nodes2.png -pics\moving_nodes2.png +pics\moving_nodes1.png pics\smoothing2.png -pics\b-mberofsegments.png -pics\b-flection1d.png -pics\a-cuttingofquadrangles.png +pics\a-maxelarea.png +pics\patternmapping1.png +image94.jpg +image106.gif +image91.gif +image80.gif +pics\distributionwithtabledensity.png +pics\moving_nodes2.png +image7.jpg +pics\patternmapping2.png +pics\extrusionalongaline1.png pics\addquadrangle.png -pics\intersectgroups.png -pics\editgroup.png image95.jpg pics\sewing1.png image92.gif image51.jpg image70.gif -pics\netgen2d.png -pics\circle_simple_after.png -pics\curvi_simple_after.png -pics\image138.gif -pics\create_group.png -pics\edit_mesh_change_value_hyp.png +pics\meshtopass.png +pics\image157.gif +pics\extrusion1.png +pics\curvi_angles_after.png +pics\straight_before.png +pics\image102.gif +pics\length2d.png pics\free_borders1.png -pics\add_triangle.png -pics\b-art_end_length.png pics\a-creategroup.png -pics\a-clipping2.png -pics\a-transparency.png -pics\diagonalinversion.png -pics\translation1.png +pics\a-startendlength.png +pics\a-patterntype.png +pics\extrusionalongaline2.png +pics\orientaation1.png +pics\unionoftwotriangles.png image96.jpg pics\sewing2.png image119.gif @@ -231,15 +247,12 @@ image52.jpg image82.gif image71.gif image30.jpg -pics\extrusion1.png -pics\distributionwithanalyticdensity.png -pics\image139.gif -pics\rotation1.png -pics\a-createpolyhedralvolume.png -pics\a-patterntype.png -pics\orientaation1.png -pics\translation2.png -pics\cutgroups.png +pics\lengthnearvertex.png +pics\straight_after.png +pics\cut_groups1.png +pics\uniting_a_set_of_triangles1.png +pics\b-erage_length.png +pics\removeelements.png image97.jpg pics\sewing3.png image86.jpg @@ -247,33 +260,38 @@ image50.gif image94.gif image83.gif image31.jpg -pics\circle_angles_after.png -pics\circle_simple_before.png -pics\curvi_angles_after.png -pics\graduatedaxes1.png -pics\image107.gif -pics\automaticlength.png +pics\aqt.png +pics\distributionwithanalyticdensity.png +pics\meshexportmesh.png pics\image27.gif -pics\add_polyhedron.png -pics\add_edge.png -pics\rotation2.png -pics\b-ithmetic1d.png +pics\cut_groups2.png +pics\edit_mesh_change_value_hyp.png +pics\add_node.png +pics\uniting_a_set_of_triangles2.png +pics\max_el_area.png image10.jpg -pics\a-maxelarea.png +pics\a-filteronedges.png +pics\revolution1.png pics\addhexahedron.png -pics\addtetrahedron.png -image5.jpg +pics\addtriangle.png +pics\editgroup.png pics\sewing4.png image95.gif image76.jpg image84.gif image32.jpg image40.gif -pics\curvi_simple_before.png -pics\image108.gif -pics\aqt.png -pics\distributionwithtabledensity.png -pics\smoothing.png +i_blue.jpg +image160.gif +pics\number_of_layers.png +pics\netgen2d.png +pics\mesh_for_extr_along_path.png +pics\meshtrianglemergeelem1.png +pics\image138.gif +pics\cut_groups3.png +pics\revolution2.png +pics\renumberelements.png +pics\intersectgroups.png image88.jpg image30.gif image96.gif @@ -282,18 +300,13 @@ image74.gif image63.gif image22.jpg image41.gif -pics\edge_wire_3d_before.png -pics\image109.gif -pics\meshimportmesh.png -pics\deletegroups.png -pics\editing_groups1.png -pics\uniting_two_triangles1.png -image7.jpg -pics\a-averagelength.png -pics\a-patterntype1.png -pics\extrusionalongaline1.png -pics\movenodes.png -pics\rotation.png +image161.gif +pics\createmesh-inv.png +pics\image139.gif +pics\b-art_end_length.png +pics\b-mberofsegments.png +pics\b-flection1d.png +pics\a-unionoftriangles.png image56.jpg image53.gif image20.gif @@ -301,43 +314,54 @@ image97.gif image78.jpg image64.gif image23.jpg -pics\edge_wire_after.png -pics\edge_wire_before.png +pics\buildcompound.png +pics\projection_3d.png image151.gif -pics\cut_groups1.png -pics\editing_groups2.png -pics\uniting_two_triangles2.png -pics\a-unionoftriangles.png -pics\a-arithmetic1d.png -pics\extrusionalongaline2.png +pics\selectionfilterlibrary.png +pics\intersect_groups1.png +pics\create_group.png +pics\add_triangle.png +pics\add_edge.png +pics\rotation1.png +pics\merging_nodes1.png +pics\translation1.png +pics\cutgroups.png image79.jpg image98.gif image32.gif +pics\projection_2d.png +pics\advanced_mesh_infos.png +pics\image108.gif pics\image91.gif image152.gif -pics\cut_groups2.png +pics\automaticlength.png +pics\intersect_groups2.png image130.gif -pics\max_el_area.png +pics\rotation2.png +pics\merging_nodes2.png +pics\a-cuttingofquadrangles.png +pics\a-transparency.png pics\a-viewgeneral.png -pics\revolution1.png -pics\addtriangle.png +pics\smoothing.png +pics\translation2.png image99.gif image55.gif image88.gif image36.jpg image33.gif image25.jpg -i_blue.jpg +pics\projection_1d.png +pics\view_rotation_point.png image153.gif +pics\image109.gif image15.jpg image142.gif -pics\cut_groups3.png +pics\intersect_groups3.png image131.gif -pics\add_quadrangle.png -pics\uniting_a_set_of_triangles1.png -pics\a-deflection1d.png -pics\revolution2.png -pics\unionoftwotriangles.png +pics\edit_mesh1.png +pics\b-ithmetic1d.png +pics\mergenodes.png +pics\rotation.png pics\addnode.png image120.gif image56.gif @@ -346,13 +370,18 @@ image67.gif image34.gif pics\convert.png image154.gif +pics\edge_wire_3d_after.png +pics\graduatedaxes1.png +pics\length-crit.png image143.gif +pics\editing_groups1.png image132.gif -pics\edit_mesh1.png -pics\remove_elements1.png -pics\uniting_a_set_of_triangles2.png -pics\mergenodes.png -pics\symmetry1.png +pics\a-maxelvolume.png +pics\a-averagelength.png +pics\movenodes.png +pics\removenodes.png +pics\addtetrahedron.png +pics\uniongroups.png image121.gif image79.gif image38.jpg @@ -360,107 +389,99 @@ image46.gif image35.gif image27.jpg image24.gif +note1.gif +pics\distribution_of_layers.png image155.gif -pics\mesh_for_extr_along_path.png -pics\createmesh-inv2.png +pics\edge_wire_after.png +pics\edge_wire_before.png image144.gif -pics\intersect_groups1.png +pics\deletegroups.png +pics\editing_groups2.png image133.gif -pics\add_polygone.png -pics\remove_elements2.png -pics\a-maxelvolume.png -pics\symmetry2.png +pics\add_polyhedron.png +pics\addedge.png +pics\creategroup.png image122.gif image58.gif image36.gif image25.gif -note1.gif image156.gif -pics\edge_wire_3d_after.png -pics\createmesh-inv3.png +pics\circle_simple_after.png image145.gif -pics\intersect_groups2.png image134.gif -pics\b-mesh_infos.png -pics\symmetry3.png -pics\addedge.png +pics\edit_mesh_remove_hyp.png +pics\a-patterntype1.png image123.gif image101.gif image37.gif -pics\straight_after.png +image157.gif pics\image96.gif image146.gif -pics\intersect_groups3.png +pics\meshimportmesh.png image135.gif -pics\b-erage_length.png -pics\a-standmeshinfo.png +pics\uniting_two_triangles1.png pics\a-nbsegments1.png -pics\patternmapping1.png +pics\a-arithmetic1d.png +pics\symmetry1.png image90.jpg image124.gif image49.gif +pics\exemple.gif image38.gif -pics\image100.gif +pics\set_rotation_point_dialog1.png pics\image97.gif -pics\length-crit.png image147.gif +pics\union_groups1.png image136.gif +pics\free_edges.png +pics\uniting_two_triangles2.png pics\a-nbsegments2.png -pics\a-startendlength.png -pics\patternmapping2.png -pics\removeelements.png -pics\removenodes.png -pics\uniongroups.png +pics\symmetry2.png image125.gif image103.gif -pics\exemple.gif image39.gif image28.gif -pics\advanced_mesh_infos.png +image159.gif +pics\set_rotation_point_dialog2.png +pics\circle_angles_after.png +pics\createmesh-inv2.png pics\image98.gif +pics\mergeelems.png image148.gif -pics\meshexportmesh.png pics\image21.gif -pics\union_groups1.png +pics\union_groups2.png image137.gif -pics\free_edges.png -pics\creategroup.png +pics\add_quadrangle.png +pics\remove_elements1.png +pics\a-createpolyhedralvolume.png +pics\a-clipping2.png +pics\a-deflection1d.png +pics\diagonalinversion.png +pics\symmetry3.png +pics\renumbernodes.png image92.jpg image126.gif image18.gif image70.jpg -pics\straight_before.png -pics\createmesh-inv.png -pics\image102.gif +pics\circle_simple_before.png +pics\edge_wire_3d_before.png +pics\curvi_simple_before.png +pics\createmesh-inv3.png pics\image99.gif pics\image77.gif -pics\meshtrianglemergeelem1.png -pics\mergeelems.png -pics\union_groups2.png -pics\length2d.png -pics\renumbernodes.png +pics\union_groups3.png +pics\add_polygone.png +pics\remove_elements2.png +pics\remove_nodes1.png +pics\smoothing1.png +pics\a-standmeshinfo.png +pics\addpolygon.png +image5.jpg image127.gif image93.jpg image105.gif image19.gif image71.jpg -pics\image89.gif -pics\image78.gif -pics\image23.gif -pics\selectionfilterlibrary.png -pics\union_groups3.png -pics\edit_mesh_remove_hyp.png -pics\remove_nodes1.png -pics\merging_nodes1.png -pics\moving_nodes1.png -pics\smoothing1.png -pics\a-filteronedges.png -pics\renumberelements.png -pics\addpolygon.png -image94.jpg -image106.gif -image91.gif -image80.gif index.ppf ehlpdhtm.js default_ns.css @@ -482,6 +503,7 @@ whgdata\whlstt6.htm whgdata\whlstt7.htm whgdata\whlstt8.htm whgdata\whlstt9.htm +whgdata\whlstt10.htm whgdata\whlsti0.htm whgdata\whlstfl0.htm whgdata\whlstfl1.htm @@ -509,6 +531,7 @@ whgdata\whlstfl22.htm whgdata\whlstfl23.htm whgdata\whlstfl24.htm whgdata\whlstfl25.htm +whgdata\whlstfl26.htm whgdata\whlstf0.htm whgdata\whlstf1.htm whgdata\whlstf2.htm diff --git a/doc/salome/gui/SMESH/whdata/whftdata0.htm b/doc/salome/gui/SMESH/whdata/whftdata0.htm index 78532ffdc..d06b4e784 100755 --- a/doc/salome/gui/SMESH/whdata/whftdata0.htm +++ b/doc/salome/gui/SMESH/whdata/whftdata0.htm @@ -17,6 +17,7 @@ aTE("Adding Quadratic Nodes and Elements","adding_quadratic_nodes_and_elements.h aTE("Aspect ratio 3D","aspect_ratio_3d.htm"); aTE("Borders at multi-connection","borders_at_multi-connection.htm"); aTE("Borders at multiconnection 2D","borders_at_multiconnection_2d.htm"); +aTE("Building Compounds","building_compounds.htm"); aTE("Clipping","clipping.htm"); aTE("Constructing Meshes","constructing_meshes.htm"); aTE("Convert to/from Quadratic Mesh","convert_to_from_quadratic_mesh.htm"); @@ -73,6 +74,7 @@ aTE("Grouping Elements","grouping_elements.htm"); aTE("Length","length.htm"); aTE("Merge Elements","merge_elements.htm"); aTE("mesh","mesh.htm"); +aTE("Mesh through point","mesh_through_point.htm"); aTE("Modifying Meshes","modifying_meshes.htm"); aTE("SALOME - SMESH - v.version: Package smesh","namespacesmesh.html"); aTE("Netgen 2D and 3D hypotheses","netgen_2d_and_3d_hypotheses.htm"); @@ -83,6 +85,7 @@ aTE("Projection Algorithms","projection_algorithms.htm"); aTE("Quality Controls","quality_controls.htm"); aTE("Radial Prism","radial_prism.htm"); aTE("Revolution","revolution.htm"); +aTE("Segments around Vertex Algorithm","segments_around_vertex_algorithm.htm"); aTE("Selection filter library","selection_filter_library.htm"); aTE("smesh.py_introduction","smesh.py_introduction.htm"); aTE("Transforming Meshes","transforming_meshes.htm"); diff --git a/doc/salome/gui/SMESH/whdata/whfwdata0.htm b/doc/salome/gui/SMESH/whdata/whfwdata0.htm index b9fdacc03..50ea833ea 100755 --- a/doc/salome/gui/SMESH/whdata/whfwdata0.htm +++ b/doc/salome/gui/SMESH/whdata/whfwdata0.htm @@ -12,1381 +12,1416 @@ diff --git a/doc/salome/gui/SMESH/whdata/whtdata0.htm b/doc/salome/gui/SMESH/whdata/whtdata0.htm index 8861e1214..17c79a84c 100755 --- a/doc/salome/gui/SMESH/whdata/whtdata0.htm +++ b/doc/salome/gui/SMESH/whdata/whtdata0.htm @@ -8,18 +8,19 @@