ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2024-12-24 08:20:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

Merge from V6_5_BR 05/06/2012

Browse Source
This commit is contained in:
vsr 2012-06-05 12:18:07 +00:00
parent 864f448dc4
commit d4a710ce52
872 changed files with 3306 additions and 1964 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -1,4 +1,4 @@
# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public

2
SMESH_version.h.in
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
// Copyright (C) 2007-2012 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

2
adm_local/Makefile.am
View File

@ -1,4 +1,4 @@
# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public

2
adm_local/cmake_files/FindSMESH.cmake
View File

@ -1,4 +1,4 @@
# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public

2
adm_local/cmake_files/Makefile.am
View File

@ -1,4 +1,4 @@
# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public

2
adm_local/unix/Makefile.am
View File

@ -1,4 +1,4 @@
# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public

2
adm_local/unix/config_files/Makefile.am
View File

@ -1,4 +1,4 @@
# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public

2
adm_local/unix/config_files/check_Platform.m4
View File

@ -1,4 +1,4 @@
dnl Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
dnl Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE
dnl
dnl Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS

2
adm_local/unix/config_files/check_SMESH.m4
View File

@ -1,4 +1,4 @@
dnl Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
dnl Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE
dnl
dnl Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS

101
adm_local/unix/config_files/check_cgal.m4 Normal file
View File

@ -0,0 +1,101 @@
dnl Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE
dnl
dnl Copyright (C) 2003-2007 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.salome-platform.org/ or email : webmaster.salome@opencascade.com
dnl
AC_DEFUN([CHECK_CGAL],[
AC_REQUIRE([AC_PROG_CC])dnl
AC_REQUIRE([AC_PROG_CPP])dnl
AC_REQUIRE([CHECK_BOOST])
AC_CHECKING(for CGAL)
AC_ARG_WITH(cgal,
[ --with-cgal=DIR root directory path to CGAL installation ],
[CGALHOME="$withval"
AC_MSG_RESULT("select $withval as path to CGAL")
])
AC_SUBST(CGAL_INCLUDES)
AC_SUBST(CGAL_LIBS)
AC_SUBST(CGALHOME)
CGAL_INCLUDES=""
CGAL_LIBS=""
cgal_ok=no
LOCAL_INCLUDES=""
LOCAL_LIBS="-lCGAL"
if test "x$CGALHOME" != "xno"; then
if test "x$CGALHOME" == "xyes"; then
CGALHOME=""
fi
if test -z $CGALHOME
then
AC_MSG_WARN(undefined CGALHOME variable which specify CGAL library installation directory)
AC_PATH_PROG(BINDIR, cgal_create_cmake_script)
if test "x$BINDIR" != "x" ; then
CGALHOME=$BINDIR
CGALHOME=`echo ${CGALHOME} | sed -e "s,[[^/]]*$,,;s,/$,,;s,^$,.,"`
CGALHOME=`echo ${CGALHOME} | sed -e "s,[[^/]]*$,,;s,/$,,;s,^$,.,"`
fi
fi
if test ! -z $CGALHOME
then
cgal_ok=yes
LOCAL_INCLUDES="-I$CGALHOME/include"
if test "x$CGALHOME" != "x/usr"; then
LOCAL_LIBS="-L$CGALHOME/lib $LOCAL_LIBS"
fi
fi
dnl check cgallib header
# CPPFLAGS_old=$CPPFLAGS
# CPPFLAGS="$CPPFLAGS $LOCAL_INCLUDES -I$BOOSTDIR/include"
# AC_CHECK_HEADER(algorithm.h,cgal_ok=yes ,cgal_ok=no)
# CPPFLAGS=$CPPFLAGS_old
fi
# if test "x$cgal_ok" = "xyes"
# then
# dnl check cgal library
# LIBS_old="$LIBS"
# LIBS="$LIBS $LOCAL_LIBS"
# AC_CHECK_LIB(cgns,cg_open,cgns_ok=yes,cgns_ok=no)
# LIBS="$LIBS_old"
# fi
if test "x$cgal_ok" = "xyes"
then
CGAL_LIBS="$LOCAL_LIBS"
CGAL_INCLUDES="$LOCAL_INCLUDES"
CPPFLAGS="-DWITH_CGAL $CPPFLAGS"
fi
AC_MSG_RESULT(for CGAL: $cgal_ok)
AM_CONDITIONAL(WITH_CGAL, [test x"$cgal_ok" = xyes])
])dnl

2
adm_local/unix/config_files/check_cgns.m4
View File

@ -1,4 +1,4 @@
dnl Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
dnl Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE
dnl
dnl Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS

2
adm_local/unix/config_files/check_f77.m4
View File

@ -1,4 +1,4 @@
dnl Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
dnl Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE
dnl
dnl Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS

69
adm_local/unix/config_files/check_padder.m4 Normal file
View File

