From 606690f432f99cdd93ff2e8d3a6382db74cdec3b Mon Sep 17 00:00:00 2001 From: abn Date: Mon, 2 Nov 2015 14:12:28 +0100 Subject: [PATCH] Various fixes on doc. --- .../examples/medcouplingexamplesmeshes.doxy | 3 +- .../reference/fields/discretization.dox | 2 +- .../reference/interpolation/Geometric2D.dox | 6 +- doc/user/doxygen/doxy2swig/doxy2swig.cmake | 20 ++--- .../fakesources/MEDCouplingFieldDouble.C | 1 - .../doxygen/fakesources/MEDCouplingMemArray.C | 24 +++--- .../doxygen/fakesources/MEDCouplingMesh.C | 10 +-- .../doxygen/fakesources/MEDCouplingUMesh.C | 64 +++++++------- doc/user/doxygen/fakesources/MEDFileField.C | 10 +-- doc/user/doxygen/fakesources/MEDFileMesh.C | 86 +++++++++---------- src/INTERP_KERNEL/InterpolationOptions.hxx | 2 +- src/MEDCoupling/MEDCouplingAMRAttribute.cxx | 3 + src/MEDCoupling/MEDCouplingMesh.cxx | 2 + src/MEDCoupling/MEDCouplingUMesh.cxx | 5 ++ .../MEDCouplingExamplesTest.py | 2 + src/ParaMEDMEM/ExplicitCoincidentDEC.cxx | 2 +- src/ParaMEDMEM/StructuredCoincidentDEC.cxx | 2 +- 17 files changed, 128 insertions(+), 116 deletions(-) diff --git a/doc/user/doxygen/doxfiles/examples/medcouplingexamplesmeshes.doxy b/doc/user/doxygen/doxfiles/examples/medcouplingexamplesmeshes.doxy index e09432473..166b7a209 100644 --- 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 dc466df78..6789241ce 100644 --- 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 eb0e25daf..a00934f61 100644 --- 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 1e3ed568a..b497ef358 100644 --- 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 b5d74a3a9..69e14afcd 100644 --- 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 fa7bac3f8..26f45eab2 100644 --- 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 DataArray::_info_on_compo; /*! \name Basic API */ ///@{ DataArrayDouble::isAllocated() const; -DataArrayDouble::setInfoAndChangeNbOfCompo(const std::vector& info); +//DataArrayDouble::setInfoAndChangeNbOfCompo(const std::vector& 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& 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& 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& tinyInfo) const; DataArrayDouble::getTinySerializationStrInformation(std::vector& tinyInfo) const; DataArrayDouble::resizeForUnserialization(const std::vector& tinyInfoI); @@ -443,7 +443,7 @@ DataArrayInt::SetArrayIn(DataArrayInt* newArray, DataArrayInt* &arrayToSet); /*! \name Basic API */ ///@{ DataArrayInt::isAllocated() const; -DataArrayInt::setInfoAndChangeNbOfCompo(const std::vector& info); +//DataArrayInt::setInfoAndChangeNbOfCompo(const std::vector& 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 eabd7a9ca..4809eec6b 100644 --- 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& 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& varsOrder, const std::string& func) const; MEDCouplingMesh::getCellsContainingPoint(const double *pos, double eps, std::vector& elts) const; MEDCouplingMesh::getCellsContainingPoints(const double *pos, int nbOfPoints, double eps, std::vector& elts, std::vector& eltsIndex) const; MEDCouplingMesh::isEqual(const MEDCouplingMesh *other, double prec) const; @@ -131,7 +131,7 @@ namespace ParaMEDMEM MEDCouplingMesh::getCoordinatesOfNode(int nodeId, std::vector& 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& code, std::vector& idsInPflPerType, std::vector& idsPerType) const; MEDCouplingMesh::translate(const double *vector) = 0; MEDCouplingMesh::unserialization(const std::vector& tinyInfoD, const std::vector& tinyInfo, const DataArrayInt *a1, DataArrayDouble *a2,const std::vector& 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 c17e7b296..443b632c7 100644 --- 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& elts) const; MEDCouplingUMesh::getCellsContainingPoints(const double *pos, int nbOfPoints, double eps, std::vector& elts, std::vector& 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& ms,DataArrayInt *&szOfCellGrpOfSameType,DataArrayInt *&idInMsOfCellGrpOfSameType); -MEDCouplingUMesh::AppendExtrudedCell(const int *connBg, const int *connEnd, int nbOfNodesPerLev, bool isQuad, std::vector& ret); +//MEDCouplingUMesh::AppendExtrudedCell(const int *connBg, const int *connEnd, int nbOfNodesPerLev, bool isQuad, std::vector& 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& candidates, int compType, const int *conn, const int *connI, DataArrayInt *result) ; -MEDCouplingUMesh::AssemblyForSplitFrom3DCurve(const std::vector& cut3DCurve, std::vector& nodesOnPlane, const int *nodal3DSurf, const int *nodalIndx3DSurf,const int *nodal3DCurve, const int *nodalIndx3DCurve,const int *desc, const int *descIndx, std::vector< std::pair >& cut3DSurf); +//MEDCouplingUMesh::AssemblyForSplitFrom3DCurve(const std::vector& cut3DCurve, std::vector& nodesOnPlane, const int *nodal3DSurf, const int *nodalIndx3DSurf,const int *nodal3DCurve, const int *nodalIndx3DCurve,const int *desc, const int *descIndx, std::vector< std::pair >& 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& addCoo, const std::vector< std::vector >& subDiv, std::vector< std::vector >& intersectEdge); -MEDCouplingUMesh::BuildIntersecting2DCellsFromEdges(double eps, const MEDCouplingUMesh *m1, const int *desc1, const int *descIndx1, const std::vector >& intesctEdges1, const std::vector< std::vector >& colinear2,const MEDCouplingUMesh *m2, const int *desc2, const int *descIndx2, const std::vector >& intesctEdges2,const std::vector& addCoords,std::vector& addCoordsQuadratic, std::vector& cr, std::vector& crI, std::vector& cNb1, std::vector& cNb2); +//MEDCouplingUMesh::BuildIntersectEdges(const MEDCouplingUMesh *m1, const MEDCouplingUMesh *m2, const std::vector& addCoo, const std::vector< std::vector >& subDiv, std::vector< std::vector >& intersectEdge); +//MEDCouplingUMesh::BuildIntersecting2DCellsFromEdges(double eps, const MEDCouplingUMesh *m1, const int *desc1, const int *descIndx1, const std::vector >& intesctEdges1, const std::vector< std::vector >& colinear2,const MEDCouplingUMesh *m2, const int *desc2, const int *descIndx2, const std::vector >& intesctEdges2,const std::vector& addCoords,std::vector& addCoordsQuadratic, std::vector& cr, std::vector& crI, std::vector& cNb1, std::vector& cNb2); MEDCouplingUMesh::ComputeNeighborsOfCellsAdv(const DataArrayInt *desc, const DataArrayInt *descI, const DataArrayInt *revDesc, const DataArrayInt *revDescI,DataArrayInt *&neighbors, DataArrayInt *&neighborsIdx); -MEDCouplingUMesh::ComputeRangesFromTypeDistribution(const std::vector& code); +//MEDCouplingUMesh::ComputeRangesFromTypeDistribution(const std::vector& 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& fetched, const int *seedBg, const int *seedEnd, const DataArrayInt *arrIn, const DataArrayInt *arrIndxIn, int nbOfDepthPeeling, int& nbOfDepthPeelingPerformed); +//MEDCouplingUMesh::ComputeSpreadZoneGraduallyFromSeedAlg(std::vector& 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 >& intersectEdge1, std::vector< std::vector >& colinear2, std::vector< std::vector >& subDiv2,MEDCouplingUMesh *& m1Desc, DataArrayInt *&desc1, DataArrayInt *&descIndx1, DataArrayInt *&revDesc1, DataArrayInt *&revDescIndx1,MEDCouplingUMesh *& m2Desc, DataArrayInt *&desc2, DataArrayInt *&descIndx2, DataArrayInt *&revDesc2, DataArrayInt *&revDescIndx2,std::vector& 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 >& intersectEdge1, std::vector< std::vector >& colinear2, std::vector< std::vector >& subDiv2,MEDCouplingUMesh *& m1Desc, DataArrayInt *&desc1, DataArrayInt *&descIndx1, DataArrayInt *&revDesc1, DataArrayInt *&revDescIndx1,MEDCouplingUMesh *& m2Desc, DataArrayInt *&desc2, DataArrayInt *&descIndx2, DataArrayInt *&revDesc2, DataArrayInt *&revDescIndx2,std::vector& 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& a); +//MEDCouplingUMesh::MergeUMeshesLL(std::vector& 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 >& cut3DSurf,const int *desc, const int *descIndx, DataArrayInt *nodalRes, DataArrayInt *nodalResIndx, DataArrayInt *cellIds) const; +//MEDCouplingUMesh::assemblyForSplitFrom3DSurf(const std::vector< std::pair >& 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& 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& tinyInfoD, const st MEDCouplingUMesh::updateTime() const; MEDCouplingUMesh::writeVTKLL(std::ostream& ofs, const std::string& cellData, const std::string& pointData) const; MEDCouplingUMesh::~MEDCouplingUMesh(); -template MEDCouplingUMesh * MEDCouplingUMesh::buildDescendingConnectivityGen(DataArrayInt *desc, DataArrayInt *descIndx, DataArrayInt *revDesc, DataArrayInt *revDescIndx, DimM1DescNbrer nbrer) const; +//template MEDCouplingUMesh * MEDCouplingUMesh::buildDescendingConnectivityGen(DataArrayInt *desc, DataArrayInt *descIndx, DataArrayInt *revDesc, DataArrayInt *revDescIndx, DimM1DescNbrer nbrer) const; template void MEDCouplingUMesh::getCellsContainingPointsAlg (const double *coords, const double *pos, int nbOfPoints,double eps, std::vector& elts, std::vector& 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 MEDCouplingUMesh::_types; diff --git a/doc/user/doxygen/fakesources/MEDFileField.C b/doc/user/doxygen/fakesources/MEDFileField.C index 4919e4a48..9e9365db6 100644 --- 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 80f85fe86..10565363b 100644 --- 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& - a map of a family name to a family id. @@ -221,48 +221,48 @@ namespace ParaMEDMEM /*! \name Basic API */ ///@{ MEDFileMesh::FindOrCreateAndGiveFamilyWithId(std::map& 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& fams, bool renum=false) const; MEDFileMesh::getFamiliesIds(const std::vector& 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& 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& 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& 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& 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& famIds, const std::vector& levs); -MEDFileMesh::removeFamily(const char *name); -MEDFileMesh::removeGroup(const char *name); -MEDFileMesh::setDescription(const char *name); -MEDFileMesh::setFamiliesIdsOnGroup(const char *name, const std::vector& famIds); -MEDFileMesh::setFamiliesOnGroup(const char *name, const std::vector& 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& famIds); +MEDFileMesh::setFamiliesOnGroup(const std::string& name, const std::vector& 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& info); MEDFileMesh::setGroupInfo(const std::map >&info); MEDFileMesh::setGroupsAtLevel(int meshDimRelToMaxExt, const std::vector& grps, bool renum=false); -MEDFileMesh::setGroupsOnFamily(const char *famName, const std::vector& grps); +MEDFileMesh::setGroupsOnFamily(const std::string& famName, const std::vector& 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 >& groups, const char *familyNameToChange, const std::vector& newFamiliesNames); +MEDFileMesh::ChangeAllGroupsContainingFamily(std::map >& groups, const std::string& familyNameToChange, const std::vector& newFamiliesNames); MEDFileMesh::CreateNameNotIn(const std::string& nameTry, const std::vector& namesToAvoid); MEDFileMesh::MEDFileMesh(); MEDFileMesh::PutInThirdComponentOfCodeOffset(std::vector& code, int strt); MEDFileMesh::TranslateFamilyIds(int offset, DataArrayInt *famArr, std::vector< std::vector >& 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 >& fidsOfGrps, const std::vector& grpNames); -MEDFileMesh::changeAllGroupsContainingFamily(const char *familyNameToChange, const std::vector& newFamiliesNames); +MEDFileMesh::changeAllGroupsContainingFamily(const std::string& familyNameToChange, const std::vector& newFamiliesNames); MEDFileMesh::changeFamilyIdArr(int oldId, int newId); MEDFileMesh::changeNames(const std::vector< std::pair >& 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 60bd70d96..dcd10d5dc 100644 --- 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 0a9844669..f49b7bf9d 100644 --- 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 >& 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 ea60f27de..3de265f1f 100644 --- 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 d50bf73c2..81e8295b4 100644 --- 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 3ebd2170d..86ee5d767 100644 --- 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 7cab3095d..db0396725 100644 --- 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 7cdc16a44..9620ba135 100644 --- 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 -- 2.39.2