-// Copyright (C) 2007-2013 CEA/DEN, EDF R&D
+// Copyright (C) 2007-2015 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
#include "MEDLoaderDefines.hxx"
#include "MEDFileUtilities.hxx"
#include "MEDCouplingMemArray.hxx"
-#include "MEDCouplingAutoRefCountObjectPtr.hxx"
+#include "MCAuto.hxx"
-namespace ParaMEDMEM
+namespace MEDCoupling
{
class MEDFileParameter1TS : public RefCountObject
{
public:
- MEDLOADER_EXPORT virtual MEDFileParameter1TS *deepCpy() const = 0;
+ MEDLOADER_EXPORT virtual MEDFileParameter1TS *deepCopy() const = 0;
MEDLOADER_EXPORT virtual bool isEqual(const MEDFileParameter1TS *other, double eps, std::string& what) const;
MEDLOADER_EXPORT virtual void simpleRepr2(int bkOffset, std::ostream& oss) const = 0;
MEDLOADER_EXPORT virtual void readValue(med_idt fid, const std::string& name) = 0;
int _order;
double _time;
};
-
+
class MEDFileParameterDouble1TSWTI : public MEDFileParameter1TS
{
public:
MEDLOADER_EXPORT static MEDFileParameterDouble1TSWTI *New(int iteration, int order, double time);
- MEDLOADER_EXPORT MEDFileParameter1TS *deepCpy() const;
+ MEDLOADER_EXPORT MEDFileParameter1TS *deepCopy() const;
MEDLOADER_EXPORT void setValue(double val) { _arr=val; }
MEDLOADER_EXPORT double getValue() const { return _arr; }
MEDLOADER_EXPORT bool isEqual(const MEDFileParameter1TS *other, double eps, std::string& what) const;
MEDLOADER_EXPORT std::size_t getHeapMemorySizeWithoutChildren() const;
- MEDLOADER_EXPORT std::vector<const BigMemoryObject *> getDirectChildren() const;
+ MEDLOADER_EXPORT std::vector<const BigMemoryObject *> getDirectChildrenWithNull() const;
MEDLOADER_EXPORT void readValue(med_idt fid, const std::string& name);
MEDLOADER_EXPORT std::string simpleRepr() const;
protected:
class MEDFileParameterTinyInfo : public MEDFileWritable
{
public:
- MEDLOADER_EXPORT void setDescription(const char *name) { _desc_name=name; }
+ MEDLOADER_EXPORT void setDescription(const std::string& name) { _desc_name=name; }
MEDLOADER_EXPORT std::string getDescription() const { return _desc_name; }
- MEDLOADER_EXPORT void setTimeUnit(const char *unit) { _dt_unit=unit; }
+ MEDLOADER_EXPORT void setTimeUnit(const std::string& unit) { _dt_unit=unit; }
MEDLOADER_EXPORT std::string getTimeUnit() const { return _dt_unit; }
MEDLOADER_EXPORT std::size_t getHeapMemSizeOfStrings() const;
MEDLOADER_EXPORT bool isEqualStrings(const MEDFileParameterTinyInfo& other, std::string& what) const;
{
public:
MEDLOADER_EXPORT static MEDFileParameterDouble1TS *New();
- MEDLOADER_EXPORT static MEDFileParameterDouble1TS *New(const char *fileName);
- MEDLOADER_EXPORT static MEDFileParameterDouble1TS *New(const char *fileName, const char *paramName);
- MEDLOADER_EXPORT static MEDFileParameterDouble1TS *New(const char *fileName, const char *paramName, int dt, int it);
- MEDLOADER_EXPORT virtual MEDFileParameter1TS *deepCpy() const;
+ MEDLOADER_EXPORT static MEDFileParameterDouble1TS *New(const std::string& fileName);
+ MEDLOADER_EXPORT static MEDFileParameterDouble1TS *New(const std::string& fileName, const std::string& paramName);
+ MEDLOADER_EXPORT static MEDFileParameterDouble1TS *New(const std::string& fileName, const std::string& paramName, int dt, int it);
+ MEDLOADER_EXPORT virtual MEDFileParameter1TS *deepCopy() const;
MEDLOADER_EXPORT virtual bool isEqual(const MEDFileParameter1TS *other, double eps, std::string& what) const;
MEDLOADER_EXPORT virtual std::string simpleRepr() const;
MEDLOADER_EXPORT std::size_t getHeapMemorySizeWithoutChildren() const;
- MEDLOADER_EXPORT std::vector<const BigMemoryObject *> getDirectChildren() const;
- MEDLOADER_EXPORT void setName(const char *name) { _name=name; }
+ MEDLOADER_EXPORT std::vector<const BigMemoryObject *> getDirectChildrenWithNull() const;
+ MEDLOADER_EXPORT void setName(const std::string& name) { _name=name; }
MEDLOADER_EXPORT std::string getName() const { return _name; }
- MEDLOADER_EXPORT void write(const char *fileName, int mode) const;
+ MEDLOADER_EXPORT void write(const std::string& fileName, int mode) const;
private:
MEDFileParameterDouble1TS();
- MEDFileParameterDouble1TS(const char *fileName);
- MEDFileParameterDouble1TS(const char *fileName, const char *paramName);
- MEDFileParameterDouble1TS(const char *fileName, const char *paramName, int dt, int it);
+ MEDFileParameterDouble1TS(const std::string& fileName);
+ MEDFileParameterDouble1TS(const std::string& fileName, const std::string& paramName);
+ MEDFileParameterDouble1TS(const std::string& fileName, const std::string& paramName, int dt, int it);
};
class MEDFileParameterMultiTS : public RefCountObject, public MEDFileParameterTinyInfo
{
public:
MEDLOADER_EXPORT static MEDFileParameterMultiTS *New();
- MEDLOADER_EXPORT static MEDFileParameterMultiTS *New(const char *fileName);
- MEDLOADER_EXPORT static MEDFileParameterMultiTS *New(const char *fileName, const char *paramName);
+ MEDLOADER_EXPORT static MEDFileParameterMultiTS *New(const std::string& fileName);
+ MEDLOADER_EXPORT static MEDFileParameterMultiTS *New(const std::string& fileName, const std::string& paramName);
MEDLOADER_EXPORT std::string getName() const { return _name; }
- MEDLOADER_EXPORT void setName(const char *name) { _name=name; }
+ MEDLOADER_EXPORT void setName(const std::string& name) { _name=name; }
MEDLOADER_EXPORT std::size_t getHeapMemorySizeWithoutChildren() const;
- MEDLOADER_EXPORT std::vector<const BigMemoryObject *> getDirectChildren() const;
- MEDLOADER_EXPORT MEDFileParameterMultiTS *deepCpy() const;
+ MEDLOADER_EXPORT std::vector<const BigMemoryObject *> getDirectChildrenWithNull() const;
+ MEDLOADER_EXPORT MEDFileParameterMultiTS *deepCopy() const;
MEDLOADER_EXPORT bool isEqual(const MEDFileParameterMultiTS *other, double eps, std::string& what) const;
- MEDLOADER_EXPORT void write(const char *fileName, int mode) const;
+ MEDLOADER_EXPORT void write(const std::string& fileName, int mode) const;
MEDLOADER_EXPORT void writeLL(med_idt fid, const MEDFileWritable& mw) const;
MEDLOADER_EXPORT std::string simpleRepr() const;
MEDLOADER_EXPORT void appendValue(int dt, int it, double time, double val);
MEDLOADER_EXPORT int getPosGivenTime(double time, double eps=1e-8) const;
MEDLOADER_EXPORT MEDFileParameter1TS *getTimeStepAtPos(int posId) const;
MEDLOADER_EXPORT void eraseTimeStepIds(const int *startIds, const int *endIds);
+ MEDLOADER_EXPORT int getNumberOfTS() const;
MEDLOADER_EXPORT std::vector< std::pair<int,int> > getIterations() const;
MEDLOADER_EXPORT std::vector< std::pair<int,int> > getTimeSteps(std::vector<double>& ret1) const;
MEDLOADER_EXPORT void simpleRepr2(int bkOffset, std::ostream& oss) const;
protected:
MEDFileParameterMultiTS();
MEDFileParameterMultiTS(const MEDFileParameterMultiTS& other, bool deepCopy);
- MEDFileParameterMultiTS(const char *fileName);
- MEDFileParameterMultiTS(const char *fileName, const char *paramName);
+ MEDFileParameterMultiTS(const std::string& fileName);
+ MEDFileParameterMultiTS(const std::string& fileName, const std::string& paramName);
void finishLoading(med_idt fid, med_parameter_type typ, int nbOfSteps);
protected:
- std::vector< MEDCouplingAutoRefCountObjectPtr<MEDFileParameter1TS> > _param_per_ts;
+ std::vector< MCAuto<MEDFileParameter1TS> > _param_per_ts;
};
class MEDFileParameters : public RefCountObject, public MEDFileWritable
{
public:
MEDLOADER_EXPORT static MEDFileParameters *New();
- MEDLOADER_EXPORT static MEDFileParameters *New(const char *fileName);
+ MEDLOADER_EXPORT static MEDFileParameters *New(const std::string& fileName);
MEDLOADER_EXPORT std::size_t getHeapMemorySizeWithoutChildren() const;
- MEDLOADER_EXPORT std::vector<const BigMemoryObject *> getDirectChildren() const;
- MEDLOADER_EXPORT MEDFileParameters *deepCpy() const;
+ MEDLOADER_EXPORT std::vector<const BigMemoryObject *> getDirectChildrenWithNull() const;
+ MEDLOADER_EXPORT MEDFileParameters *deepCopy() const;
MEDLOADER_EXPORT bool isEqual(const MEDFileParameters *other, double eps, std::string& what) const;
- MEDLOADER_EXPORT void write(const char *fileName, int mode) const;
+ MEDLOADER_EXPORT void write(const std::string& fileName, int mode) const;
MEDLOADER_EXPORT void writeLL(med_idt fid) const;
MEDLOADER_EXPORT std::vector<std::string> getParamsNames() const;
MEDLOADER_EXPORT std::string simpleRepr() const;
MEDLOADER_EXPORT void pushParam(MEDFileParameterMultiTS *param);
MEDLOADER_EXPORT void setParamAtPos(int i, MEDFileParameterMultiTS *param);
MEDLOADER_EXPORT MEDFileParameterMultiTS *getParamAtPos(int i) const;
- MEDLOADER_EXPORT MEDFileParameterMultiTS *getParamWithName(const char *paramName) const;
+ MEDLOADER_EXPORT MEDFileParameterMultiTS *getParamWithName(const std::string& paramName) const;
MEDLOADER_EXPORT void destroyParamAtPos(int i);
- MEDLOADER_EXPORT int getPosFromParamName(const char *paramName) const;
+ MEDLOADER_EXPORT int getPosFromParamName(const std::string& paramName) const;
MEDLOADER_EXPORT int getNumberOfParams() const;
protected:
void simpleRepr2(int bkOffset, std::ostream& oss) const;
- MEDFileParameters(const char *fileName);
+ MEDFileParameters(const std::string& fileName);
MEDFileParameters(const MEDFileParameters& other, bool deepCopy);
MEDFileParameters();
protected:
- std::vector< MEDCouplingAutoRefCountObjectPtr<MEDFileParameterMultiTS> > _params;
+ std::vector< MCAuto<MEDFileParameterMultiTS> > _params;
};
}