Merge from V6_5_BR 05/06/2012

[modules/smesh.git] / src / StdMeshers / StdMeshers_Quadrangle_2D.cxx

diff --git a/src/StdMeshers/StdMeshers_Quadrangle_2D.cxx b/src/StdMeshers/StdMeshers_Quadrangle_2D.cxx
index 23be5d62faaab0306318ae709e11d59422abe35a..57640ac0ba8d783a533fff5d4e3eced5e66caedb 100644 (file)
--- a/src/StdMeshers/StdMeshers_Quadrangle_2D.cxx
+++ b/src/StdMeshers/StdMeshers_Quadrangle_2D.cxx
@@ -1,4 +1,4 @@
-// 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
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS


@@ -2545,22 +2545,19 @@ bool StdMeshers_Quadrangle_2D::ComputeReduced (SMESH_Mesh &        aMesh,
     // maximum number of bottom elements for "tree" simple reduce 4->2
     int max_tree42 = 0;
     // number of rows needed to reduce ncol_bot to ncol_top using simple 4->2 "tree"
     // maximum number of bottom elements for "tree" simple reduce 4->2
     int max_tree42 = 0;
     // number of rows needed to reduce ncol_bot to ncol_top using simple 4->2 "tree"

-#ifdef WIN32
-    //<cmath> of the MSVC doesn't contain log2
-    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) {
+    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);
       max_tree42 = npair_top * pow(2.0, nrows + 1);

-      int delta = ncol_bot - int( max_tree42 );
-      for (int irow = 1; irow < nrows; irow++) {
-        int nfour = delta / 4;
-        delta -= nfour * 2;
+      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;

       }
       }

-      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);
     }
     // maximum number of bottom elements for "tree" simple reduce 3->1
     //int max_tree31 = ncol_top * pow(3.0, nrows);