staffan :

	* update doc
	* inlined some methods

diff --git a/src/INTERP_KERNEL/Interpolation3D.cxx b/src/INTERP_KERNEL/Interpolation3D.cxx
index df58fd052bed7c8e962048d6acb155bee192b6ea..b3d592477d4f9567eea09abaec1d15c4526c5d22 100644 (file)
--- a/src/INTERP_KERNEL/Interpolation3D.cxx
+++ b/src/INTERP_KERNEL/Interpolation3D.cxx
@@ -116,7 +116,6 @@ namespace MEDMEM
     int totalFiltered = 0;
 
 #ifdef USE_RECURSIVE_BBOX_FILTER
-
     
     /*
      * Performs a depth-first search over srcMesh, using bounding boxes to recursively eliminate the elements of targetMesh
@@ -265,7 +264,9 @@ namespace MEDMEM
              }
          }
              
+       // all nodes are deleted here
        delete currNode;
+
        LOG(4, "Next iteration. Nodes left : " << nodes.size());
       }
 

diff --git a/src/INTERP_KERNEL/MeshRegion.cxx b/src/INTERP_KERNEL/MeshRegion.cxx
index 16f87409217fc5869bb02e6edc5b7367d3549766..0153435eac8c65052f31329b687a7e771a236a65 100644 (file)
--- a/src/INTERP_KERNEL/MeshRegion.cxx
+++ b/src/INTERP_KERNEL/MeshRegion.cxx
@@ -1,7 +1,6 @@
 #include "MeshRegion.hxx"
 
 #include "MeshElement.hxx"
-
 #include "MeshUtils.hxx"
 
 namespace INTERP_UTILS
@@ -33,6 +32,7 @@ namespace INTERP_UTILS
    * exist, it is created here. This creation is delayed to make it possible to have empty MeshRegions
    *
    * @param element pointer to element to add to region
+   * @param mesh    mesh to which element belongs
    *
    */
   void MeshRegion::addElement(MeshElement* const element, const MEDMEM::MESH& mesh)
@@ -72,6 +72,7 @@ namespace INTERP_UTILS
    * @param region1 region in which to store one half of this region
    * @param region2 region in which to store the other of this region
    * @param coord   coordinate of BoundingBox to use when splitting the region
+   * @param mesh    mesh to which region belongs
    *
    */
   void MeshRegion::split(MeshRegion& region1, MeshRegion& region2, BoundingBox::BoxCoord coord, const MEDMEM::MESH& mesh)
@@ -119,37 +120,9 @@ namespace INTERP_UTILS
     assert(elemBox != 0);
 
     return _box->isDisjointWith(*elemBox);
-  }
+  }  
 
-  /*
-   * Accessor to beginning of elements vector
-   *
-   * @return  constant iterator pointing at the beginning of the vector or elements
-   */
-  std::vector<MeshElement*>::const_iterator MeshRegion::getBeginElements() const
-  {
-    return _elements.begin();
-  }
-
-  /*
-   * Accessor to end of elements vector
-   *
-   * @return  constant iterator pointing at the end of the vector or elements
-   */
-  std::vector<MeshElement*>::const_iterator MeshRegion::getEndElements() const
-  {
-    return _elements.end();
-  }
   
-  /*
-   * Gives information on how many elements are contained in the region.
-   *
-   * @return  the number of elements contained in the region
-   */
-  int MeshRegion::getNumberOfElements() const
-  {
-    return _elements.size();
-  }
 };
 
 

diff --git a/src/INTERP_KERNEL/MeshRegion.hxx b/src/INTERP_KERNEL/MeshRegion.hxx
index b190154ce734534732f597adb25671cf2bc2a69c..4edaebbe63d207c89c580d7553003aca9eaf3c17 100644 (file)
--- a/src/INTERP_KERNEL/MeshRegion.hxx
+++ b/src/INTERP_KERNEL/MeshRegion.hxx
@@ -4,7 +4,6 @@
 #include <vector>
 
 #include "BoundingBox.hxx"
-
 #include "MEDMEM_Mesh.hxx"
 
 namespace INTERP_UTILS
@@ -30,15 +29,16 @@ namespace INTERP_UTILS
 
     bool isDisjointWithElementBoundingBox(const MeshElement& elem) const;
 
