From 358f8ddd54e7ed553eecc22ca665575e4019e3a0 Mon Sep 17 00:00:00 2001 From: abd Date: Wed, 18 Apr 2007 15:44:59 +0000 Subject: [PATCH] Merging from V3_2_6pre4 --- adm_local/unix/config_files/check_Platform.m4 | 117 + configure.in.base | 427 --- doc/salome/gui/SMESH/about_viewing_meshes.htm | 27 +- doc/salome/gui/SMESH/building_compounds.htm | 160 + .../SMESH/files/about_meshing_algorithms.htm | 104 +- .../gui/SMESH/files/constructing_meshes.htm | 4 +- .../SMESH/files/constructing_submeshes.htm | 4 +- doc/salome/gui/SMESH/files/merging_nodes.htm | 4 +- .../reassigning_hypotheses_and_algorithms.htm | 4 +- doc/salome/gui/SMESH/files/vtk_3d_viewer.htm | 265 -- doc/salome/gui/SMESH/image159.gif | Bin 0 -> 927 bytes doc/salome/gui/SMESH/image160.gif | Bin 0 -> 5504 bytes doc/salome/gui/SMESH/image161.gif | Bin 0 -> 997 bytes doc/salome/gui/SMESH/mesh_through_point.htm | 132 + doc/salome/gui/SMESH/modifying_meshes.htm | 861 +++--- doc/salome/gui/SMESH/pics/buildcompound.png | Bin 0 -> 18585 bytes doc/salome/gui/SMESH/pics/createmesh-inv.png | Bin 19734 -> 19908 bytes doc/salome/gui/SMESH/pics/createmesh-inv2.png | Bin 20798 -> 21089 bytes doc/salome/gui/SMESH/pics/createmesh-inv3.png | Bin 19436 -> 20008 bytes .../gui/SMESH/pics/lengthnearvertex.png | Bin 0 -> 11402 bytes doc/salome/gui/SMESH/pics/mergenodes.png | Bin 15359 -> 18264 bytes doc/salome/gui/SMESH/pics/meshtopass.png | Bin 0 -> 16356 bytes doc/salome/gui/SMESH/prism_3d_algorithm.htm | 20 +- .../segments_around_vertex_algorithm.htm | 98 + doc/salome/gui/SMESH/smesh.log | 303 +- doc/salome/gui/SMESH/whdata/whftdata0.htm | 3 + doc/salome/gui/SMESH/whdata/whfwdata0.htm | 2749 +++++++++-------- doc/salome/gui/SMESH/whdata/whtdata0.htm | 18 +- doc/salome/gui/SMESH/whxdata/whftdata0.xml | 3 + doc/salome/gui/SMESH/whxdata/whfwdata0.xml | 2749 +++++++++-------- doc/salome/gui/SMESH/whxdata/whtdata0.xml | 8 +- idl/Makefile.am | 6 +- idl/SMESH_BasicHypothesis.idl | 35 +- idl/SMESH_Filter.idl | 39 +- idl/SMESH_Gen.idl | 59 +- idl/SMESH_Hypothesis.idl | 8 + idl/SMESH_Mesh.idl | 393 +-- idl/SMESH_MeshEditor.idl | 437 +++ resources/Makefile.am | 5 +- resources/SMESH_en.xml | 2 + resources/SMESH_fr.xml | 1 + resources/StdMeshers.xml | 23 +- resources/mesh_build_compound.png | Bin 0 -> 660 bytes resources/mesh_merge_elements.png | Bin 258 -> 404 bytes resources/mesh_node_to_point.png | Bin 0 -> 188 bytes resources/mesh_tree_mesh_partial.png | Bin 0 -> 313 bytes src/Controls/SMESH_Controls.cxx | 105 +- src/Controls/SMESH_ControlsDef.hxx | 15 +- src/DriverMED/DriverMED_W_SMESHDS_Mesh.cxx | 28 +- src/DriverUNV/DriverUNV_W_SMDS_Mesh.cxx | 15 +- src/MEFISTO2/Rn.h | 20 +- src/MEFISTO2/aptrte.cxx | 128 +- src/MEFISTO2/aptrte.h | 14 +- src/MEFISTO2/areteideale.f | 5 +- src/MEFISTO2/trte.f | 2513 ++++++++------- src/OBJECT/SMESH_Object.cxx | 18 +- src/SMDS/SMDS_FaceOfNodes.cxx | 31 +- src/SMDS/SMDS_Mesh.cxx | 239 +- src/SMDS/SMDS_MeshNode.cxx | 38 +- src/SMDS/SMDS_MeshNode.hxx | 3 +- src/SMDS/SMDS_PolygonalFaceOfNodes.cxx | 31 +- src/SMDS/SMDS_PolyhedralVolumeOfNodes.cxx | 141 +- src/SMDS/SMDS_PolyhedralVolumeOfNodes.hxx | 26 +- src/SMDS/SMDS_QuadraticFaceOfNodes.cxx | 32 +- src/SMDS/SMDS_QuadraticVolumeOfNodes.cxx | 30 +- src/SMDS/SMDS_SetIterator.hxx | 86 +- src/SMDS/SMDS_VolumeOfNodes.cxx | 38 + src/SMDS/SMDS_VolumeTool.cxx | 66 +- src/SMDS/SMDS_VolumeTool.hxx | 6 + src/SMESH/Makefile.am | 10 +- src/SMESH/SMESH_0D_Algo.cxx | 53 + src/SMESH/SMESH_0D_Algo.hxx | 40 + src/SMESH/SMESH_Algo.cxx | 153 +- src/SMESH/SMESH_Algo.hxx | 92 +- src/SMESH/SMESH_Block.hxx | 3 + src/SMESH/SMESH_Comment.hxx | 69 + src/SMESH/SMESH_ComputeError.hxx | 103 + src/SMESH/SMESH_Gen.cxx | 117 +- src/SMESH/SMESH_Gen.hxx | 21 +- src/SMESH/SMESH_Hypothesis.cxx | 12 - src/SMESH/SMESH_Hypothesis.hxx | 6 +- src/SMESH/SMESH_Mesh.cxx | 158 +- src/SMESH/SMESH_Mesh.hxx | 43 +- src/SMESH/SMESH_MeshEditor.cxx | 1274 ++++---- src/SMESH/SMESH_MeshEditor.hxx | 223 +- src/SMESH/SMESH_MesherHelper.cxx | 348 ++- src/SMESH/SMESH_MesherHelper.hxx | 243 +- src/SMESH/SMESH_Octree.cxx | 16 +- src/SMESH/SMESH_Octree.hxx | 5 +- src/SMESH/SMESH_OctreeNode.cxx | 38 +- src/SMESH/SMESH_OctreeNode.hxx | 28 +- src/SMESH/SMESH_Pattern.cxx | 8 +- src/SMESH/SMESH_subMesh.cxx | 782 +++-- src/SMESH/SMESH_subMesh.hxx | 99 +- src/SMESH/SMESH_subMeshEventListener.hxx | 2 +- src/SMESHClient/SMESH_Client.cxx | 6 +- src/SMESHDS/SMESHDS_Hypothesis.hxx | 2 +- src/SMESHDS/SMESHDS_Mesh.cxx | 76 +- src/SMESHDS/SMESHDS_Mesh.hxx | 4 +- src/SMESHGUI/Makefile.am | 11 +- src/SMESHGUI/SMESHGUI.cxx | 312 +- src/SMESHGUI/SMESHGUI_AddMeshElementDlg.cxx | 2 + .../SMESHGUI_AddQuadraticElementDlg.cxx | 2 + src/SMESHGUI/SMESHGUI_BuildCompoundDlg.cxx | 506 +++ src/SMESHGUI/SMESHGUI_BuildCompoundDlg.h | 135 + src/SMESHGUI/SMESHGUI_ComputeDlg.cxx | 1055 +++++++ src/SMESHGUI/SMESHGUI_ComputeDlg.h | 145 + src/SMESHGUI/SMESHGUI_ConvToQuadOp.cxx | 2 + .../SMESHGUI_CreatePolyhedralVolumeDlg.cxx | 1 + src/SMESHGUI/SMESHGUI_Dialog.cxx | 2 +- src/SMESHGUI/SMESHGUI_EditMeshDlg.cxx | 1004 +++++- src/SMESHGUI/SMESHGUI_EditMeshDlg.h | 104 +- .../SMESHGUI_ExtrusionAlongPathDlg.cxx | 6 +- src/SMESHGUI/SMESHGUI_ExtrusionAlongPathDlg.h | 1 + src/SMESHGUI/SMESHGUI_ExtrusionDlg.cxx | 3 +- src/SMESHGUI/SMESHGUI_FilterDlg.cxx | 18 +- src/SMESHGUI/SMESHGUI_GEOMGenUtils.cxx | 14 + src/SMESHGUI/SMESHGUI_GEOMGenUtils.h | 3 + src/SMESHGUI/SMESHGUI_GroupDlg.cxx | 193 +- src/SMESHGUI/SMESHGUI_Hypotheses.cxx | 2 +- src/SMESHGUI/SMESHGUI_HypothesesUtils.cxx | 29 +- src/SMESHGUI/SMESHGUI_MakeNodeAtPointDlg.cxx | 630 ++++ src/SMESHGUI/SMESHGUI_MakeNodeAtPointDlg.h | 124 + src/SMESHGUI/SMESHGUI_MergeNodesDlg.cxx | 58 +- src/SMESHGUI/SMESHGUI_MergeNodesDlg.h | 5 +- src/SMESHGUI/SMESHGUI_MeshDlg.cxx | 9 +- src/SMESHGUI/SMESHGUI_MeshDlg.h | 2 +- src/SMESHGUI/SMESHGUI_MeshEditPreview.cxx | 245 ++ src/SMESHGUI/SMESHGUI_MeshEditPreview.h | 62 + src/SMESHGUI/SMESHGUI_MeshOp.cxx | 97 +- src/SMESHGUI/SMESHGUI_MeshOp.h | 2 +- src/SMESHGUI/SMESHGUI_MoveNodesDlg.cxx | 12 +- src/SMESHGUI/SMESHGUI_MultiEditDlg.h | 1 + src/SMESHGUI/SMESHGUI_NodesDlg.cxx | 5 + src/SMESHGUI/SMESHGUI_RemoveElementsDlg.cxx | 2 + src/SMESHGUI/SMESHGUI_RemoveNodesDlg.cxx | 2 + src/SMESHGUI/SMESHGUI_RenumberingDlg.cxx | 2 + src/SMESHGUI/SMESHGUI_RevolutionDlg.cxx | 11 +- src/SMESHGUI/SMESHGUI_RotationDlg.cxx | 11 +- src/SMESHGUI/SMESHGUI_SewingDlg.cxx | 10 +- src/SMESHGUI/SMESHGUI_ShapeByMeshDlg.cxx | 4 - src/SMESHGUI/SMESHGUI_ShapeByMeshDlg.h | 40 +- src/SMESHGUI/SMESHGUI_SingleEditDlg.h | 1 + src/SMESHGUI/SMESHGUI_SmoothingDlg.cxx | 5 +- src/SMESHGUI/SMESHGUI_Swig.cxx | 16 +- src/SMESHGUI/SMESHGUI_Swig.hxx | 2 +- src/SMESHGUI/SMESHGUI_Swig.i | 2 +- src/SMESHGUI/SMESHGUI_SymmetryDlg.cxx | 8 +- src/SMESHGUI/SMESHGUI_TranslationDlg.cxx | 9 +- src/SMESHGUI/SMESHGUI_Utils.cxx | 38 +- src/SMESHGUI/SMESHGUI_Utils.h | 5 +- src/SMESHGUI/SMESHGUI_VTKUtils.cxx | 142 +- src/SMESHGUI/SMESHGUI_VTKUtils.h | 129 +- src/SMESHGUI/SMESHGUI_XmlHandler.cxx | 8 +- src/SMESHGUI/SMESH_images.po | 17 +- src/SMESHGUI/SMESH_msg_en.po | 252 +- src/SMESH_I/Makefile.am | 4 +- src/SMESH_I/SMESH_0D_Algo_i.cxx | 84 + src/SMESH_I/SMESH_0D_Algo_i.hxx | 55 + src/SMESH_I/SMESH_2smeshpy.cxx | 348 ++- src/SMESH_I/SMESH_2smeshpy.hxx | 50 +- src/SMESH_I/SMESH_DumpPython.cxx | 1 + src/SMESH_I/SMESH_Filter_i.cxx | 70 +- src/SMESH_I/SMESH_Filter_i.hxx | 17 + src/SMESH_I/SMESH_Gen_i.cxx | 382 ++- src/SMESH_I/SMESH_Gen_i.hxx | 21 +- src/SMESH_I/SMESH_MeshEditor_i.cxx | 900 ++++-- src/SMESH_I/SMESH_MeshEditor_i.hxx | 49 +- src/SMESH_I/SMESH_Mesh_i.cxx | 99 +- src/SMESH_I/SMESH_Mesh_i.hxx | 10 +- src/SMESH_I/SMESH_subMesh_i.cxx | 54 +- src/SMESH_SWIG/SMESH_shared_modules.py | 4 +- src/SMESH_SWIG/smesh.py | 348 ++- src/StdMeshers/Makefile.am | 10 +- src/StdMeshers/StdMeshers_AutomaticLength.cxx | 189 +- src/StdMeshers/StdMeshers_AutomaticLength.hxx | 11 +- .../StdMeshers_CompositeSegment_1D.cxx | 418 +++ .../StdMeshers_CompositeSegment_1D.hxx | 68 + src/StdMeshers/StdMeshers_Distribution.cxx | 14 +- src/StdMeshers/StdMeshers_FaceSide.cxx | 466 +++ src/StdMeshers/StdMeshers_FaceSide.hxx | 270 ++ src/StdMeshers/StdMeshers_Hexa_3D.cxx | 396 +-- src/StdMeshers/StdMeshers_Hexa_3D.hxx | 9 +- src/StdMeshers/StdMeshers_MEFISTO_2D.cxx | 631 ++-- src/StdMeshers/StdMeshers_MEFISTO_2D.hxx | 41 +- src/StdMeshers/StdMeshers_Penta_3D.cxx | 130 +- src/StdMeshers/StdMeshers_Penta_3D.hxx | 14 +- src/StdMeshers/StdMeshers_Prism_3D.cxx | 143 +- src/StdMeshers/StdMeshers_Prism_3D.hxx | 15 +- src/StdMeshers/StdMeshers_ProjectionUtils.cxx | 109 +- src/StdMeshers/StdMeshers_ProjectionUtils.hxx | 10 + src/StdMeshers/StdMeshers_Projection_1D.cxx | 50 +- src/StdMeshers/StdMeshers_Projection_2D.cxx | 43 +- src/StdMeshers/StdMeshers_Projection_3D.cxx | 63 +- src/StdMeshers/StdMeshers_Propagation.cxx | 456 ++- src/StdMeshers/StdMeshers_Propagation.hxx | 27 +- src/StdMeshers/StdMeshers_Quadrangle_2D.cxx | 1042 ++----- src/StdMeshers/StdMeshers_Quadrangle_2D.hxx | 53 +- src/StdMeshers/StdMeshers_RadialPrism_3D.cxx | 51 +- src/StdMeshers/StdMeshers_RadialPrism_3D.hxx | 4 +- src/StdMeshers/StdMeshers_Regular_1D.cxx | 462 ++- src/StdMeshers/StdMeshers_Regular_1D.hxx | 48 +- .../StdMeshers_SegmentAroundVertex_0D.cxx | 96 + .../StdMeshers_SegmentAroundVertex_0D.hxx | 50 + .../StdMeshers_SegmentLengthAroundVertex.cxx | 204 ++ .../StdMeshers_SegmentLengthAroundVertex.hxx | 66 + .../StdMeshersGUI_StdHypothesisCreator.cxx | 73 +- src/StdMeshersGUI/StdMeshers_images.po | 12 + src/StdMeshersGUI/StdMeshers_msg_en.po | 12 + src/StdMeshers_I/Makefile.am | 8 +- .../StdMeshers_CompositeSegment_1D_i.cxx | 85 + .../StdMeshers_CompositeSegment_1D_i.hxx | 56 + src/StdMeshers_I/StdMeshers_Regular_1D_i.cxx | 8 +- .../StdMeshers_SegmentAroundVertex_0D_i.cxx | 71 + .../StdMeshers_SegmentAroundVertex_0D_i.hxx | 57 + ...StdMeshers_SegmentLengthAroundVertex_i.cxx | 140 + ...StdMeshers_SegmentLengthAroundVertex_i.hxx | 70 + src/StdMeshers_I/StdMeshers_i.cxx | 11 +- 218 files changed, 20234 insertions(+), 10772 deletions(-) create mode 100755 adm_local/unix/config_files/check_Platform.m4 delete mode 100644 configure.in.base create mode 100755 doc/salome/gui/SMESH/building_compounds.htm delete mode 100755 doc/salome/gui/SMESH/files/vtk_3d_viewer.htm create mode 100755 doc/salome/gui/SMESH/image159.gif create mode 100755 doc/salome/gui/SMESH/image160.gif create mode 100755 doc/salome/gui/SMESH/image161.gif create mode 100755 doc/salome/gui/SMESH/mesh_through_point.htm create mode 100755 doc/salome/gui/SMESH/pics/buildcompound.png create mode 100755 doc/salome/gui/SMESH/pics/lengthnearvertex.png create mode 100755 doc/salome/gui/SMESH/pics/meshtopass.png create mode 100755 doc/salome/gui/SMESH/segments_around_vertex_algorithm.htm create mode 100644 idl/SMESH_MeshEditor.idl create mode 100644 resources/mesh_build_compound.png create mode 100644 resources/mesh_node_to_point.png create mode 100755 resources/mesh_tree_mesh_partial.png create mode 100644 src/SMESH/SMESH_0D_Algo.cxx create mode 100644 src/SMESH/SMESH_0D_Algo.hxx create mode 100644 src/SMESH/SMESH_Comment.hxx create mode 100644 src/SMESH/SMESH_ComputeError.hxx create mode 100644 src/SMESHGUI/SMESHGUI_BuildCompoundDlg.cxx create mode 100644 src/SMESHGUI/SMESHGUI_BuildCompoundDlg.h create mode 100644 src/SMESHGUI/SMESHGUI_ComputeDlg.cxx create mode 100644 src/SMESHGUI/SMESHGUI_ComputeDlg.h create mode 100644 src/SMESHGUI/SMESHGUI_MakeNodeAtPointDlg.cxx create mode 100644 src/SMESHGUI/SMESHGUI_MakeNodeAtPointDlg.h create mode 100644 src/SMESHGUI/SMESHGUI_MeshEditPreview.cxx create mode 100644 src/SMESHGUI/SMESHGUI_MeshEditPreview.h create mode 100644 src/SMESH_I/SMESH_0D_Algo_i.cxx create mode 100644 src/SMESH_I/SMESH_0D_Algo_i.hxx create mode 100644 src/StdMeshers/StdMeshers_CompositeSegment_1D.cxx create mode 100644 src/StdMeshers/StdMeshers_CompositeSegment_1D.hxx create mode 100644 src/StdMeshers/StdMeshers_FaceSide.cxx create mode 100644 src/StdMeshers/StdMeshers_FaceSide.hxx create mode 100644 src/StdMeshers/StdMeshers_SegmentAroundVertex_0D.cxx create mode 100644 src/StdMeshers/StdMeshers_SegmentAroundVertex_0D.hxx create mode 100644 src/StdMeshers/StdMeshers_SegmentLengthAroundVertex.cxx create mode 100644 src/StdMeshers/StdMeshers_SegmentLengthAroundVertex.hxx create mode 100644 src/StdMeshers_I/StdMeshers_CompositeSegment_1D_i.cxx create mode 100644 src/StdMeshers_I/StdMeshers_CompositeSegment_1D_i.hxx create mode 100644 src/StdMeshers_I/StdMeshers_SegmentAroundVertex_0D_i.cxx create mode 100644 src/StdMeshers_I/StdMeshers_SegmentAroundVertex_0D_i.hxx create mode 100644 src/StdMeshers_I/StdMeshers_SegmentLengthAroundVertex_i.cxx create mode 100644 src/StdMeshers_I/StdMeshers_SegmentLengthAroundVertex_i.hxx 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 0000000000000000000000000000000000000000..45a024ec7d05496d8609d3133a6ab800d0205acd GIT binary patch literal 927 zcmZ?wbh9u|lxC1+_|5CVV@wb;>H47JvD7|$+7`}IwZqd`R~wn$2y6&n g%5vzO$ZUbt2i7N+=GD$9TYP(a!Q)eRB?K6(0b2$?w*UYD literal 0 HcmV?d00001 diff --git a/doc/salome/gui/SMESH/image160.gif b/doc/salome/gui/SMESH/image160.gif new file mode 100755 index 0000000000000000000000000000000000000000..6baffdb303a80b233b64e903067f2831cdaaf2b8 GIT binary patch literal 5504 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 literal 0 HcmV?d00001 diff --git a/doc/salome/gui/SMESH/image161.gif b/doc/salome/gui/SMESH/image161.gif new file mode 100755 index 0000000000000000000000000000000000000000..54364d2609be8e233c1d8ee5d370c436eb248c67 GIT binary patch literal 997 zcmZ?wbh9u|lw^=#_|5LwbAVte z2m-;{rE7s;YsYyLRr{y?giGzkmN72>yTn|NlSK_)%&!1O{se z=ztss$_oq}rxKrli*B5p%G@L%FM zor(9smE|EzgEU2Kt4y^6m|~_UecknS<&n*f;wwV6Mb}*97L~JTu)3CZlea?KrNE$Z zT?lgpbN+^a#HQ9+NlVoP&PeDdEnr~N(Y-Lkkd0+VrdvZn!hy!~yjsR;IgJ}w4hyQS Rn5VF7>+9 + + + + +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 @@