X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FMEDCoupling%2FMEDCouplingFieldInt.hxx;h=ff8443e4147cc34b706ad420be6cfe27ad4e131c;hb=af8a6b836ed960509fcb2d719d7396c187dfbf2b;hp=5986efb6058f8f014d192cc90616d429bd529b03;hpb=8290d19848d70d320933e1fd944bdb61596e9865;p=tools%2Fmedcoupling.git diff --git a/src/MEDCoupling/MEDCouplingFieldInt.hxx b/src/MEDCoupling/MEDCouplingFieldInt.hxx index 5986efb60..ff8443e41 100644 --- a/src/MEDCoupling/MEDCouplingFieldInt.hxx +++ b/src/MEDCoupling/MEDCouplingFieldInt.hxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2016 CEA/DEN, EDF R&D +// Copyright (C) 2020 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 @@ -16,43 +16,13 @@ // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// Author : Yann Pora (EDF R&D) +// Author : Anthony Geay (EDF R&D) -#ifndef __PARAMEDMEM_MEDCOUPLINGFIELDINT_HXX__ -#define __PARAMEDMEM_MEDCOUPLINGFIELDINT_HXX__ +#pragma once -#include "MEDCoupling.hxx" -#include "MEDCouplingField.hxx" -#include "MEDCouplingTimeDiscretization.hxx" -#include "MEDCouplingMemArray.hxx" - -#include +#include "MEDCouplingFieldInt32.hxx" namespace MEDCoupling { - class MEDCouplingFieldInt : public MEDCouplingField - { - public: - MEDCOUPLING_EXPORT static MEDCouplingFieldInt *New(TypeOfField type, TypeOfTimeDiscretization td=ONE_TIME); - MEDCOUPLING_EXPORT void checkConsistencyLight() const; - MEDCOUPLING_EXPORT std::string simpleRepr() const; - MEDCOUPLING_EXPORT void reprQuickOverview(std::ostream& stream) const; - MEDCOUPLING_EXPORT void setTimeUnit(const std::string& unit); - MEDCOUPLING_EXPORT std::string getTimeUnit() const; - MEDCOUPLING_EXPORT void setTime(double val, int iteration, int order); - MEDCOUPLING_EXPORT double getTime(int& iteration, int& order) const; - MEDCOUPLING_EXPORT void setArray(DataArrayInt *array); - MEDCOUPLING_EXPORT const DataArrayInt *getArray() const; - MEDCOUPLING_EXPORT DataArrayInt *getArray(); - protected: - MEDCouplingFieldInt(TypeOfField type, TypeOfTimeDiscretization td); - MEDCouplingFieldInt(const MEDCouplingFieldInt& other, bool deepCopy); - MEDCouplingFieldInt(NatureOfField n, MEDCouplingTimeDiscretization *td, MEDCouplingFieldDiscretization *type); - ~MEDCouplingFieldInt(); - private: - MEDCouplingTimeDiscretization *_time_discr; - MCAuto _array;// agy : don't panic ! this is temporary ! templatization of time discr is planned ! - }; + using MEDCouplingFieldInt = MEDCouplingFieldInt32; } - -#endif