ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2024-12-29 02:40:35 +05:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote branch 'origin/V7_dev' into V8_0_0_BR

Browse Source
This commit is contained in:
vsr 2016-02-05 17:25:24 +03:00
commit ee0738fe56
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
doc/salome/gui/SMESH/input/about_meshes.doc
View File

@ -110,9 +110,10 @@ SALOME supports elements of second order, without a central node
(quadratic triangle, quadrangle, polygon, tetrahedron, hexahedron, (quadratic triangle, quadrangle, polygon, tetrahedron, hexahedron,
pentahedron and pyramid) and with central nodes (bi-quadratic triangle pentahedron and pyramid) and with central nodes (bi-quadratic triangle
and quadrangle and tri-quadratic hexahedron).<br> and quadrangle and tri-quadratic hexahedron).<br>
Quadratic mesh can be obtained in two ways: Quadratic mesh can be obtained in three ways:
- Using a global \ref quadratic_mesh_anchor "Quadratic Mesh" - Using a global \ref quadratic_mesh_anchor "Quadratic Mesh"
hypothesis. (Elements with the central node are not generated in this way). hypothesis. (Elements with the central node are not generated in this way).
- Using \ref convert_to_from_quadratic_mesh_page operation. - Using \ref convert_to_from_quadratic_mesh_page operation.
- Using an appropriate option of some meshing algorithms, which
generate elements of several dimensions starting from mesh segments.
*/ */

2
src/SMESH_I/SMESH_Mesh_i.cxx
View File

@ -293,7 +293,7 @@ void SMESH_Mesh_i::Clear() throw (SALOME::SALOME_Exception)
{ {
Unexpect aCatch(SALOME_SalomeException); Unexpect aCatch(SALOME_SalomeException);
if ( _preMeshInfo ) if ( _preMeshInfo )
_preMeshInfo->ForgetAllData(); _preMeshInfo->ForgetOrLoad(); // load in case if !HasShapeToMesh()
try { try {
_impl->Clear(); _impl->Clear();