From da1b6a32e4e4c61dc969637f20183041e8b046dc Mon Sep 17 00:00:00 2001 From: vbd Date: Fri, 14 Sep 2007 13:13:39 +0000 Subject: [PATCH] staffan : * doc updates --- src/INTERP_KERNEL/Interpolation3D.cxx | 3 +-- src/INTERP_KERNEL/MeshUtils.hxx | 4 ++-- src/INTERP_KERNEL/Test/MeshTestToolkit.cxx | 6 +++--- src/INTERP_KERNEL/TransformedTriangle.hxx | 6 ++++++ src/INTERP_KERNEL/TransformedTriangle_inline.hxx | 6 +----- src/INTERP_KERNEL/doc/Doxyfile | 9 ++++++++- 6 files changed, 21 insertions(+), 13 deletions(-) diff --git a/src/INTERP_KERNEL/Interpolation3D.cxx b/src/INTERP_KERNEL/Interpolation3D.cxx index d91e853cd..e2978cbfc 100644 --- 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 431371840..cf9d2e9b0 100644 --- 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 5f4aca218..be51ef437 100644 --- 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* 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 428540d06..bcd62da80 100644 --- 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 2953118c3..c80c304e0 100644 --- 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 ac648dec2..6a13ed9a2 100644 --- 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 = -- 2.39.2