staffan :

	* doc updates

diff --git a/src/INTERP_KERNEL/Interpolation3D.cxx b/src/INTERP_KERNEL/Interpolation3D.cxx
index d91e853cd0b202df8596506fb2f061df91dd0486..e2978cbfc6c493f783626e200eede64ae679208e 100644 (file)
--- a/src/INTERP_KERNEL/Interpolation3D.cxx
+++ b/src/INTERP_KERNEL/Interpolation3D.cxx
@@ -86,8 +86,7 @@ namespace MEDMEM
    * @param matrix      vector of maps in which the result is stored 
    *
    */
-  void Interpolation3D::calculateIntersectionVolumes(const MESH& srcMesh, const MESH& targetMesh, IntersectionMatrix& matrix)
-  {
+  void Interpolation3D::calculateIntersectionVolumes(const MEDMEM::MESH& srcMesh, const MEDMEM::MESH& targetMesh, IntersectionMatrix& matrix)  {
 
     // create MeshElement objects corresponding to each element of the two meshes
     const int numSrcElems = srcMesh.getNumberOfElements(MED_CELL, MED_ALL_ELEMENTS);

diff --git a/src/INTERP_KERNEL/MeshUtils.hxx b/src/INTERP_KERNEL/MeshUtils.hxx
index 431371840b33a3c864393ba6953165b75232ca8f..cf9d2e9b08850f3a7deebbe1e987e906bbf8dc68 100644 (file)
--- a/src/INTERP_KERNEL/MeshUtils.hxx
+++ b/src/INTERP_KERNEL/MeshUtils.hxx
@@ -14,7 +14,7 @@ namespace INTERP_UTILS
 
   /**
    * Returns the global number of the node of an element.
-   * (1 <= node <= #nodes of element)
+   * (1 <= node <= no. nodes of element)
    *
    * @param      node       the node for which the global number is sought
    * @param      element    an element of the mesh
@@ -32,7 +32,7 @@ namespace INTERP_UTILS
 
   /**
    * Returns the coordinates of a node of an element
-   * (1 <= node <= #nodes)
+   * (1 <= node <= no. nodes)
    *
    * @param      node       the node for which the coordinates are sought
    * @param      element    an element of the mesh

diff --git a/src/INTERP_KERNEL/Test/MeshTestToolkit.cxx b/src/INTERP_KERNEL/Test/MeshTestToolkit.cxx
index 5f4aca2183fffbcc973a923b427ebfc7a99e0f66..be51ef437e923a015f2767a936231c789c068337 100644 (file)
--- a/src/INTERP_KERNEL/Test/MeshTestToolkit.cxx
+++ b/src/INTERP_KERNEL/Test/MeshTestToolkit.cxx
@@ -36,7 +36,7 @@ namespace INTERP_TEST
    * Calculates the sum of a row of an intersection matrix
    *
    * @param m  an intersection matrix
-   * @param i  the index of the row (1 <= i <= #rows)
+   * @param i  the index of the row (1 <= i <= no. rows)
    * @return the sum of the values of row i
    *
    */
@@ -79,7 +79,7 @@ namespace INTERP_TEST
    * @param mesh   the mesh
    * @param tab    pointer to double[no. elements of mesh] array in which to store the volumes
    */
-  void MeshTestToolkit::getVolumes(MESH& mesh, const double*& tab) const
+  void MeshTestToolkit::getVolumes(MEDMEM::MESH& mesh, const double*& tab) const
   {
     SUPPORT *sup=new SUPPORT(&mesh,"dummy",MED_CELL);
     FIELD<double>* f=mesh.getVolume(sup);
@@ -125,7 +125,7 @@ namespace INTERP_TEST
    * @param  tMesh   the target mesh
    * @return true if the condition is verified, false if not.
    */
-  bool MeshTestToolkit::testVolumes(const IntersectionMatrix& m,  MESH& sMesh,  MESH& tMesh) const
+  bool MeshTestToolkit::testVolumes(const IntersectionMatrix& m,  MEDMEM::MESH& sMesh,  MEDMEM::MESH& tMesh) const
   {
     bool ok = true;
 

diff --git a/src/INTERP_KERNEL/TransformedTriangle.hxx b/src/INTERP_KERNEL/TransformedTriangle.hxx
index 428540d0656fec5edcc62024cd929da5ec037c23..bcd62da80445c03fc4ddc884341ae43014a60a1c 100644 (file)
--- a/src/INTERP_KERNEL/TransformedTriangle.hxx
+++ b/src/INTERP_KERNEL/TransformedTriangle.hxx
@@ -271,6 +271,12 @@ namespace INTERP_UTILS
     bool _validTP[4];
 
 #ifdef OPTIMIZE
+
+    /**
+     * Calls TransformedTriangle::testTriangleSurroundsEdge for edges OX to ZX and stores the result in
+     * member variable array_triangleSurroundsEdgeCache. 
+     *
+     */
     void preCalculateTriangleSurroundsEdge();
 
     /// Array holding results of the test testTriangleSurroundsEdge() for all the edges. 

diff --git a/src/INTERP_KERNEL/TransformedTriangle_inline.hxx b/src/INTERP_KERNEL/TransformedTriangle_inline.hxx
index 2953118c3ec0ccb88b75810014a2066138ac45a0..c80c304e0a4c33b83ed4180ed85a4c68d86c9e6d 100644 (file)
--- a/src/INTERP_KERNEL/TransformedTriangle_inline.hxx
+++ b/src/INTERP_KERNEL/TransformedTriangle_inline.hxx
@@ -9,11 +9,7 @@
 //  Optimization methods. These are only defined and used if OPTIMIZE is defined.
 // -----------------------------------------------------------------------------------
 
-/**
- * Calls TransformedTriangle::testTriangleSurroundsEdge for edges OX to ZX and stores the result in
- * member variable array_triangleSurroundsEdgeCache. 
- *
- */
+
 inline void TransformedTriangle::preCalculateTriangleSurroundsEdge() 
 {
   for(TetraEdge edge = OX ; edge <= ZX ; edge = TetraEdge(edge + 1))

diff --git a/src/INTERP_KERNEL/doc/Doxyfile b/src/INTERP_KERNEL/doc/Doxyfile
index ac648dec20aade17db83b7215ed8f838156348a9..6a13ed9a26f1a12c8f6000ff3cb32b71b88cf52c 100644 (file)
--- a/src/INTERP_KERNEL/doc/Doxyfile
+++ b/src/INTERP_KERNEL/doc/Doxyfile
@@ -122,7 +122,14 @@ FILE_PATTERNS          = *.c \
                          *.M \
                          *.MM
 RECURSIVE              = YES
-EXCLUDE                = 
+EXCLUDE                = Test/Interpolation3DTest.cxx \
+                         Test/Interpolation3DTest.hxx \
+                         TransformedTriangle_inline.hxx \
+                         Intersector3D.hxx \
+                         Test/CppUnitTest.hxx \
+                         Test/CppUnitTest.cxx \
+                         Intersector.hxx \
+                         Test/TestingUtils.hxx
 EXCLUDE_SYMLINKS       = NO
 EXCLUDE_PATTERNS       = 
 EXAMPLE_PATH           =