-    std::vector<MeshElement*>::const_iterator getBeginElements() const;
+    inline std::vector<MeshElement*>::const_iterator getBeginElements() const;
 
-    std::vector<MeshElement*>::const_iterator getEndElements() const;
+    inline std::vector<MeshElement*>::const_iterator getEndElements() const;
 
-    int getNumberOfElements() const;
+    inline int getNumberOfElements() const;
 
   private:
-    /// Vector of pointers to elements. NB : these pointers are not owned by the region object, and are thus
-    /// neither allocated or liberated in this class. The elements must therefore be allocated and liberated outside this class
+    /// Vector of pointers to contained MeshElements. 
+    /// NB : these pointers are not owned by the region object, and are thus
+    /// neither allocated or liberated in this class. The elements must therefore be allocated and liberated outside the class.
     std::vector<MeshElement*> _elements;
 
     /// BoundingBox containing all the nodes of all the elements in the region.
@@ -46,6 +46,36 @@ namespace INTERP_UTILS
   
   };
 
+  /*
+   * Accessor to beginning of elements vector
+   *
+   * @return  constant iterator pointing at the beginning of the vector or elements
+   */
+  inline std::vector<MeshElement*>::const_iterator MeshRegion::getBeginElements() const
+  {
+    return _elements.begin();
+  }
+
+  /*
+   * Accessor to end of elements vector
+   *
+   * @return  constant iterator pointing at the end of the vector or elements
+   */
+  inline std::vector<MeshElement*>::const_iterator MeshRegion::getEndElements() const
+  {
+    return _elements.end();
+  }
+  
+  /*
+   * Gives information on how many elements are contained in the region.
+   *
+   * @return  the number of elements contained in the region
+   */
+  inline int MeshRegion::getNumberOfElements() const
+  {
+    return _elements.size();
+  }
+
 };
 
 

diff --git a/src/INTERP_KERNEL/RegionNode.cxx b/src/INTERP_KERNEL/RegionNode.cxx
index d49b3d9cd76ea5c4ba30bbda07c975c20d93e982..3be27a8eaf82519c4f4488b93c3cf7dd2ddf80a3 100644 (file)
--- a/src/INTERP_KERNEL/RegionNode.cxx
+++ b/src/INTERP_KERNEL/RegionNode.cxx
@@ -18,23 +18,6 @@ namespace INTERP_UTILS
   {
   }
     
-  /**
-   *  Accessor to source region
-   *
-   * @return   reference to source region
-   */
-  MeshRegion& RegionNode::getSrcRegion()
-  {
-    return _srcRegion;
-  }
-  /**
-   *  Accessor to target region
-   *
-   * @return   reference to target region
-   */
-  MeshRegion& RegionNode::getTargetRegion()
-  {
-    return _targetRegion;
-  }
+  
 
 };

diff --git a/src/INTERP_KERNEL/RegionNode.hxx b/src/INTERP_KERNEL/RegionNode.hxx
index b8352c368265fe5e82fa923b2e616398706a67ef..8820abb11ab61707ed11b72590e37d974a676a63 100644 (file)
--- a/src/INTERP_KERNEL/RegionNode.hxx
+++ b/src/INTERP_KERNEL/RegionNode.hxx
@@ -19,17 +19,39 @@ namespace INTERP_UTILS
     
     ~RegionNode();
 
-    MeshRegion& getSrcRegion();
+    inline MeshRegion& getSrcRegion();
     
-    MeshRegion& getTargetRegion();
+    inline MeshRegion& getTargetRegion();
 
   private:
-
-    MeshRegion _srcRegion;          /// source region
-    MeshRegion _targetRegion;       /// target region
+    
+    /// source region
+    MeshRegion _srcRegion;          
+    
+    /// target region
+    MeshRegion _targetRegion;       
 
   };
 
+  /**
+   *  Accessor to source region
+   *
+   * @return   reference to source region
+   */
+  inline MeshRegion& RegionNode::getSrcRegion()
+  {
+    return _srcRegion;
+  }
+  /**
+   *  Accessor to target region
+   *
+   * @return   reference to target region
+   */
+  inline MeshRegion& RegionNode::getTargetRegion()
+  {
+    return _targetRegion;
+  }
+
 };