Various fixes on doc.

diff --git a/doc/user/doxygen/doxfiles/examples/medcouplingexamplesmeshes.doxy b/doc/user/doxygen/doxfiles/examples/medcouplingexamplesmeshes.doxy
index e094324739f7c6238709ed1db7c06c2cf43fe675..166b7a209a002ddc31e9da797666f2a6a45a89e0 100644 (file)
--- a/doc/user/doxygen/doxfiles/examples/medcouplingexamplesmeshes.doxy
+++ b/doc/user/doxygen/doxfiles/examples/medcouplingexamplesmeshes.doxy
@@ -73,7 +73,8 @@ Or :
 
 \snippet MEDCouplingExamplesTest.cxx CppSnippetCMeshStdBuild1_3
 
-When this mesh is no more needed simply call decrRef to decrement its reference counter.
+When this mesh is no more needed simply call decrRef to decrement its reference counter (nothing
+to be done in Python).
 
 \snippet MEDCouplingExamplesTest.cxx CppSnippetCMeshStdBuild1_4
 

diff --git a/doc/user/doxygen/doxfiles/reference/fields/discretization.dox b/doc/user/doxygen/doxfiles/reference/fields/discretization.dox
index dc466df78f090092ced5391418a51220dcb90e02..6789241ce837008e419d268018a72268f7a0846e 100644 (file)
--- a/doc/user/doxygen/doxfiles/reference/fields/discretization.dox
+++ b/doc/user/doxygen/doxfiles/reference/fields/discretization.dox
@@ -41,7 +41,7 @@ representing the time range that is covered by the data. It is also specified in
 It can be one of:
 - \ref ParaMEDMEM::TypeOfTimeDiscretization "NO_TIME", in this case no time is attached to the field, and no
 time-related operation is permitted (for example unable to call 
-\ref ParaMEDMEM::MEDCouplingFieldDouble::getValueOnTime() "getValueOnTime()") 
+\ref ParaMEDMEM::MEDCouplingFieldDouble::getValueOn "getValueOn()") 
 - \ref ParaMEDMEM::TypeOfTimeDiscretization "ONE_TIME", the field data represent a single time step. 
 - \ref ParaMEDMEM::TypeOfTimeDiscretization "LINEAR_TIME", the field data contains \b two arrays, stamped with two
 different time points. A linear interpolation of the field values between those two time steps is then possible. 

diff --git a/doc/user/doxygen/doxfiles/reference/interpolation/Geometric2D.dox b/doc/user/doxygen/doxfiles/reference/interpolation/Geometric2D.dox
index eb0e25dafb5f33ec3823450006f87b3ac8bdcdbd..a00934f610a6b5b46be544de68fee676f2d8364a 100644 (file)
--- a/doc/user/doxygen/doxfiles/reference/interpolation/Geometric2D.dox
+++ b/doc/user/doxygen/doxfiles/reference/interpolation/Geometric2D.dox
@@ -154,9 +154,9 @@ The algorithms used are :
 
 As internal architecture is quite general, it is possible to have more than classical intersection on any polygons :
 
-  - \ref INTERP_KERNEL::ComposedEdge::getAreaOfZone "area" computation is available.
-  - \ref INTERP_KERNEL::QuadraticPolygon::getPerimeterFast "perimeter" computation.
-  - \ref INTERP_KERNEL::QuadraticPolygon::getHydraulicDiameter "Hydraulic diameter" computation.
+  - \ref INTERP_KERNEL::ComposedEdge::getArea "area" computation is available.
+  - \ref INTERP_KERNEL::ComposedEdge::getPerimeter "perimeter" computation.
+  - \ref INTERP_KERNEL::ComposedEdge::getHydraulicDiameter "Hydraulic diameter" computation.
 
 \section interpkernelGeo2DUsage Usage
 

diff --git a/doc/user/doxygen/doxy2swig/doxy2swig.cmake b/doc/user/doxygen/doxy2swig/doxy2swig.cmake
index 1e3ed568a4252c4d53778f684d2bc937402a0c68..b497ef358074ead4670623db50b352e01e005f0c 100644 (file)
--- a/doc/user/doxygen/doxy2swig/doxy2swig.cmake
+++ b/doc/user/doxygen/doxy2swig/doxy2swig.cmake
@@ -29,12 +29,12 @@ SET(_SWIG_DOC_SUFFIX "doc_class_")
 # MEDCoupling classes to include
 #
 SET(_classes_MEDCoupling
-    ParaMEDMEM_1_1MEDCouplingPointSet
-    ParaMEDMEM_1_1MEDCouplingUMesh
-    ParaMEDMEM_1_1MEDCouplingCMesh
-    ParaMEDMEM_1_1MEDCouplingRemapper
-    ParaMEDMEM_1_1DataArray
-    ParaMEDMEM_1_1DataArrayInt
+#    ParaMEDMEM_1_1MEDCouplingPointSet
+#    ParaMEDMEM_1_1MEDCouplingUMesh
+#    ParaMEDMEM_1_1MEDCouplingCMesh
+#    ParaMEDMEM_1_1MEDCouplingRemapper
+#    ParaMEDMEM_1_1DataArray
+#    ParaMEDMEM_1_1DataArrayInt
     ParaMEDMEM_1_1DataArrayDouble
     )
 
