Changeset 157 for XMLIO_V2/dev/dev_rv/src

Timestamp:

03/25/11 11:42:58 (13 years ago)

Author:

hozdoba

Message:

 

Location:

XMLIO_V2/dev/dev_rv/src/xmlio

Files:

• buffer.cpp (modified) (1 diff)
• buffer_list.hpp (modified) (1 diff)
• buffer_pair.hpp (modified) (1 diff)
• calendar_util.cpp (modified) (1 diff)
• configure.cpp (modified) (1 diff)
• configure.hpp (modified) (1 diff)
• data_output.hpp (modified) (1 diff)
• data_treatment.hpp (modified) (1 diff)
• functor.hpp (modified) (1 diff)
• group_factory.cpp (modified) (1 diff)
• main_server.cpp (modified) (1 diff)
• manager/mpi_manager.cpp (modified) (1 diff)
• manager/tree_manager.hpp (modified) (1 diff)
• mask.cpp (modified) (1 diff)
• node/axis.hpp (modified) (1 diff)
• node/context.cpp (modified) (4 diffs)
• node/context.hpp (modified) (1 diff)
• node/domain.hpp (modified) (1 diff)
• node/field.hpp (modified) (2 diffs)
• node/file.hpp (modified) (1 diff)
• node/grid.hpp (modified) (1 diff)
• node/method.hpp (modified) (1 diff)
• node/node_enum.hpp (modified) (1 diff)
• node/var.hpp (modified) (1 diff)
• object.cpp (modified) (2 diffs)
• object_template.hpp (modified) (1 diff)
• output/nc4_data_output.cpp (modified) (1 diff)
• output/nc4_data_output.hpp (modified) (1 diff)
• output/onetcdf4.hpp (modified) (1 diff)
• xml_node.hpp (modified) (1 diff)
• xml_parser.hpp (modified) (1 diff)
• xmlioserver.hpp (modified) (1 diff)

XMLIO_V2/dev/dev_rv/src/xmlio/buffer.cpp

@@ -1 +1 @@
 #include "buffer.hpp"
 
-#include "manager/mpi_manager.hpp"
+#include "mpi_manager.hpp"
 #include "buffer_impl.hpp"
 

XMLIO_V2/dev/dev_rv/src/xmlio/buffer_list.hpp

@@ -7 +7 @@
 #include "circular_buffer.hpp"
 #include "linear_buffer.hpp"
-#include "manager/mpi_manager.hpp"
+#include "mpi_manager.hpp"
 
 namespace xmlioserver

XMLIO_V2/dev/dev_rv/src/xmlio/buffer_pair.hpp

@@ -7 +7 @@
 #include "circular_buffer.hpp"
 #include "linear_buffer.hpp"
-#include "manager/mpi_manager.hpp"
+#include "mpi_manager.hpp"
 
 namespace xmlioserver

XMLIO_V2/dev/dev_rv/src/xmlio/calendar_util.cpp

@@ -1 +1 @@
 #include "calendar_util.hpp"
-
 
 namespace xmlioserver

XMLIO_V2/dev/dev_rv/src/xmlio/configure.cpp

@@ -11 +11 @@
 namespace xmlioserver
 {
-#include "config/properties.conf"
+#include "properties.conf"
 } // namespace xmlioserver

XMLIO_V2/dev/dev_rv/src/xmlio/configure.hpp

@@ -11 +11 @@
 namespace xmlioserver
 {
-#include "config/properties.conf"
+#include "properties.conf"
 } // namespace xmlioserver
 

XMLIO_V2/dev/dev_rv/src/xmlio/data_output.hpp

@@ -5 +5 @@
 #include "xmlioserver_spl.hpp"
 #include "exception.hpp"
-#include "node/grid.hpp"
-#include "node/field.hpp"
+#include "grid.hpp"
+#include "field.hpp"
 
 #include <mpi.h>

XMLIO_V2/dev/dev_rv/src/xmlio/data_treatment.hpp

@@ -4 +4 @@
 /// xmlioserver headers ///
 #include "xmlioserver_spl.hpp"
-#include "node/node_type.hpp"
-#include "manager/mpi_manager.hpp"
+#include "node_type.hpp"
+#include "mpi_manager.hpp"
 #include "data_output.hpp"
 

XMLIO_V2/dev/dev_rv/src/xmlio/functor.hpp

@@ -78 +78 @@
 } // namespace xmlioserver
 
-#include "functor/functor_type.hpp"
+#include "functor_type.hpp"
 
 #endif // __XMLIO_CFunctor__

XMLIO_V2/dev/dev_rv/src/xmlio/group_factory.cpp

@@ -7 +7 @@
 
    void CGroupFactory::SetCurrentContextId(const StdString & context)
-   { CGroupFactory::CurrContext = context; }
+   { 
+      CGroupFactory::CurrContext = context;
+   }
 
    StdString & CGroupFactory::GetCurrentContextId(void)
