Changeset 676 for XIOS/trunk/src/node/grid.hpp

Timestamp:

08/25/15 16:52:45 (9 years ago)

Author:

rlacroix

Message:

Add support for indexed output.

If the new field attribute "indexed_output" is set to true and a mask is defined (either at grid, domain or axis level), the indexed data will be outputed instead of the full data with missing values.

See ​http://cfconventions.org/Data/cf-conventions/cf-conventions-1.5/build/cf-conventions.html#compression-by-gathering for more information.

File:

• XIOS/trunk/src/node/grid.hpp (modified) (11 diffs)

XIOS/trunk/src/node/grid.hpp

@@ -48 +48 @@
          typedef CGridAttributes SuperClassAttribute;
 
-      public :
+      public:
 
          typedef CGridAttributes RelAttributes;
@@ -72 +72 @@
 //         void solveReference(void);
 
+         void checkEligibilityForCompressedOutput();
+
          void solveDomainAxisRef(bool areAttributesChecked);
 
@@ -79 +81 @@
 //         virtual void fromBinary(StdIStream& is);
 
+         void addRelFileCompressed(const StdString& filename);
+
          /// Tests ///
-         bool hasAxis(void) const;
-
-      public :
+         bool isCompressible(void) const;
+         bool isWrittenCompressed(const StdString& filename) const;
+
+      public:
 
          /// Accesseurs ///
@@ -98 +103 @@
          void inputField(int rank, const double* const field, CArray<double,1>& stored);
 
+         void outputCompressedField(int rank, const CArray<double,1>& stored, double* field);
+
          virtual void parse(xml::CXMLNode& node);
 
@@ -103 +110 @@
          virtual ~CGrid(void);
 
-      public :
+      public:
 
          /// Accesseurs statiques ///
@@ -116 +123 @@
          static CGrid* createGrid(std::vector<CDomain*> domains, std::vector<CAxis*> axis, CArray<bool,1> axisDomainOrder = CArray<bool,1>());
 
-      public :
+      public:
 
          /// Entrées-sorties de champs (interne) ///
@@ -126 +133 @@
          void computeIndex(void);
          void computeIndexScalarGrid();
+         void computeCompressedIndex();
 
          void solveDomainRef(bool checkAtt);
@@ -163 +171 @@
          bool doGridHaveDataDistributed();
          size_t getWrittenDataSize() const;
+         int getNumberWrittenIndexes() const;
+         int getTotalNumberWrittenIndexes() const;
+         int getOffsetWrittenIndexes() const;
 
          const CDistributionServer* getDistributionServer() const;
@@ -184 +195 @@
          map<int,int> nbSenders;
 
-         map<int, CArray<size_t, 1> > outIndexFromClient;
+         map<int, CArray<size_t, 1> > outIndexFromClient, compressedOutIndexFromClient;
          void checkMask(void);
          void modifyMask(const CArray<int,1>& indexToModify);
@@ -221 +232 @@
 
         std::vector<int> globalDim_;
+
       private:
         CDomainGroup* vDomainGroup_;
@@ -231 +243 @@
         CClientServerMapping* clientServerMap_;
         size_t writtenDataSize_;
+        int numberWrittenIndexes_, totalNumberWrittenIndexes_, offsetWrittenIndexes_;
         std::map<int,size_t> connectedDataSize_;
         std::vector<int> connectedServerRank_;
         bool isDataDistributed_;
         int positionDimensionDistributed_;
+         //! True if and only if the data defined on the grid can be outputted in a compressed way
+        bool isCompressible_;
+        std::set<std::string> relFilesCompressed;
 
         bool isTransformed_;