X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FMEDCoupling%2FMEDCouplingCurveLinearMesh.cxx;h=7b59a4d9ab0ca616433e5516cdff33cc9c6509bb;hb=b8616069f6667dcec3f90574a05bfc9e66d87fa5;hp=8b1ad4a076afbf275c0bb95001feb250bbba4eb1;hpb=b219559763498c4bd10c730cd3d2c62b1eed45db;p=tools%2Fmedcoupling.git diff --git a/src/MEDCoupling/MEDCouplingCurveLinearMesh.cxx b/src/MEDCoupling/MEDCouplingCurveLinearMesh.cxx index 8b1ad4a07..7b59a4d9a 100755 --- a/src/MEDCoupling/MEDCouplingCurveLinearMesh.cxx +++ b/src/MEDCoupling/MEDCouplingCurveLinearMesh.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2019 CEA/DEN, EDF R&D +// Copyright (C) 2007-2021 CEA/DEN, EDF R&D // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -376,7 +376,8 @@ MEDCouplingFieldDouble *MEDCouplingCurveLinearMesh::getMeasureField(bool isAbs) } /*! - * \param [in,out] f field fed with good values. + * \param [in] isAbs whether to compute signed or absolute values + * \param [in,out] field field fed with good values. * \sa MEDCouplingCurveLinearMesh::getMeasureField */ void MEDCouplingCurveLinearMesh::getMeasureFieldMeshDim1(bool isAbs, MEDCouplingFieldDouble *field) const @@ -402,7 +403,8 @@ void MEDCouplingCurveLinearMesh::getMeasureFieldMeshDim1(bool isAbs, MEDCoupling } /*! - * \param [in,out] f field fed with good values. + * \param [in] isAbs whether to compute signed or absolute values + * \param [in,out] field field fed with good values. * \sa MEDCouplingCurveLinearMesh::getMeasureField */ void MEDCouplingCurveLinearMesh::getMeasureFieldMeshDim2(bool isAbs, MEDCouplingFieldDouble *field) const @@ -428,7 +430,8 @@ void MEDCouplingCurveLinearMesh::getMeasureFieldMeshDim2(bool isAbs, MEDCoupling } /*! - * \param [in,out] f field fed with good values. + * \param [in] isAbs whether to compute signed or absolute values + * \param [in,out] field field fed with good values. * \sa MEDCouplingCurveLinearMesh::getMeasureField */ void MEDCouplingCurveLinearMesh::getMeasureFieldMeshDim3(bool isAbs, MEDCouplingFieldDouble *field) const @@ -537,6 +540,7 @@ mcIdType MEDCouplingCurveLinearMesh::getCellContainingPoint(const double *pos, d return nodeId; } } + break; case 2: if(spaceDim==2) { @@ -566,6 +570,7 @@ mcIdType MEDCouplingCurveLinearMesh::getCellContainingPoint(const double *pos, d return nx+ny*_structure[0]; } } + break; case 3: { if(spaceDim==3) @@ -630,9 +635,11 @@ mcIdType MEDCouplingCurveLinearMesh::getCellContainingPoint(const double *pos, d } } } + break; default: throw INTERP_KERNEL::Exception("MEDCouplingCurveLinearMesh::getCellContainingPoint : mesh dimension managed are 1, 2 or 3 !"); } + return 0; } void MEDCouplingCurveLinearMesh::getCellsContainingPoint(const double *pos, double eps, std::vector& elts) const @@ -686,7 +693,7 @@ void MEDCouplingCurveLinearMesh::scale(const double *point, double factor) for(mcIdType i=0;i()); - std::transform(coords+i*dim,coords+(i+1)*dim,coords+i*dim,std::bind2nd(std::multiplies(),factor)); + std::transform(coords+i*dim,coords+(i+1)*dim,coords+i*dim,std::bind(std::multiplies(),std::placeholders::_1,factor)); std::transform(coords+i*dim,coords+(i+1)*dim,point,coords+i*dim,std::plus()); } _coords->declareAsNew(); @@ -790,7 +797,7 @@ void MEDCouplingCurveLinearMesh::getBarycenterAndOwnerMeshDim1(DataArrayDouble * { int spaceDim=getSpaceDimension(); std::transform(_coords->begin()+spaceDim,_coords->end(),_coords->begin(),bary->getPointer(),std::plus()); - std::transform(bary->begin(),bary->end(),bary->getPointer(),std::bind2nd(std::multiplies(),0.5)); + std::transform(bary->begin(),bary->end(),bary->getPointer(),std::bind(std::multiplies(),std::placeholders::_1,0.5)); } void MEDCouplingCurveLinearMesh::renumberCells(const mcIdType *old2NewBg, bool check)