Changeset 124 for XMLIO_V2/dev/dev_rv/src/XMLIO/field.hpp

Timestamp:

10/01/10 11:32:41 (14 years ago)

Author:

hozdoba

Message:

Commit pour sauvegarde - diverses corrections de bogues et améliorations du code.

File:

• XMLIO_V2/dev/dev_rv/src/XMLIO/field.hpp (modified) (3 diffs)

XMLIO_V2/dev/dev_rv/src/XMLIO/field.hpp

@@ -8 +8 @@
 {
    class CGrid; // CGRID = CDOMAINE + CAXIS
+   class CFile;
 
    class CField : public ObjectTemplate<CField>, public FieldAttribut
@@ -13 +14 @@
       public:
 
-         CField(void) : ObjectTemplate<CField>(), FieldAttribut(), grid(NULL)
+         CField(void) : ObjectTemplate<CField>(), FieldAttribut(), lastStored(NULL), grid(NULL), file(NULL)
          {/* Ne rien faire de plus */}
-         CField(const string& _id) : ObjectTemplate<CField>(_id), FieldAttribut(), grid(NULL), foper(NULL)
+         CField(const string& _id) : ObjectTemplate<CField>(_id), FieldAttribut(), lastStored(NULL), grid(NULL), file(NULL)
          {/* Ne rien faire de plus */}
 
          static string GetName(void) { return ("field"); }
 
-         inline void SolveGridRef(void) ;
+         inline void solveGridRef(void) ;
 
          const CGrid* getGrid(void) const { return (grid); }
          const Array<double, 1>& getData(void) const { return (data); }
-         const FieldOperation* getFieldOperation(void) const { return (foper); }
+
+         void initLastStoredDate(const Date& _newlastStored)
+         { if(lastStored == NULL) lastStored = new Date(_newlastStored); };
+
+         bool isStorable(const Date& currDate)
+         {
+            if (lastStored == NULL) return (false);
+            if (freq_op.hasValue())
+               return (currDate >= (*lastStored + (Duration)freq_op));
+            return (true);
+         }
+
+         void storeData(const Array<double, 1> & arr, const Date& currDate)
+         {
+            *lastStored = currDate;
+            data.resize(shape(arr.size())) ;
+            data = arr;
+         }
+
+         const CFile* getRelFile(void) const { return (file); }
+         void setRelFile(CFile* _file) { file = _file; }
 
          virtual CField* getReference(void) const
@@ -36 +57 @@
 
          virtual ~CField(void)
-         { /* Ne rien faire de plus */ }
+         { if(lastStored !=  NULL) delete lastStored; }
 
       private :
 
+         Date* lastStored;
+
          CGrid* grid ;
-         FieldOperation* foper;
-         Array<double, 1> data;
+         CFile* file;
+
+         Array<double, 1>  data;
 
    }; // class CField