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

Merge branch 'master' of https://codev-tuleap.cea.fr/plugins/git/salome/smesh

Browse Source
This commit is contained in:
rnv 2019-08-16 18:45:56 +03:00
commit 4786233c98
4 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
doc/salome/gui/SMESH/images/hypo_quad_params_dialog.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 24 KiB

BIN
doc/salome/gui/SMESH/images/hypo_quad_params_dialog_corners.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 18 KiB

1
src/SMDS/SMDS_Mesh.cxx
View File

@ -2980,6 +2980,7 @@ void SMDS_Mesh::Modified()
{ {
if (this->myModified) if (this->myModified)
{ {
myGrid->Modified();
this->myModifTime++; this->myModifTime++;
myModified = false; myModified = false;
} }

38
src/StdMeshers/StdMeshers_Hexa_3D.cxx
View File

@ -167,7 +167,7 @@ namespace
// map of (node parameter on EDGE) to (column (vector) of nodes) // map of (node parameter on EDGE) to (column (vector) of nodes)
TParam2ColumnMap _u2nodesMap; TParam2ColumnMap _u2nodesMap;
// node column's taken form _u2nodesMap taking into account sub-shape orientation // node column's taken from _u2nodesMap taking into account sub-shape orientation
vector<TNodeColumn> _columns; vector<TNodeColumn> _columns;
// columns of normalized parameters of nodes within the unitary cube // columns of normalized parameters of nodes within the unitary cube
@ -542,18 +542,24 @@ bool StdMeshers_Hexa_3D::Compute(SMESH_Mesh & aMesh,
_FaceGrid* fFront = & aCubeSide[ B_FRONT ]; _FaceGrid* fFront = & aCubeSide[ B_FRONT ];
_FaceGrid* fBack = & aCubeSide[ B_BACK ]; _FaceGrid* fBack = & aCubeSide[ B_BACK ];
// compute normalized parameters of nodes on sides (PAL23189)
computeIJK( *fBottom, COO_X, COO_Y, /*z=*/0. );
computeIJK( *fRight, COO_Y, COO_Z, /*x=*/1. );
computeIJK( *fTop, COO_X, COO_Y, /*z=*/1. );
computeIJK( *fLeft, COO_Y, COO_Z, /*x=*/0. );
computeIJK( *fFront, COO_X, COO_Z, /*y=*/0. );
computeIJK( *fBack, COO_X, COO_Z, /*y=*/1. );
// cube size measured in nb of nodes // cube size measured in nb of nodes
int x, xSize = fBottom->_columns.size() , X = xSize - 1; size_t x, xSize = fBottom->_columns.size() , X = xSize - 1;
int y, ySize = fLeft->_columns.size() , Y = ySize - 1; size_t y, ySize = fLeft->_columns.size() , Y = ySize - 1;
int z, zSize = fLeft->_columns[0].size(), Z = zSize - 1; size_t z, zSize = fLeft->_columns[0].size(), Z = zSize - 1;
// check sharing of FACEs (IPAL54417)
if ( fFront ->_columns.size() != xSize ||
fBack ->_columns.size() != xSize ||
fTop ->_columns.size() != xSize ||
fRight ->_columns.size() != ySize ||
fTop ->_columns[0].size() != ySize ||
fBottom->_columns[0].size() != ySize ||
fRight ->_columns[0].size() != zSize ||
fFront ->_columns[0].size() != zSize ||
fBack ->_columns[0].size() != zSize )
return error( COMPERR_BAD_SHAPE, "Not sewed faces" );
// columns of internal nodes "rising" from nodes of fBottom // columns of internal nodes "rising" from nodes of fBottom
_Indexer colIndex( xSize, ySize ); _Indexer colIndex( xSize, ySize );
@ -591,6 +597,14 @@ bool StdMeshers_Hexa_3D::Compute(SMESH_Mesh & aMesh,
} }
} }
// compute normalized parameters of nodes on sides (PAL23189)
computeIJK( *fBottom, COO_X, COO_Y, /*z=*/0. );
computeIJK( *fRight, COO_Y, COO_Z, /*x=*/1. );
computeIJK( *fTop, COO_X, COO_Y, /*z=*/1. );
computeIJK( *fLeft, COO_Y, COO_Z, /*x=*/0. );
computeIJK( *fFront, COO_X, COO_Z, /*y=*/0. );
computeIJK( *fBack, COO_X, COO_Z, /*y=*/1. );
// projection points of the internal node on cube sub-shapes by which // projection points of the internal node on cube sub-shapes by which
// coordinates of the internal node are computed // coordinates of the internal node are computed
vector<gp_XYZ> pointsOnShapes( SMESH_Block::ID_Shell ); vector<gp_XYZ> pointsOnShapes( SMESH_Block::ID_Shell );