X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FMEDCoupling%2FMEDCouplingField.cxx;h=94c0a12fad091179c86d4e2c1fc3586e300646dd;hb=ac1df6b0ba8b337555fb39610c89f678d889580d;hp=b00d779eeeca5a6dae9de9bb18c22e4ad310d03d;hpb=a795b1bc48ac2de4650c9f4a522e3f6487497983;p=tools%2Fmedcoupling.git diff --git a/src/MEDCoupling/MEDCouplingField.cxx b/src/MEDCoupling/MEDCouplingField.cxx index b00d779ee..94c0a12fa 100644 --- a/src/MEDCoupling/MEDCouplingField.cxx +++ b/src/MEDCoupling/MEDCouplingField.cxx @@ -1,9 +1,9 @@ -// Copyright (C) 2007-2013 CEA/DEN, EDF R&D +// Copyright (C) 2007-2016 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 // License as published by the Free Software Foundation; either -// version 2.1 of the License. +// version 2.1 of the License, or (at your option) any later version. // // This library is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -24,9 +24,17 @@ #include -using namespace ParaMEDMEM; +using namespace MEDCoupling; -bool MEDCouplingField::isEqualIfNotWhy(const MEDCouplingField *other, double meshPrec, double valsPrec, std::string& reason) const throw(INTERP_KERNEL::Exception) +void MEDCouplingField::checkConsistencyLight() const +{ + if(!_mesh) + throw INTERP_KERNEL::Exception("Field invalid because no mesh specified !"); + if(_type.isNull()) + throw INTERP_KERNEL::Exception("MEDCouplingField::checkConsistencyLight : no spatial discretization !"); +} + +bool MEDCouplingField::isEqualIfNotWhyProtected(const MEDCouplingField *other, double meshPrec, std::string& reason) const { if(!other) throw INTERP_KERNEL::Exception("MEDCouplingField::isEqualIfNotWhy : other instance is NULL !"); @@ -49,7 +57,7 @@ bool MEDCouplingField::isEqualIfNotWhy(const MEDCouplingField *other, double mes reason=oss.str(); return false; } - if(!_type->isEqualIfNotWhy(other->_type,valsPrec,reason)) + if(!_type->isEqualIfNotWhy(other->_type,meshPrec,reason)) { reason.insert(0,"Spatial discretizations differ :"); return false; @@ -69,37 +77,22 @@ bool MEDCouplingField::isEqualIfNotWhy(const MEDCouplingField *other, double mes return ret; } -/*! - * Checks if \a this and another MEDCouplingField are fully equal. - * \param [in] other - the field to compare with \a this one. - * \param [in] meshPrec - precision used to compare node coordinates of the underlying mesh. - * \param [in] valsPrec - precision used to compare field values. - * \return bool - \c true if the two fields are equal, \c false else. - * \throw If \a other is NULL. - */ -bool MEDCouplingField::isEqual(const MEDCouplingField *other, double meshPrec, double valsPrec) const -{ - std::string tmp; - return isEqualIfNotWhy(other,meshPrec,valsPrec,tmp); -} - /*! * Checks if \a this and another MEDCouplingField are equal. The textual * information like names etc. is not considered. * \param [in] other - the field to compare with \a this one. * \param [in] meshPrec - precision used to compare node coordinates of the underlying mesh. - * \param [in] valsPrec - precision used to compare field values. * \return bool - \c true if the two fields are equal, \c false else. * \throw If \a other is NULL. * \throw If the spatial discretization of \a this field is NULL. */ -bool MEDCouplingField::isEqualWithoutConsideringStr(const MEDCouplingField *other, double meshPrec, double valsPrec) const +bool MEDCouplingField::isEqualWithoutConsideringStrProtected(const MEDCouplingField *other, double meshPrec) const { if(!other) throw INTERP_KERNEL::Exception("MEDCouplingField::isEqualWithoutConsideringStr : input field is NULL !"); if(!_type) throw INTERP_KERNEL::Exception("MEDCouplingField::isEqualWithoutConsideringStr : spatial discretization of this is NULL !"); - if(!_type->isEqualWithoutConsideringStr(other->_type,valsPrec)) + if(!_type->isEqualWithoutConsideringStr(other->_type,meshPrec)) return false; if(_nature!=other->_nature) return false; @@ -145,6 +138,21 @@ bool MEDCouplingField::areStrictlyCompatible(const MEDCouplingField *other) cons return _mesh==other->_mesh; } +/*! + * This method is less strict than MEDCouplingField::areStrictlyCompatible method. + * The difference is that the nature is not checked. + * This method is used for multiplication and division on fields to operate a first check before attempting operation. + */ +bool MEDCouplingField::areStrictlyCompatibleForMulDiv(const MEDCouplingField *other) const +{ + if(!other) + throw INTERP_KERNEL::Exception("MEDCouplingField::areStrictlyCompatible : input field is NULL !"); + if(!_type->isEqual(other->_type,1.e-12)) + return false; + return _mesh==other->_mesh; +} + + void MEDCouplingField::updateTime() const { if(_mesh) @@ -153,31 +161,38 @@ void MEDCouplingField::updateTime() const updateTimeWith(*_type); } -std::size_t MEDCouplingField::getHeapMemorySize() const +std::size_t MEDCouplingField::getHeapMemorySizeWithoutChildren() const { std::size_t ret=0; ret+=_name.capacity(); ret+=_desc.capacity(); - if(_mesh) - ret+=_mesh->getHeapMemorySize(); - if((const MEDCouplingFieldDiscretization *)_type) - ret+=_type->getHeapMemorySize(); + return ret; +} + +std::vector MEDCouplingField::getDirectChildrenWithNull() const +{ + std::vector ret; + ret.push_back(_mesh); + ret.push_back((const MEDCouplingFieldDiscretization *)_type); return ret; } /*! * Returns a type of \ref MEDCouplingSpatialDisc "spatial discretization" of \a this - * field in terms of enum ParaMEDMEM::TypeOfField. - * \return ParaMEDMEM::TypeOfField - the type of \a this field. + * field in terms of enum MEDCoupling::TypeOfField. + * \return MEDCoupling::TypeOfField - the type of \a this field. + * \throw If the geometric type is empty. */ TypeOfField MEDCouplingField::getTypeOfField() const { + if(!((const MEDCouplingFieldDiscretization *)_type)) + throw INTERP_KERNEL::Exception("MEDCouplingField::getTypeOfField : spatial discretization is null !"); return _type->getEnum(); } /*! * Returns the nature of \a this field. This information is very important during - * interpolation process using ParaMEDMEM::MEDCouplingRemapper or ParaMEDMEM::InterpKernelDEC. + * interpolation process using MEDCoupling::MEDCouplingRemapper or MEDCoupling::InterpKernelDEC. * In other context than the two mentioned above, this attribute is unimportant. This * attribute is not stored in the MED file. * For more information of the semantics and the influence of this attribute to the @@ -192,7 +207,7 @@ NatureOfField MEDCouplingField::getNature() const /*! * Sets the nature of \a this field. This information is very important during - * interpolation process using ParaMEDMEM::MEDCouplingRemapper or ParaMEDMEM::InterpKernelDEC. + * interpolation process using MEDCoupling::MEDCouplingRemapper or MEDCoupling::InterpKernelDEC. * In other context than the two mentioned above, this attribute is unimportant. This * attribute is not stored in the MED file. * For more information of the semantics and the influence of this attribute to the @@ -203,9 +218,11 @@ NatureOfField MEDCouplingField::getNature() const * \param [in] nat - the nature of \a this field. * \throw If \a nat has an invalid value. */ -void MEDCouplingField::setNature(NatureOfField nat) throw(INTERP_KERNEL::Exception) +void MEDCouplingField::setNature(NatureOfField nat) { MEDCouplingNatureOfField::GetRepr(nat);//generate a throw if nat not recognized + if(_type) + _type->checkCompatibilityWithNature(nat); _nature=nat; } @@ -221,7 +238,7 @@ void MEDCouplingField::setNature(NatureOfField nat) throw(INTERP_KERNEL::Excepti * \throw If the spatial discretization of \a this field is NULL. * \throw If the mesh is not set. */ -DataArrayDouble *MEDCouplingField::getLocalizationOfDiscr() const throw(INTERP_KERNEL::Exception) +DataArrayDouble *MEDCouplingField::getLocalizationOfDiscr() const { if(!_mesh) throw INTERP_KERNEL::Exception("MEDCouplingField::getLocalizationOfDiscr : No mesh set !"); @@ -247,7 +264,7 @@ DataArrayDouble *MEDCouplingField::getLocalizationOfDiscr() const throw(INTERP_K * \throw If the spatial discretization of \a this field is not well defined. */ -MEDCouplingFieldDouble *MEDCouplingField::buildMeasureField(bool isAbs) const throw(INTERP_KERNEL::Exception) +MEDCouplingFieldDouble *MEDCouplingField::buildMeasureField(bool isAbs) const { if(!_mesh) throw INTERP_KERNEL::Exception("MEDCouplingField::buildMeasureField : no mesh defined !"); @@ -291,7 +308,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 !"); @@ -317,7 +334,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 !"); @@ -344,12 +361,13 @@ void MEDCouplingField::clearGaussLocalizations() * problem. * \param [in] locId - the id of the Gauss localization object of interest. * It must be in range 0 <= locId < getNbOfGaussLocalization() . - * \return \ref MEDCouplingGaussLocalization & - the Gauss localization object. + * \return \ref MEDCoupling::MEDCouplingGaussLocalization "MEDCouplingGaussLocalization" & - the + * Gauss localization object. * \throw If \a this field is not on Gauss points. * \throw If \a locId is not within the valid range. * \throw If the spatial discretization of \a this field is NULL. */ -MEDCouplingGaussLocalization& MEDCouplingField::getGaussLocalization(int locId) throw(INTERP_KERNEL::Exception) +MEDCouplingGaussLocalization& MEDCouplingField::getGaussLocalization(int locId) { if(!((const MEDCouplingFieldDiscretization *)_type)) throw INTERP_KERNEL::Exception("Spatial discretization not set ! Impossible to call getGaussLocalization method !"); @@ -365,7 +383,7 @@ MEDCouplingGaussLocalization& MEDCouplingField::getGaussLocalization(int locId) * \throw If no Gauss localization object found for the given cell \a type. * \throw If more than one Gauss localization object found for the given cell \a type. */ -int MEDCouplingField::getGaussLocalizationIdOfOneType(INTERP_KERNEL::NormalizedCellType type) const throw(INTERP_KERNEL::Exception) +int MEDCouplingField::getGaussLocalizationIdOfOneType(INTERP_KERNEL::NormalizedCellType type) const { if(!((const MEDCouplingFieldDiscretization *)_type)) throw INTERP_KERNEL::Exception("Spatial discretization not set ! Impossible to call getGaussLocalizationIdOfOneType method !"); @@ -379,7 +397,7 @@ int MEDCouplingField::getGaussLocalizationIdOfOneType(INTERP_KERNEL::NormalizedC * \throw If \a this field is not on Gauss points. * \throw If the spatial discretization of \a this field is NULL */ -std::set MEDCouplingField::getGaussLocalizationIdsOfOneType(INTERP_KERNEL::NormalizedCellType type) const throw(INTERP_KERNEL::Exception) +std::set MEDCouplingField::getGaussLocalizationIdsOfOneType(INTERP_KERNEL::NormalizedCellType type) const { if(!((const MEDCouplingFieldDiscretization *)_type)) throw INTERP_KERNEL::Exception("Spatial discretization not set ! Impossible to call getGaussLocalizationIdsOfOneType method !"); @@ -393,7 +411,7 @@ std::set MEDCouplingField::getGaussLocalizationIdsOfOneType(INTERP_KERNEL:: * \throw If \a this field is not on Gauss points. * \throw If the spatial discretization of \a this field is NULL. */ -int MEDCouplingField::getNbOfGaussLocalization() const throw(INTERP_KERNEL::Exception) +int MEDCouplingField::getNbOfGaussLocalization() const { if(!((const MEDCouplingFieldDiscretization *)_type)) throw INTERP_KERNEL::Exception("Spatial discretization not set ! Impossible to call getNbOfGaussLocalization method !"); @@ -408,7 +426,7 @@ int MEDCouplingField::getNbOfGaussLocalization() const throw(INTERP_KERNEL::Exce * \throw If the spatial discretization of \a this field is NULL. * \throw If no Gauss localization object found for the given cell. */ -int MEDCouplingField::getGaussLocalizationIdOfOneCell(int cellId) const throw(INTERP_KERNEL::Exception) +int MEDCouplingField::getGaussLocalizationIdOfOneCell(int cellId) const { if(!((const MEDCouplingFieldDiscretization *)_type)) throw INTERP_KERNEL::Exception("Spatial discretization not set ! Impossible to call getGaussLocalizationIdOfOneCell method !"); @@ -425,7 +443,7 @@ int MEDCouplingField::getGaussLocalizationIdOfOneCell(int cellId) const throw(IN * \throw If \a locId is not within the valid range. * \throw If the spatial discretization of \a this field is NULL. */ -void MEDCouplingField::getCellIdsHavingGaussLocalization(int locId, std::vector& cellIds) const throw(INTERP_KERNEL::Exception) +void MEDCouplingField::getCellIdsHavingGaussLocalization(int locId, std::vector& cellIds) const { cellIds.clear(); if(!((const MEDCouplingFieldDiscretization *)_type)) @@ -438,12 +456,12 @@ void MEDCouplingField::getCellIdsHavingGaussLocalization(int locId, std::vector< * \warning This method is const, so the returned object is not apt for modification. * \param [in] locId - the id of the Gauss localization object of interest. * It must be in range 0 <= locId < getNbOfGaussLocalization() . - * \return \ref const MEDCouplingGaussLocalization & - the Gauss localization object. + * \return const \ref MEDCouplingGaussLocalization & - the Gauss localization object. * \throw If \a this field is not on Gauss points. * \throw If \a locId is not within the valid range. * \throw If the spatial discretization of \a this field is NULL. */ -const MEDCouplingGaussLocalization& MEDCouplingField::getGaussLocalization(int locId) const throw(INTERP_KERNEL::Exception) +const MEDCouplingGaussLocalization& MEDCouplingField::getGaussLocalization(int locId) const { if(!((const MEDCouplingFieldDiscretization *)_type)) throw INTERP_KERNEL::Exception("Spatial discretization not set ! Impossible to call getGaussLocalization method !"); @@ -465,7 +483,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) { @@ -480,7 +498,7 @@ MEDCouplingField::MEDCouplingField(const MEDCouplingField& other, bool deepCopy) /*! * Returns a new MEDCouplingMesh constituted by some cells of the underlying mesh of \a - * this filed, and returns ids of entities (nodes, cells, Gauss points) lying on the + * this field, and returns ids of entities (nodes, cells, Gauss points) lying on the * specified cells. The cells to include to the result mesh are specified by an array of * cell ids. The new mesh shares the coordinates array with the underlying mesh. * \param [in] start - an array of cell ids to include to the result mesh. @@ -532,12 +550,12 @@ 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. */ -int MEDCouplingField::getNumberOfTuplesExpected() const throw(INTERP_KERNEL::Exception) +int MEDCouplingField::getNumberOfTuplesExpected() const { if(!((const MEDCouplingFieldDiscretization *)_type)) throw INTERP_KERNEL::Exception("Spatial discretization not set ! Impossible to call getNumberOfTuplesExpected method !"); @@ -564,7 +582,7 @@ void MEDCouplingField::setDiscretization(MEDCouplingFieldDiscretization *newDisc * \throw If the spatial discretization of \a this field is NULL. * \throw If the mesh is not set. */ -int MEDCouplingField::getNumberOfMeshPlacesExpected() const throw(INTERP_KERNEL::Exception) +int MEDCouplingField::getNumberOfMeshPlacesExpected() const { if(!((const MEDCouplingFieldDiscretization *)_type)) throw INTERP_KERNEL::Exception("Spatial discretization not set ! Impossible to call getNumberOfMeshPlacesExpected method !"); @@ -577,12 +595,12 @@ int MEDCouplingField::getNumberOfMeshPlacesExpected() const throw(INTERP_KERNEL: /*! * Copy tiny info (component names, name, description) but warning the underlying mesh is not renamed (for safety reason). */ -void MEDCouplingField::copyTinyStringsFrom(const MEDCouplingField *other) throw(INTERP_KERNEL::Exception) +void MEDCouplingField::copyTinyStringsFrom(const MEDCouplingField *other) { if(other) { - setName(other->_name.c_str()); - setDescription(other->_desc.c_str()); + setName(other->_name); + setDescription(other->_desc); } } @@ -603,10 +621,10 @@ void MEDCouplingField::copyTinyStringsFrom(const MEDCouplingField *other) throw( * \throw If input code point to invalid zones in spatial discretization. * \throw If spatial discretization in \a this requires a mesh and those mesh is invalid (null,...) */ -int MEDCouplingField::getNumberOfTuplesExpectedRegardingCode(const std::vector& code, const std::vector& idsPerType) const throw(INTERP_KERNEL::Exception) +int MEDCouplingField::getNumberOfTuplesExpectedRegardingCode(const std::vector& code, const std::vector& idsPerType) const { const MEDCouplingFieldDiscretization *t(_type); if(!t) throw INTERP_KERNEL::Exception("MEDCouplingField::getNumberOfTuplesExpectedRegardingCode : no spatial discretization set !"); - return t->getNumberOfTuplesExpectedRegardingCode(_mesh,code,idsPerType); + return t->getNumberOfTuplesExpectedRegardingCode(code,idsPerType); }