-   { return (CGroupFactory::CurrContext); }
+   { 
+      return (CGroupFactory::CurrContext);
+   }
 
 } // namespace xmlioserver

XMLIO_V2/dev/dev_rv/src/xmlio/main_server.cpp

@@ -2 +2 @@
 #include "xmlioserver.hpp"
 
-#include "fake_client/fake.hpp"
+#include "fake.hpp"
 #include "attribute_template_impl.hpp"
-#include "output/nc4_data_output.hpp"
+#include "nc4_data_output.hpp"
 
 // Point d'entrée du programme principal

XMLIO_V2/dev/dev_rv/src/xmlio/manager/mpi_manager.cpp

@@ -1 +1 @@
 #include "mpi_manager.hpp"
 
-#include "fortran/impi_interface.hpp"
+#include "impi_interface.hpp"
 
 namespace xmlioserver

XMLIO_V2/dev/dev_rv/src/xmlio/manager/tree_manager.hpp

@@ -4 +4 @@
 /// xmlioserver headers ///
 #include "xmlioserver_spl.hpp"
-#include "node/node_type.hpp"
+#include "node_type.hpp"
 #include "xml_parser.hpp"
 #include "indent.hpp"

XMLIO_V2/dev/dev_rv/src/xmlio/mask.cpp

@@ -23 +23 @@
 
    const int * CMask::getData(void) const
-   { return (SuperClass::data()); }
+   { 
+      return (SuperClass::data());
+   }
 
    //---------------------------------------------------------------

XMLIO_V2/dev/dev_rv/src/xmlio/node/axis.hpp

@@ -22 +22 @@
       // Declare/Define CAxisAttribute
       BEGIN_DECLARE_ATTRIBUTE_MAP(CAxis)
-#include "../config/axis_attribute.conf"
+#include "axis_attribute.conf"
       END_DECLARE_ATTRIBUTE_MAP(CAxis)
 

XMLIO_V2/dev/dev_rv/src/xmlio/node/context.cpp

@@ -61 +61 @@
       continue; }
 #define DECLARE_NODE_PAR(Name_, name_)
-#include "../config/node_type.conf"
+#include "node_type.conf"
 
                DEBUG(<< "L'élément nommé \'"     << name
@@ -116 +116 @@
       oss << *CObjectFactory::GetObject<C##Name_##Definition>(C##Name_##Definition::GetDefName()) << std::endl;
 #define DECLARE_NODE_PAR(Name_, name_)
-#include "../config/node_type.conf"
+#include "node_type.conf"
 
          }
@@ -131 +131 @@
       CObjectFactory::GetObject<C##Name_##Definition>(C##Name_##Definition::GetDefName())->solveDescInheritance();
 #define DECLARE_NODE_PAR(Name_, name_)
-#include "../config/node_type.conf"
+#include "node_type.conf"
       }
 
@@ -140 +140 @@
    CObjectFactory::HasObject<C##Name_##Definition>  (C##Name_##Definition::GetDefName())   ||
 #define DECLARE_NODE_PAR(Name_, name_)
-#include "../config/node_type.conf"
+#include "node_type.conf"
          false);
       }

XMLIO_V2/dev/dev_rv/src/xmlio/node/context.hpp

@@ -21 +21 @@
       // Declare/Define CFileAttribute
       BEGIN_DECLARE_ATTRIBUTE_MAP(CContext)
-#include "../config/context_attribute.conf"
+#include "context_attribute.conf"
       END_DECLARE_ATTRIBUTE_MAP(CContext)
 

XMLIO_V2/dev/dev_rv/src/xmlio/node/domain.hpp

@@ -23 +23 @@
       // Declare/Define CDomainAttribute
       BEGIN_DECLARE_ATTRIBUTE_MAP(CDomain)
-#include "../config/domain_attribute.conf"
+#include "domain_attribute.conf"
       END_DECLARE_ATTRIBUTE_MAP(CDomain)
 

XMLIO_V2/dev/dev_rv/src/xmlio/node/field.hpp

@@ -7 +7 @@
 
 #include "functor.hpp"
-#include "functor/functor_type.hpp"
+#include "functor_type.hpp"
 
 #include "declare_group.hpp"
@@ -28 +28 @@
       // Declare/Define CFieldAttribute
       BEGIN_DECLARE_ATTRIBUTE_MAP(CField)
-#include "../config/field_attribute.conf"
+#include "field_attribute.conf"
       END_DECLARE_ATTRIBUTE_MAP(CField)
 

XMLIO_V2/dev/dev_rv/src/xmlio/node/file.hpp

@@ -23 +23 @@
       // Declare/Define CFileAttribute
       BEGIN_DECLARE_ATTRIBUTE_MAP(CFile)
-#include "../config/file_attribute.conf"
+#include "file_attribute.conf"
       END_DECLARE_ATTRIBUTE_MAP(CFile)
 

XMLIO_V2/dev/dev_rv/src/xmlio/node/grid.hpp

@@ -24 +24 @@
       // Declare/Define CGridAttribute
       BEGIN_DECLARE_ATTRIBUTE_MAP(CGrid)