@ -0,0 +1,69 @@
dnl Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE
dnl
dnl Copyright (C) 2003-2007 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.salome-platform.org/ or email : webmaster.salome@opencascade.com
dnl
AC_DEFUN([CHECK_PADDER],[
AC_REQUIRE([AC_PROG_CC])dnl
AC_REQUIRE([AC_PROG_CPP])dnl
AC_REQUIRE([CHECK_CGAL])
AC_CHECKING(for PADDER)
padder_ok=no
AC_ARG_WITH(padder,
[ --with-padder=DIR root directory path to PADDER installation ],
[PADDERHOME="$withval"
AC_MSG_RESULT("select $withval as path to PADDER")
])
if test "x$PADDERHOME" != "xno"; then
if test "x$PADDERHOME" == "xyes"; then
PADDERHOME=""
fi
if test -z $PADDERHOME
then
AC_MSG_WARN(undefined PADDERHOME variable which specify PADDER installation directory)
AC_PATH_PROG(BINDIR, padder.exe)
if test "x$BINDIR" != "x" ; then
PADDERHOME=$BINDIR
PADDERHOME=`echo ${PADDERHOME} | sed -e "s,[[^/]]*$,,;s,/$,,;s,^$,.,"`
PADDERHOME=`echo ${PADDERHOME} | sed -e "s,[[^/]]*$,,;s,/$,,;s,^$,.,"`
fi
fi
if test ! -z $PADDERHOME
then
AC_CHECK_FILE($PADDERHOME/padder.env,padder_ok=yes,padder_ok=no)
fi
fi
if test "x$padder_ok" = "xyes"
then
CPPFLAGS="-DWITH_PADDER $CPPFLAGS"
fi
AC_SUBST(PADDERHOME)
AC_MSG_RESULT(for PADDER: $padder_ok)
AM_CONDITIONAL(WITH_PADDER, [test x"$padder_ok" = xyes])
])dnl

2
adm_local/unix/config_files/check_qwt.m4
View File

@ -1,4 +1,4 @@
dnl Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
dnl Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE
dnl
dnl Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS

2
adm_local/unix/make_common_starter.am
View File

@ -1,4 +1,4 @@
# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public

2
bin/Makefile.am
View File

@ -1,4 +1,4 @@
# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public

2
bin/smesh_setenv.py
View File

@ -1,6 +1,6 @@
#!/usr/bin/env python
# -*- coding: iso-8859-1 -*-
# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public

2
build_cmake
View File

@ -1,5 +1,5 @@
#!/bin/sh
# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public

2
build_cmake.bat
View File

@ -1,4 +1,4 @@
@REM Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
@REM Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE
@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

2
build_configure
View File

@ -1,5 +1,5 @@
#!/bin/bash
# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
# Copyright (C) 2007-2012 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

2
clean_configure
View File

@ -1,5 +1,5 @@
#!/bin/sh
# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public

23
configure.ac
View File

@ -1,4 +1,4 @@
# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
@ -24,7 +24,7 @@
# Modified by : Alexander BORODIN (OCN) - autotools usage
# Created from configure.in.base
#
AC_INIT([Salome2 Project SMESH module], [6.4.0], [webmaster.salome@opencascade.com], [SalomeSMESH])
AC_INIT([Salome2 Project SMESH module], [6.5.0], [webmaster.salome@opencascade.com], [SalomeSMESH])
AC_CONFIG_AUX_DIR(adm_local/unix/config_files)
AC_CANONICAL_HOST
AC_CANONICAL_TARGET
@ -426,6 +426,15 @@ echo
CHECK_CGNS
echo
echo ---------------------------------------------
echo Testing PADDER library
echo ---------------------------------------------
echo
CHECK_CGAL
CHECK_PADDER
echo
echo ---------------------------------------------
echo Testing TBB library
@ -460,6 +469,16 @@ echo
echo "Default ORB : $DEFAULT_ORB"
echo
echo "Optionnal products (for plugins):"
optional_vars="cgal_ok padder_ok"
for var in $optional_vars
do
printf " %10s : " `echo \$var | sed -e "s,_ok,,"`
eval echo \$$var
done
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

2
doc/Makefile.am
View File

@ -1,4 +1,4 @@
# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public

2
doc/docutils/Makefile.am
View File

@ -1,5 +1,5 @@
# -*- coding: iso-8859-1 -*-
# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
# Copyright (C) 2007-2012 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

2
doc/salome/Makefile.am
View File

@ -1,4 +1,4 @@
# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public

2
doc/salome/gui/Makefile.am
View File

@ -1,4 +1,4 @@
# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public

2
doc/salome/gui/SMESH/Makefile.am
View File

@ -1,4 +1,4 @@
# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public

2
doc/salome/gui/SMESH/doxyfile.in
View File

@ -1,4 +1,4 @@
# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
# Copyright (C) 2007-2012 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

2
doc/salome/gui/SMESH/doxyfile_py.in
View File

@ -1,4 +1,4 @@
# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
# Copyright (C) 2007-2012 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

BIN
doc/salome/gui/SMESH/images/duplicate01.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 22 KiB

BIN
doc/salome/gui/SMESH/images/duplicate02.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 27 KiB

BIN
doc/salome/gui/SMESH/images/pref21.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 83 KiB

BIN
doc/salome/gui/SMESH/images/pref22.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 43 KiB

BIN
doc/salome/gui/SMESH/images/pref23.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 31 KiB

BIN
doc/salome/gui/SMESH/images/pref24.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 52 KiB

BIN
doc/salome/gui/SMESH/images/projection_1d.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 15 KiB

BIN
doc/salome/gui/SMESH/images/projection_2d.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 19 KiB

BIN
doc/salome/gui/SMESH/images/projection_3d.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 23 KiB

After

Width:  |  Height:  |  Size: 26 KiB

4
doc/salome/gui/SMESH/input/about_quality_controls.doc
View File

@ -45,7 +45,7 @@ Face quality controls:
<li>\subpage warping_page "Warping"</li>
<li>\subpage skew_page "Skew"</li>
<li>\subpage max_element_length_2d_page "Element Diameter 2D"</li>
<li>\subpage double_elements_page "Double faces"</li>
<li>\ref double_elements_page "Double faces"</li>
</ul>
Volume quality controls:
@ -55,7 +55,7 @@ Volume quality controls:
<li>\subpage max_element_length_3d_page "Element Diameter 3D"</li>
<li>\subpage bare_border_volumes_page "Bare border volumes"</li>
<li>\subpage over_constrained_volumes_page "Over-constrained volumes"</li>
<li>\subpage double_elements_page "Double volumes"</li>
<li>\ref double_elements_page "Double volumes"</li>
</ul>
To manage the quality controls call pop-up in the VTK viewer and select "Controls" sub-menu

10
doc/salome/gui/SMESH/input/cartesian_algo.doc
View File

@ -3,7 +3,7 @@
\page cartesian_algo_page Body Fitting 3D meshing algorithm
Body Fitting algorithm generates hexahedrons of a Cartesian grid in
the internal part of geometry and polyhedra and other types of
the internal part of geometry and polyhedrons and other types of
elements at the intersection of Cartesian cells with the geometrical
boundary.
@ -21,7 +21,7 @@ of the geometry boundary. Depending on a result of this check
<ul>
<li> skip a cell, if all its nodes are outside </li>
<li> skip a cell, if it is too small according to <b> Size
Threshold </b> paremeter</li>
Threshold </b> parameter</li>
<li> add a hexahedron in the mesh, if all nodes are inside </li>
<li> add a polyhedron or another cell type in the mesh, if some
nodes are inside and some outside. </li>
@ -55,10 +55,10 @@ This dialog allows to define
click on a coordinate in the list enables its edition. A grid
defined by \b Coordinates should enclose the geometry, else the
algorithm will fail. </li>
<li> You can define the \b Spacing of a grid as an algebraic formular
<em>f(t)</em> where \a t is a position along a grid axiz
<li> You can define the \b Spacing of a grid as an algebraic formula
<em>f(t)</em> where \a t is a position along a grid axis
normalized at [0.0,1.0]. The whole range of geometry can be
divided into sub-ranges with their own spacing formulars to apply;
divided into sub-ranges with their own spacing formulas to apply;
\a t varies between 0.0 and 1.0 within each sub-range. \b Insert button
divides a selected range into two ones. \b Delete button adds the
selected sub-range to the previous one. Double click on a range in

12
doc/salome/gui/SMESH/input/double_nodes_page.doc
View File

@ -2,10 +2,10 @@
\page double_nodes_page Duplicate Nodes
\n This operation allows to duplicate nodes of your mesh.
\n This operation allows to duplicate nodes of your mesh, which can be
useful to emulate a crack in the model.
Duplication consists in replacement of an existing mesh element by another one.
Lower level elements of the duplicated ones are cloned
automatically.
Lower level elements of the duplicated ones are cloned automatically.
<em>To duplicate nodes:</em>
<ol>
@ -61,10 +61,12 @@ Parameters to be defined in this mode:
<li><b>Group of elements to replace nodes with new ones</b> (<em>mandatory</em>): the duplicated nodes
will be associated with these elements.</li>
<li><b>Construct group with newly created elements</b> option (<em>checked by default</em>):
if checked - the group with just created elements will be built.</li>
if checked - the group of just created elements will be built.</li>
<li><b>Construct group with newly created nodes</b> option (<em>checked by default</em>):
if checked - the group of just created nodes will be built.</li>
</ul>
<br><b>See Also</b> a sample TUI Script of a \ref tui_duplicate_nodes "Duplicate nodes" operation.
<br><b>See Also</b> a sample TUI Script of a \ref tui_duplicate_nodes "Duplicate nodes" operation.
*/

2
doc/salome/gui/SMESH/input/index.doc
View File

@ -23,6 +23,8 @@ array of dedicated operations;</li>
\subpage using_notebook_mesh_page "Salome notebook".</li>
</ul>
Mesh module preferences are described in the \subpage mesh_preferences_page section of SALOME Mesh Help.
Almost all mesh module functionalities are accessible via
\subpage smeshpy_interface_page "Mesh module Python interface".

