-// Copyright (C) 2007-2013 CEA/DEN, EDF R&D
+// Copyright (C) 2007-2014 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
MEDCOUPLING_EXPORT void updateTime() const;
MEDCOUPLING_EXPORT std::size_t getHeapMemorySizeWithoutChildren() const;
MEDCOUPLING_EXPORT std::vector<const BigMemoryObject *> getDirectChildren() const;
- MEDCOUPLING_EXPORT static TypeOfField GetTypeOfFieldFromStringRepr(const char *repr);
+ MEDCOUPLING_EXPORT static TypeOfField GetTypeOfFieldFromStringRepr(const std::string& repr);
MEDCOUPLING_EXPORT virtual TypeOfField getEnum() const = 0;
MEDCOUPLING_EXPORT virtual bool isEqual(const MEDCouplingFieldDiscretization *other, double eps) const;
MEDCOUPLING_EXPORT virtual bool isEqualIfNotWhy(const MEDCouplingFieldDiscretization *other, double eps, std::string& reason) const = 0;
MEDCOUPLING_EXPORT virtual ~MEDCouplingFieldDiscretization();
protected:
MEDCOUPLING_EXPORT MEDCouplingFieldDiscretization();
- MEDCOUPLING_EXPORT static void RenumberEntitiesFromO2NArr(double epsOnVals, const int *old2NewPtr, int newNbOfEntity, DataArrayDouble *arr, const char *msg);
- MEDCOUPLING_EXPORT static void RenumberEntitiesFromN2OArr(const int *new2OldPtr, int new2OldSz, DataArrayDouble *arr, const char *msg);
+ MEDCOUPLING_EXPORT static void RenumberEntitiesFromO2NArr(double epsOnVals, const int *old2NewPtr, int newNbOfEntity, DataArrayDouble *arr, const std::string& msg);
+ MEDCOUPLING_EXPORT static void RenumberEntitiesFromN2OArr(const int *new2OldPtr, int new2OldSz, DataArrayDouble *arr, const std::string& msg);
protected:
double _precision;
static const double DFLT_PRECISION;
public:
static const char REPR[];
static const TypeOfField TYPE;
+ static const double FGP_POINT1[1];
static const double FGP_SEG2[2];
static const double FGP_SEG3[3];
static const double FGP_SEG4[4];
static const double FGP_QUAD8[8];
static const double FGP_QUAD9[9];
static const double FGP_TETRA4[4];
- //static const double FGP_TETRA10[10];
+ static const double FGP_TETRA10[10];//to check
static const double FGP_PENTA6[6];
- //static const double FGP_PENTA15[15];
+ static const double FGP_PENTA15[15];//to check
static const double FGP_HEXA8[8];
+ static const double FGP_HEXA20[20];//to check
static const double FGP_HEXA27[27];
static const double FGP_PYRA5[5];
- //static const double FGP_PYRA13[13];
+ static const double FGP_PYRA13[13];//to check
static const double REF_SEG2[2];
static const double REF_SEG3[3];
static const double REF_SEG4[4];
static const double LOC_QUAD8[16];
static const double LOC_QUAD9[18];
static const double LOC_TETRA4[12];
- //static const double LOC_TETRA10[30];
+ static const double LOC_TETRA10[30];//to check
static const double LOC_PENTA6[18];
- //static const double LOC_PENTA15[45];
+ static const double LOC_PENTA15[45];//to check
static const double LOC_HEXA8[24];
+ static const double LOC_HEXA20[60];//to check
static const double LOC_HEXA27[81];
static const double LOC_PYRA5[15];
- //static const double LOC_PYRA13[39];
+ static const double LOC_PYRA13[39];//to check
};
class MEDCouplingFieldDiscretizationKriging : public MEDCouplingFieldDiscretizationOnNodes