Changeset 676 for XIOS/trunk/src/node/axis.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/axis.hpp (modified) (4 diffs)

XIOS/trunk/src/node/axis.hpp

@@ -67 +67 @@
          const std::set<StdString> & getRelFiles(void) const;
 
+         const std::vector<int>& getIndexesToWrite(void) const;
+         int getNumberWrittenIndexes() const;
+         int getTotalNumberWrittenIndexes() const;
+         int getOffsetWrittenIndexes() const;
+
          /// Test ///
          bool IsWritten(const StdString & filename) const;
+         bool isWrittenCompressed(const StdString& filename) const;
          bool isDistributed(void) const;
+         bool isCompressible(void) const;
 
          /// Mutateur ///
          void addRelFile(const StdString & filename);
+         void addRelFileCompressed(const StdString& filename);
 
          /// Vérifications ///
@@ -97 +105 @@
                                     CServerDistributionDescription::ServerDistributionType disType = CServerDistributionDescription::BAND_DISTRIBUTION);
 
+         void checkEligibilityForCompressedOutput();
+
          bool hasTransformation();
          void solveInheritanceTransformation();
@@ -107 +117 @@
         CArray<double,1> value_srv;
         CArray<double,2> bound_srv;
-      private :
+
+      private:
          void checkData();
          void checkMask();
@@ -128 +139 @@
 
          void setTransformations(const TransMapTypes&);
+
       private:
          bool isChecked;
          bool areClientAttributesChecked_;
-         std::set<StdString> relFiles;
+         std::set<StdString> relFiles, relFilesCompressed;
          TransMapTypes transformationMap_;
          bool isDistributed_;
+         //! True if and only if the data defined on the axis can be outputted in a compressed way
+         bool isCompressible_;
          std::map<int,int> nbConnectedClients_; // Mapping of number of communicating client to a server
          std::map<int, vector<size_t> > indSrv_; // Global index of each client sent to server
+         std::map<int, vector<int> > indWrittenSrv_; // Global written index of each client sent to server
+         std::vector<int> indexesToWrite;
+         int numberWrittenIndexes_, totalNumberWrittenIndexes_, offsetWrittenIndexes_;
          std::vector<int> connectedServerRank_;
          std::map<int, CArray<int,1> > indiSrv_;