203
doc/salome/gui/SMESH/input/mesh_preferences.doc Normal file
View File

@ -0,0 +1,203 @@
/*!
\page mesh_preferences_page Mesh preferences
In the Mesh module you can set mesh preferences, which can be used in
later sessions with this module.
<h2>General Preferences</h2>
\image html pref21.png
<ul>
<li><b>Automatic Update</b></li>
<ul>
<li>If you toggle <b>Automatic Update</b> checkbox, the model in your
viewer automatically updated whenever you make changes in it.</li>
<li><b>Size limit (elements)</b> - allows to specify the maximum
number of elements in the resulting mesh for which the automatic updating
of the presentation is performed. This option affects only
<b>Compute</b> operation. Zero value means "no limit". Default value
is 500 000 mesh elements.
</ul>
<li><b>Quality Controls</b></li>
<ul>
<li>If you toggle <b>Display entity</b>, both faces and edges of an
object will be displayed in the viewer by default.</li>
<li>If you toggle <b>Use precision</b> checkbox, you can display numbers in
<b>Quality Control</b> diagrams at the necessary level of precision.</li>
<li><b>Number of digits after point</b> - defines precision for <b>Quality Controls</b>. By default, numbers in <b>Quality Control</b>
diagrams are presented as integers.</li>
<li><b>Double nodes tolerance</b> defines the maximal distance between two
mesh nodes, at which they are considered coincident by <b>Double nodes</b>
quality control.
</ul>
<li><b>Display mode</b> - allows to set Wireframe, Shading, Nodes or Shrink
presentation mode as default.</li>
<li><b>Representation of the 2D quadratic elements</b></li>
<ul>
<li><b>Representation of the 2D quadratic elements</b> combobox - allows
to select lines or arcs for representation of quadratic elements.</li>
<li><b>Maximum Angle</b> - maximum deviation angle used by the
application to build arcs. </li>
</ul>
<li><b>Mesh export</b></li>
<ul>
<li>If you toggle <b>Automatically create groups for MED export</b> checkbox,
this operation will be carried out automatically.</li>
<li>If you toggle <b>Automatic renumbering</b> checkbox, the exported
mesh will be renumbered automatically</li>
</ul>
<li><b>Mesh computation</b></li>
<ul>
<li><b>Show a computation result notification</b> combobox allows to
select the notification mode about a mesh computation result.
There are 3 possible modes:</li>
<ul>
<li><b>Never</b> - do not show the result dialog at all;</li>
<li><b>Errors only</b> - the result dialog will be shown if there were
some errors during a mesh computation;</li>
<li><b>Always</b> - show the result dialog after each mesh
computation. This is a default mode.</li>
</ul></ul>
<li><b>Mesh information</b></li>
<ul>
<li><b>Mesh element information</b></li> - Change the way mesh element
information is shown:
<ul>
<li><b>Simple</b> - as a plain text</li>
<li><b>Tree</b> - in a tree-like form</li>
</ul>
<li><b>Automatic nodes compute limit</b></li> - allows to define the size limit for the
mesh groups for which the number of underlying nodes is calculated
automatically. If the group size exceeds the value set in the preferences,
the user will have to press \em Compute button explicitly. Zero value
means "no limit". By default the value is set to 100 000 mesh elements.
</li></ul>
<li><b>Automatic Parameters</b></li>
<ul>
<li><b>Ratio Bounding Box Diagonal / Max Size</b> - this parameter is
used for automatic meshing: ratio between the bounding box of the
meshed object and the Max Size of segments.</li>
<li><b>Default Number of Segments</b> - allows defining the default
number of segments on each edge</li>
</li></ul>
<li><b>Mesh loading</b></li>
<ul>
<li>If <b>No mesh loading from study file at hypothesis modification</b>
checkbox is on, the mesh data will not be loaded from the study file
when a hypothesis is modified. This allows saving time by omitting
loading data of a large mesh that is planned to be recomputed with other parameters.</li>
</ul>
<li><b>Input fields precision</b></li>
<ul>
<li><b>Length precision</b> - allows to adjust input precision of coordinates and dimensions.</li>
<li><b>Angular precision</b> - allows to adjust input precision of angles.</li>
<li><b>Length tolerance precision</b> - allows to adjust input precision of tolerance of coordinates and dimensions.</li>
<li><b>Parametric precision</b> - allows to adjust input precision of parametric values.</li>
<li><b>Area precision</b> - allows to adjust input precision of mesh element area.</li>
<li><b>Volume precision</b> - allows to adjust input precision of mesh element volume.</li>
</ul>
<li><b>Python Dump</b></li>
<ul>
<li><b>Historical python dump</b> checkbox allows switching between
\a Historical and \a Snapshot dump mode. In \a
Historical mode, Python Dump script includes all commands
performed by SMESH engine. In \a Snapshot mode, the commands
relating to objects removed from the Study as well as the commands
not influencing the current state of meshes are excluded from the script.</li>
</ul>
</ul>
<h2>Mesh Preferences</h2>
\image html pref22.png
<ul>
<li><b>Nodes</b></li>
<ul>
<li><b>Color</b> - allows to select the color of nodes. Click on the
colored line to access to the <b>Select Color</b> dialog box.</li>
<li><b>Type of marker</b> - allows to define the shape of nodes.</li>
<li><b>Scale of marker</b> - allows to define the size of nodes.</li>
</ul>
<li><b>Elements</b></li>
<ul>
<li><b>Surface color</b> - allows to select the surface color of elements
(seen in Shading mode). Click on the colored line to access to the <b>Select Color</b> dialog box.</li>
<li><b>Back surface color</b> - allows to select the interior surface color
of elements. Use the slider to select the color generated basing on
the <b>Surface color</b> by changing its brightness and saturation.</li>
<li><b>Outline color</b> - allows to select the color of element
borders. Click on the colored line to access to the <b>Select Color</b> dialog box.</li>
<li><b>Wireframe color</b> - allows to select the color of borders of
elements in the wireframe mode. Click on the colored line to access to the <b>Select Color</b> dialog box.</li>
<li><b>Width</b> - allows to define the width of lines (edges and borders of elements).</li>
<li><b>Shrink coef.</b> - allows to define relative space of elements
compared to gaps between them in shrink mode.</li>
</ul>
<li><b>Orientation of Faces</b> - allows to define the behavior of
<b>Orientation of faces</b> functionality</li>
<ul>
<li> \b Color - allows to define the color of orientation vertors;</li>
<li> \b Scale - allows to define the size of orientation vectors;</li>
<li> <b> 3D Vector </b> checkbox allows to choose between 2D planar
and 3D vectors.</li>
</ul>
</ul>
<br><h2>Selection Preferences</h2>
\image html pref23.png
<ul>
<li><b>Selection</b> - performed with mouse-indexing (preselection)
and left-clicking on an object, whose appearance changes as defined in
the <b>Preferences</b>.</li>
<ul>
<li><b>Object Color</b> - allows to select the color of mesh (edges and
borders of meshes) of the selected entity. Click on the colored line
to access to the <b>Select Color</b> dialog
box.</li>
<li><b>Element color</b> - allows to select the color of surface of selected
elements (seen in Shading mode). Click on the colored line to access
to the <b>Select Color</b> dialog box.</li>
</ul>
<li><b>Preselection</b> - performed with mouse-indexing on an object,
whose appearance changes as defined in the <b>Preferences</b>.</li>
<ul>
<li><b>Highlight Color</b> - allows to select the color of mesh (edges and
borders of meshes) of the entity . Click on the colored line to access
to the <b>Select Color</b> dialog box.</li>
</ul>
<li><b>Precision</b> - in this menu you can set the value of precision
used for <b>Nodes</b>, <b>Elements</b> and <b>Objects</b>.</li>
</ul>
<br><h2>Scalar Bar Preferences</h2>
\image html pref24.png
<ul>
<li><b>Font</b> - in this menu you can set type, face and color for
the font of <b>Title</b> and <b>Labels</b>.</li>
<li><b>Colors & Labels</b> - in this menu you can set the <b>number of
colors</b> and the <b>number of labels</b> in use.</li>
<li><b>Orientation</b> - here you can choose between vertical and
horizontal orientation of the <b>Scalar Bar</b></li>.
<li><b>Origin & Size Vertical & Horizontal</b> - allows to define
placement (<b>X</b> and <b>Y</b>) and lookout (<b>Width</b> and
<b>Height</b>) of Scalar Bars</li>
<ul>
<li><b>X</b>: abscissa of the point of origin (from the left
side)</li>
<li><b>Y</b>: ordinate of the origin of the bar (from the bottom)</li>
</ul>
<li><b>Distribution</b> in this menu you can Show/Hide distribution histogram of the values of the <b>Scalar Bar</b> and specify the <b>Coloring Type</b> of the histogram</li>
<ul>
<li><b>Multicolor</b> the histogram is colored as <b>Scalar Bar</b></li>
<li><b>Monocolor</b> the histogram is colored as selected with <b>Distribution color</b> selector</li>
</ul>
</ul>
*/

