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

XIOS/trunk/src/attribute_array_impl.hpp

@@ -7 +7 @@
 #include "attribute_array.hpp"
 
-  
+
 namespace xios
 {
@@ -47 +47 @@
         inheritedValue.reset() ;
       }
-      
+
       template <typename T_numtype, int N_rank>
       CArray<T_numtype,N_rank> CAttributeArray<T_numtype, N_rank>::getValue(void) const
@@ -65 +65 @@
     {
       this->set(dynamic_cast<const CAttributeArray<T_numtype,N_rank>& >(attr)) ;
-    } 
+    }
 
     template <typename T_numtype, int N_rank>
@@ -71 +71 @@
     {
       this->setValue(attr) ;
-    } 
-    
-    
+    }
+
+
     template <typename T_numtype, int N_rank>
     void CAttributeArray<T_numtype,N_rank>::setInheritedValue(const CAttribute& attr)
     {
       this->setInheritedValue(dynamic_cast<const CAttributeArray<T_numtype,N_rank>& >(attr)) ;
-    } 
+    }
 
     template <typename T_numtype, int N_rank>
     void CAttributeArray<T_numtype,N_rank>::setInheritedValue(const CAttributeArray& attr)
     {
-      if (this->isEmpty() && attr.hasInheritedValue()) 
+      if (this->isEmpty() && attr.hasInheritedValue())
       {
         inheritedValue.resize(attr.shape()) ;
         inheritedValue=attr ;
       }
-    } 
+    }
 
     template <typename T_numtype, int N_rank>
@@ -95 +95 @@
       if (this->isEmpty()) return inheritedValue.copy() ;
       else return getValue() ;
-    } 
-    
+    }
+
     template <typename T_numtype, int N_rank>
     bool CAttributeArray<T_numtype,N_rank>::hasInheritedValue(void) const
     {
       return !this->isEmpty() || !inheritedValue.isEmpty() ;
-    } 
-    
+    }
+
 
     template <typename T_numtype, int N_rank>
@@ -133 +133 @@
       void CAttributeArray<T_numtype, N_rank>::generateCInterface(ostream& oss,const string& className)
       {
-        CInterface::AttributeCInterface<CArray<T_numtype, N_rank> >(oss, className, this->getName()) ;
+        if (this->isAttributePublic())
+          CInterface::AttributeCInterface<CArray<T_numtype, N_rank> >(oss, className, this->getName()) ;
       }
-      
+
       template <typename T_numtype, int N_rank>
       void CAttributeArray<T_numtype, N_rank>::generateFortran2003Interface(ostream& oss,const string& className)
       {
-        CInterface::AttributeFortran2003Interface<CArray<T_numtype, N_rank> >(oss, className, this->getName()) ;
+        if (this->isAttributePublic())
+          CInterface::AttributeFortran2003Interface<CArray<T_numtype, N_rank> >(oss, className, this->getName()) ;
       }
-      
+
       template <typename T_numtype, int N_rank>
       void CAttributeArray<T_numtype, N_rank>::generateFortranInterfaceDeclaration_(ostream& oss,const string& className)
       {
-        CInterface::AttributeFortranInterfaceDeclaration<CArray<T_numtype, N_rank> >(oss, className, this->getName()+"_") ;
+        if (this->isAttributePublic())
+          CInterface::AttributeFortranInterfaceDeclaration<CArray<T_numtype, N_rank> >(oss, className, this->getName()+"_") ;
       }
- 
+
       template <typename T_numtype, int N_rank>
       void CAttributeArray<T_numtype, N_rank>::generateFortranInterfaceBody_(ostream& oss,const string& className)
       {
-        CInterface::AttributeFortranInterfaceBody<CArray<T_numtype, N_rank> >(oss, className, this->getName()) ;
+        if (this->isAttributePublic())
+          CInterface::AttributeFortranInterfaceBody<CArray<T_numtype, N_rank> >(oss, className, this->getName()) ;
       }
 
@@ -157 +161 @@
       void CAttributeArray<T_numtype, N_rank>::generateFortranInterfaceDeclaration(ostream& oss,const string& className)
       {
-        CInterface::AttributeFortranInterfaceDeclaration<CArray<T_numtype, N_rank> >(oss, className, this->getName()) ;
+        if (this->isAttributePublic())
+          CInterface::AttributeFortranInterfaceDeclaration<CArray<T_numtype, N_rank> >(oss, className, this->getName()) ;
       }
-      
+
       template <typename T_numtype, int N_rank>
       void CAttributeArray<T_numtype, N_rank>::generateFortranInterfaceGetDeclaration_(ostream& oss,const string& className)
       {
-        CInterface::AttributeFortranInterfaceGetDeclaration<CArray<T_numtype, N_rank> >(oss, className, this->getName()+"_") ;
+        if (this->isAttributePublic())
+          CInterface::AttributeFortranInterfaceGetDeclaration<CArray<T_numtype, N_rank> >(oss, className, this->getName()+"_") ;
       }
- 
+
       template <typename T_numtype, int N_rank>
       void CAttributeArray<T_numtype, N_rank>::generateFortranInterfaceGetBody_(ostream& oss,const string& className)
       {
-        CInterface::AttributeFortranInterfaceGetBody<CArray<T_numtype, N_rank> >(oss, className, this->getName()) ;
+        if (this->isAttributePublic())
+          CInterface::AttributeFortranInterfaceGetBody<CArray<T_numtype, N_rank> >(oss, className, this->getName()) ;
       }
 
@@ -175 +182 @@
       void CAttributeArray<T_numtype, N_rank>::generateFortranInterfaceGetDeclaration(ostream& oss,const string& className)
       {
-        CInterface::AttributeFortranInterfaceGetDeclaration<CArray<T_numtype, N_rank> >(oss, className, this->getName()) ;
+        if (this->isAttributePublic())
+          CInterface::AttributeFortranInterfaceGetDeclaration<CArray<T_numtype, N_rank> >(oss, className, this->getName()) ;
       }
 } // namespace xios