Changeset 1144 for XIOS/dev/dev_olga/src/node/grid.hpp

Timestamp:

05/23/17 16:32:26 (7 years ago)

Author:

mhnguyen

Message:

Cleaning up some redundant codes

File:

• XIOS/dev/dev_olga/src/node/grid.hpp (modified) (4 diffs)

XIOS/dev/dev_olga/src/node/grid.hpp

@@ -91 +91 @@
          StdSize  getDataSize(void) const;
 
-         /// Entrées-sorties de champs ///
+         /// Entrées-sorties de champs 
          template <int n>
          void inputField(const CArray<double,n>& field, CArray<double,1>& stored) const;
          template <int n>
-         void outputField(const CArray<double,1>& stored, CArray<double,n>& field) const;
-
-         void outputField(int rank, const CArray<double,1>& stored, double* field);
-         void inputField(int rank, const double* const field, CArray<double,1>& stored);
-
-         void outputCompressedField(int rank, const CArray<double,1>& stored, double* field);
+         void outputField(const CArray<double,1>& stored, CArray<double,n>& field) const;      
 
          virtual void parse(xml::CXMLNode& node);
@@ -129 +124 @@
          static CGrid* cloneGrid(const StdString& idNewGrid, CGrid* gridSrc);
 
-      public:
-
-         /// Entrées-sorties de champs (interne) ///
-         void storeField_arr(const double* const data, CArray<double,1>& stored) const;
-         void restoreField_arr(const CArray<double,1>& stored, double* const data) const;
-
-         /// Traitements protégés ///
+      public:            
          void computeIndexServer(void);
          void computeIndex(void);
          void computeIndexScalarGrid();
-         void computeCompressedIndex();
          void computeWrittenIndex();
 
@@ -188 +176 @@
          std::vector<int> getGlobalDimension();
          bool isScalarGrid() const;
-         std::vector<int> getAxisPositionInGrid() const;
 
          bool doGridHaveDataToWrite();
@@ -261 +248 @@
         template<int N>
         void modifyGridMaskSize(CArray<bool,N>& gridMask, const std::vector<int>& eachDimSize, bool newValue);
+
+        void storeField_arr(const double* const data, CArray<double, 1>& stored) const;
+        void restoreField_arr(const CArray<double, 1>& stored, double* const data) const;
 
         void setVirtualDomainGroup(CDomainGroup* newVDomainGroup);