Changeset 775 for XIOS/trunk/src/io/nc4_data_input.hpp

Timestamp:

11/02/15 11:46:25 (8 years ago)

Author:

mhnguyen

Message:

Implementing the reading of attributes of an axis from a file

+) 3d grid can be read directly from a file
+) Clean some redundant codes
+) Add new attribute declaration that allows to output only desired attributes

Test
+) On Curie
+) test_remap passes and result is correct

File:

• XIOS/trunk/src/io/nc4_data_input.hpp (modified) (2 diffs)

XIOS/trunk/src/io/nc4_data_input.hpp

@@ -9 +9 @@
 namespace xios
 {
+  class CDomain;
+  class CAxis;
+
   class CNc4DataInput
     : protected CINetCDF4
@@ -33 +36 @@
     virtual StdSize getFieldNbRecords_(CField* field);
     virtual void readFieldData_(CField* field);
+    virtual void readFieldAttributes_(CField* field, bool readAttributeValues);
     virtual void closeFile_(void);
+
+  private:
+    void readDomainAttributesFromFile(CDomain* domain, std::map<StdString, StdSize>& dimSizeMap,
+                                      int elementPosition, const StdString& fieldId);
+    void readDomainAttributeValueFromFile(CDomain* domain, std::map<StdString, StdSize>& dimSizeMap,
+                                          int elementPosition, const StdString& fieldId);
+
+    void readAxisAttributesFromFile(CAxis* axis, std::map<StdString, StdSize>& dimSizeMap,
+                                    int elementPosition, const StdString& fieldId);
+    void readAxisAttributeValueFromFile(CAxis* axis, std::map<StdString, StdSize>& dimSizeMap,
+                                        int elementPosition, const StdString& fieldId);
+
+    void readFieldVariableValue(CArray<double,1>& var, const StdString& varId,
+                                const std::vector<StdSize>& nBegin,
+                                const std::vector<StdSize>& nSize,
+                                bool forceIndependent = false);
+
+  private:
+    std::set<StdString> readMetaDataDomains_, readValueDomains_;
+    std::set<StdString> readMetaDataAxis_, readValueAxis_;
 
   private: