ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-01-12 17:50:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

for reduced type, enable 4->2 "tree" reducing disabled by mistake

Browse Source
This commit is contained in:
eap 2012-05-16 08:35:56 +00:00
parent 181cf99534
commit 25a1a467fe
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/StdMeshers/StdMeshers_Quadrangle_2D.cxx
View File

@ -2545,15 +2545,11 @@ bool StdMeshers_Quadrangle_2D::ComputeReduced (SMESH_Mesh & aMesh,
// maximum number of bottom elements for "tree" simple reduce 4->2 // maximum number of bottom elements for "tree" simple reduce 4->2
int max_tree42 = 0; int max_tree42 = 0;
// number of rows needed to reduce ncol_bot to ncol_top using simple 4->2 "tree" // number of rows needed to reduce ncol_bot to ncol_top using simple 4->2 "tree"
#ifdef WIN32 int nrows_tree42 = int( log( (double)(ncol_bot / ncol_top) )/log((double)2) ); // needed to avoid overflow at pow(2) while computing max_tree42
//<cmath> of the MSVC doesn't contain log2 if ( nrows_tree42 < nrows) {
int nrows_tree42 = int( log( (double)(ncol_bot / ncol_top) )/log((double)2) ); // needed to avoid overflow at pow(2)
#else
int nrows_tree42 = int( log2( ncol_bot / ncol_top )); // needed to avoid overflow at pow(2)
#endif
if (ncol_top > npair_top * 2 && nrows_tree42 < nrows) {
max_tree42 = npair_top * pow(2.0, nrows + 1); max_tree42 = npair_top * pow(2.0, nrows + 1);
if (ncol_top > npair_top * 2 )
{
int delta = ncol_bot - int( max_tree42 ); int delta = ncol_bot - int( max_tree42 );
for (int irow = 1; irow < nrows; irow++) { for (int irow = 1; irow < nrows; irow++) {
int nfour = delta / 4; int nfour = delta / 4;
@ -2562,6 +2558,7 @@ bool StdMeshers_Quadrangle_2D::ComputeReduced (SMESH_Mesh & aMesh,
if (delta <= (ncol_top - npair_top * 2)) if (delta <= (ncol_top - npair_top * 2))
max_tree42 = ncol_bot; max_tree42 = ncol_bot;
} }
}
// maximum number of bottom elements for "tree" simple reduce 3->1 // maximum number of bottom elements for "tree" simple reduce 3->1
//int max_tree31 = ncol_top * pow(3.0, nrows); //int max_tree31 = ncol_top * pow(3.0, nrows);
bool is_lin_31 = false; bool is_lin_31 = false;