@@ -42,10 +42,10 @@ SET(_classes_MEDCoupling
 # MEDLoader classes to include
 #
 SET(_classes_MEDLoader
-    MEDLoader
-    ParaMEDMEM_1_1MEDFileMeshes
-    ParaMEDMEM_1_1MEDFileMesh
-    ParaMEDMEM_1_1MEDFileUMesh
+#    MEDLoader
+#    ParaMEDMEM_1_1MEDFileMeshes
+#    ParaMEDMEM_1_1MEDFileMesh
+#    ParaMEDMEM_1_1MEDFileUMesh
     ParaMEDMEM_1_1MEDFileCMesh
     )
 

diff --git a/doc/user/doxygen/fakesources/MEDCouplingFieldDouble.C b/doc/user/doxygen/fakesources/MEDCouplingFieldDouble.C
index b5d74a3a92666cba49f2fde731708f343215bd36..69e14afcdcf450bea15949dd5d663bb0c528fc1a 100644 (file)
--- a/doc/user/doxygen/fakesources/MEDCouplingFieldDouble.C
+++ b/doc/user/doxygen/fakesources/MEDCouplingFieldDouble.C
@@ -371,7 +371,6 @@ MEDCouplingFieldDouble::getArrays() const;
 MEDCouplingFieldDouble::getEndArray() const;
 MEDCouplingFieldDouble::getEndArray();
 MEDCouplingFieldDouble::getEndTime(int& iteration, int& order) const;
-MEDCouplingFieldDouble::getHeapMemorySize() const;
 MEDCouplingFieldDouble::getStartTime(int& iteration, int& order) const;
 MEDCouplingFieldDouble::getTimeDiscretizationUnderGround() const;
 MEDCouplingFieldDouble::getTimeDiscretizationUnderGround();

diff --git a/doc/user/doxygen/fakesources/MEDCouplingMemArray.C b/doc/user/doxygen/fakesources/MEDCouplingMemArray.C
index fa7bac3f8f2e076d064f0335f352af6f74f57218..26f45eab2c41f6d4b59c52332ba574c7fd4fdad0 100644 (file)
--- a/doc/user/doxygen/fakesources/MEDCouplingMemArray.C
+++ b/doc/user/doxygen/fakesources/MEDCouplingMemArray.C
@@ -232,8 +232,8 @@ DataArray::getUnitsOnComponent() const;
 DataArray::getInfoOnComponent(int i) const;
 DataArray::checkNbOfTuples(int nbOfTuples, const char *msg) const;
 DataArray::checkNbOfComps(int nbOfCompo, const char *msg) const;
-DataArray::checkNbOfTuplesAndComp(const DataArray& other, const char *msg) const throw(INTERP_KERNEL::Exception);
-DataArray::checkNbOfTuplesAndComp(int nbOfTuples, int nbOfCompo, const char *msg) const throw(INTERP_KERNEL::Exception);
+//DataArray::checkNbOfTuplesAndComp(const DataArray& other, const char *msg) const throw(INTERP_KERNEL::Exception);
+//DataArray::checkNbOfTuplesAndComp(int nbOfTuples, int nbOfCompo, const char *msg) const throw(INTERP_KERNEL::Exception);
 DataArray::GetNumberOfItemGivenBES(int begin, int end, int step, const char *msg);
 DataArray::GetNumberOfItemGivenBESRelative(int begin, int end, int step, const char *msg);
 DataArray::GetPosOfItemGivenBESRelativeNoThrow(int value, int begin, int end, int step);
@@ -253,7 +253,7 @@ std::vector<std::string> DataArray::_info_on_compo;
 /*! \name Basic API   */
 ///@{
 DataArrayDouble::isAllocated() const;
-DataArrayDouble::setInfoAndChangeNbOfCompo(const std::vector<std::string>& info);
+//DataArrayDouble::setInfoAndChangeNbOfCompo(const std::vector<std::string>& info);
 DataArrayDouble::doubleValue() const;
 DataArrayDouble::empty() const;
 DataArrayDouble::deepCpy() const;
@@ -338,10 +338,10 @@ DataArrayDouble::applyLin(double a, double b, int compoId);
 DataArrayDouble::applyLin(double a, double b);
 DataArrayDouble::applyInv(double numerator);
 DataArrayDouble::negate() const;
-DataArrayDouble::applyFunc(int nbOfComp, const char* func) const;
-DataArrayDouble::applyFunc(const char* func) const;
-DataArrayDouble::applyFunc2(int nbOfComp, const char* func) const;
-DataArrayDouble::applyFunc3(int nbOfComp, const std::vector<std::string>& varsOrder, const char* func) const;
+DataArrayDouble::applyFunc(int nbOfComp, const std::string& func, bool isSafe=true) const;
+DataArrayDouble::applyFunc(const std::string& func, bool isSafe=true) const;
+DataArrayDouble::applyFunc2(int nbOfComp, const std::string& func, bool isSafe=true) const;
+DataArrayDouble::applyFunc3(int nbOfComp, const std::vector<std::string>& varsOrder, const std::string& func, bool isSafe=true) const;
 DataArrayDouble::getIdsInRange(double vmin, double vmax) const;
 DataArrayDouble::addEqual(const DataArrayDouble* other);
 DataArrayDouble::substractEqual(const DataArrayDouble* other);
@@ -376,7 +376,7 @@ DataArrayDouble::applyFunc(int nbOfComp, FunctionToEvaluate func) const;
 ///@{
 DataArrayDouble::getNumberOfTuples() const;
 DataArrayDouble::getNbOfElems() const;
-DataArrayDouble::getHeapMemorySize() const;
+//DataArrayDouble::getHeapMemorySize() const;
 DataArrayDouble::reserve(int nbOfElems);
 DataArrayDouble::pushBackSilent(double val);
 DataArrayDouble::popBackSilent();
@@ -408,8 +408,8 @@ DataArrayDouble::recenterForMaxPrecision(double eps);
 DataArrayDouble::distanceToTuple(const double* tupleBg, const double* tupleEnd, int& tupleId) const;
 DataArrayDouble::buildEuclidianDistanceDenseMatrix() const;
 DataArrayDouble::buildEuclidianDistanceDenseMatrixWith(const DataArrayDouble* other) const;
-DataArrayDouble::applyFuncFast32(const char* func);
-DataArrayDouble::applyFuncFast64(const char* func);
+DataArrayDouble::applyFuncFast32(const std::string& func);
+DataArrayDouble::applyFuncFast64(const std::string& func);
 DataArrayDouble::getTinySerializationIntInformation(std::vector<int>& tinyInfo) const;
 DataArrayDouble::getTinySerializationStrInformation(std::vector<std::string>& tinyInfo) const;
 DataArrayDouble::resizeForUnserialization(const std::vector<int>& tinyInfoI);
@@ -443,7 +443,7 @@ DataArrayInt::SetArrayIn(DataArrayInt* newArray, DataArrayInt* &arrayToSet);
 /*! \name Basic API   */
 ///@{
 DataArrayInt::isAllocated() const;
-DataArrayInt::setInfoAndChangeNbOfCompo(const std::vector<std::string>& info);
+//DataArrayInt::setInfoAndChangeNbOfCompo(const std::vector<std::string>& info);
 DataArrayInt::intValue() const;
 DataArrayInt::empty() const;
 DataArrayInt::deepCpy() const;
@@ -558,7 +558,7 @@ DataArrayInt::Range(int begin, int end, int step);
 ///@{
 DataArrayInt::getNumberOfTuples() const;
 DataArrayInt::getNbOfElems() const;
-DataArrayInt::getHeapMemorySize() const;
+//DataArrayInt::getHeapMemorySize() const;
 DataArrayInt::reserve(int nbOfElems);
 DataArrayInt::pushBackSilent(int val);
 DataArrayInt::popBackSilent();

diff --git a/doc/user/doxygen/fakesources/MEDCouplingMesh.C b/doc/user/doxygen/fakesources/MEDCouplingMesh.C
index eabd7a9ca545e8be962e51afc58b7114113970b2..4809eec6bb14922b3d1cdbe3475d1ce903deee93 100644 (file)
--- a/doc/user/doxygen/fakesources/MEDCouplingMesh.C
+++ b/doc/user/doxygen/fakesources/MEDCouplingMesh.C
@@ -84,9 +84,9 @@ namespace ParaMEDMEM
   MEDCouplingMesh::checkDeepEquivalOnSameNodesWith(const MEDCouplingMesh *other, int cellCompPol, double prec,DataArrayInt *&cellCor) const;
   MEDCouplingMesh::checkDeepEquivalWith(const MEDCouplingMesh *other, int cellCompPol, double prec,DataArrayInt *&cellCor, DataArrayInt *&nodeCor) const;
   MEDCouplingMesh::fillFromAnalytic(TypeOfField t, int nbOfComp, FunctionToEvaluate func) const;
-  MEDCouplingMesh::fillFromAnalytic(TypeOfField t, int nbOfComp, const char *func) const;
-  MEDCouplingMesh::fillFromAnalytic2(TypeOfField t, int nbOfComp, const char *func) const;
-  MEDCouplingMesh::fillFromAnalytic3(TypeOfField t, int nbOfComp, const std::vector<std::string>& varsOrder, const char *func) const;
+  MEDCouplingMesh::fillFromAnalytic(TypeOfField t, int nbOfComp, const std::string& func) const;
+  MEDCouplingMesh::fillFromAnalytic2(TypeOfField t, int nbOfComp, const std::string& func) const;
+  MEDCouplingMesh::fillFromAnalytic3(TypeOfField t, int nbOfComp, const std::vector<std::string>& varsOrder, const std::string& func) const;
   MEDCouplingMesh::getCellsContainingPoint(const double *pos, double eps, std::vector<int>& elts) const;
   MEDCouplingMesh::getCellsContainingPoints(const double *pos, int nbOfPoints, double eps, std::vector<int>& elts, std::vector<int>& eltsIndex) const;
   MEDCouplingMesh::isEqual(const MEDCouplingMesh *other, double prec) const;
@@ -131,7 +131,7 @@ namespace ParaMEDMEM
   MEDCouplingMesh::getCoordinatesOfNode(int nodeId, std::vector<double>& coo) const;
   MEDCouplingMesh::getDescription() const;
   MEDCouplingMesh::getDistributionOfTypes() const;
-  MEDCouplingMesh::getHeapMemorySize() const;
+//  MEDCouplingMesh::getHeapMemorySize() const;
   MEDCouplingMesh::getMeasureField(bool isAbs) const = 0;
   MEDCouplingMesh::getMeasureFieldOnNode(bool isAbs) const = 0;
   MEDCouplingMesh::getMeshDimension() const = 0;
@@ -166,7 +166,7 @@ namespace ParaMEDMEM
   MEDCouplingMesh::splitProfilePerType(const DataArrayInt *profile, std::vector<int>& code, std::vector<DataArrayInt *>& idsInPflPerType, std::vector<DataArrayInt *>& idsPerType) const;
   MEDCouplingMesh::translate(const double *vector) = 0;
   MEDCouplingMesh::unserialization(const std::vector<double>& tinyInfoD, const std::vector<int>& tinyInfo, const DataArrayInt *a1, DataArrayDouble *a2,const std::vector<std::string>& littleStrings) = 0;
-  MEDCouplingMesh::writeVTKAdvanced(const char *fileName, const std::string& cda, const std::string& pda) const;
+  //MEDCouplingMesh::writeVTKAdvanced(const char *fileName, const std::string& cda, const std::string& pda) const;
   MEDCouplingMesh::writeVTKLL(std::ostream& ofs, const std::string& cellData, const std::string& pointData) const;
   MEDCouplingMesh::_description;
   MEDCouplingMesh::_iteration;

diff --git a/doc/user/doxygen/fakesources/MEDCouplingUMesh.C b/doc/user/doxygen/fakesources/MEDCouplingUMesh.C
index c17e7b29673df50eb47f60e105a482df3ed2cd9e..443b632c7ea3f196bbe8b20830dc08d0bbef47ac 100644 (file)
--- a/doc/user/doxygen/fakesources/MEDCouplingUMesh.C
+++ b/doc/user/doxygen/fakesources/MEDCouplingUMesh.C
@@ -99,15 +99,15 @@ MEDCouplingUMesh::buildDirectionVectorField() const;
 MEDCouplingUMesh::buildFacePartOfMySelfNode(const int *begin, const int *end, bool fullyIn) const;
 MEDCouplingUMesh::buildOrthogonalField() const;
 MEDCouplingUMesh::buildPartOfMySelf(const int *begin, const int *end, bool keepCoords=true) const;
-MEDCouplingUMesh::buildPartOfMySelfNode(const int *begin, const int *end, bool fullyIn) const;
+//MEDCouplingUMesh::buildPartOfMySelfNode(const int *begin, const int *end, bool fullyIn) const;
 MEDCouplingUMesh::buildPartOrthogonalField(const int *begin, const int *end) const;
 MEDCouplingUMesh::buildSlice3D(const double *origin, const double *vec, double eps, DataArrayInt *&cellIds) const;
 MEDCouplingUMesh::buildSlice3DSurf(const double *origin, const double *vec, double eps, DataArrayInt *&cellIds) const;
 MEDCouplingUMesh::checkCoherency() const;
 MEDCouplingUMesh::checkCoherency1(double eps=1e-12) const;
 MEDCouplingUMesh::checkCoherency2(double eps=1e-12) const;
-MEDCouplingUMesh::checkDeepEquivalOnSameNodesWith(const MEDCouplingMesh *other, int cellCompPol, double prec,DataArrayInt *&cellCor) const;
-MEDCouplingUMesh::checkDeepEquivalWith(const MEDCouplingMesh *other, int cellCompPol, double prec,DataArrayInt *&cellCor, DataArrayInt *&nodeCor) const;
+//MEDCouplingUMesh::checkDeepEquivalOnSameNodesWith(const MEDCouplingMesh *other, int cellCompPol, double prec,DataArrayInt *&cellCor) const;
+//MEDCouplingUMesh::checkDeepEquivalWith(const MEDCouplingMesh *other, int cellCompPol, double prec,DataArrayInt *&cellCor, DataArrayInt *&nodeCor) const;
 MEDCouplingUMesh::checkFastEquivalWith(const MEDCouplingMesh *other, double prec) const;
 MEDCouplingUMesh::clone(bool recDeepCpy) const;
 MEDCouplingUMesh::computeIsoBarycenterOfNodesPerCell() const;
@@ -123,8 +123,8 @@ MEDCouplingUMesh::getAspectRatioField() const;
 MEDCouplingUMesh::getBarycenterAndOwner() const;
 MEDCouplingUMesh::getCellContainingPoint(const double *pos, double eps) const;
 MEDCouplingUMesh::getCellIdsCrossingPlane(const double *origin, const double *vec, double eps) const;
-MEDCouplingUMesh::getCellIdsFullyIncludedInNodeIds(const int *partBg, const int *partEnd) const;
-MEDCouplingUMesh::getCellIdsLyingOnNodes(const int *begin, const int *end, bool fullyIn) const;
+//MEDCouplingUMesh::getCellIdsFullyIncludedInNodeIds(const int *partBg, const int *partEnd) const;
+//MEDCouplingUMesh::getCellIdsLyingOnNodes(const int *begin, const int *end, bool fullyIn) const;
 MEDCouplingUMesh::getCellsContainingPoint(const double *pos, double eps, std::vector<int>& elts) const;
 MEDCouplingUMesh::getCellsContainingPoints(const double *pos, int nbOfPoints, double eps, std::vector<int>& elts, std::vector<int>& eltsIndex) const;
 MEDCouplingUMesh::getCellsInBoundingBox(const INTERP_KERNEL::DirectedBoundingBox& bbox, double eps);
@@ -149,20 +149,20 @@ MEDCouplingUMesh::getTypesOfPart(const int *begin, const int *end) const;
 MEDCouplingUMesh::getWarpField() const;
 MEDCouplingUMesh::insertNextCell(INTERP_KERNEL::NormalizedCellType type, int size, const int *nodalConnOfCell);
 MEDCouplingUMesh::isEqualWithoutConsideringStr(const MEDCouplingMesh *other, double prec) const;
-MEDCouplingUMesh::mergeNodes(double precision, bool& areNodesMerged, int& newNbOfNodes);
-MEDCouplingUMesh::mergeNodes2(double precision, bool& areNodesMerged, int& newNbOfNodes);
+//MEDCouplingUMesh::mergeNodes(double precision, bool& areNodesMerged, int& newNbOfNodes);
+//MEDCouplingUMesh::mergeNodes2(double precision, bool& areNodesMerged, int& newNbOfNodes);
 MEDCouplingUMesh::orientCorrectly2DCells(const double *vec, bool polyOnly);
 MEDCouplingUMesh::orientCorrectlyPolyhedrons();
-MEDCouplingUMesh::renumberNodes(const int *newNodeNumbers, int newNbOfNodes);
-MEDCouplingUMesh::renumberNodes2(const int *newNodeNumbers, int newNbOfNodes);
+//MEDCouplingUMesh::renumberNodes(const int *newNodeNumbers, int newNbOfNodes);
+//MEDCouplingUMesh::renumberNodes2(const int *newNodeNumbers, int newNbOfNodes);
 MEDCouplingUMesh::renumberNodesInConn(const int *newNodeNumbersO2N);
 MEDCouplingUMesh::reprQuickOverview(std::ostream& stream) const;
 MEDCouplingUMesh::setConnectivity(DataArrayInt *conn, DataArrayInt *connIndex, bool isComputingTypes=true);
 MEDCouplingUMesh::setMeshDimension(int meshDim);
 MEDCouplingUMesh::sortCellsInMEDFileFrmt();
-MEDCouplingUMesh::tryToShareSameCoordsPermute(const MEDCouplingPointSet& other, double epsilon);
+//MEDCouplingUMesh::tryToShareSameCoordsPermute(const MEDCouplingPointSet& other, double epsilon);
 MEDCouplingUMesh::unPolyze();
-MEDCouplingUMesh::zipConnectivityTraducer(int compType, int startCellId=0);
+//MEDCouplingUMesh::zipConnectivityTraducer(int compType, int startCellId=0);
 MEDCouplingUMesh::zipCoordsTraducer();
   ///@} 
 
@@ -184,7 +184,7 @@ MEDCouplingUMesh::tessellate2DCurve(double eps);
 /*! \name Others... */
 ///@{
 MEDCouplingUMesh::AggregateSortedByTypeMeshesOnSameCoords(const std::vector<const MEDCouplingUMesh *>& ms,DataArrayInt *&szOfCellGrpOfSameType,DataArrayInt *&idInMsOfCellGrpOfSameType);
-MEDCouplingUMesh::AppendExtrudedCell(const int *connBg, const int *connEnd, int nbOfNodesPerLev, bool isQuad, std::vector<int>& ret);
+//MEDCouplingUMesh::AppendExtrudedCell(const int *connBg, const int *connEnd, int nbOfNodesPerLev, bool isQuad, std::vector<int>& ret);
 MEDCouplingUMesh::AreCellsEqual(const int *conn, const int *connI, int cell1, int cell2, int compType);
 MEDCouplingUMesh::AreCellsEqual0(const int *conn, const int *connI, int cell1, int cell2);
 MEDCouplingUMesh::AreCellsEqual1(const int *conn, const int *connI, int cell1, int cell2);
@@ -192,24 +192,24 @@ MEDCouplingUMesh::AreCellsEqual2(const int *conn, const int *connI, int cell1, i
 MEDCouplingUMesh::AreCellsEqual3(const int *conn, const int *connI, int cell1, int cell2);
 MEDCouplingUMesh::AreCellsEqual7(const int *conn, const int *connI, int cell1, int cell2);
 MEDCouplingUMesh::AreCellsEqualInPool(const std::vector<int>& candidates, int compType, const int *conn, const int *connI, DataArrayInt *result) ;
-MEDCouplingUMesh::AssemblyForSplitFrom3DCurve(const std::vector<int>& cut3DCurve, std::vector<int>& nodesOnPlane, const int *nodal3DSurf, const int *nodalIndx3DSurf,const int *nodal3DCurve, const int *nodalIndx3DCurve,const int *desc, const int *descIndx, std::vector< std::pair<int,int> >& cut3DSurf);
+//MEDCouplingUMesh::AssemblyForSplitFrom3DCurve(const std::vector<int>& cut3DCurve, std::vector<int>& nodesOnPlane, const int *nodal3DSurf, const int *nodalIndx3DSurf,const int *nodal3DCurve, const int *nodalIndx3DCurve,const int *desc, const int *descIndx, std::vector< std::pair<int,int> >& cut3DSurf);
 MEDCouplingUMesh::Build0DMeshFromCoords(DataArrayDouble *da);
 MEDCouplingUMesh::BuildConvexEnvelopOf2DCellJarvis(const double *coords, const int *nodalConnBg, const int *nodalConnEnd, DataArrayInt *nodalConnecOut);
-MEDCouplingUMesh::BuildIntersectEdges(const MEDCouplingUMesh *m1, const MEDCouplingUMesh *m2, const std::vector<double>& addCoo, const std::vector< std::vector<int> >& subDiv, std::vector< std::vector<int> >& intersectEdge);
-MEDCouplingUMesh::BuildIntersecting2DCellsFromEdges(double eps, const MEDCouplingUMesh *m1, const int *desc1, const int *descIndx1, const std::vector<std::vector<int> >& intesctEdges1, const std::vector< std::vector<int> >& colinear2,const MEDCouplingUMesh *m2, const int *desc2, const int *descIndx2, const std::vector<std::vector<int> >& intesctEdges2,const std::vector<double>& addCoords,std::vector<double>& addCoordsQuadratic, std::vector<int>& cr, std::vector<int>& crI, std::vector<int>& cNb1, std::vector<int>& cNb2);
+//MEDCouplingUMesh::BuildIntersectEdges(const MEDCouplingUMesh *m1, const MEDCouplingUMesh *m2, const std::vector<double>& addCoo, const std::vector< std::vector<int> >& subDiv, std::vector< std::vector<int> >& intersectEdge);
+//MEDCouplingUMesh::BuildIntersecting2DCellsFromEdges(double eps, const MEDCouplingUMesh *m1, const int *desc1, const int *descIndx1, const std::vector<std::vector<int> >& intesctEdges1, const std::vector< std::vector<int> >& colinear2,const MEDCouplingUMesh *m2, const int *desc2, const int *descIndx2, const std::vector<std::vector<int> >& intesctEdges2,const std::vector<double>& addCoords,std::vector<double>& addCoordsQuadratic, std::vector<int>& cr, std::vector<int>& crI, std::vector<int>& cNb1, std::vector<int>& cNb2);
 MEDCouplingUMesh::ComputeNeighborsOfCellsAdv(const DataArrayInt *desc, const DataArrayInt *descI, const DataArrayInt *revDesc, const DataArrayInt *revDescI,DataArrayInt *&neighbors, DataArrayInt *&neighborsIdx);
-MEDCouplingUMesh::ComputeRangesFromTypeDistribution(const std::vector<int>& code);
+//MEDCouplingUMesh::ComputeRangesFromTypeDistribution(const std::vector<int>& code);
 MEDCouplingUMesh::ComputeSpreadZoneGradually(const DataArrayInt *arrIn, const DataArrayInt *arrIndxIn);
 MEDCouplingUMesh::ComputeSpreadZoneGraduallyFromSeed(const int *seedBg, const int *seedEnd, const DataArrayInt *arrIn, const DataArrayInt *arrIndxIn, int nbOfDepthPeeling, int& nbOfDepthPeelingPerformed);
-MEDCouplingUMesh::ComputeSpreadZoneGraduallyFromSeedAlg(std::vector<bool>& fetched, const int *seedBg, const int *seedEnd, const DataArrayInt *arrIn, const DataArrayInt *arrIndxIn, int nbOfDepthPeeling, int& nbOfDepthPeelingPerformed);
+//MEDCouplingUMesh::ComputeSpreadZoneGraduallyFromSeedAlg(std::vector<bool>& fetched, const int *seedBg, const int *seedEnd, const DataArrayInt *arrIn, const DataArrayInt *arrIndxIn, int nbOfDepthPeeling, int& nbOfDepthPeelingPerformed);
 MEDCouplingUMesh::ComputeVecAndPtOfFace(double eps, const double *coords, const int *begin, const int *end, double *v, double *p);
-MEDCouplingUMesh::CorrectExtrudedCell(int *begin, int *end);
+//MEDCouplingUMesh::CorrectExtrudedCell(int *begin, int *end);
 MEDCouplingUMesh::CorrectExtrudedStaticCell(int *begin, int *end);
 MEDCouplingUMesh::ExtractFromIndexedArrays(const int *idsOfSelectBg, const int *idsOfSelectEnd, const DataArrayInt *arrIn, const DataArrayInt *arrIndxIn,DataArrayInt* &arrOut, DataArrayInt* &arrIndexOut);
-MEDCouplingUMesh::FillInCompact3DMode(int spaceDim, int nbOfNodesInCell, const int *conn, const double *coo, double *zipFrmt);
+//MEDCouplingUMesh::FillInCompact3DMode(int spaceDim, int nbOfNodesInCell, const int *conn, const double *coo, double *zipFrmt);
 MEDCouplingUMesh::FindCommonCellsAlg(int compType, int startCellId, const DataArrayInt *nodal, const DataArrayInt *nodalI, const DataArrayInt *revNodal, const DataArrayInt *revNodalI,DataArrayInt *& commonCellsArr, DataArrayInt *& commonCellsIArr);
-MEDCouplingUMesh::IntersectDescending2DMeshes(const MEDCouplingUMesh *m1, const MEDCouplingUMesh *m2, double eps,std::vector< std::vector<int> >& intersectEdge1, std::vector< std::vector<int> >& colinear2, std::vector< std::vector<int> >& subDiv2,MEDCouplingUMesh *& m1Desc, DataArrayInt *&desc1, DataArrayInt *&descIndx1, DataArrayInt *&revDesc1, DataArrayInt *&revDescIndx1,MEDCouplingUMesh *& m2Desc, DataArrayInt *&desc2, DataArrayInt *&descIndx2, DataArrayInt *&revDesc2, DataArrayInt *&revDescIndx2,std::vector<double>& addCoo);
-MEDCouplingUMesh::Is3DExtrudedCellWellOriented(const int *begin, const int *end, const double *coords);
+//MEDCouplingUMesh::IntersectDescending2DMeshes(const MEDCouplingUMesh *m1, const MEDCouplingUMesh *m2, double eps,std::vector< std::vector<int> >& intersectEdge1, std::vector< std::vector<int> >& colinear2, std::vector< std::vector<int> >& subDiv2,MEDCouplingUMesh *& m1Desc, DataArrayInt *&desc1, DataArrayInt *&descIndx1, DataArrayInt *&revDesc1, DataArrayInt *&revDescIndx1,MEDCouplingUMesh *& m2Desc, DataArrayInt *&desc2, DataArrayInt *&descIndx2, DataArrayInt *&revDesc2, DataArrayInt *&revDescIndx2,std::vector<double>& addCoo);
+//MEDCouplingUMesh::Is3DExtrudedCellWellOriented(const int *begin, const int *end, const double *coords);
 MEDCouplingUMesh::Is3DExtrudedStaticCellWellOriented(const int *begin, const int *end, const double *coords);
 MEDCouplingUMesh::IsPolygonWellOriented(bool isQuadratic, const double *vec, const int *begin, const int *end, const double *coords);
 MEDCouplingUMesh::IsPolyhedronWellOriented(const int *begin, const int *end, const double *coords);
@@ -217,9 +217,9 @@ MEDCouplingUMesh::IsPyra5WellOriented(const int *begin, const int *end, const do
 MEDCouplingUMesh::IsTetra4WellOriented(const int *begin, const int *end, const double *coords);
 MEDCouplingUMesh::MEDCouplingUMesh();
 MEDCouplingUMesh::MEDCouplingUMesh(const MEDCouplingUMesh& other, bool deepCopy);
-MEDCouplingUMesh::MergeUMeshesLL(std::vector<const MEDCouplingUMesh *>& a);
+//MEDCouplingUMesh::MergeUMeshesLL(std::vector<const MEDCouplingUMesh *>& a);
 MEDCouplingUMesh::New();
-MEDCouplingUMesh::New(const char *meshName, int meshDim);
+MEDCouplingUMesh::New(const std::string& meshName, int meshDim);
 MEDCouplingUMesh::RemoveIdsFromIndexedArrays(const int *idsToRemoveBg, const int *idsToRemoveEnd, DataArrayInt *arr, DataArrayInt *arrIndx, int offsetForRemoval=0);
 MEDCouplingUMesh::SetPartOfIndexedArrays(const int *idsOfSelectBg, const int *idsOfSelectEnd, const DataArrayInt *arrIn, const DataArrayInt *arrIndxIn,const DataArrayInt *srcArr, const DataArrayInt *srcArrIndex,DataArrayInt* &arrOut, DataArrayInt* &arrIndexOut);
 MEDCouplingUMesh::SetPartOfIndexedArrays2(int start, int end, int step, const DataArrayInt *arrIn, const DataArrayInt *arrIndxIn,const DataArrayInt *srcArr, const DataArrayInt *srcArrIndex,DataArrayInt* &arrOut, DataArrayInt* &arrIndexOut);
@@ -228,9 +228,9 @@ MEDCouplingUMesh::SetPartOfIndexedArraysSameIdx2(int start, int end, int step, D
 MEDCouplingUMesh::SimplifyPolyhedronCell(double eps, const DataArrayDouble *coords, const int *begin, const int *end, DataArrayInt *res);
 MEDCouplingUMesh::TryToCorrectPolyhedronOrientation(int *begin, int *end, const double *coords);
 MEDCouplingUMesh::advancedRepr() const;
-MEDCouplingUMesh::areCellsFrom2MeshEqual(const MEDCouplingUMesh *other, int cellId, double prec) const;
+//MEDCouplingUMesh::areCellsFrom2MeshEqual(const MEDCouplingUMesh *other, int cellId, double prec) const;
 MEDCouplingUMesh::areCellsIncludedIn2(const MEDCouplingUMesh *other, DataArrayInt *& arr) const;
-MEDCouplingUMesh::assemblyForSplitFrom3DSurf(const std::vector< std::pair<int,int> >& cut3DSurf,const int *desc, const int *descIndx, DataArrayInt *nodalRes, DataArrayInt *nodalResIndx, DataArrayInt *cellIds) const;
+//MEDCouplingUMesh::assemblyForSplitFrom3DSurf(const std::vector< std::pair<int,int> >& cut3DSurf,const int *desc, const int *descIndx, DataArrayInt *nodalRes, DataArrayInt *nodalResIndx, DataArrayInt *cellIds) const;
 MEDCouplingUMesh::buildExtrudedMesh(const MEDCouplingUMesh *mesh1D, int policy);
 MEDCouplingUMesh::buildExtrudedMeshFromThisLowLev(int nbOfNodesOf1Lev, bool isQuad) const;
 MEDCouplingUMesh::buildPartOfMySelf2(int start, int end, int step, bool keepCoords=true) const;
@@ -265,8 +265,8 @@ MEDCouplingUMesh::convertLinearCellsToQuadratic3D1(DataArrayInt *&conn, DataArra
 MEDCouplingUMesh::convexEnvelop2D();
 MEDCouplingUMesh::cppRepr() const;
 MEDCouplingUMesh::distanceToPoint(const double *ptBg, const double *ptEnd, int& cellId, int& nodeId) const;
-MEDCouplingUMesh::distanceToPoint2DCurveAlg(const double *pt, const DataArrayInt *cellIds, double& ret0, int& cellId) const;
-MEDCouplingUMesh::distanceToPoint3DSurfAlg(const double *pt, const DataArrayInt *cellIds, double& ret0, int& cellId) const;
+//MEDCouplingUMesh::distanceToPoint2DCurveAlg(const double *pt, const DataArrayInt *cellIds, double& ret0, int& cellId) const;
+//MEDCouplingUMesh::distanceToPoint3DSurfAlg(const double *pt, const DataArrayInt *cellIds, double& ret0, int& cellId) const;
 MEDCouplingUMesh::duplicateNodes(const int *nodeIdsToDuplicateBg, const int *nodeIdsToDuplicateEnd);
 MEDCouplingUMesh::duplicateNodesInConn(const int *nodeIdsToDuplicateBg, const int *nodeIdsToDuplicateEnd, int offset);
 MEDCouplingUMesh::emulateMEDMEMBDC(const MEDCouplingUMesh *nM1LevMesh, DataArrayInt *desc, DataArrayInt *descIndx, DataArrayInt *&revDesc, DataArrayInt *&revDescIndx, DataArrayInt *& nM1LevMeshIds, DataArrayInt *&meshnM1Old2New) const;
@@ -281,11 +281,11 @@ MEDCouplingUMesh::findCellIdsLyingOn(const MEDCouplingUMesh& otherDimM1OnSameCoo
 MEDCouplingUMesh::findCellIdsOnBoundary() const;
 MEDCouplingUMesh::findCommonCells(int compType, int startCellId, DataArrayInt *& commonCellsArr, DataArrayInt *& commonCellsIArr) const;
 MEDCouplingUMesh::findNodesToDuplicate(const MEDCouplingUMesh& otherDimM1OnSameCoords, DataArrayInt *& nodeIdsToDuplicate,DataArrayInt *& cellIdsNeededToBeRenum, DataArrayInt *& cellIdsNotModified) const;
-MEDCouplingUMesh::getAllTypes() const;
+//MEDCouplingUMesh::getAllTypes() const;
 MEDCouplingUMesh::getBoundingBoxForBBTree(std::vector<double>& bbox) const;
 MEDCouplingUMesh::getDistributionOfTypes() const;
 MEDCouplingUMesh::getFastAveragePlaneOfThis(double *vec, double *pos) const;
-MEDCouplingUMesh::getHeapMemorySize() const;
+//MEDCouplingUMesh::getHeapMemorySize() const;
 MEDCouplingUMesh::getLevArrPerCellTypes(const INTERP_KERNEL::NormalizedCellType *orderBg, const INTERP_KERNEL::NormalizedCellType *orderEnd, DataArrayInt *&nbPerType) const;
 MEDCouplingUMesh::getNumberOfCellsWithType(INTERP_KERNEL::NormalizedCellType type) const;
 MEDCouplingUMesh::getNumberOfNodesInCell(int cellId) const;
@@ -326,13 +326,13 @@ MEDCouplingUMesh::unserialization(const std::vector<double>& tinyInfoD, const st
 MEDCouplingUMesh::updateTime() const;
 MEDCouplingUMesh::writeVTKLL(std::ostream& ofs, const std::string& cellData, const std::string& pointData) const;
 MEDCouplingUMesh::~MEDCouplingUMesh();
-template<class SonsGenerator> MEDCouplingUMesh * MEDCouplingUMesh::buildDescendingConnectivityGen(DataArrayInt *desc, DataArrayInt *descIndx, DataArrayInt *revDesc, DataArrayInt *revDescIndx, DimM1DescNbrer nbrer) const;
+//template<class SonsGenerator> MEDCouplingUMesh * MEDCouplingUMesh::buildDescendingConnectivityGen(DataArrayInt *desc, DataArrayInt *descIndx, DataArrayInt *revDesc, DataArrayInt *revDescIndx, DimM1DescNbrer nbrer) const;
 template<int SPACEDIM> void MEDCouplingUMesh::getCellsContainingPointsAlg
 (const double *coords, const double *pos, int nbOfPoints,double eps, std::vector<int>& elts,
  std::vector<int>& eltsIndex) const;
 
-const INTERP_KERNEL::NormalizedCellType MEDCouplingUMesh::MEDMEM_ORDER[N_MEDMEM_ORDER];
-const int MEDCouplingUMesh::N_MEDMEM_ORDER=24;
+//const INTERP_KERNEL::NormalizedCellType MEDCouplingUMesh::MEDMEM_ORDER[N_MEDMEM_ORDER];
+//const int MEDCouplingUMesh::N_MEDMEM_ORDER=24;
 double MEDCouplingUMesh::EPS_FOR_POLYH_ORIENTATION;
 int MEDCouplingUMesh::_mesh_dim;
 std::set<INTERP_KERNEL::NormalizedCellType> MEDCouplingUMesh::_types;

diff --git a/doc/user/doxygen/fakesources/MEDFileField.C b/doc/user/doxygen/fakesources/MEDFileField.C
index 4919e4a4820d725fc598d63a179744b41d0d3f60..9e9365db6d69f4d27248d76e980d03b160d69735 100644 (file)
--- a/doc/user/doxygen/fakesources/MEDFileField.C
+++ b/doc/user/doxygen/fakesources/MEDFileField.C
@@ -27,12 +27,12 @@ namespace ParaMEDMEM // inline methods of MEDFileField1TSWithoutSDA
    * Returns the number of iteration where \a this field has been calculated.
    *  \return int - the iteration number.
    */
-  int MEDFileField1TSWithoutSDA::getIteration() const {}
+//  int MEDFileField1TSWithoutSDA::getIteration() const {}
   /*!
    * Returns the order number of iteration where \a this field has been calculated.
    *  \return int - the order number.
    */
-  int MEDFileField1TSWithoutSDA::getOrder() const {}
+//  int MEDFileField1TSWithoutSDA::getOrder() const {}
   /*!
    * Returns time, number of iteration and order number of iteration when
    * \a this field has been calculated.
@@ -40,7 +40,7 @@ namespace ParaMEDMEM // inline methods of MEDFileField1TSWithoutSDA
    *  \param [out] order - the order number.
    *  \return double - the time value.
    */
-  double MEDFileField1TSWithoutSDA::getTime(int& iteration, int& order) const {}
+//  double MEDFileField1TSWithoutSDA::getTime(int& iteration, int& order) const {}
   /*!
    * Sets time, number of iteration and order number of iteration when
    * \a this field has been calculated.
@@ -48,12 +48,12 @@ namespace ParaMEDMEM // inline methods of MEDFileField1TSWithoutSDA
    *  \param [in] iteration - the iteration number.
    *  \param [in] order - the order number.
    */
-  void MEDFileField1TSWithoutSDA::setTime(int iteration, int order, double val) {}
+//  void MEDFileField1TSWithoutSDA::setTime(int iteration, int order, double val) {}
   /*!
    * Returns units in which the time is measured.
    *  \return const char * - the time unit name.
    */
-  const std::string& MEDFileField1TSWithoutSDA::getDtUnit() const {}
+//  const std::string& MEDFileField1TSWithoutSDA::getDtUnit() const {}
 }
 
 namespace ParaMEDMEM // inline methods of MEDFileFieldGlobsReal

diff --git a/doc/user/doxygen/fakesources/MEDFileMesh.C b/doc/user/doxygen/fakesources/MEDFileMesh.C
index 80f85fe860bf690197c60920721b01b3ceea66f2..10565363b602b67d2be82a3aaf62552236192486 100644 (file)
--- a/doc/user/doxygen/fakesources/MEDFileMesh.C
+++ b/doc/user/doxygen/fakesources/MEDFileMesh.C
@@ -28,32 +28,32 @@ namespace ParaMEDMEM
    * Sets the name of \a this mesh.
    *  \param [in] name - the new mesh name.
    */
-  void MEDFileMesh::setName(const char *name) {}
+  void MEDFileMesh::setName(const std::string& name) {}
   /*!
    * Returns the name of \a this mesh.
    *  \return const char* name - the mesh name.
    */
-  const char *MEDFileMesh::getName() const {}
+  const std::string& MEDFileMesh::getName() const {}
   /*!
    * Sets the universal name of \a this mesh. The universal name uniquely identifies the mesh.
    *  \param [in] name - the new universal mesh name.
    */
-  void MEDFileMesh::setUnivName(const char *name) {}
+  void MEDFileMesh::setUnivName(const std::string& name) {}
   /*!
    * Returns the universal name of \a this mesh. The universal name uniquely identifies the mesh.
-   *  \return const char * - the universal mesh name.
+   *  \return const std::string&  - the universal mesh name.
    */
-  const char *MEDFileMesh::getUnivName() const {}
+  const std::string& MEDFileMesh::getUnivName() const {}
   /*!
    * Sets the description of \a this mesh.
    *  \param [in] name - the new mesh description.
    */
-  void MEDFileMesh::setDescription(const char *name) {}
+  void MEDFileMesh::setDescription(const std::string& name) {}
   /*!
    * Returns the description of \a this mesh.
    *  \return const char* - the mesh description.
    */
-  const char *MEDFileMesh::getDescription() const {}
+  const std::string& MEDFileMesh::getDescription() const {}
   /*!
    * Sets the order number of iteration of \a this mesh state.
    *  \param [in] order - the order number.
@@ -104,12 +104,12 @@ namespace ParaMEDMEM
    * Sets units in which the time is measured.
    *  \param [in] unit - the time unit name.
    */
-  void MEDFileMesh::setTimeUnit(const char *unit) {}
+  void MEDFileMesh::setTimeUnit(const std::string& unit) {}
   /*!
    * Returns units in which the time is measured.
-   *  \return const char * - the time unit name.
+   *  \return const std::string&  - the time unit name.
    */
-  const char *MEDFileMesh::getTimeUnit() const {}
+  const std::string& MEDFileMesh::getTimeUnit() const {}
   /*!
    * Returns names and ids of all families in \a this mesh.
    *  \return const std::map<std::string,int>& - a map of a family name to a family id.
@@ -221,48 +221,48 @@ namespace ParaMEDMEM
   /*! \name Basic API   */
   ///@{
   MEDFileMesh::FindOrCreateAndGiveFamilyWithId(std::map<std::string,int>& families, int id, bool& created);
-MEDFileMesh::New(const char *fileName);
-MEDFileMesh::New(const char *fileName, const char *mName, int dt=-1, int it=-1);
-MEDFileMesh::addFamily(const char *familyName, int id);
-MEDFileMesh::addFamilyOnGrp(const char *grpName, const char *famName);
+//MEDFileMesh::New(const std::string& fileName);
+//MEDFileMesh::New(const std::string& fileName, const std::string& mName, int dt=-1, int it=-1);
+MEDFileMesh::addFamily(const std::string& familyName, int id);
+MEDFileMesh::addFamilyOnGrp(const std::string& grpName, const std::string& famName);
 MEDFileMesh::advancedRepr() const = 0;
 MEDFileMesh::areFamsEqual(const MEDFileMesh *other, std::string& what) const;
 MEDFileMesh::areGrpsEqual(const MEDFileMesh *other, std::string& what) const;
 MEDFileMesh::assignFamilyNameWithGroupName();
 MEDFileMesh::changeFamilyId(int oldId, int newId);
-MEDFileMesh::changeFamilyName(const char *oldName, const char *newName);
-MEDFileMesh::changeGroupName(const char *oldName, const char *newName);
+MEDFileMesh::changeFamilyName(const std::string& oldName, const std::string& newName);
+MEDFileMesh::changeGroupName(const std::string& oldName, const std::string& newName);
 MEDFileMesh::copyFamGrpMapsFrom(const MEDFileMesh& other);
-MEDFileMesh::createGroupOnAll(int meshDimRelToMaxExt, const char *groupName);
-MEDFileMesh::existsFamily(const char *familyName) const;
+MEDFileMesh::createGroupOnAll(int meshDimRelToMaxExt, const std::string& groupName);
+MEDFileMesh::existsFamily(const std::string& familyName) const;
 MEDFileMesh::existsFamily(int famId) const;
-MEDFileMesh::existsGroup(const char *groupName) const;
+MEDFileMesh::existsGroup(const std::string& groupName) const;
 MEDFileMesh::findOrCreateAndGiveFamilyWithId(int id, bool& created);
 MEDFileMesh::getDescription() const;
 MEDFileMesh::getFamiliesArr(int meshDimRelToMaxExt, const std::vector<std::string>& fams, bool renum=false) const;
 MEDFileMesh::getFamiliesIds(const std::vector<std::string>& famNames) const;
-MEDFileMesh::getFamiliesIdsOnGroup(const char *name) const;
+MEDFileMesh::getFamiliesIdsOnGroup(const std::string& name) const;
 MEDFileMesh::getFamiliesNames() const;
-MEDFileMesh::getFamiliesOnGroup(const char *name) const;
+MEDFileMesh::getFamiliesOnGroup(const std::string& name) const;
 MEDFileMesh::getFamiliesOnGroups(const std::vector<std::string>& grps) const;
-MEDFileMesh::getFamilyArr(int meshDimRelToMaxExt, const char *fam, bool renum=false) const;
+MEDFileMesh::getFamilyArr(int meshDimRelToMaxExt, const std::string& fam, bool renum=false) const;
 MEDFileMesh::getFamilyFieldAtLevel(int meshDimRelToMaxExt) const;
-MEDFileMesh::getFamilyId(const char *name) const;
+MEDFileMesh::getFamilyId(const std::string& name) const;
 MEDFileMesh::getFamilyInfo() const;
 MEDFileMesh::getFamilyNameGivenId(int id) const;
 MEDFileMesh::getGenMeshAtLevel(int meshDimRelToMax, bool renum=false) const;
-MEDFileMesh::getGroupArr(int meshDimRelToMaxExt, const char *grp, bool renum=false) const;
+MEDFileMesh::getGroupArr(int meshDimRelToMaxExt, const std::string& grp, bool renum=false) const;
 MEDFileMesh::getGroupInfo() const;
 MEDFileMesh::getGroupsArr(int meshDimRelToMaxExt, const std::vector<std::string>& grps, bool renum=false) const;
 MEDFileMesh::getGroupsNames() const;
-MEDFileMesh::getGroupsOnFamily(const char *name) const;
+MEDFileMesh::getGroupsOnFamily(const std::string& name) const;
 MEDFileMesh::getIteration() const;
 MEDFileMesh::getMaxFamilyId() const;
 MEDFileMesh::getMeshDimension() const;
 MEDFileMesh::getName() const;
 MEDFileMesh::getNodeFamiliesArr(const std::vector<std::string>& fams, bool renum=false) const;
-MEDFileMesh::getNodeFamilyArr(const char *fam, bool renum=false) const;
-MEDFileMesh::getNodeGroupArr(const char *grp, bool renum=false) const;
+MEDFileMesh::getNodeFamilyArr(const std::string& fam, bool renum=false) const;
+MEDFileMesh::getNodeGroupArr(const std::string& grp, bool renum=false) const;
 MEDFileMesh::getNodeGroupsArr(const std::vector<std::string>& grps, bool renum=false) const;
 MEDFileMesh::getNonEmptyLevels() const = 0;
 MEDFileMesh::getNonEmptyLevelsExt() const = 0;
@@ -276,27 +276,27 @@ MEDFileMesh::getTimeValue() const;
 MEDFileMesh::getUnivName() const;
 MEDFileMesh::isEqual(const MEDFileMesh *other, double eps, std::string& what) const;
 MEDFileMesh::keepFamIdsOnlyOnLevs(const std::vector<int>& famIds, const std::vector<int>& levs);
-MEDFileMesh::removeFamily(const char *name);
-MEDFileMesh::removeGroup(const char *name);
-MEDFileMesh::setDescription(const char *name);
-MEDFileMesh::setFamiliesIdsOnGroup(const char *name, const std::vector<int>& famIds);
-MEDFileMesh::setFamiliesOnGroup(const char *name, const std::vector<std::string>& fams);
+MEDFileMesh::removeFamily(const std::string& name);
+MEDFileMesh::removeGroup(const std::string& name);
+MEDFileMesh::setDescription(const std::string& name);
+MEDFileMesh::setFamiliesIdsOnGroup(const std::string& name, const std::vector<int>& famIds);
+MEDFileMesh::setFamiliesOnGroup(const std::string& name, const std::vector<std::string>& fams);
 MEDFileMesh::setFamilyFieldArr(int meshDimRelToMaxExt, DataArrayInt *famArr);
-MEDFileMesh::setFamilyId(const char *familyName, int id);
+MEDFileMesh::setFamilyId(const std::string& familyName, int id);
 MEDFileMesh::setFamilyInfo(const std::map<std::string,int>& info);
 MEDFileMesh::setGroupInfo(const std::map<std::string, std::vector<std::string> >&info);
 MEDFileMesh::setGroupsAtLevel(int meshDimRelToMaxExt, const std::vector<const DataArrayInt *>& grps, bool renum=false);
-MEDFileMesh::setGroupsOnFamily(const char *famName, const std::vector<std::string>& grps);
+MEDFileMesh::setGroupsOnFamily(const std::string& famName, const std::vector<std::string>& grps);
 MEDFileMesh::setIteration(int it);
-MEDFileMesh::setName(const char *name);
+MEDFileMesh::setName(const std::string& name);
 MEDFileMesh::setOrder(int order);
 MEDFileMesh::setRenumFieldArr(int meshDimRelToMaxExt, DataArrayInt *renumArr);
 MEDFileMesh::setTime(int dt, int it, double time);
-MEDFileMesh::setTimeUnit(const char *unit);
+MEDFileMesh::setTimeUnit(const std::string& unit);
 MEDFileMesh::setTimeValue(double time);
-MEDFileMesh::setUnivName(const char *name);
+MEDFileMesh::setUnivName(const std::string& name);
 MEDFileMesh::simpleRepr() const;
-MEDFileMesh::write(const char *fileName, int mode) const;
+MEDFileMesh::write(const std::string& fileName, int mode) const;
 MEDFileMesh::write(med_idt fid) const;
 ///@}
 
@@ -307,14 +307,14 @@ MEDFileMesh::clearNonDiscrAttributes() const;
 
 /*! \name Others... */
 ///@{
-MEDFileMesh::ChangeAllGroupsContainingFamily(std::map<std::string, std::vector<std::string> >& groups, const char *familyNameToChange, const std::vector<std::string>& newFamiliesNames);
+MEDFileMesh::ChangeAllGroupsContainingFamily(std::map<std::string, std::vector<std::string> >& groups, const std::string& familyNameToChange, const std::vector<std::string>& newFamiliesNames);
 MEDFileMesh::CreateNameNotIn(const std::string& nameTry, const std::vector<std::string>& namesToAvoid);
 MEDFileMesh::MEDFileMesh();
 MEDFileMesh::PutInThirdComponentOfCodeOffset(std::vector<int>& code, int strt);
 MEDFileMesh::TranslateFamilyIds(int offset, DataArrayInt *famArr, std::vector< std::vector<int> >& famIdsPerGrp);
-MEDFileMesh::addFamilyOnAllGroupsHaving(const char *famName, const char *otherFamName);
+MEDFileMesh::addFamilyOnAllGroupsHaving(const std::string& famName, const std::string& otherFamName);
 MEDFileMesh::appendFamilyEntries(const DataArrayInt *famIds, const std::vector< std::vector<int> >& fidsOfGrps, const std::vector<std::string>& grpNames);
-MEDFileMesh::changeAllGroupsContainingFamily(const char *familyNameToChange, const std::vector<std::string>& newFamiliesNames);
+MEDFileMesh::changeAllGroupsContainingFamily(const std::string& familyNameToChange, const std::vector<std::string>& newFamiliesNames);
 MEDFileMesh::changeFamilyIdArr(int oldId, int newId);
 MEDFileMesh::changeNames(const std::vector< std::pair<std::string,std::string> >& modifTab);
 MEDFileMesh::dealWithTinyInfo(const MEDCouplingMesh *m);
@@ -322,7 +322,7 @@ MEDFileMesh::deepCpy() const;
 MEDFileMesh::ensureDifferentFamIdsPerLevel();
 MEDFileMesh::getAllFamiliesIdsReferenced() const;
 MEDFileMesh::getFamilyRepr(std::ostream& oss) const;
-MEDFileMesh::getHeapMemorySize() const;
+//MEDFileMesh::getHeapMemorySize() const;
 MEDFileMesh::getMaxFamilyIdInArrays() const;
 MEDFileMesh::getMinFamilyId() const;
 MEDFileMesh::getMinFamilyIdInArrays() const;
@@ -332,7 +332,7 @@ MEDFileMesh::getTheMaxFamilyId() const;
 MEDFileMesh::getTheMinFamilyId() const;
 MEDFileMesh::normalizeFamIdsMEDFile();
 MEDFileMesh::normalizeFamIdsTrio();
-MEDFileMesh::setFamilyIdUnique(const char *familyName, int id);
+MEDFileMesh::setFamilyIdUnique(const std::string& familyName, int id);
 MEDFileMesh::setNameFieldAtLevel(int meshDimRelToMaxExt, DataArrayAsciiChar *nameArr);
 MEDFileMesh::shallowCpy() const;
 MEDFileMesh::synchronizeTinyInfoOnLeaves() const = 0;

diff --git a/src/INTERP_KERNEL/InterpolationOptions.hxx b/src/INTERP_KERNEL/InterpolationOptions.hxx
index 60bd70d96e36656e2dd8e1df00eb9bd833e65003..dcd10d5dc3e7efec973942497cd6ea84fa0f1622 100644 (file)
--- a/src/INTERP_KERNEL/InterpolationOptions.hxx
+++ b/src/INTERP_KERNEL/InterpolationOptions.hxx
@@ -31,7 +31,7 @@ namespace INTERP_KERNEL
   typedef enum { Triangulation, Convex, Geometric2D, PointLocator, Barycentric, BarycentricGeo2D } IntersectionType;
   
   /*!
-   * Class defining the options for all interpolation algorithms used in the \ref MEDCouplingRemapper "remapper" and
+   * Class defining the options for all interpolation algorithms used in the \ref remapper "remapper" and
    * in some of the \ref para-dec "DECs".
    * 
    * List of options, possible values and default values can be found on this page:

diff --git a/src/MEDCoupling/MEDCouplingAMRAttribute.cxx b/src/MEDCoupling/MEDCouplingAMRAttribute.cxx
index 0a98446690049ecd21e20ce9ae23d77d4a1aea9f..f49b7bf9d7e456622bb9d08625be607a14acb25f 100644 (file)
--- a/src/MEDCoupling/MEDCouplingAMRAttribute.cxx
+++ b/src/MEDCoupling/MEDCouplingAMRAttribute.cxx
@@ -28,6 +28,7 @@
 
 using namespace ParaMEDMEM;
 
+/// @cond INTERNAL
 DataArrayDoubleCollection *DataArrayDoubleCollection::New(const std::vector< std::pair<std::string,int> >& fieldNames)
 {
   return new DataArrayDoubleCollection(fieldNames);
@@ -727,6 +728,8 @@ void MEDCouplingGridCollection::updateTime() const
     }
 }
 
+/// @endcond
+
 MEDCouplingCartesianAMRMesh *MEDCouplingDataForGodFather::getMyGodFather()
 {
   return _gf;

diff --git a/src/MEDCoupling/MEDCouplingMesh.cxx b/src/MEDCoupling/MEDCouplingMesh.cxx
index ea60f27deac2474620603a7c76a71d495b93057c..3de265f1fe3ee0b81bfbd6a40f94a3aed7e6100b 100644 (file)
--- a/src/MEDCoupling/MEDCouplingMesh.cxx
+++ b/src/MEDCoupling/MEDCouplingMesh.cxx
@@ -726,6 +726,7 @@ std::string MEDCouplingMesh::getVTKFileNameOf(const std::string& fileName) const
   return ret;
 }
 
+/// @cond INTERNAL
 void MEDCouplingMesh::writeVTKAdvanced(const std::string& fileName, const std::string& cda, const std::string& pda, DataArrayByte *byteData) const
 {
   std::ofstream ofs(fileName.c_str());
@@ -758,3 +759,4 @@ void MEDCouplingMesh::SplitExtension(const std::string& fileName, std::string& b
   baseName=fileName.substr(0,pos);
   extension=fileName.substr(pos);
 }
+/// @endcond

diff --git a/src/MEDCoupling/MEDCouplingUMesh.cxx b/src/MEDCoupling/MEDCouplingUMesh.cxx
index d50bf73c257e0c5b1224da089a71538fea7ce103..81e8295b479a9fd2054fcde7b39e89026db21a73 100644 (file)
--- a/src/MEDCoupling/MEDCouplingUMesh.cxx
+++ b/src/MEDCoupling/MEDCouplingUMesh.cxx
@@ -53,7 +53,9 @@ using namespace ParaMEDMEM;
 
 double MEDCouplingUMesh::EPS_FOR_POLYH_ORIENTATION=1.e-14;
 
+/// @cond INTERNAL
 const INTERP_KERNEL::NormalizedCellType MEDCouplingUMesh::MEDMEM_ORDER[N_MEDMEM_ORDER] = { INTERP_KERNEL::NORM_POINT1, INTERP_KERNEL::NORM_SEG2, INTERP_KERNEL::NORM_SEG3, INTERP_KERNEL::NORM_SEG4, INTERP_KERNEL::NORM_POLYL, INTERP_KERNEL::NORM_TRI3, INTERP_KERNEL::NORM_QUAD4, INTERP_KERNEL::NORM_TRI6, INTERP_KERNEL::NORM_TRI7, INTERP_KERNEL::NORM_QUAD8, INTERP_KERNEL::NORM_QUAD9, INTERP_KERNEL::NORM_POLYGON, INTERP_KERNEL::NORM_QPOLYG, INTERP_KERNEL::NORM_TETRA4, INTERP_KERNEL::NORM_PYRA5, INTERP_KERNEL::NORM_PENTA6, INTERP_KERNEL::NORM_HEXA8, INTERP_KERNEL::NORM_HEXGP12, INTERP_KERNEL::NORM_TETRA10, INTERP_KERNEL::NORM_PYRA13, INTERP_KERNEL::NORM_PENTA15, INTERP_KERNEL::NORM_HEXA20, INTERP_KERNEL::NORM_HEXA27, INTERP_KERNEL::NORM_POLYHED };
+/// @endcond
 
 MEDCouplingUMesh *MEDCouplingUMesh::New()
 {
@@ -4160,6 +4162,8 @@ DataArrayDouble *MEDCouplingUMesh::distanceToPoints(const DataArrayDouble *pts,
   return ret0.retn();
 }
 
+/// @cond INTERNAL
+
 /*!
  * \param [in] pt the start pointer (included) of the coordinates of the point
  * \param [in] cellIdsBg the start pointer (included) of cellIds
@@ -4231,6 +4235,7 @@ void MEDCouplingUMesh::DistanceToPoint2DCurveAlg(const double *pt, const int *ce
       }
     }
 }
+/// @endcond
 
 /*!
  * Finds cells in contact with a ball (i.e. a point with precision). 

diff --git a/src/MEDCoupling_Swig/MEDCouplingExamplesTest.py b/src/MEDCoupling_Swig/MEDCouplingExamplesTest.py
index 3ebd2170d8a645ccb6947be7cbca8e43a7124e49..86ee5d7671f94976aea21a7284c91d03f5b5f7f0 100644 (file)
--- a/src/MEDCoupling_Swig/MEDCouplingExamplesTest.py
+++ b/src/MEDCoupling_Swig/MEDCouplingExamplesTest.py
@@ -2159,6 +2159,8 @@ class MEDCouplingBasicsTest(unittest.TestCase):
         self.assertEqual(9*7,mesh.getNumberOfNodes())
         self.assertEqual(2,mesh.getSpaceDimension())
         self.assertEqual(2,mesh.getMeshDimension())
+# ! [PySnippetCMeshStdBuild1_4]
+# ! [PySnippetCMeshStdBuild1_4]
         return
 
     def testExampleUMeshAdvBuild1(self):

diff --git a/src/ParaMEDMEM/ExplicitCoincidentDEC.cxx b/src/ParaMEDMEM/ExplicitCoincidentDEC.cxx
index 7cab3095dca3ee4e35d6e50c445db19b4827e0ad..db0396725b3135d1e1639e8f3a0870f4e404125e 100644 (file)
--- a/src/ParaMEDMEM/ExplicitCoincidentDEC.cxx
+++ b/src/ParaMEDMEM/ExplicitCoincidentDEC.cxx
@@ -38,7 +38,7 @@ namespace ParaMEDMEM
     \class ExplicitCoincidentDEC
 
 
-    This class aims at \ref interp "remapping fields" that have identical
+    This class aims at \ref interpolation "remapping fields" that have identical
     supports (=the same underlying mesh) but different parallel topologies
     (=different sub-domains in the mesh). It can be used to couple
     together multi-physics codes that operate on the same domain

diff --git a/src/ParaMEDMEM/StructuredCoincidentDEC.cxx b/src/ParaMEDMEM/StructuredCoincidentDEC.cxx
index 7cdc16a4438d345858d2f4fe9910d735c7f560d1..9620ba1358bbb937ad70fc6065e1e0793f672888 100644 (file)
--- a/src/ParaMEDMEM/StructuredCoincidentDEC.cxx
+++ b/src/ParaMEDMEM/StructuredCoincidentDEC.cxx
@@ -38,7 +38,7 @@ namespace ParaMEDMEM
     \anchor StructuredCoincidentDEC-det
     \class StructuredCoincidentDEC
 
-    This class aims at \ref interp "remapping fields" that have identical
+    This class aims at \ref interpolation "remapping fields" that have identical
     structured supports (=the same underlying mesh) but different parallel topologies
     (=different sub-domains in the structured mesh). It can be used to couple
     together multi-physics codes that operate on the same domain