Changeset 342 for XIOS/trunk

Timestamp:

03/30/12 16:43:19 (12 years ago)

Author:

ymipsl

Message:

suppress ym related element

YM

Location:

XIOS/trunk/src

Files:

• buffer.cpp (modified) (2 diffs)
• buffer.hpp (modified) (3 diffs)
• buffer_impl.hpp (modified) (2 diffs)
• buffer_server.hpp (modified) (1 diff)
• client.cpp (modified) (3 diffs)
• client.hpp (modified) (3 diffs)
• cxios.cpp (modified) (4 diffs)
• interface/c/icdata.cpp (modified) (2 diffs)
• server.cpp (modified) (3 diffs)
• server.hpp (modified) (3 diffs)
• test/test_xios.cpp (modified) (5 diffs)

XIOS/trunk/src/buffer.cpp

@@ -1 +1 @@
 #include "xmlioserver_spl.hpp"
-#include "buffer_ym.hpp"
+#include "buffer.hpp"
 
 
 namespace xios
 {
-  namespace ym
-  {
     CBuffer::CBuffer(void* buffer_,size_t size_)
     {
@@ -46 +44 @@
     }
     
-  }
 }
     

XIOS/trunk/src/buffer.hpp

@@ -1 @@
-#ifndef __BUFFER_YM_HPP__
-#define __BUFFER_YM_HPP__
+#ifndef __BUFFER_HPP__
+#define __BUFFER_HPP__
 
 
@@ -7 +7 @@
 namespace xios
 {
-  namespace ym
-  {
   
     class CBuffer
@@ -73 +71 @@
   
  
-  }
 }
 
-#include "buffer_ym_impl.hpp" 
+#include "buffer_impl.hpp" 
 
 

XIOS/trunk/src/buffer_impl.hpp

@@ -1 @@
-#ifndef __BUFFER_YM_IMPL_HPP__
-#define __BUFFER_YM_IMPL_HPP__
+#ifndef __BUFFER_IMPL_HPP__
+#define __BUFFER_IMPL_HPP__
 
 namespace xios
 {
-  namespace ym
-  {
 
 // template spectialisation : CBuffer::put
@@ -172 +170 @@
     }    
 
-  }
 }
   

XIOS/trunk/src/buffer_server.hpp

@@ -3 +3 @@
 
 #include "xmlioserver_spl.hpp"
-#include "buffer_ym.hpp"
+#include "buffer.hpp"
 #include <mpi.h>
 

XIOS/trunk/src/client.cpp

@@ -1 +1 @@
 #include "xmlioserver_spl.hpp"
 #include "cxios.hpp"
-#include "client_ym.hpp"
+#include "client.hpp"
 #include <boost/functional/hash.hpp>
 #include "type.hpp"
@@ -12 +12 @@
 namespace xios
 {                      
-  namespace ym
-  {
 
     MPI_Comm CClient::intraComm ;
@@ -196 +194 @@
       info(20) << "Client side context is finalized"<<endl ;
     }
-  }
 }

XIOS/trunk/src/client.hpp

@@ -1 @@
-#ifndef __CLIENT_YM__HPP__
-#define __CLIENT_YM__HPP__
+#ifndef __CLIENT_HPP__
+#define __CLIENT_HPP__
 
 #include "xmlioserver_spl.hpp"
@@ -7 +7 @@
 namespace xios
 {                      
-  namespace ym
-  {
     class CClient
     {
@@ -22 +20 @@
        static bool is_MPI_Initialized ;
     } ;
-  }
 }
 

XIOS/trunk/src/cxios.cpp

@@ -2 +2 @@
 #include "xmlioserver_spl.hpp"
 #include "cxios.hpp"
-#include "client_ym.hpp"
-#include "server_ym.hpp"
+#include "client.hpp"
+#include "server.hpp"
 #include "tree_manager.hpp"
 #include <boost/functional/hash.hpp>
@@ -44 +44 @@
     else isServer=true ;
     
-    ym::CClient::initialize(codeId,localComm,returnComm) ;
+    CClient::initialize(codeId,localComm,returnComm) ;
 
   }   
@@ -50 +50 @@
   void CXios::clientFinalize(void)
   {
-     ym::CClient::finalize() ;    
+     CClient::finalize() ;    
   }   
   
