-// 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
for ( int i = degenSides.size()-1; i > -1; --i )
{
- StdMeshers_FaceSide * & degenSide = quad->side[ degenSides[ i ]];
+ StdMeshers_FaceSide* degenSide = quad->side[ degenSides[ i ]];
delete degenSide;
- quad->side.erase( vector<StdMeshers_FaceSide*>::iterator( & degenSide ));
+ quad->side.erase( quad->side.begin() + degenSides[ i ] );
}
for ( unsigned i = TOP_SIDE; i < quad->side.size(); ++i )
quad->side[i]->Reverse();
int nrows = nr1 - 1;
int ncol_top = nt1 - 1;
int ncol_bot = nb1 - 1;
- // maximum number of bottom elements for "tree" simple reduce 3->1
- int max_tree31 = ncol_top * pow(3.0, nrows);
- if (ncol_bot > max_tree31)
+ // number of rows needed to reduce ncol_bot to ncol_top using simple 3->1 "tree" (see below)
+ int nrows_tree31 = int( log( (double)(ncol_bot / ncol_top) ) / log((double) 3 )); // = log x base 3
+ if ( nrows < nrows_tree31 )
MultipleReduce = true;
}
// maximum number of bottom elements for "linear" simple reduce 4->2
int max_lin31 = ncol_top + ncol_top * 2 * nrows;
// maximum number of bottom elements for "tree" simple reduce 4->2
- int max_tree42 = npair_top * pow(2.0, nrows + 1);
- if (ncol_top > npair_top * 2) {
- int delta = ncol_bot - max_tree42;
- for (int irow = 1; irow < nrows; irow++) {
- int nfour = delta / 4;
- delta -= nfour * 2;
- }
- if (delta <= (ncol_top - npair_top * 2))
- max_tree42 = ncol_bot;
+ int max_tree42 = 0;
+ // number of rows needed to reduce ncol_bot to ncol_top using simple 4->2 "tree"
+ int nrows_tree42 = int( log( (double)(ncol_bot / ncol_top) )/log((double)2) ); // needed to avoid overflow at pow(2) while computing max_tree42
+ if ( nrows_tree42 < nrows) {
+ max_tree42 = npair_top * pow(2.0, nrows + 1);
+ if (ncol_top > npair_top * 2 )
+ {
+ int delta = ncol_bot - int( max_tree42 );
+ for (int irow = 1; irow < nrows; irow++) {
+ int nfour = delta / 4;
+ delta -= nfour * 2;
+ }
+ if (delta <= (ncol_top - npair_top * 2))
+ max_tree42 = ncol_bot;
+ }
}
// maximum number of bottom elements for "tree" simple reduce 3->1
//int max_tree31 = ncol_top * pow(3.0, nrows);