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

bos #33557 [CEA] Merge pyramid method using geometrical median for the apex.

Browse Source 
Avoid include twice SMDS_VolumeTool header.

update expected values in cubeMilieu.py
This commit is contained in:
cconopoima 2023-05-29 15:00:11 -03:00 committed by Christophe Bourcier
parent 3f904f17c9
commit 2f549d1c9a
2 changed files with 41 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/StdMeshers/StdMeshers_QuadToTriaAdaptor.cxx
View File

@ -26,6 +26,7 @@
#include "SMDS_IteratorOnIterators.hxx" #include "SMDS_IteratorOnIterators.hxx"
#include "SMDS_SetIterator.hxx" #include "SMDS_SetIterator.hxx"
#include "SMDS_VolumeTool.hxx"
#include "SMESHDS_GroupBase.hxx" #include "SMESHDS_GroupBase.hxx"
#include "SMESHDS_Mesh.hxx" #include "SMESHDS_Mesh.hxx"
#include "SMESH_Algo.hxx" #include "SMESH_Algo.hxx"
@ -376,7 +377,44 @@ void StdMeshers_QuadToTriaAdaptor::MergePiramids( const SMDS_MeshElement* Pr
if ( CommonNode == Nrem ) return; // already merged if ( CommonNode == Nrem ) return; // already merged
//int nbI = CommonNode->NbInverseElements( SMDSAbs_Volume ); //int nbI = CommonNode->NbInverseElements( SMDSAbs_Volume );
SMESH_TNodeXYZ Pi( CommonNode ); SMESH_TNodeXYZ Pi( CommonNode );
gp_XYZ Pnew = /*( nbI*Pi + nbJ*Pj ) / (nbI+nbJ);*/ 0.5 * ( Pi + Pj ); // gp_XYZ Pnew = /*( nbI*Pi + nbJ*Pj ) / (nbI+nbJ);*/ 0.5 * ( Pi + Pj );
SMDS_VolumeTool volumeTool;
double pyrad1Vol = 0.0;
double pyrad2Vol = 0.0;
// To get the pyramids vols
if ( volumeTool.Set( PrmI ) )
pyrad1Vol = volumeTool.GetSize();
if ( volumeTool.Set( PrmJ ) )
pyrad2Vol = volumeTool.GetSize();
typedef SMDS_StdIterator< const SMDS_MeshElement*, SMDS_ElemIteratorPtr > elemIterator;
elemIterator iteratorsEnd;
vector< const SMDS_MeshElement* > associatedElementsI ( elemIterator( CommonNode->GetInverseElementIterator(SMDSAbs_Volume)), iteratorsEnd);
if ( associatedElementsI.size() > 1 )
for ( size_t i = 0; i < associatedElementsI.size(); ++i )
{
const SMDS_MeshElement* element = associatedElementsI[i];
if ( element != PrmI && volumeTool.Set( element ) )
pyrad1Vol += volumeTool.GetSize();
}
vector< const SMDS_MeshElement* > associatedElementsJ ( elemIterator( Nrem->GetInverseElementIterator(SMDSAbs_Volume)), iteratorsEnd);
if ( associatedElementsJ.size() > 1 )
for ( size_t i = 0; i < associatedElementsJ.size(); ++i )
{
const SMDS_MeshElement* element = associatedElementsJ[i];
if ( element != PrmJ && volumeTool.Set( element ) )
pyrad2Vol += volumeTool.GetSize(); //associatedVolPyramid->GetSize();
}
double totalVol = pyrad1Vol + pyrad2Vol;
// The new Apex can't be computed based in an arithmetic median,
// Geometric mediam is considered to be better
// gp_XYZ Pnew = /*( nbI*Pi + nbJ*Pj ) / (nbI+nbJ);*/ 0.5 * ( Pi + Pj );
ASSERT( totalVol > 0. );
gp_XYZ Pnew = Pi * pyrad1Vol/totalVol + Pj * pyrad2Vol/totalVol;
CommonNode->setXYZ( Pnew.X(), Pnew.Y(), Pnew.Z() ); CommonNode->setXYZ( Pnew.X(), Pnew.Y(), Pnew.Z() );
nodesToMove.insert( CommonNode ); nodesToMove.insert( CommonNode );

4
src/Tools/blocFissure/CasTests/cubeMilieu.py
View File

@ -41,10 +41,10 @@ dicoParams = dict(nomCas = "cubeMilieu",
referencesMaillageFissure = dict( \ referencesMaillageFissure = dict( \
Entity_Quad_Quadrangle = 3140, \ Entity_Quad_Quadrangle = 3140, \
Entity_Quad_Hexa = 7120, \ Entity_Quad_Hexa = 7120, \
Entity_Node = 61414, \ Entity_Node = 60127, \
Entity_Quad_Edge = 346, \ Entity_Quad_Edge = 346, \
Entity_Quad_Triangle = 818, \ Entity_Quad_Triangle = 818, \
Entity_Quad_Tetra = 19117, \ Entity_Quad_Tetra = 18141, \
Entity_Quad_Pyramid = 990, \ Entity_Quad_Pyramid = 990, \
Entity_Quad_Penta = 230 \ Entity_Quad_Penta = 230 \
) )