@@ -62 +62 @@
     isServer=false ;
 
-    ym::CServer::initialize() ;
+    CServer::initialize() ;
   } 
   

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

@@ -18 +18 @@
 #include "icutil.hpp"
 #include "cxios.hpp"
-#include "client_ym.hpp"
+#include "client.hpp"
 #include "field.hpp"
 #include "field_impl.hpp"
@@ -62 +62 @@
      if (!cstr2string(context_id, len_context_id, str)) return;
      comm=MPI_Comm_f2c(*f_comm) ;
-     ym::CClient::registerContext(str,comm) ;
+     CClient::registerContext(str,comm) ;
    }
  

XIOS/trunk/src/server.cpp

@@ -1 +1 @@
 #include "xmlioserver_spl.hpp"
 #include "cxios.hpp"
-#include "server_ym.hpp"
+#include "server.hpp"
 #include "type.hpp"
 #include "context.hpp"
@@ -13 +13 @@
 namespace xios
 {                      
-  namespace ym
-  {
-
     MPI_Comm CServer::intraComm ;
     list<MPI_Comm> CServer::interComm ;
@@ -372 +369 @@
      }
      
-
-
-  }
 }

XIOS/trunk/src/server.hpp

@@ -1 @@
-#ifndef __SERVER_YM__HPP__
-#define __SERVER_YM__HPP__
+#ifndef __SERVER_HPP__
+#define __SERVER_HPP__
 
 #include "xmlioserver_spl.hpp"
@@ -8 +8 @@
 namespace xios
 {
-  namespace ym
-  {
     class CServer
     {
@@ -40 +38 @@
       static bool is_MPI_Initialized ;
     } ;
-  }
 }
 

XIOS/trunk/src/test/test_xios.cpp

@@ -1 +1 @@
 #include "xmlioserver.hpp"
 #include "attribute_template_impl.hpp"
-/*
-#include "group_template_impl.hpp"
-#include "file.hpp"
-*/
 #include "buffer_out.hpp"
 #include "buffer_in.hpp"
 #include "type.hpp"
 #include "cxios.hpp"
-#include "client_ym.hpp"
+#include "client.hpp"
 #include "event_client.hpp"
 #include "context.hpp"
@@ -19 +15 @@
 
 using namespace std ;
-using namespace ym ;
 
 int main (int argc, char ** argv, char ** UNUSED (env))
@@ -70 +65 @@
    {
      CXios::initClientSide("test1") ;
-     ym::CClient::registerContext("toto",ym::CClient::intraComm) ;
-//     ym::CClient::registerContext("tata",ym::CClient::intraComm) ;
-     ym::CClient::registerContext("tutu",ym::CClient::intraComm) ;
+     CClient::registerContext("toto",CClient::intraComm) ;
+//     CClient::registerContext("tata",CClient::intraComm) ;
+     CClient::registerContext("tutu",CClient::intraComm) ;
      CObjectFactory::SetCurrentContextId("tutu") ;
      CContext*  tutu=(CObjectFactory::GetObject<CContext>("tutu")).get(); 
@@ -105 +100 @@
    {
      CXios::initClientSide("test2") ;
-     ym::CClient::registerContext("tito",ym::CClient::intraComm) ;
+     CClient::registerContext("tito",CClient::intraComm) ;
      CObjectFactory::SetCurrentContextId("tito") ;
      CContext*  tito=(CObjectFactory::GetObject<CContext>("tito")).get();
       
-     ym::CClient::registerContext("tete",ym::CClient::intraComm) ;
+     CClient::registerContext("tete",CClient::intraComm) ;
      CObjectFactory::SetCurrentContextId("tete") ;
      CContext*  tete=(CObjectFactory::GetObject<CContext>("tete")).get(); 
@@ -120 +115 @@
    {
      CXios::initClientSide("test3") ;
-     ym::CClient::registerContext("turlututu",ym::CClient::intraComm) ;
+     CClient::registerContext("turlututu",CClient::intraComm) ;
      CObjectFactory::SetCurrentContextId("turlututu") ;
      CContext*  turlututu=(CObjectFactory::GetObject<CContext>("turlututu")).get();