2
doc/salome/gui/SMESH/input/modifying_meshes.doc
View File

@ -22,7 +22,7 @@ the mesh or some of its elements.</li>
elements.</li>
<li>\subpage symmetry_page "Mirror" the mesh
through a point or a vector of symmetry.</li>
<li>\subpage double_nodes_page "Duplicate nodes".</li>
<li>\subpage double_nodes_page "Duplicate nodes" to emulate a crack in the model.</li>
<li>Unite meshes by \subpage sewing_meshes_page "sewing" free borders,
conform free borders, border to side or side elements.</li>
<li>\subpage merging_nodes_page "Merge Nodes", considered coincident

12
doc/salome/gui/SMESH/input/selection_filter_library.doc
View File

@ -106,17 +106,17 @@ specified arbitrary surface within a given <b>Tolerance</b>.
</li>
</ul>
Additional criteria to select mesh <b>Nodes</b> are the following:
The following criteria allow selecting mesh <b>Nodes</b>:
<ul><li>
<b>Free nodes</b> selects nodes belonging to none mesh element.
<b>Free nodes</b> selects nodes not belonging to any mesh element.
</li><li>
<b>Double nodes</b> selects node coincident with other nodes
<b>Double nodes</b> selects a node coincident with other nodes
(within a given <b>Tolerance</b>).
See also \ref tui_double_nodes_control "Double Nodes quality control".
</li>
</ul>
Additional criteria to select mesh <b>Edges</b> are the following:
The following criteria allow selecting mesh <b>Edges</b>:
<ul><li>
<b>Free Borders</b> selects free 1D mesh elements, i.e. edges belonging to
one face only. See also a
@ -137,7 +137,7 @@ See also a
</li>
</ul>
Additional criteria to select mesh <b>Faces</b> are the following:
The following criteria allow selecting mesh <b>Faces</b>:
<ul><li>
<b>Aspect ratio</b> selects 2D mesh elements with an aspect ratio (see also an
\ref aspect_ratio_page "Aspect Ratio quality control"), which is more, less or equal
@ -203,7 +203,7 @@ diagonals with a value of length, which is more, less or equal
</li>
</ul>
Additional criteria to select mesh <b>Volumes</b> are the following:
The following criteria allow selecting mesh <b>Volumes</b>:
<ul><li>
<b>Aspect ratio 3D</b> selects 3D mesh elements with an aspect ratio (see also an
\ref aspect_ratio_3d_page "Aspect Ratio 3D quality control"), which is more, less or equal

