Changeset 1250 for XIOS/dev/XIOS_DEV_CMIP6/src/node/grid.hpp

Timestamp:

09/01/17 13:39:53 (7 years ago)

Author:

mhnguyen

Message:

Fixing bug on mask grid

+) Add mask_0d for scalar grid
+) Transmit grid's attributes (mask) from client and reconstruct them correctly on server
+) Rebuild data in the input of data flow on the server side

Test
+) On Curie
+) Simple test

File:

• XIOS/dev/XIOS_DEV_CMIP6/src/node/grid.hpp (modified) (3 diffs)

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

@@ -95 +95 @@
          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(const CArray<double,1>& stored, CArray<double,n>& field) const;  
+         template <int n>
+         void uncompressField(const CArray<double,n>& data, CArray<double,1>& outData) const; 
 
          virtual void parse(xml::CXMLNode& node);
@@ -252 +254 @@
         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 uncompressField_arr(const double* const data, CArray<double, 1>& outData) const;
 
         void setVirtualDomainGroup(CDomainGroup* newVDomainGroup);
@@ -353 +356 @@
                 << "Grid = " << this->GetName())
       this->restoreField_arr(stored, field.dataFirst());
+   }
+
+   /*!
+     This function removes the effect of mask on received data on the server.
+     This function only serve for the checking purpose. TODO: Something must be done to seperate mask and data_index from each other in received data
+     \data data received data with masking effect on the server
+     \outData data without masking effect
+   */
+   template <int N>
+   void CGrid::uncompressField(const CArray<double,N>& data, CArray<double,1>& outData) const
+   {      
+     uncompressField_arr(data.dataFirst(), outData);
    }