Changeset 775 for XIOS/trunk/src/attribute_template_impl.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_impl.hpp (modified) (16 diffs)

XIOS/trunk/src/attribute_template_impl.hpp

@@ -8 +8 @@
 #include "attribute_template.hpp"
 
-  
+
 namespace xios
 {
@@ -54 +54 @@
       template <class T>
       CAttributeTemplate<T>::~CAttributeTemplate(void)
-      { 
+      {
 //         this->CType<T>::reset() ;
 //         this->clear();
@@ -108 +108 @@
     {
       this->set(dynamic_cast<const CAttributeTemplate<T>& >(attr)) ;
-    } 
+    }
 
    template <class T>
@@ -114 +114 @@
     {
       CType<T>::set(attr) ;
-    } 
+    }
 
     template <class T>
@@ -120 +120 @@
     {
       this->setInheritedValue(dynamic_cast<const CAttributeTemplate<T>& >(attr)) ;
-    } 
+    }
 
     template <class T>
@@ -126 +126 @@
     {
       if (this->isEmpty() && attr.hasInheritedValue()) inheritedValue.set(attr.getInheritedValue()) ;
-    } 
+    }
 
     template <class T>
@@ -133 +133 @@
       if (this->isEmpty()) return inheritedValue.get() ;
       else return getValue() ;
-    } 
-    
+    }
+
     template <class T>
     bool CAttributeTemplate<T>::hasInheritedValue(void) const
     {
       return !this->isEmpty() || !inheritedValue.isEmpty() ;
-    } 
-    
+    }
+
       //---------------------------------------------------------------
 
@@ -188 +188 @@
       {
          return CType<T>::toBuffer(buffer) ;
-/*         
+/*
          if (isEmpty()) return buffer.put(true) ;
          else
@@ -205 +205 @@
       {
         return CType<T>::fromBuffer(buffer) ;
-/*        
+/*
         bool empty ;
         bool ret=true ;
         ret&=buffer.get(empty) ;
-        if (empty) 
+        if (empty)
         {
           clear() ;
@@ -230 +230 @@
       template <class T>
       size_t CAttributeTemplate<T>::size(void) const
-      { 
+      {
         return CType<T>::size() ;*/
-/*        
+/*
         if (isEmpty()) return sizeof(bool) ;
         else
@@ -245 +245 @@
       void CAttributeTemplate<T>::generateCInterface(ostream& oss,const string& className)
       {
-        CInterface::AttributeCInterface<T>(oss, className, this->getName()) ;
+        if (this->isAttributePublic())
+          CInterface::AttributeCInterface<T>(oss, className, this->getName()) ;
 //        CInterface::AttributeIsDefinedCInterface(oss, className, this->getName()) ;
       }
-      
+
       template <typename T>
       void CAttributeTemplate<T>::generateFortran2003Interface(ostream& oss,const string& className)
       {
-        CInterface::AttributeFortran2003Interface<T>(oss, className, this->getName()) ;
+        if (this->isAttributePublic())
+          CInterface::AttributeFortran2003Interface<T>(oss, className, this->getName()) ;
 //        CInterface::AttributeIsDefinedFortran2003Interface(oss, className, this->getName()) ;
       }
-      
+
       template <typename T>
       void CAttributeTemplate<T>::generateFortranInterfaceDeclaration_(ostream& oss,const string& className)
       {
-        CInterface::AttributeFortranInterfaceDeclaration<T>(oss, className, this->getName()+"_") ;
-      }
- 
+        if (this->isAttributePublic())
+          CInterface::AttributeFortranInterfaceDeclaration<T>(oss, className, this->getName()+"_") ;
+      }
+
       template <typename T>
       void CAttributeTemplate<T>::generateFortranInterfaceBody_(ostream& oss,const string& className)
       {
-        CInterface::AttributeFortranInterfaceBody<T>(oss, className, this->getName()) ;
+        if (this->isAttributePublic())
+          CInterface::AttributeFortranInterfaceBody<T>(oss, className, this->getName()) ;
       }
 
@@ -271 +275 @@
       void CAttributeTemplate<T>::generateFortranInterfaceDeclaration(ostream& oss,const string& className)
       {
-        CInterface::AttributeFortranInterfaceDeclaration<T>(oss, className, this->getName()) ;
-      }
-      
+        if (this->isAttributePublic())
+          CInterface::AttributeFortranInterfaceDeclaration<T>(oss, className, this->getName()) ;
+      }
+
       template <typename T>
       void CAttributeTemplate<T>::generateFortranInterfaceGetDeclaration_(ostream& oss,const string& className)
       {
-        CInterface::AttributeFortranInterfaceGetDeclaration<T>(oss, className, this->getName()+"_") ;
-      }
- 
- 
+        if (this->isAttributePublic())
+          CInterface::AttributeFortranInterfaceGetDeclaration<T>(oss, className, this->getName()+"_") ;
+      }
+
+
       template <typename T>
       void CAttributeTemplate<T>::generateFortranInterfaceGetBody_(ostream& oss,const string& className)
       {
-        CInterface::AttributeFortranInterfaceGetBody<T>(oss, className, this->getName()) ;
+        if (this->isAttributePublic())
+          CInterface::AttributeFortranInterfaceGetBody<T>(oss, className, this->getName()) ;
       }
 
@@ -290 +297 @@
       void CAttributeTemplate<T>::generateFortranInterfaceGetDeclaration(ostream& oss,const string& className)
       {
-        CInterface::AttributeFortranInterfaceGetDeclaration<T>(oss, className, this->getName()) ;
-      }
-
- 
-/*      
-      //---------------------------------------------------------------
-
-      // Spécialisations des templates pour la fonction [toString] 
+        if (this->isAttributePublic())
+          CInterface::AttributeFortranInterfaceGetDeclaration<T>(oss, className, this->getName()) ;
+      }
+
+
+/*
+      //---------------------------------------------------------------
+
+      // Spécialisations des templates pour la fonction [toString]
 
       template <>
@@ -304 +312 @@
       //---------------------------------------------------------------
 
-      // Spécialisations des templates pour la fonction [fromString] 
+      // Spécialisations des templates pour la fonction [fromString]
 
       template <> // Chaîne de caractÚres.
@@ -333 +341 @@
       template <> // Booléen
          void CAttributeTemplate<bool>::toBinary(StdOStream & os) const;
-         
+
       template <> // Double
          void CAttributeTemplate<double>::toBinary(StdOStream & os) const;
@@ -349 +357 @@
       template <> // Booléen
          void CAttributeTemplate<bool>::fromBinary(StdIStream & is);
-         
+
       template <> // Double
          void CAttributeTemplate<double>::fromBinary(StdIStream & is);
 
       ///--------------------------------------------------------------
-*/      
+*/
 } // namespace xios