Changeset 342


Ignore:
Timestamp:
03/30/12 16:43:19 (9 years ago)
Author:
ymipsl
Message:

suppress ym related element

YM

Location:
XIOS/trunk/src
Files:
11 edited

Legend:

Unmodified
Added
Removed
  • XIOS/trunk/src/buffer.cpp

    r339 r342  
    11#include "xmlioserver_spl.hpp" 
    2 #include "buffer_ym.hpp" 
     2#include "buffer.hpp" 
    33 
    44 
    55namespace xios 
    66{ 
    7   namespace ym 
    8   { 
    97    CBuffer::CBuffer(void* buffer_,size_t size_) 
    108    { 
     
    4644    } 
    4745     
    48   } 
    4946} 
    5047     
  • XIOS/trunk/src/buffer.hpp

    r339 r342  
    1 #ifndef __BUFFER_YM_HPP__ 
    2 #define __BUFFER_YM_HPP__ 
     1#ifndef __BUFFER_HPP__ 
     2#define __BUFFER_HPP__ 
    33 
    44 
     
    77namespace xios 
    88{ 
    9   namespace ym 
    10   { 
    119   
    1210    class CBuffer 
     
    7371   
    7472  
    75   } 
    7673} 
    7774 
    78 #include "buffer_ym_impl.hpp"  
     75#include "buffer_impl.hpp"  
    7976 
    8077 
  • XIOS/trunk/src/buffer_impl.hpp

    r340 r342  
    1 #ifndef __BUFFER_YM_IMPL_HPP__ 
    2 #define __BUFFER_YM_IMPL_HPP__ 
     1#ifndef __BUFFER_IMPL_HPP__ 
     2#define __BUFFER_IMPL_HPP__ 
    33 
    44namespace xios 
    55{ 
    6   namespace ym 
    7   { 
    86 
    97// template spectialisation : CBuffer::put 
     
    172170    }     
    173171 
    174   } 
    175172} 
    176173   
  • XIOS/trunk/src/buffer_server.hpp

    r335 r342  
    33 
    44#include "xmlioserver_spl.hpp" 
    5 #include "buffer_ym.hpp" 
     5#include "buffer.hpp" 
    66#include <mpi.h> 
    77 
  • XIOS/trunk/src/client.cpp

    r341 r342  
    11#include "xmlioserver_spl.hpp" 
    22#include "cxios.hpp" 
    3 #include "client_ym.hpp" 
     3#include "client.hpp" 
    44#include <boost/functional/hash.hpp> 
    55#include "type.hpp" 
     
    1212namespace xios 
    1313{                       
    14   namespace ym 
    15   { 
    1614 
    1715    MPI_Comm CClient::intraComm ; 
     
    196194      info(20) << "Client side context is finalized"<<endl ; 
    197195    } 
    198   } 
    199196} 
  • XIOS/trunk/src/client.hpp

    r341 r342  
    1 #ifndef __CLIENT_YM__HPP__ 
    2 #define __CLIENT_YM__HPP__ 
     1#ifndef __CLIENT_HPP__ 
     2#define __CLIENT_HPP__ 
    33 
    44#include "xmlioserver_spl.hpp" 
     
    77namespace xios 
    88{                       
    9   namespace ym 
    10   { 
    119    class CClient 
    1210    { 
     
    2220       static bool is_MPI_Initialized ; 
    2321    } ; 
    24   } 
    2522} 
    2623 
  • XIOS/trunk/src/cxios.cpp

    r335 r342  
    22#include "xmlioserver_spl.hpp" 
    33#include "cxios.hpp" 
    4 #include "client_ym.hpp" 
    5 #include "server_ym.hpp" 
     4#include "client.hpp" 
     5#include "server.hpp" 
    66#include "tree_manager.hpp" 
    77#include <boost/functional/hash.hpp> 
     
    4444    else isServer=true ; 
    4545     
    46     ym::CClient::initialize(codeId,localComm,returnComm) ; 
     46    CClient::initialize(codeId,localComm,returnComm) ; 
    4747 
    4848  }    
     
    5050  void CXios::clientFinalize(void) 
    5151  { 
    52      ym::CClient::finalize() ;     
     52     CClient::finalize() ;     
    5353  }    
    5454   
     
    6262    isServer=false ; 
    6363 
    64     ym::CServer::initialize() ; 
     64    CServer::initialize() ; 
    6565  }  
    6666   
  • XIOS/trunk/src/interface/c/icdata.cpp

    r335 r342  
    1818#include "icutil.hpp" 
    1919#include "cxios.hpp" 
    20 #include "client_ym.hpp" 
     20#include "client.hpp" 
    2121#include "field.hpp" 
    2222#include "field_impl.hpp" 
     
    6262     if (!cstr2string(context_id, len_context_id, str)) return; 
    6363     comm=MPI_Comm_f2c(*f_comm) ; 
    64      ym::CClient::registerContext(str,comm) ; 
     64     CClient::registerContext(str,comm) ; 
    6565   } 
    6666  
  • XIOS/trunk/src/server.cpp

    r340 r342  
    11#include "xmlioserver_spl.hpp" 
    22#include "cxios.hpp" 
    3 #include "server_ym.hpp" 
     3#include "server.hpp" 
    44#include "type.hpp" 
    55#include "context.hpp" 
     
    1313namespace xios 
    1414{                       
    15   namespace ym 
    16   { 
    17  
    1815    MPI_Comm CServer::intraComm ; 
    1916    list<MPI_Comm> CServer::interComm ; 
     
    372369     } 
    373370      
    374  
    375  
    376   } 
    377371} 
  • XIOS/trunk/src/server.hpp

    r340 r342  
    1 #ifndef __SERVER_YM__HPP__ 
    2 #define __SERVER_YM__HPP__ 
     1#ifndef __SERVER_HPP__ 
     2#define __SERVER_HPP__ 
    33 
    44#include "xmlioserver_spl.hpp" 
     
    88namespace xios 
    99{ 
    10   namespace ym 
    11   { 
    1210    class CServer 
    1311    { 
     
    4038      static bool is_MPI_Initialized ; 
    4139    } ; 
    42   } 
    4340} 
    4441 
  • XIOS/trunk/src/test/test_xios.cpp

    r300 r342  
    11#include "xmlioserver.hpp" 
    22#include "attribute_template_impl.hpp" 
    3 /* 
    4 #include "group_template_impl.hpp" 
    5 #include "file.hpp" 
    6 */ 
    73#include "buffer_out.hpp" 
    84#include "buffer_in.hpp" 
    95#include "type.hpp" 
    106#include "cxios.hpp" 
    11 #include "client_ym.hpp" 
     7#include "client.hpp" 
    128#include "event_client.hpp" 
    139#include "context.hpp" 
     
    1915 
    2016using namespace std ; 
    21 using namespace ym ; 
    2217 
    2318int main (int argc, char ** argv, char ** UNUSED (env)) 
     
    7065   { 
    7166     CXios::initClientSide("test1") ; 
    72      ym::CClient::registerContext("toto",ym::CClient::intraComm) ; 
    73 //     ym::CClient::registerContext("tata",ym::CClient::intraComm) ; 
    74      ym::CClient::registerContext("tutu",ym::CClient::intraComm) ; 
     67     CClient::registerContext("toto",CClient::intraComm) ; 
     68//     CClient::registerContext("tata",CClient::intraComm) ; 
     69     CClient::registerContext("tutu",CClient::intraComm) ; 
    7570     CObjectFactory::SetCurrentContextId("tutu") ; 
    7671     CContext*  tutu=(CObjectFactory::GetObject<CContext>("tutu")).get();  
     
    105100   { 
    106101     CXios::initClientSide("test2") ; 
    107      ym::CClient::registerContext("tito",ym::CClient::intraComm) ; 
     102     CClient::registerContext("tito",CClient::intraComm) ; 
    108103     CObjectFactory::SetCurrentContextId("tito") ; 
    109104     CContext*  tito=(CObjectFactory::GetObject<CContext>("tito")).get(); 
    110105       
    111      ym::CClient::registerContext("tete",ym::CClient::intraComm) ; 
     106     CClient::registerContext("tete",CClient::intraComm) ; 
    112107     CObjectFactory::SetCurrentContextId("tete") ; 
    113108     CContext*  tete=(CObjectFactory::GetObject<CContext>("tete")).get();  
     
    120115   { 
    121116     CXios::initClientSide("test3") ; 
    122      ym::CClient::registerContext("turlututu",ym::CClient::intraComm) ; 
     117     CClient::registerContext("turlututu",CClient::intraComm) ; 
    123118     CObjectFactory::SetCurrentContextId("turlututu") ; 
    124119     CContext*  turlututu=(CObjectFactory::GetObject<CContext>("turlututu")).get();  
Note: See TracChangeset for help on using the changeset viewer.