2
doc/salome/gui/SMESH/static/footer.html
View File

@ -3,7 +3,7 @@
</div>
<div class="footer1">
<div style="text-align: center;">
Copyright &copy; 2007-2011 CEA/DEN, EDF R&amp;D, OPEN CASCADE<br>
Copyright &copy; 2007-2012 CEA/DEN, EDF R&amp;D, OPEN CASCADE<br>
Copyright &copy; 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, CEDRAT, EDF R&amp;D, LEG, PRINCIPIA R&amp;D, BUREAU VERITAS<br>
</div>
</div>

13
doc/salome/tui/Makefile.am
View File

@ -1,4 +1,4 @@
# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
@ -42,4 +42,13 @@ install-data-local:
fi;
uninstall-local:
rm -rf $(DESTDIR)$(docdir)/tui/SMESH
@test -d $(DESTDIR)$(tuidocdir) && chmod -R +w $(DESTDIR)$(tuidocdir) ; \
for filen in `find $(DESTDIR)$(tuidocdir) -mindepth 1 -maxdepth 1` dummy ; do \
case $${filen} in \
dummy ) ;; \
$(DESTDIR)$(tuidocdir)/docutils ) ;; \
$(DESTDIR)$(tuidocdir)/head.png ) ;; \
$(DESTDIR)$(tuidocdir)/smeshscreen.png ) ;; \
* ) echo "removing $${filen}" && rm -rf $${filen} ;; \
esac ; \
done

2
doc/salome/tui/doxyfile.in
View File

@ -1,4 +1,4 @@
# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
# Copyright (C) 2007-2012 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

2
doc/salome/tui/static/footer.html
View File

@ -6,7 +6,7 @@
<div class="footer1">
<!--hr style="width: 100%; height: 2px;"-->
<div style="text-align: center;">
Copyright &copy; 2007-2011 CEA/DEN, EDF R&amp;D, OPEN CASCADE<br>
Copyright &copy; 2007-2012 CEA/DEN, EDF R&amp;D, OPEN CASCADE<br>
Copyright &copy; 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, CEDRAT, EDF R&amp;D, LEG, PRINCIPIA R&amp;D, BUREAU VERITAS<br>
</div>
</div>

14
idl/Makefile.am
View File

@ -1,4 +1,4 @@
# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
@ -35,6 +35,8 @@ BASEIDL_FILES = \
SMESH_MeshEditor.idl \
SMESH_Measurements.idl
BASEIDL_FILES_PY=$(BASEIDL_FILES:%.idl=%_idl.py)
# This variable defines the files to be installed
dist_salomeidl_DATA = $(BASEIDL_FILES)
@ -108,9 +110,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 SMESH StdMeshers ; 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

2
idl/SMESH_BasicHypothesis.idl
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
// Copyright (C) 2007-2012 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

2
idl/SMESH_Filter.idl
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
// Copyright (C) 2007-2012 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

2
idl/SMESH_Gen.idl
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
// Copyright (C) 2007-2012 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

2
idl/SMESH_Group.idl
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
// Copyright (C) 2007-2012 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

2
idl/SMESH_Hypothesis.idl
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
// Copyright (C) 2007-2012 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

2
idl/SMESH_Measurements.idl
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
// Copyright (C) 2007-2012 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

2
idl/SMESH_Mesh.idl
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
// Copyright (C) 2007-2012 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

