X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FMEDCoupling%2FMEDCouplingField.cxx;h=bf5c05ac63ad8dfa3ce2fb600fe3cb906824ed99;hb=378cb2ebe08f8f4543ef632b2bd5f77fe180f978;hp=4ec3a937e20eac6932869b4f61f8f67650973007;hpb=8763c12d01e33d6845dd53be65b001514d00bd42;p=tools%2Fmedcoupling.git diff --git a/src/MEDCoupling/MEDCouplingField.cxx b/src/MEDCoupling/MEDCouplingField.cxx old mode 100644 new mode 100755 index 4ec3a937e..bf5c05ac6 --- a/src/MEDCoupling/MEDCouplingField.cxx +++ b/src/MEDCoupling/MEDCouplingField.cxx @@ -161,13 +161,11 @@ std::size_t MEDCouplingField::getHeapMemorySizeWithoutChildren() const return ret; } -std::vector MEDCouplingField::getDirectChildren() const +std::vector MEDCouplingField::getDirectChildrenWithNull() const { std::vector ret; - if(_mesh) - ret.push_back(_mesh); - if((const MEDCouplingFieldDiscretization *)_type) - ret.push_back((const MEDCouplingFieldDiscretization *)_type); + ret.push_back(_mesh); + ret.push_back((const MEDCouplingFieldDiscretization *)_type); return ret; } @@ -300,7 +298,7 @@ void MEDCouplingField::setMesh(const MEDCouplingMesh *mesh) * \throw If size of any vector do not match the \a type. */ void MEDCouplingField::setGaussLocalizationOnType(INTERP_KERNEL::NormalizedCellType type, const std::vector& refCoo, - const std::vector& gsCoo, const std::vector& wg) throw(INTERP_KERNEL::Exception) + const std::vector& gsCoo, const std::vector& wg) { if(!_mesh) throw INTERP_KERNEL::Exception("Mesh has to be set before calling setGaussLocalizationOnType method !"); @@ -326,7 +324,7 @@ void MEDCouplingField::setGaussLocalizationOnType(INTERP_KERNEL::NormalizedCellT * \throw If the range [_begin_,_end_) is empty. */ void MEDCouplingField::setGaussLocalizationOnCells(const int *begin, const int *end, const std::vector& refCoo, - const std::vector& gsCoo, const std::vector& wg) throw(INTERP_KERNEL::Exception) + const std::vector& gsCoo, const std::vector& wg) { if(!_mesh) throw INTERP_KERNEL::Exception("Mesh has to be set before calling setGaussLocalizationOnCells method !"); @@ -474,7 +472,7 @@ MEDCouplingField::MEDCouplingField(TypeOfField type):_nature(NoNature),_mesh(0), } MEDCouplingField::MEDCouplingField(const MEDCouplingField& other, bool deepCopy):RefCountObject(other),_name(other._name),_desc(other._desc),_nature(other._nature), - _mesh(0),_type(0) + _mesh(0),_type(0) { if(other._mesh) { @@ -541,7 +539,7 @@ DataArrayInt *MEDCouplingField::computeTupleIdsToSelectFromCellIds(const int *st /*! * Returns number of tuples expected regarding the spatial discretization of \a this - * field and number of entities in the underlying mesh. + * field and number of entities in the underlying mesh. This method behaves exactly as MEDCouplingFieldDouble::getNumberOfTuples. * \return int - the number of expected tuples. * \throw If the spatial discretization of \a this field is NULL. * \throw If the mesh is not set.