Changeset 352

Timestamp:

07/09/12 11:33:05 (12 years ago)

Author:

ymipsl

Message:

 

Location:

XIOS/trunk/src

Files:

• array.hpp (modified) (4 diffs)
• array_impl.cpp (added)
• attribute.hpp (modified) (2 diffs)
• attribute_template.cpp (deleted)
• attribute_template_decl.cpp (added)
• attribute_template_impl.hpp (modified) (1 diff)
• attribute_template_specialisation.hpp (added)
• buffer.hpp (modified) (1 diff)
• buffer_decl.cpp (added)
• buffer_in.hpp (modified) (1 diff)
• buffer_in_decl.cpp (added)
• buffer_out.hpp (modified) (1 diff)
• buffer_out_decl.cpp (added)
• context_server.cpp (modified) (1 diff)
• cxios.hpp (modified) (1 diff)
• cxios_decl.cpp (added)
• cxios_impl.hpp (modified) (1 diff)
• data_output.cpp (modified) (1 diff)
• field_impl.hpp (deleted)
• functor.hpp (modified) (1 diff)
• generate_fortran_interface.cpp (modified) (1 diff)
• generate_interface.hpp (modified) (2 diffs)
• generate_interface_decl.cpp (added)
• generate_interface_impl.hpp (modified) (2 diffs)
• group_factory.hpp (modified) (1 diff)
• group_factory_decl.cpp (added)
• group_factory_impl.hpp (modified) (2 diffs)
• group_template_decl.cpp (added)
• group_template_impl.hpp (modified) (4 diffs)
• interface/c/icaxis.cpp (modified) (1 diff)
• interface/c/iccontext.cpp (modified) (2 diffs)
• interface/c/icdata.cpp (modified) (2 diffs)
• interface/c/icdate.cpp (modified) (2 diffs)
• interface/c/icdomain.cpp (modified) (1 diff)
• interface/c/icfield.cpp (modified) (1 diff)
• interface/c/icfile.cpp (modified) (1 diff)
• interface/c/icgrid.cpp (modified) (1 diff)
• interface/c/icxml_tree.cpp (modified) (1 diff)
• interface/c_attr/icaxis_attr.cpp (modified) (1 diff)
• interface/c_attr/icaxisgroup_attr.cpp (modified) (1 diff)
• interface/c_attr/iccontext_attr.cpp (modified) (1 diff)
• interface/c_attr/icdomain_attr.cpp (modified) (1 diff)
• interface/c_attr/icdomaingroup_attr.cpp (modified) (1 diff)
• interface/c_attr/icfield_attr.cpp (modified) (1 diff)
• interface/c_attr/icfieldgroup_attr.cpp (modified) (1 diff)
• interface/c_attr/icfile_attr.cpp (modified) (1 diff)
• interface/c_attr/icfilegroup_attr.cpp (modified) (1 diff)
• interface/c_attr/icgrid_attr.cpp (modified) (1 diff)
• interface/c_attr/icgridgroup_attr.cpp (modified) (1 diff)
• node/axis.cpp (modified) (1 diff)
• node/context.cpp (modified) (2 diffs)
• node/context.hpp (modified) (2 diffs)
• node/domain.cpp (modified) (2 diffs)
• node/field.cpp (modified) (1 diff)
• node/field_decl.cpp (added)
• node/field_impl.hpp (added)
• node/file.cpp (modified) (2 diffs)
• node/grid.cpp (modified) (1 diff)
• node/variable.cpp (modified) (1 diff)
• node/variable.hpp (modified) (3 diffs)
• object_factory.hpp (modified) (2 diffs)
• object_factory_decl.cpp (added)
• object_factory_impl.hpp (modified) (1 diff)
• object_template_decl.cpp (added)
• object_template_impl.hpp (modified) (2 diffs)
• output/nc4_data_output.cpp (modified) (1 diff)
• output/nc4_data_output.hpp (modified) (2 diffs)
• output/onetcdf4.cpp (modified) (1 diff)
• output/onetcdf4.hpp (modified) (1 diff)
• output/onetcdf4_decl.cpp (added)
• output/onetcdf4_impl.hpp (added)
• server.cpp (modified) (1 diff)
• test/test_xios.cpp (modified) (2 diffs)
• type/type.hpp (modified) (1 diff)
• type/type_decl.cpp (added)
• type/type_impl.hpp (modified) (1 diff)
• type/type_util.hpp (modified) (2 diffs)
• xml_parser.cpp (modified) (1 diff)
• xml_parser.hpp (modified) (2 diffs)
• xml_parser_decl.cpp (added)
• xml_parser_impl.hpp (added)

XIOS/trunk/src/array.hpp

