X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FMEDCoupling%2FMEDCouplingNatureOfField.hxx;h=811bc4041ae02de9632ea6bb5b0034d277c1264d;hb=b1681460da1d3c8e3a196e9b13410321587db207;hp=bc9e0caf4cb0aeb41ad3d7d4d80fcf6a0cc53e11;hpb=f67dc0817fad8a24d547e09fdab9c36e280cd378;p=tools%2Fmedcoupling.git diff --git a/src/MEDCoupling/MEDCouplingNatureOfField.hxx b/src/MEDCoupling/MEDCouplingNatureOfField.hxx index bc9e0caf4..811bc4041 100644 --- a/src/MEDCoupling/MEDCouplingNatureOfField.hxx +++ b/src/MEDCoupling/MEDCouplingNatureOfField.hxx @@ -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 @@ -22,23 +22,16 @@ #define __PARAMEDMEM_MEDCOUPLINGNATUREOFFIELD_HXX__ #include "MEDCoupling.hxx" +#include "MEDCouplingNatureOfFieldEnum" + #include "InterpKernelException.hxx" -namespace ParaMEDMEM +namespace MEDCoupling { - typedef enum - { - NoNature = 17, - ConservativeVolumic = 26, - Integral = 32, - IntegralGlobConstraint = 35, - RevIntegral = 37 - } NatureOfField; - class MEDCouplingNatureOfField { public: - MEDCOUPLING_EXPORT static const char *GetRepr(NatureOfField nat) throw(INTERP_KERNEL::Exception); + MEDCOUPLING_EXPORT static const char *GetRepr(NatureOfField nat); MEDCOUPLING_EXPORT static std::string GetReprNoThrow(NatureOfField nat); MEDCOUPLING_EXPORT static std::string GetAllPossibilitiesStr(); private: