Changeset 775 for XIOS/trunk/src/attribute_template.hpp

Timestamp:

11/02/15 11:46:25 (9 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/attribute_template.hpp (modified) (7 diffs)

XIOS/trunk/src/attribute_template.hpp

@@ -12 +12 @@
 #include "buffer_out.hpp"
 #include "type.hpp"
-
+#include "attribute_public.hpp"
 
 namespace xios
@@ -18 +18 @@
       /// ////////////////////// Déclarations ////////////////////// ///
       template <class T>
-         class CAttributeTemplate : public CAttribute, public CType<T>
+         class CAttributeTemplate : public CAttribute, public CType<T>, public PublicAttributes
       {
             typedef CAttribute SuperClass;
@@ -45 +45 @@
             /// Mutateurs ///
             void setValue(const ValueType & value);
-            
+
             void set(const CAttribute& attr) ;
             void set(const CAttributeTemplate& attr) ;
@@ -54 +54 @@
             T getInheritedValue(void) const ;
             bool hasInheritedValue(void) const;
-            
+
             /// Destructeur ///
             virtual ~CAttributeTemplate(void) { }
@@ -66 +66 @@
 //            virtual CAttributeTemplate* clone() const {}
 //            virtual void toBinary  (StdOStream & os) const;
-//            virtual void fromBinary(StdIStream & is);            
+//            virtual void fromBinary(StdIStream & is);
 
-            virtual bool toBuffer  (CBufferOut& buffer) const { return _toBuffer(buffer);} 
-            virtual bool fromBuffer(CBufferIn& buffer) { return _fromBuffer(buffer); } 
+            virtual bool toBuffer  (CBufferOut& buffer) const { return _toBuffer(buffer);}
+            virtual bool fromBuffer(CBufferIn& buffer) { return _fromBuffer(buffer); }
 //            virtual size_t size(void) const;
             virtual void generateCInterface(ostream& oss,const string& className) ;
@@ -83 +83 @@
 //            virtual void generateFortranInterfaceIsDefinedDeclaration(ostream& oss,const string& className) ;
 
-      
+
          protected :
 
@@ -93 +93 @@
           bool _toBuffer  (CBufferOut& buffer) const;
           bool _fromBuffer(CBufferIn& buffer) ;
-          
+
           CType<T> inheritedValue ;
-      }; // class CAttribute    
-      
-   
+      }; // class CAttribute
+
+
    template <class T>  void FromBinary(StdIStream & is, T & obj);
-   
+
 } // namespace xios