@@ -16 +16 @@
 {
    template<size_t numDims>
-   detail::multi_array::extent_gen<numDims> getExtentNull(void) { return getExtentNull<numDims-1>()[0];}
+   inline detail::multi_array::extent_gen<numDims> getExtentNull(void) { return getExtentNull<numDims-1>()[0];}
    
    template<>
-   detail::multi_array::extent_gen<1> getExtentNull<1>(void) { return extents[0]; }
+   inline detail::multi_array::extent_gen<1> getExtentNull<1>(void) { return extents[0]; }
 
    /// ////////////////////// Déclarations ////////////////////// ///
-   template <typename ValueType, StdSize  NumDims,
-             typename Allocator = std::allocator<ValueType> >
-      class CArray
-         : public boost::multi_array<ValueType, NumDims, Allocator>
+   
+   template <typename ValueType, StdSize  NumDims, typename Allocator = std::allocator<ValueType> >
+   class CArray : public boost::multi_array<ValueType, NumDims, Allocator>
    {
          /// Définition de type ///
@@ -35 +34 @@
 
          /// Constructeurs ///
-         template <typename ExtentList>
-            explicit CArray(const ExtentList & sizes);
+//         template <typename ExtentList>
+//            explicit CArray(const ExtentList & sizes);
+      template <typename ExtentList> CArray(const ExtentList & sizes)
+            : boost::multi_array<ValueType, NumDims, Allocator>
+                  (sizes, boost::fortran_storage_order())
+   { /* Ne rien faire de plus */ }
+
 
          explicit CArray();
 
-         template <typename ExtentList>
-            CArray(const ExtentList & sizes, const boost::general_storage_order<NumDims> & store);
+//         template <typename ExtentList>
+//            CArray(const ExtentList & sizes, const boost::general_storage_order<NumDims> & store);
+      template <typename ExtentList>  CArray(const ExtentList & sizes, const boost::general_storage_order<NumDims> & store)
+               : boost::multi_array<ValueType, NumDims, Allocator> (sizes, store)
+   { /* Ne rien faire de plus */ }
 
          CArray(const CArray & array);       // NEVER IMPLEMENTED.
@@ -71 +78 @@
 
    }; // class CArray
-   
 
    ///---------------------------------------------------------------
@@ -77 +83 @@
 } // namespace xios
 
-#include "array_impl.hpp"
+//#include "array_impl.hpp"
 #include "array_mac.hpp"
-
+namespace xios
+{
+   template <typename ValueType> void FromBinary(StdIStream & is, ARRAY(ValueType, 1) & array) ;
+   template <typename ValueType> void FromBinary(StdIStream & is, ARRAY(ValueType, 2) & array) ;
+   template <typename ValueType> void FromBinary(StdIStream & is, ARRAY(ValueType, 3) & array) ;
+}
 #endif // __XMLIO_CArray__

XIOS/trunk/src/attribute.hpp

@@ -40 +40 @@
             /// Test ///
             bool isEmpty(void) const;
-            template <typename T> inline bool isType(void);
+            template <typename T> inline bool isType(void) const;
 
             /// Destructeur ///
@@ -92 +92 @@
 
       template<typename T>
-         bool CAttribute::isType(void)
+         bool CAttribute::isType(void) const
       { 
          return (this->value.type() == typeid(T)); 

XIOS/trunk/src/attribute_template_impl.hpp

@@ -6 +6 @@
 #include "buffer_in.hpp"
 #include "buffer_out.hpp"
-#include "generate_interface_impl.hpp"
-
+#include "generate_interface.hpp"
+#include "attribute_template.hpp"
 
   

XIOS/trunk/src/buffer.hpp

@@ -73 +73 @@
 }
 
-#include "buffer_impl.hpp" 
+//#include "buffer_impl.hpp" 
 
 

XIOS/trunk/src/buffer_in.hpp

@@ -59 +59 @@
 }
 
-#include "buffer_in_impl.hpp" 
+//#include "buffer_in_impl.hpp" 
 
 

XIOS/trunk/src/buffer_out.hpp

@@ -61 +61 @@
 }
 
-#include "buffer_out_impl.hpp" 
+//#include "buffer_out_impl.hpp" 
 
 

XIOS/trunk/src/context_server.cpp

@@ -3 +3 @@
 #include "type.hpp"
 #include "context.hpp"
-#include "object_template_impl.hpp"
-#include "group_template_impl.hpp"
-#include "attribute_template_impl.hpp"
+#include "object_template.hpp"
+#include "group_template.hpp"
+#include "attribute_template.hpp"
 #include "domain.hpp"
-
+#include "field.hpp"
+#include "file.hpp"
+#include "grid.hpp"
 #include <mpi.h>
 #include "tracer.hpp"

XIOS/trunk/src/cxios.hpp

@@ -41 +41 @@
         
   } ;
+
 }
 
-#include "cxios_impl.hpp"
+//#include "cxios_impl.hpp"
 
 

XIOS/trunk/src/cxios_impl.hpp

@@ -4 +4 @@
 #include "xmlioserver_spl.hpp"
 #include "variable.hpp"
-#include "object_template_impl.hpp"
+#include "object_template.hpp"
+#include "cxios.hpp"
 
 namespace xios

XIOS/trunk/src/data_output.cpp

@@ -1 +1 @@
 #include "data_output.hpp"
 
-#include "attribute_template_impl.hpp"
-#include "group_template_impl.hpp"
+#include "attribute_template.hpp"
+#include "group_template.hpp"
 #include "context.hpp"
 

XIOS/trunk/src/functor.hpp

@@ -58 +58 @@
 } // namespace xios
 
-#include "functor_type.hpp"
+//#include "functor_type.hpp"
 
 #endif // __XMLIO_CFunctor__

XIOS/trunk/src/generate_fortran_interface.cpp

@@ -1 +1 @@
 #include "xmlioserver.hpp"
-#include "generate_interface_impl.hpp"
+#include "generate_interface.hpp"
 #include "indent.hpp"
-#include "attribute_template_impl.hpp"
-#include "object_template_impl.hpp"
-#include "group_template_impl.hpp"
+#include "attribute_template.hpp"
+#include "object_template.hpp"
+#include "group_template.hpp"
 
 int main (int argc, char ** argv, char ** UNUSED (env))

XIOS/trunk/src/generate_interface.hpp

@@ -42 +42 @@
 
   };
-  
+/*  
   template<> string CInterface::getStrFortranType<int>(void) {return string("INTEGER") ;}
   template<> string CInterface::getStrFortranType<bool>(void) {return string("LOGICAL") ;}
@@ -62 +62 @@
   template<> bool CInterface::matchingTypeCFortran<double>(void) { return true; }
   template<> bool CInterface::matchingTypeCFortran<float>(void) { return true; }
-  
+*/
 }
 #endif

XIOS/trunk/src/generate_interface_impl.hpp

@@ -6 +6 @@
 #include "type_util.hpp"
 #include "indent.hpp"
+#include "array.hpp"
 
 namespace xios
 { 
-
+  template<> string CInterface::getStrFortranType<int>(void) {return string("INTEGER") ;}
+  template<> string CInterface::getStrFortranType<bool>(void) {return string("LOGICAL") ;}
+  template<> string CInterface::getStrFortranType<double>(void) {return string("REAL") ;}
+  template<> string CInterface::getStrFortranType<float>(void) {return string("REAL") ;}
+  
+  template<> string CInterface::getStrFortranKind<int>(void) {return string("") ;}
+  template<> string CInterface::getStrFortranKind<bool>(void) {return string("") ;}
+  template<> string CInterface::getStrFortranKind<double>(void) {return string("(KIND=8)") ;}
+  template<> string CInterface::getStrFortranKind<float>(void) {return string("(KIND=4)") ;}
+  
+  template<> string CInterface::getStrFortranKindC<int>(void) {return string("(KIND=C_INT)") ;}
+  template<> string CInterface::getStrFortranKindC<bool>(void) {return string("(KIND=C_BOOL)") ;}
+  template<> string CInterface::getStrFortranKindC<double>(void) {return string("(KIND=C_DOUBLE)") ;}
+  template<> string CInterface::getStrFortranKindC<float>(void) {return string("(KIND=C_FLOAT)") ;}
+  
+  template<> bool CInterface::matchingTypeCFortran<int>(void) { return true ; } 
+  template<> bool CInterface::matchingTypeCFortran<bool>(void) { return false ;} 
+  template<> bool CInterface::matchingTypeCFortran<double>(void) { return true; }
+  template<> bool CInterface::matchingTypeCFortran<float>(void) { return true; }
+  
 
 // /////////////////////////////////////////////////
@@ -15 +35 @@
 // /////////////////////////////////////////////////
 
+  
   template <class T>
   void CInterface::AttributeCInterface(ostream& oss, const string& className,const string& name)

XIOS/trunk/src/group_factory.hpp

@@ -74 +74 @@
 } // namespace xios
 
-#include "group_factory_impl.hpp"
-#include "group_parser.hpp"
+//#include "group_factory_impl.hpp"
+//#include "group_parser.hpp"
 
 #endif // __XMLIO_CGroupFactory__

XIOS/trunk/src/group_factory_impl.hpp

@@ -1 +1 @@
 #ifndef __XMLIO_CGroupFactory_impl__
 #define __XMLIO_CGroupFactory_impl__
+
+#include "group_factory.hpp"
 
 namespace xios
@@ -14 +16 @@
                << " pgroup or cgroup NULL !");
       if (!cgroup->hasId())
-         pgroup->groupList.insert(pgroup->groupList.end(), cgroup);
+         pgroup->groupList.insert(pgroup->groupList.end(), cgroup.get());
       else
       {
-         pgroup->groupList.insert(pgroup->groupList.end(), cgroup);
-         pgroup->groupMap.insert(std::make_pair(cgroup->getId(), cgroup));
+         pgroup->groupList.insert(pgroup->groupList.end(), cgroup.get());
+         pgroup->groupMap.insert(std::make_pair(cgroup->getId(), cgroup.get()));
       }
    }

XIOS/trunk/src/group_template_impl.hpp

@@ -4 +4 @@
 #include "xmlioserver_spl.hpp"
 #include "event_server.hpp"
-#include "object_template_impl.hpp"
+#include "object_template.hpp"
 #include "group_template.hpp"
 #include "context.hpp"
 #include "event_client.hpp"
 #include "context_client.hpp"
+#include "message.hpp"
+#include "type.hpp"
+#include "type_util.hpp"
 
 
@@ -238 +241 @@
          CGroupTemplate<U, V, W>::getGroupMap(void) const
    { 
-      return (this->groupList);
+      return (this->groupMap);
    }
 
@@ -351 +354 @@
    void CGroupTemplate<U, V, W>::addChild(U* child) 
   {
-    return CGroupFactory::AddChild<V>(this->getShared,child->getShared()) ;
+    return CGroupFactory::AddChild<V>(this->getShared(),child->getShared()) ;
   }
   
@@ -475 +478 @@
    }
 
+   template <class U, class V, class W>
+      void CGroupTemplate<U, V, W>::parse(xml::CXMLNode & node, bool withAttr)
+   {
+
+      StdString name = node.getElementName();
+      xml::THashAttributes attributes = node.getAttributes();
+      if (withAttr)
+      {
+         CGroupTemplate<U, V, W>::SuperClass::parse(node);
+         if (attributes.end() != attributes.find("src"))
+         {
+            StdIFStream ifs ( attributes["src"].c_str() , StdIFStream::in );
+            if (!ifs.good())
+               ERROR("CGroupTemplate<U, V, W>::parse(xml::CXMLNode & node, bool withAttr)",
+                     << "[ filename = " << attributes["src"] << " ] Bad xml stream !");
+            xml::CXMLParser::ParseInclude(ifs, *this);
+         }
+      }
+
+      // PARSING POUR GESTION DES ENFANTS
+           V* group_ptr = (this->hasId()) 
+         ? V::get(this->getId())
+         : boost::polymorphic_downcast<V*>(this);
+
+      if (!(node.goToChildElement()))
+      {
+         if (this->hasId())
+         {
+            DEBUG(<< "L'objet de type \'" << V::GetName()
+                  << "\' nommé \'" << this->getId()
+                  << "\' ne contient pas d\'enfant !");
+         }
+      }
+      else
+      {
+         do { // Parcours pour traitement.
+
+            StdString name = node.getElementName();
+            attributes.clear();
+            attributes = node.getAttributes();
+
+            if (name.compare(V::GetName()) == 0)
+            {
+               if (attributes.end() == attributes.find("id"))
+                  CGroupFactory::CreateGroup(group_ptr->getShared())->parse(node);
+               else
+                  CGroupFactory::CreateGroup(group_ptr->getShared(), attributes["id"])->parse(node);
+               continue;
+            }
+
+            if (name.compare(U::GetName()) == 0)
+            {
+               if (attributes.end() == attributes.find("id"))
+                  CGroupFactory::CreateChild(group_ptr->getShared())->parse(node);
+               else
+                  CGroupFactory::CreateChild(group_ptr->getShared(), attributes["id"])->parse(node);
+               continue;
+            }
+
+            DEBUG(<< "Dans le contexte \'" << CContext::getCurrent()->getId()
+                  << "\', un objet de type \'" << V::GetName()
+                  << "\' ne peut contenir qu'un objet de type \'" << V::GetName()
+                  << "\' ou de type \'" << U::GetName()
+                  << "\' (reçu : " << name << ") !");
+
+         } while (node.goToNextElement());
+         node.goToParentElement(); // Retour au parent
+      }
+   }
 } // namespace xios
 

XIOS/trunk/src/interface/c/icaxis.cpp

@@ -8 +8 @@
 #include "xmlioserver.hpp"
 
-#include "object_template_impl.hpp"
-#include "group_template_impl.hpp"
-#include "attribute_template_impl.hpp"
+#include "object_template.hpp"
+#include "group_template.hpp"
+#include "attribute_template.hpp"
 
 #include "icutil.hpp"
 #include "timer.hpp"
+#include "axis.hpp"
 
 extern "C"

XIOS/trunk/src/interface/c/iccontext.cpp

@@ -8 +8 @@
 #include "xmlioserver.hpp"
 
-#include "attribute_template_impl.hpp"
-#include "object_template_impl.hpp"
-#include "group_template_impl.hpp"
+#include "attribute_template.hpp"
+#include "object_template.hpp"
+#include "group_template.hpp"
 
 #include "calendar_type.hpp"
@@ -16 +16 @@
 #include "icutil.hpp"
 #include "timer.hpp"
+#include "context.hpp"
 
 extern "C"

XIOS/trunk/src/interface/c/icdata.cpp

@@ -12 +12 @@
 #include "oasis_cinterface.hpp"
 
-#include "attribute_template_impl.hpp"
-#include "object_template_impl.hpp"
-#include "group_template_impl.hpp"
+#include "attribute_template.hpp"
+#include "object_template.hpp"
+#include "group_template.hpp"
 
 #include "icutil.hpp"
@@ -20 +20 @@
 #include "client.hpp"
 #include "field.hpp"
-#include "field_impl.hpp"
+#include "context.hpp"
 #include <mpi.h>
 #include "timer.hpp"

XIOS/trunk/src/interface/c/icdate.cpp

@@ -8 +8 @@
 #include "xmlioserver.hpp"
 
-#include "attribute_template_impl.hpp"
-#include "object_template_impl.hpp"
-#include "group_template_impl.hpp"
+#include "attribute_template.hpp"
+#include "object_template.hpp"
+#include "group_template.hpp"
 
 #include "calendar_type.hpp"
@@ -16 +16 @@
 #include "icutil.hpp"
 #include "timer.hpp"
+#include "context.hpp"
 
 extern "C"

XIOS/trunk/src/interface/c/icdomain.cpp

@@ -8 +8 @@
 #include "xmlioserver.hpp"
 
-#include "attribute_template_impl.hpp"
-#include "object_template_impl.hpp"
-#include "group_template_impl.hpp"
+#include "attribute_template.hpp"
+#include "object_template.hpp"
+#include "group_template.hpp"
 
 #include "icutil.hpp"
 #include "timer.hpp"
+#include "domain.hpp"
 
 extern "C"

XIOS/trunk/src/interface/c/icfield.cpp

@@ -8 +8 @@
 #include "xmlioserver.hpp"
 
-#include "attribute_template_impl.hpp"
-#include "object_template_impl.hpp"
-#include "group_template_impl.hpp"
+#include "attribute_template.hpp"
+#include "object_template.hpp"
+#include "group_template.hpp"
 
 #include "icutil.hpp"
 #include "timer.hpp"
+#include "field.hpp"
 
 extern "C"

XIOS/trunk/src/interface/c/icfile.cpp

@@ -8 +8 @@
 #include "xmlioserver.hpp"
 
-#include "attribute_template_impl.hpp"
-#include "object_template_impl.hpp"
-#include "group_template_impl.hpp"
+#include "attribute_template.hpp"
+#include "object_template.hpp"
+#include "group_template.hpp"
 
 #include "icutil.hpp"
 #include "timer.hpp"
+#include "file.hpp"
 
 extern "C"

XIOS/trunk/src/interface/c/icgrid.cpp

@@ -8 +8 @@
 #include "xmlioserver.hpp"
 
-#include "attribute_template_impl.hpp"
-#include "object_template_impl.hpp"
-#include "group_template_impl.hpp"
+#include "attribute_template.hpp"
+#include "object_template.hpp"
+#include "group_template.hpp"
 
 #include "icutil.hpp"
 #include "timer.hpp"
