From 7b1d23539207e985b7b12043615c3926aed416ea Mon Sep 17 00:00:00 2001
From: ageay <ageay>
Date: Thu, 8 Aug 2013 08:11:30 +0000
Subject: [PATCH] abstraction of MEDCouplingPointSet::getBoundingBoxForBBTree

---
 src/MEDCoupling/MEDCoupling1GTUMesh.cxx | 30 ++++++++++++-------------
 src/MEDCoupling/MEDCouplingUMesh.cxx    | 15 ++++++-------
 2 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/src/MEDCoupling/MEDCoupling1GTUMesh.cxx b/src/MEDCoupling/MEDCoupling1GTUMesh.cxx
index c838c975c..0cf66514f 100644
--- a/src/MEDCoupling/MEDCoupling1GTUMesh.cxx
+++ b/src/MEDCoupling/MEDCoupling1GTUMesh.cxx
@@ -1784,7 +1784,7 @@ MEDCoupling1DGTUMesh *MEDCoupling1SGTUMesh::computeDualMesh2D() const throw(INTE
 /*!
  * This method aggregate the bbox of each cell and put it into bbox 
  *
- * \return DataArrayDouble * - having \a this number of cells tuples and 2*spacedim components.
+ * \return DataArrayDouble * - newly created object (to be managed by the caller) \a this number of cells tuples and 2*spacedim components.
  * 
  * \throw If \a this is not fully set (coordinates and connectivity).
  * \throw If a cell in \a this has no valid nodeId.
@@ -1803,9 +1803,10 @@ DataArrayDouble *MEDCoupling1SGTUMesh::getBoundingBoxForBBTree() const
   const int *conn(_conn->getConstPointer());
   for(int i=0;i<nbOfCells;i++)
     {
+      int kk(0);
       for(int j=0;j<nbOfNodesPerCell;j++,conn++)
         {
-          int nodeId(*conn),kk(0);
+          int nodeId(*conn);
           if(nodeId>=0 && nodeId<nbOfNodes)
             {
               for(int k=0;k<spaceDim;k++)
@@ -1815,11 +1816,11 @@ DataArrayDouble *MEDCoupling1SGTUMesh::getBoundingBoxForBBTree() const
                 }
               kk++;
             }
-          if(kk==0)
-            {
-              std::ostringstream oss; oss << "MEDCoupling1SGTUMesh::getBoundingBoxForBBTree : cell #" << i << " contains no valid nodeId !";
-              throw INTERP_KERNEL::Exception(oss.str().c_str());
-            }
+        }
+      if(kk==0)
+        {
+          std::ostringstream oss; oss << "MEDCoupling1SGTUMesh::getBoundingBoxForBBTree : cell #" << i << " contains no valid nodeId !";
+          throw INTERP_KERNEL::Exception(oss.str().c_str());
         }
     }
   return ret.retn();
@@ -3171,7 +3172,7 @@ MEDCoupling1DGTUMesh *MEDCoupling1DGTUMesh::buildSetInstanceFromThis(int spaceDi
 /*!
  * This method aggregate the bbox of each cell and put it into bbox parameter.
  * 
- * \return DataArrayDouble * - having \a this number of cells tuples and 2*spacedim components.
+ * \return DataArrayDouble * - newly created object (to be managed by the caller) \a this number of cells tuples and 2*spacedim components.
  * 
  * \throw If \a this is not fully set (coordinates and connectivity).
  * \throw If a cell in \a this has no valid nodeId.
@@ -3192,11 +3193,10 @@ DataArrayDouble *MEDCoupling1DGTUMesh::getBoundingBoxForBBTree() const
   for(int i=0;i<nbOfCells;i++)
     {
       int offset=connI[i];
-      int nbOfNodesForCell=connI[i+1]-offset;
+      int nbOfNodesForCell(connI[i+1]-offset),kk(0);
       for(int j=0;j<nbOfNodesForCell;j++)
         {
           int nodeId=conn[offset+j];
-          int kk(0);
           if(nodeId>=0 && nodeId<nbOfNodes)
             {
               for(int k=0;k<spaceDim;k++)
@@ -3206,11 +3206,11 @@ DataArrayDouble *MEDCoupling1DGTUMesh::getBoundingBoxForBBTree() const
                 }
               kk++;
             }
-          if(kk==0)
-            {
-              std::ostringstream oss; oss << "MEDCoupling1DGTUMesh::getBoundingBoxForBBTree : cell #" << i << " contains no valid nodeId !";
-              throw INTERP_KERNEL::Exception(oss.str().c_str());
-            }
+        }
+      if(kk==0)
+        {
+          std::ostringstream oss; oss << "MEDCoupling1SGTUMesh::getBoundingBoxForBBTree : cell #" << i << " contains no valid nodeId !";
+          throw INTERP_KERNEL::Exception(oss.str().c_str());
         }
     }
   return ret.retn();
diff --git a/src/MEDCoupling/MEDCouplingUMesh.cxx b/src/MEDCoupling/MEDCouplingUMesh.cxx
index 88cbe90bc..8015d9ed5 100644
--- a/src/MEDCoupling/MEDCouplingUMesh.cxx
+++ b/src/MEDCoupling/MEDCouplingUMesh.cxx
@@ -6177,7 +6177,7 @@ MEDCouplingFieldDouble *MEDCouplingUMesh::getSkewField() const throw(INTERP_KERN
 /*!
  * This method aggregate the bbox of each cell and put it into bbox parameter.
  * 
- * \return DataArrayDouble * - having \a this number of cells tuples and 2*spacedim components.
+ * \return DataArrayDouble * - newly created object (to be managed by the caller) \a this number of cells tuples and 2*spacedim components.
  * 
  * \throw If \a this is not fully set (coordinates and connectivity).
  * \throw If a cell in \a this has no valid nodeId.
@@ -6198,11 +6198,10 @@ DataArrayDouble *MEDCouplingUMesh::getBoundingBoxForBBTree() const
   for(int i=0;i<nbOfCells;i++)
     {
       int offset=connI[i]+1;
-      int nbOfNodesForCell=connI[i+1]-offset;
+      int nbOfNodesForCell(connI[i+1]-offset),kk(0);
       for(int j=0;j<nbOfNodesForCell;j++)
         {
           int nodeId=conn[offset+j];
-          int kk(0);
           if(nodeId>=0 && nodeId<nbOfNodes)
             {
               for(int k=0;k<spaceDim;k++)
@@ -6212,11 +6211,11 @@ DataArrayDouble *MEDCouplingUMesh::getBoundingBoxForBBTree() const
                 }
               kk++;
             }
-          if(kk==0)
-            {
-              std::ostringstream oss; oss << "MEDCouplingUMesh::getBoundingBoxForBBTree : cell #" << i << " contains no valid nodeId !";
-              throw INTERP_KERNEL::Exception(oss.str().c_str());
-            }
+        }
+      if(kk==0)
+        {
+          std::ostringstream oss; oss << "MEDCouplingUMesh::getBoundingBoxForBBTree : cell #" << i << " contains no valid nodeId !";
+          throw INTERP_KERNEL::Exception(oss.str().c_str());
         }
     }
   return ret.retn();
-- 
2.39.2