-#include "../config/grid_attribute.conf"
+#include "grid_attribute.conf"
       END_DECLARE_ATTRIBUTE_MAP(CGrid)
 

XMLIO_V2/dev/dev_rv/src/xmlio/node/method.hpp

@@ -17 +17 @@
       // Declare/Define CMethodAttribute
       BEGIN_DECLARE_ATTRIBUTE_MAP(CMethod)
-#include "../config/method_attribute.conf"
+#include "method_attribute.conf"
       END_DECLARE_ATTRIBUTE_MAP(CMethod)
 

XMLIO_V2/dev/dev_rv/src/xmlio/node/node_enum.hpp

@@ -14 +14 @@
          Unknown = 0
 
-#include "config/node_type.conf"
+#include "node_type.conf"
 
       } ENodeType;

XMLIO_V2/dev/dev_rv/src/xmlio/node/var.hpp

@@ -17 +17 @@
       // Declare/Define CVarAttribute
       BEGIN_DECLARE_ATTRIBUTE_MAP(CVar)
-#include "../config/var_attribute.conf"
+#include "var_attribute.conf"
       END_DECLARE_ATTRIBUTE_MAP(CVar)
 

XMLIO_V2/dev/dev_rv/src/xmlio/object.cpp

@@ -20 +20 @@
    { /* Ne rien faire de plus */ }
 
-   const StdString & CObject::getId(void) const { return (this->id); }
+   const StdString & CObject::getId(void) const 
+   { 
+      return (this->id);
+   }
 
-   bool CObject::hasId(void) const  { return (this->IdDefined); }
+   bool CObject::hasId(void) const  
+   { 
+      return (this->IdDefined);
+   }
 
-   void CObject::resetId(void) { this->IdDefined = false ;}
+   void CObject::resetId(void) 
+   { 
+      this->IdDefined = false ;
+   }
 
    void CObject::setId(const StdString & id)
-   { this->id = id ; this->IdDefined = true ; }
+   { 
+      this->id = id ;
+      this->IdDefined = true ;
+   }
 
    bool CObject::operator==(const CObject & other) const
@@ -37 +49 @@
 
    bool CObject::operator!=(const CObject & other) const
-   { return (!(*this == other)); }
+   { 
+      return (!(*this == other));
+   }
 
    StdOStream & operator << (StdOStream & os, const CObject & object)
-   { os << object.toString(); return (os); }
+   { 
+      os << object.toString();
+      return (os);
+   }
 
 } // namespace xmlioserver

XMLIO_V2/dev/dev_rv/src/xmlio/object_template.hpp

@@ -5 +5 @@
 #include "xmlioserver_spl.hpp"
 #include "attribute_map.hpp"
-#include "node/node_enum.hpp"
+#include "node_enum.hpp"
 
 namespace xmlioserver

XMLIO_V2/dev/dev_rv/src/xmlio/output/nc4_data_output.cpp

@@ -4 +4 @@
 #include "attribute_template_impl.hpp"
 
-#include "node/file.hpp"
+#include "file.hpp"
 
 namespace xmlioserver

XMLIO_V2/dev/dev_rv/src/xmlio/output/nc4_data_output.hpp

@@ -5 +5 @@
 #include "xmlioserver_spl.hpp"
 #include "onetcdf4.hpp"
-#include "../data_output.hpp"
+#include "data_output.hpp"
 
 namespace xmlioserver

XMLIO_V2/dev/dev_rv/src/xmlio/output/onetcdf4.hpp

@@ -7 +7 @@
 #include "array.hpp"
 #include "mask.hpp"
-#include "../data_output.hpp"
-#include "manager/mpi_manager.hpp"
+#include "data_output.hpp"
+#include "mpi_manager.hpp"
 
 #include <mpi.h>

XMLIO_V2/dev/dev_rv/src/xmlio/xml_node.hpp

@@ -3 +3 @@
 
 /// rapidXML headers ///
-#include <xml/rapidxml.hpp>
+#include <rapidxml.hpp>
 
 /// xmlioserver headers ///

XMLIO_V2/dev/dev_rv/src/xmlio/xml_parser.hpp

@@ -5 +5 @@
 #include "xmlioserver_spl.hpp"
 #include "xml_node.hpp"
-#include "node/context.hpp"
+#include "context.hpp"
 
 namespace xmlioserver

XMLIO_V2/dev/dev_rv/src/xmlio/xmlioserver.hpp

@@ -5 +5 @@
 
 /// xmlioserver headers ///
-#include "manager/mpi_manager.hpp"
-#include "manager/tree_manager.hpp"
-#include "manager/xios_manager.hpp"
+#include "mpi_manager.hpp"
+#include "tree_manager.hpp"
+#include "xios_manager.hpp"
 #include "data_treatment.hpp"
-#include "output/nc4_data_output.hpp"
+#include "nc4_data_output.hpp"
 
 //#include "data_manager.hpp"