46
idl/SMESH_MeshEditor.idl
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
// Copyright (C) 2007-2012 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
@ -834,7 +834,6 @@ module SMESH
*/
boolean DoubleNodeGroup( in SMESH_GroupBase theNodes,
in SMESH_GroupBase theModifiedElems );
/*!
* \brief Creates a hole in a mesh by doubling the nodes of some particular elements.
* Works as DoubleNodeGroup() described above, but returns a new group with
@ -857,7 +856,6 @@ module SMESH
*/
boolean DoubleNodeGroups( in ListOfGroups theNodes,
in ListOfGroups theModifiedElems );
/*!
* \brief Creates a hole in a mesh by doubling the nodes of some particular elements
* Works as DoubleNodeGroups() described above, but returns a new group with
@ -912,7 +910,6 @@ module SMESH
boolean DoubleNodeElemGroup( in SMESH_GroupBase theElems,
in SMESH_GroupBase theNodesNot,
in SMESH_GroupBase theAffectedElems );
/*!
* \brief Creates a hole in a mesh by doubling the nodes of some particular elements.
* Works as DoubleNodeElemGroup() described above, but returns a new group with
@ -927,6 +924,24 @@ module SMESH
SMESH_Group DoubleNodeElemGroupNew( in SMESH_GroupBase theElems,
in SMESH_GroupBase theNodesNot,
in SMESH_GroupBase theAffectedElems );
/*!
* \brief Creates a hole in a mesh by doubling the nodes of some particular elements.
* Works as DoubleNodeElemGroup() described above, but returns two new groups:
* a group of newly created elements and a group of newly created nodes
* \param theElems - group of of elements (edges or faces) to be replicated
* \param theNodesNot - group of nodes not to replicated
* \param theAffectedElems - group of elements to which the replicated nodes
* should be associated to.
* \param theElemGroupNeeded - to create group of new elements or not
* \param theNodeGroupNeeded - to create group of new nodes or not
* \return two new groups of newly created elements (1st) and nodes (2nd)
* \sa DoubleNodeElemGroup()
*/
ListOfGroups DoubleNodeElemGroup2New( in SMESH_GroupBase theElems,
in SMESH_GroupBase theNodesNot,
in SMESH_GroupBase theAffectedElems,
in boolean theElemGroupNeeded,
in boolean theNodeGroupNeeded);
/*!
* \brief Creates a hole in a mesh by doubling the nodes of some particular elements
@ -940,8 +955,8 @@ module SMESH
* \sa DoubleNodesInRegion(), DoubleNodeGroupsInRegion()
*/
boolean DoubleNodeElemGroupInRegion( in SMESH_GroupBase theElems,
in SMESH_GroupBase theNodesNot,
in GEOM::GEOM_Object theShape );
in SMESH_GroupBase theNodesNot,
in GEOM::GEOM_Object theShape );
/*!
* \brief Creates a hole in a mesh by doubling the nodes of some particular elements
@ -956,7 +971,6 @@ module SMESH
boolean DoubleNodeElemGroups( in ListOfGroups theElems,
in ListOfGroups theNodesNot,
in ListOfGroups theAffectedElems );
/*!
* \brief Creates a hole in a mesh by doubling the nodes of some particular elements.
* Works as DoubleNodeElemGroups() described above, but returns a new group with
@ -971,6 +985,24 @@ module SMESH
SMESH_Group DoubleNodeElemGroupsNew( in ListOfGroups theElems,
in ListOfGroups theNodesNot,
in ListOfGroups theAffectedElems );
/*!
* \brief Creates a hole in a mesh by doubling the nodes of some particular elements.
* Works as DoubleNodeElemGroups() described above, but returns two new groups:
* a group of newly created elements and a group of newly created nodes.
* \param theElems - list of groups of elements (edges or faces) to be replicated
* \param theNodesNot - list of groups of nodes not to replicated
* \param theAffectedElems - group of elements to which the replicated nodes
* should be associated to.
* \param theElemGroupNeeded - to create group of new elements or not
* \param theNodeGroupNeeded - to create group of new nodes or not
* \return two new groups of newly created elements (1st) and nodes (2nd)
* \sa DoubleNodeElemGroups()
*/
ListOfGroups DoubleNodeElemGroups2New( in ListOfGroups theElems,
in ListOfGroups theNodesNot,
in ListOfGroups theAffectedElems,
in boolean theElemGroupNeeded,
in boolean theNodeGroupNeeded );
/*!
* \brief Creates a hole in a mesh by doubling the nodes of some particular elements

2
idl/SMESH_Pattern.idl
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
// Copyright (C) 2007-2012 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

2
resources/Makefile.am
View File

@ -1,4 +1,4 @@
# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public

2
resources/SMESHCatalog.xml.in
View File

@ -1,6 +1,6 @@
<?xml version='1.0' encoding='us-ascii' ?>
<!--
Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
Copyright (C) 2007-2012 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

2
resources/SalomeApp.xml.in
View File

@ -1,5 +1,5 @@
<!--
Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
Copyright (C) 2007-2012 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

2
resources/StdMeshers.xml
View File

@ -1,7 +1,7 @@
<?xml version='1.0' encoding='us-ascii'?>
<!DOCTYPE meshers PUBLIC "" "desktop.dtd">
<!--
Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
Copyright (C) 2007-2012 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

2
src/Controls/Makefile.am
View File

@ -1,4 +1,4 @@
# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public

2
src/Controls/SMESHControls.cxx
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
// Copyright (C) 2007-2012 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

3
src/Controls/SMESH_Controls.cxx
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
// Copyright (C) 2007-2012 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
@ -18,6 +18,7 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
#include "SMESH_ControlsDef.hxx"

2
src/Controls/SMESH_ControlsDef.hxx
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
// Copyright (C) 2007-2012 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

2
src/Driver/Driver_Document.cxx
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
// Copyright (C) 2007-2012 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

2
src/Driver/Driver_Document.h
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
// Copyright (C) 2007-2012 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

2
src/Driver/Driver_Mesh.cxx
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
// Copyright (C) 2007-2012 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

2
src/Driver/Driver_Mesh.h
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
// Copyright (C) 2007-2012 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

2
src/Driver/Driver_SMDS_Mesh.cxx
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
// Copyright (C) 2007-2012 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

2
src/Driver/Driver_SMDS_Mesh.h
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
// Copyright (C) 2007-2012 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

2
src/Driver/Driver_SMESHDS_Mesh.cxx
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
// Copyright (C) 2007-2012 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

2
src/Driver/Driver_SMESHDS_Mesh.h
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
// Copyright (C) 2007-2012 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

2
src/Driver/Makefile.am
View File

@ -1,4 +1,4 @@
# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public

2
src/DriverCGNS/DriverCGNS_Read.cxx
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
// Copyright (C) 2007-2012 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

2
src/DriverCGNS/DriverCGNS_Read.hxx
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
// Copyright (C) 2007-2012 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

4
src/DriverCGNS/DriverCGNS_Write.cxx
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
// Copyright (C) 2007-2012 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
@ -387,7 +387,7 @@ Driver_Mesh::Status DriverCGNS_Write::Perform()
// Write polyhedral volumes
// -------------------------
if ( myMesh->GetMeshInfo().NbElements() != cgID ) // polyhedra or hexagonal prisms remain
if ( myMesh->GetMeshInfo().NbElements() > cgID-1 ) // polyhedra or hexagonal prisms remain
{
// the polyhedron (NFACE_n) is described as a set of signed face IDs,
// so first we are to write all polygones (NGON_n) bounding polyhedrons

2
src/DriverCGNS/DriverCGNS_Write.hxx
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
// Copyright (C) 2007-2012 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

2
src/DriverCGNS/Makefile.am
View File

@ -1,4 +1,4 @@
# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public

2
src/DriverCGNS/SMESH_DriverCGNS.hxx
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
// Copyright (C) 2007-2012 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

2
src/DriverDAT/DAT_Test.cxx
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
// Copyright (C) 2007-2012 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

2
src/DriverDAT/DriverDAT_R_SMDS_Mesh.cxx
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
// Copyright (C) 2007-2012 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

2
src/DriverDAT/DriverDAT_R_SMDS_Mesh.h
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
// Copyright (C) 2007-2012 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

2
src/DriverDAT/DriverDAT_W_SMDS_Mesh.cxx
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
// Copyright (C) 2007-2012 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

2
src/DriverDAT/DriverDAT_W_SMDS_Mesh.h
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
// Copyright (C) 2007-2012 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

2
src/DriverDAT/Makefile.am
View File

@ -1,4 +1,4 @@
# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public

2
src/DriverDAT/SMESH_DriverDAT.hxx
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
// Copyright (C) 2007-2012 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

2
src/DriverMED/DriverMED_Family.cxx
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
// Copyright (C) 2007-2012 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

2
src/DriverMED/DriverMED_Family.h
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
// Copyright (C) 2007-2012 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

2
src/DriverMED/DriverMED_R_SMESHDS_Mesh.cxx
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
// Copyright (C) 2007-2012 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

2
src/DriverMED/DriverMED_R_SMESHDS_Mesh.h
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
// Copyright (C) 2007-2012 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

2
src/DriverMED/DriverMED_W_SMESHDS_Mesh.cxx
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
// Copyright (C) 2007-2012 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

2
src/DriverMED/DriverMED_W_SMESHDS_Mesh.h
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
// Copyright (C) 2007-2012 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

2
src/DriverMED/MED_Test.cxx
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
// Copyright (C) 2007-2012 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

2
src/DriverMED/Makefile.am
View File

@ -1,4 +1,4 @@
# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public

2
src/DriverMED/SMESH_DriverMED.hxx
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
// Copyright (C) 2007-2012 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

2
src/DriverSTL/DriverSTL_R_SMDS_Mesh.cxx
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
// Copyright (C) 2007-2012 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

2
src/DriverSTL/DriverSTL_R_SMDS_Mesh.h
View File

@ -1,4 +1,4 @@
// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
// Copyright (C) 2007-2012 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

Some files were not shown because too many files have changed in this diff Show More