+#include "grid.hpp"
 
 extern "C"

XIOS/trunk/src/interface/c/icxml_tree.cpp

@@ -8 +8 @@
 #include "xmlioserver.hpp"
 
-#include "attribute_template_impl.hpp"
-#include "object_template_impl.hpp"
-#include "group_template_impl.hpp"
+#include "attribute_template.hpp"
+#include "object_template.hpp"
+#include "group_template.hpp"
 
 #include "icutil.hpp"
 #include "timer.hpp"
+#include "context.hpp"
+#include "grid.hpp"
+#include "file.hpp"
+#include "field.hpp"
+#include "axis.hpp"
+#include "domain.hpp"
 
 extern "C"

XIOS/trunk/src/interface/c_attr/icaxis_attr.cpp

@@ -6 +6 @@
 #include <boost/shared_ptr.hpp>
 #include "xmlioserver.hpp"
-#include "attribute_template_impl.hpp"
-#include "object_template_impl.hpp"
-#include "group_template_impl.hpp"
+#include "attribute_template.hpp"
+#include "object_template.hpp"
+#include "group_template.hpp"
 #include "icutil.hpp"
 #include "timer.hpp"
+#include "axis.hpp"
 
 extern "C"

XIOS/trunk/src/interface/c_attr/icaxisgroup_attr.cpp

@@ -6 +6 @@
 #include <boost/shared_ptr.hpp>
 #include "xmlioserver.hpp"
-#include "attribute_template_impl.hpp"
-#include "object_template_impl.hpp"
-#include "group_template_impl.hpp"
+#include "attribute_template.hpp"
+#include "object_template.hpp"
+#include "group_template.hpp"
 #include "icutil.hpp"
 #include "timer.hpp"
+#include "axis.hpp"
 
 extern "C"

XIOS/trunk/src/interface/c_attr/iccontext_attr.cpp

@@ -6 +6 @@
 #include <boost/shared_ptr.hpp>
 #include "xmlioserver.hpp"
-#include "attribute_template_impl.hpp"
-#include "object_template_impl.hpp"
-#include "group_template_impl.hpp"
+#include "attribute_template.hpp"
+#include "object_template.hpp"
+#include "group_template.hpp"
 #include "icutil.hpp"
 #include "timer.hpp"
+#include "context.hpp"
 
 extern "C"

XIOS/trunk/src/interface/c_attr/icdomain_attr.cpp

@@ -6 +6 @@
 #include <boost/shared_ptr.hpp>
 #include "xmlioserver.hpp"
-#include "attribute_template_impl.hpp"
-#include "object_template_impl.hpp"
-#include "group_template_impl.hpp"
+#include "attribute_template.hpp"
+#include "object_template.hpp"
+#include "group_template.hpp"
 #include "icutil.hpp"
 #include "timer.hpp"
+#include "domain.hpp"
 
 extern "C"

XIOS/trunk/src/interface/c_attr/icdomaingroup_attr.cpp

@@ -6 +6 @@
 #include <boost/shared_ptr.hpp>
 #include "xmlioserver.hpp"
-#include "attribute_template_impl.hpp"
-#include "object_template_impl.hpp"
-#include "group_template_impl.hpp"
+#include "attribute_template.hpp"
+#include "object_template.hpp"
+#include "group_template.hpp"
 #include "icutil.hpp"
 #include "timer.hpp"
+#include "domain.hpp"
 
 extern "C"

XIOS/trunk/src/interface/c_attr/icfield_attr.cpp

@@ -6 +6 @@
 #include <boost/shared_ptr.hpp>
 #include "xmlioserver.hpp"
-#include "attribute_template_impl.hpp"
-#include "object_template_impl.hpp"
-#include "group_template_impl.hpp"
+#include "attribute_template.hpp"
+#include "object_template.hpp"
+#include "group_template.hpp"
 #include "icutil.hpp"
 #include "timer.hpp"
+#include "field.hpp"
 
 extern "C"

XIOS/trunk/src/interface/c_attr/icfieldgroup_attr.cpp

@@ -6 +6 @@
 #include <boost/shared_ptr.hpp>
 #include "xmlioserver.hpp"
-#include "attribute_template_impl.hpp"
-#include "object_template_impl.hpp"
-#include "group_template_impl.hpp"
+#include "attribute_template.hpp"
+#include "object_template.hpp"
+#include "group_template.hpp"
 #include "icutil.hpp"
 #include "timer.hpp"
+#include "field.hpp"
 
 extern "C"

XIOS/trunk/src/interface/c_attr/icfile_attr.cpp

@@ -6 +6 @@
 #include <boost/shared_ptr.hpp>
 #include "xmlioserver.hpp"
-#include "attribute_template_impl.hpp"
-#include "object_template_impl.hpp"
-#include "group_template_impl.hpp"
+#include "attribute_template.hpp"
+#include "object_template.hpp"
+#include "group_template.hpp"
 #include "icutil.hpp"
 #include "timer.hpp"
+#include "file.hpp"
 
 extern "C"

XIOS/trunk/src/interface/c_attr/icfilegroup_attr.cpp

@@ -6 +6 @@
 #include <boost/shared_ptr.hpp>
 #include "xmlioserver.hpp"
-#include "attribute_template_impl.hpp"
-#include "object_template_impl.hpp"
-#include "group_template_impl.hpp"
+#include "attribute_template.hpp"
+#include "object_template.hpp"
+#include "group_template.hpp"
 #include "icutil.hpp"
 #include "timer.hpp"
+#include "file.hpp"
 
 extern "C"

XIOS/trunk/src/interface/c_attr/icgrid_attr.cpp

@@ -6 +6 @@
 #include <boost/shared_ptr.hpp>
 #include "xmlioserver.hpp"
-#include "attribute_template_impl.hpp"
-#include "object_template_impl.hpp"
-#include "group_template_impl.hpp"
+#include "attribute_template.hpp"
+#include "object_template.hpp"
+#include "group_template.hpp"
 #include "icutil.hpp"
 #include "timer.hpp"
+#include "grid.hpp"
 
 extern "C"

XIOS/trunk/src/interface/c_attr/icgridgroup_attr.cpp

@@ -6 +6 @@
 #include <boost/shared_ptr.hpp>
 #include "xmlioserver.hpp"
-#include "attribute_template_impl.hpp"
-#include "object_template_impl.hpp"
-#include "group_template_impl.hpp"
+#include "attribute_template.hpp"
+#include "object_template.hpp"
+#include "group_template.hpp"
 #include "icutil.hpp"
 #include "timer.hpp"
+#include "grid.hpp"
 
 extern "C"

XIOS/trunk/src/node/axis.cpp

@@ -1 +1 @@
 #include "axis.hpp"
 
-#include "attribute_template_impl.hpp"
-#include "object_template_impl.hpp"
-#include "group_template_impl.hpp"
+#include "attribute_template.hpp"
+#include "object_template.hpp"
+#include "group_template.hpp"
+#include "message.hpp"
+#include "type.hpp"
+#include "xmlioserver_spl.hpp"
 
 namespace xios {

XIOS/trunk/src/node/context.cpp

@@ -1 +1 @@
 #include "context.hpp"
-#include "attribute_template_impl.hpp"
-#include "object_template_impl.hpp"
-#include "group_template_impl.hpp"
+#include "attribute_template.hpp"
+#include "object_template.hpp"
+#include "group_template.hpp"
 
 #include "calendar_type.hpp"
@@ -11 +11 @@
 #include "nc4_data_output.hpp"
 #include "node_type.hpp"
+#include "message.hpp"
+#include "type.hpp"
+#include "xmlioserver_spl.hpp"
 
 namespace xios {

XIOS/trunk/src/node/context.hpp

@@ -4 +4 @@
 /// xios headers ///
 #include "xmlioserver_spl.hpp"
-#include "node_type.hpp"
+//#include "node_type.hpp"
 #include "calendar.hpp"
 
@@ -24 +24 @@
    class CContextAttributes;
    class CContext;
-  
+   class CFile;
    ///--------------------------------------------------------------
 

XIOS/trunk/src/node/domain.cpp

@@ -1 +1 @@
 #include "domain.hpp"
 
-#include "attribute_template_impl.hpp"
-#include "object_template_impl.hpp"
-#include "group_template_impl.hpp"
+#include "attribute_template.hpp"
+#include "object_template.hpp"
+#include "group_template.hpp"
 
 #include "xmlioserver_spl.hpp"
@@ -9 +9 @@
 #include "event_server.hpp"
 #include "buffer_in.hpp"
+#include "message.hpp"
+#include "type.hpp"
+#include "context.hpp"
+#include "context_client.hpp"
 
 namespace xios {

XIOS/trunk/src/node/field.cpp

@@ -1 +1 @@
 #include "field.hpp"
 
-#include "attribute_template_impl.hpp"
-#include "object_template_impl.hpp"
-#include "group_template_impl.hpp"
+#include "attribute_template.hpp"
+#include "object_template.hpp"
+#include "group_template.hpp"
 
 #include "node_type.hpp"
 #include "calendar_util.hpp"
+#include "message.hpp"
+#include "xmlioserver_spl.hpp"
+#include "type.hpp"
+#include "context_client.hpp"
 
 namespace xios{

XIOS/trunk/src/node/file.cpp

@@ -1 +1 @@
 #include "file.hpp"
 
-#include "attribute_template_impl.hpp"
-#include "object_template_impl.hpp"
-#include "group_template_impl.hpp"
-
+#include "attribute_template.hpp"
+#include "object_template.hpp"
+#include "group_template.hpp"
 #include "object_factory.hpp"
-#include "object_factory_impl.hpp"
 #include "data_output.hpp"
 #include "context.hpp"
@@ -13 +11 @@
 #include "calendar_util.hpp"
 #include "date.hpp"
-
+#include "message.hpp"
+#include "type.hpp"
+#include "xmlioserver_spl.hpp"
+#include "context_client.hpp"
 
 namespace xios {

XIOS/trunk/src/node/grid.cpp

@@ -2 +2 @@
 #include "grid.hpp"
 
-#include "attribute_template_impl.hpp"
-#include "object_template_impl.hpp"
-#include "group_template_impl.hpp"
+#include "attribute_template.hpp"
+#include "object_template.hpp"
+#include "group_template.hpp"
+#include "message.hpp"
 #include <iostream>
+#include "xmlioserver_spl.hpp"
+#include "type.hpp"
+#include "context.hpp"
+#include "context_client.hpp"
 
 namespace xios {

XIOS/trunk/src/node/variable.cpp

@@ -1 +1 @@
 #include "variable.hpp"
 
-#include "attribute_template_impl.hpp"
-#include "object_template_impl.hpp"
-#include "group_template_impl.hpp"
-
+#include "attribute_template.hpp"
+#include "object_template.hpp"
+#include "group_template.hpp"
 #include "object_factory.hpp"
-#include "object_factory_impl.hpp"
+#include "xmlioserver_spl.hpp"
+#include "type.hpp"
 
 namespace xios {

XIOS/trunk/src/node/variable.hpp

@@ -64 +64 @@
             template <typename T> inline T getData(void) const;
 //            bool inline getData<bool>(void) const ;
+//            template <> getData<bool>(void) const ;
             
             template <typename T, StdSize N>
@@ -81 +82 @@
       }; // class CVar
 
-     
+      template<>
+      inline bool CVariable::getData(void) const
+      {
+         if (content.compare("true")==0 || content.compare(".true.")==0 || content.compare(".TRUE.")==0) return true ; 
+         else if (content.compare("false")==0 || content.compare(".false.")==0 || content.compare(".FALSE.")==0) return false ; 
+         else ERROR("CVariable::getdata()",
+               << "Cannot convert string <" << content << "> into type required" );
+         return false ;
+      } 
+      
       template <typename T>
-      T CVariable::getData(void) const
+      inline T CVariable::getData(void) const
       {
          T retval ;
@@ -94 +104 @@
       } 
 
-      template<>
-      bool CVariable::getData<bool>(void) const
-      {
-         if (content.compare("true")==0 || content.compare(".true.")==0 || content.compare(".TRUE.")==0) return true ; 
-         else if (content.compare("false")==0 || content.compare(".false.")==0 || content.compare(".FALSE.")==0) return false ; 
-         else ERROR("CVariable::getdata()",
-               << "Cannot convert string <" << content << "> into type required" );
-         return false ;
-      } 
+
       ///--------------------------------------------------------------
 

XIOS/trunk/src/object_factory.hpp

@@ -24 +24 @@
 
          template <typename U>
-            static inline boost::shared_ptr<U> GetObject(const StdString & id);
+            static  boost::shared_ptr<U> GetObject(const StdString & id);
 
          template <typename U>
-            static inline boost::shared_ptr<U> GetObject(const StdString& context,const StdString & id);
+            static  boost::shared_ptr<U> GetObject(const StdString& context,const StdString & id);
 
          template <typename U>
-            static inline boost::shared_ptr<U> GetObject(const U * const object);
+            static  boost::shared_ptr<U> GetObject(const U * const object);
 
          template <typename U>
-            static inline int GetObjectNum(void);
+            static  int GetObjectNum(void);
          template <typename U>
-            static inline int GetObjectIdNum(void);
+            static  int GetObjectIdNum(void);
 
          template <typename U>
-            static inline const std::vector<boost::shared_ptr<U> > &
+            static  const std::vector<boost::shared_ptr<U> > &
                GetObjectVector(const StdString & context = CObjectFactory::GetCurrentContextId());
 
          /// Tests ///
          template <typename U>
-            static inline bool HasObject(const StdString & id);
+            static  bool HasObject(const StdString & id);
 
          template <typename U>
-            static inline bool HasObject(const StdString& context,const StdString & id);
+            static  bool HasObject(const StdString& context,const StdString & id);
 
          /// Instanciateur ///
          template <typename U>
-            static inline boost::shared_ptr<U> CreateObject(const StdString & id = StdString(""));
+            static  boost::shared_ptr<U> CreateObject(const StdString & id = StdString(""));
 
-         template <typename U> static inline StdString GenUId(void) ; 
+         template <typename U> static  StdString GenUId(void) ; 
 
       private :
@@ -62 +62 @@
 } // namespace xios
 
-#include "object_factory_impl.hpp"
+//#include "object_factory_impl.hpp"
 
 #endif // __XMLIO_CObjectFactory__

XIOS/trunk/src/object_factory_impl.hpp

@@ -1 +1 @@
 #ifndef __XMLIO_CObjectFactory_impl__
 #define __XMLIO_CObjectFactory_impl__
+
+#include "object_factory.hpp"
 
 namespace xios

XIOS/trunk/src/object_template_impl.hpp

@@ -15 +15 @@
 #include "message.hpp"
 #include "type.hpp"
+#include "type_util.hpp"
+#include "group_template.hpp"
 
 namespace xios
@@ -314 +316 @@
      oss<<"#include <boost/shared_ptr.hpp>"<<iendl ;
      oss<<"#include \"xmlioserver.hpp\""<<iendl;
-     oss<<"#include \"attribute_template_impl.hpp\""<<iendl ;
-     oss<<"#include \"object_template_impl.hpp\""<<iendl;
-     oss<<"#include \"group_template_impl.hpp\""<<iendl ;
+     oss<<"#include \"attribute_template.hpp\""<<iendl ;
+     oss<<"#include \"object_template.hpp\""<<iendl;
+     oss<<"#include \"group_template.hpp\""<<iendl ;
      oss<<"#include \"icutil.hpp\""<<iendl ;
      oss<<"#include \"timer.hpp\""<<iendl ;

XIOS/trunk/src/output/nc4_data_output.cpp

@@ -3 +3 @@
 
 #include <boost/lexical_cast.hpp>
-#include "attribute_template_impl.hpp"
-#include "group_template_impl.hpp"
+#include "attribute_template.hpp"
+#include "group_template.hpp"
 
 #include "file.hpp"

XIOS/trunk/src/output/nc4_data_output.hpp

@@ -81 +81 @@
                                      const StdString & units,
                                      const StdString & nav_model);
+/*
             template <class T>
                void writeAxisData(const StdString & axis_name,
@@ -87 +88 @@
                                   const std::vector<StdSize> * start = NULL,
                                   const std::vector<StdSize> * count = NULL);
-
+*/
          private :
 

XIOS/trunk/src/output/onetcdf4.cpp

@@ -1 +1 @@
 #include "onetcdf4.hpp"
-#include "group_template_impl.hpp"
+#include "group_template.hpp"
 
 namespace xios

XIOS/trunk/src/output/onetcdf4.hpp

@@ -126 +126 @@
       ///---------------------------------------------------------------
            
-      template <class T, StdSize ndim>
-         void CONetCDF4::writeData(const ARRAY(T, ndim) data, const StdString & name,
-                                   bool collective, StdSize record,
-                                   const std::vector<StdSize> * start,
-                                   const std::vector<StdSize> * count)
-      {
-         int grpid = this->getCurrentGroup();
-         int varid = this->getVariable(name);
-         StdSize array_size = 1;
-         std::vector<StdSize> sstart, scount;
 
-         if (this->wmpi && collective)
-            CheckError(nc_var_par_access(grpid, varid, NC_COLLECTIVE));
-         if (this->wmpi && !collective)
-            CheckError(nc_var_par_access(grpid, varid, NC_INDEPENDENT));
-
-         this->getWriteDataInfos
-         (name, record, array_size,  sstart, scount, start, count);
-         if (data->num_elements() != array_size)
-         {
-            ERROR("CONetCDF4::writeData(...)",
-                  << "[ input array size = "  << data->num_elements()
-                  << ", intern array size = " << array_size
-                  << " ] Invalid input data !" );
-         }
-         
-         this->writeData_(grpid, varid, sstart, scount, data->data());
-      }
-      
-      //----------------------------------------------------------------
-           
-      template <class T>
-         void CONetCDF4::setDefaultValue(const StdString & varname, const T * value)
-      {
-         int grpid = this->getCurrentGroup();
-         int varid = this->getVariable(varname);
-         
-         if (value != NULL)
-         {
-            CheckError(nc_def_var_fill(grpid, varid, 0, value));
-            this->addAttribute(StdString("missing_value"), *value, &varname);
-         }
-         else
-            CheckError(nc_def_var_fill(grpid, varid, 1, NULL));         
-      }
-     
-      ///---------------------------------------------------------------
 
 } // namespace xios

XIOS/trunk/src/server.cpp

@@ -4 +4 @@
 #include "type.hpp"
 #include "context.hpp"
-#include "object_template_impl.hpp"
+#include "object_template.hpp"
 #include "oasis_cinterface.hpp"
 #include <boost/functional/hash.hpp>

XIOS/trunk/src/test/test_xios.cpp

@@ -1 +1 @@
 #include "xmlioserver.hpp"
-#include "attribute_template_impl.hpp"
+#include "attribute_template.hpp"
 #include "buffer_out.hpp"
 #include "buffer_in.hpp"
@@ -10 +10 @@
 #include "context_client.hpp"
 #include "context_server.hpp"
-#include "object_template_impl.hpp"
+#include "object_template.hpp"
 #include <mpi.h>
 

XIOS/trunk/src/type/type.hpp

@@ -41 +41 @@
   } ;
 
+  class CMessage ;
+  
+  template <typename T>
+  CBufferOut& operator<<(CBufferOut& buffer, const CType<T>& type) ;
+  
+
+  template <typename T>
+  CBufferOut& operator<<(CBufferOut& buffer, T& type) ;
+  
+  template <typename T>
+  CBufferOut& operator<<(CBufferOut& buffer, const T& type) ;
+  
+  template <typename T>
+  CBufferIn& operator>>(CBufferIn& buffer, const CType<T>& type) ;
+  
+  template <typename T>
+  CBufferIn& operator>>(CBufferIn& buffer, T& type) ;
+  
+
+
+  template <typename T>
+  CMessage& operator<<(CMessage& msg, const CType<T>& type) ;
+  
+  template <typename T>
+  CMessage& operator<<(CMessage& msg,CType<T>& type) ;
+  
+  template <typename T>
+  CMessage& operator<<(CMessage& msg, const T& type) ;
+  
+  template <typename T>
+  CMessage& operator<<(CMessage& msg, T& type) ;
+  
 }
 
-#include "type_impl.hpp"
-#include "type_specialisation.hpp"
+
+//#include "type_impl.hpp"
+//#include "type_specialisation.hpp"
 
 #endif

XIOS/trunk/src/type/type_impl.hpp

@@ -7 +7 @@
 #include "buffer_out.hpp"
 #include "message.hpp"
+#include "type.hpp"
 
 

XIOS/trunk/src/type/type_util.hpp

@@ -16 +16 @@
     class CFileGroup;
     class CContext;
-
+    class CContextGroup;
+    class CVariable ;
+    class CVariableGroup ;
         
-  template <typename T>
-  inline string getStrType(void) ;
+  template <typename T> inline string getStrType(void) ;
     
 #define macro(T) template <> inline string getStrType<T>(void) { return std::string(#T) ; }
@@ -50 +51 @@
   macro(CFileGroup)
   macro(CContext)
+  macro(CContextGroup)
+  macro(CVariable)
+  macro(CVariableGroup)
   
+ 
 #undef macro
 

XIOS/trunk/src/xml_parser.cpp

@@ -3 +3 @@
 #include "context.hpp"
 
-#include "attribute_template_impl.hpp"
-#include "object_template_impl.hpp"
-#include "group_template_impl.hpp"
+#include "attribute_template.hpp"
+#include "object_template.hpp"
+#include "group_template.hpp"
 
 namespace xios

XIOS/trunk/src/xml_parser.hpp

@@ -21 +21 @@
             static void ParseStream(StdIStream & stream);
             template <class T>
-               static inline void ParseInclude(StdIStream & stream, T & object);
+               static void ParseInclude(StdIStream & stream, T & object);
 
       }; //class CXMLParser
-
+/*
       template <class T>
          void CXMLParser::ParseInclude(StdIStream & stream, T& object)
@@ -45 +45 @@
          }
       }
-
+*/
    }// namespace xml
 } // namespace xios