- Timestamp:
- 03/30/12 16:43:19 (12 years ago)
- Location:
- XIOS/trunk/src
- Files:
-
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
XIOS/trunk/src/buffer.cpp
r339 r342 1 1 #include "xmlioserver_spl.hpp" 2 #include "buffer _ym.hpp"2 #include "buffer.hpp" 3 3 4 4 5 5 namespace xios 6 6 { 7 namespace ym8 {9 7 CBuffer::CBuffer(void* buffer_,size_t size_) 10 8 { … … 46 44 } 47 45 48 }49 46 } 50 47 -
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__ 3 3 4 4 … … 7 7 namespace xios 8 8 { 9 namespace ym10 {11 9 12 10 class CBuffer … … 73 71 74 72 75 }76 73 } 77 74 78 #include "buffer_ ym_impl.hpp"75 #include "buffer_impl.hpp" 79 76 80 77 -
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__ 3 3 4 4 namespace xios 5 5 { 6 namespace ym7 {8 6 9 7 // template spectialisation : CBuffer::put … … 172 170 } 173 171 174 }175 172 } 176 173 -
XIOS/trunk/src/buffer_server.hpp
r335 r342 3 3 4 4 #include "xmlioserver_spl.hpp" 5 #include "buffer _ym.hpp"5 #include "buffer.hpp" 6 6 #include <mpi.h> 7 7 -
XIOS/trunk/src/client.cpp
r341 r342 1 1 #include "xmlioserver_spl.hpp" 2 2 #include "cxios.hpp" 3 #include "client _ym.hpp"3 #include "client.hpp" 4 4 #include <boost/functional/hash.hpp> 5 5 #include "type.hpp" … … 12 12 namespace xios 13 13 { 14 namespace ym15 {16 14 17 15 MPI_Comm CClient::intraComm ; … … 196 194 info(20) << "Client side context is finalized"<<endl ; 197 195 } 198 }199 196 } -
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__ 3 3 4 4 #include "xmlioserver_spl.hpp" … … 7 7 namespace xios 8 8 { 9 namespace ym10 {11 9 class CClient 12 10 { … … 22 20 static bool is_MPI_Initialized ; 23 21 } ; 24 }25 22 } 26 23 -
XIOS/trunk/src/cxios.cpp
r335 r342 2 2 #include "xmlioserver_spl.hpp" 3 3 #include "cxios.hpp" 4 #include "client _ym.hpp"5 #include "server _ym.hpp"4 #include "client.hpp" 5 #include "server.hpp" 6 6 #include "tree_manager.hpp" 7 7 #include <boost/functional/hash.hpp> … … 44 44 else isServer=true ; 45 45 46 ym::CClient::initialize(codeId,localComm,returnComm) ;46 CClient::initialize(codeId,localComm,returnComm) ; 47 47 48 48 } … … 50 50 void CXios::clientFinalize(void) 51 51 { 52 ym::CClient::finalize() ;52 CClient::finalize() ; 53 53 } 54 54 … … 62 62 isServer=false ; 63 63 64 ym::CServer::initialize() ;64 CServer::initialize() ; 65 65 } 66 66 -
XIOS/trunk/src/interface/c/icdata.cpp
r335 r342 18 18 #include "icutil.hpp" 19 19 #include "cxios.hpp" 20 #include "client _ym.hpp"20 #include "client.hpp" 21 21 #include "field.hpp" 22 22 #include "field_impl.hpp" … … 62 62 if (!cstr2string(context_id, len_context_id, str)) return; 63 63 comm=MPI_Comm_f2c(*f_comm) ; 64 ym::CClient::registerContext(str,comm) ;64 CClient::registerContext(str,comm) ; 65 65 } 66 66 -
XIOS/trunk/src/server.cpp
r340 r342 1 1 #include "xmlioserver_spl.hpp" 2 2 #include "cxios.hpp" 3 #include "server _ym.hpp"3 #include "server.hpp" 4 4 #include "type.hpp" 5 5 #include "context.hpp" … … 13 13 namespace xios 14 14 { 15 namespace ym16 {17 18 15 MPI_Comm CServer::intraComm ; 19 16 list<MPI_Comm> CServer::interComm ; … … 372 369 } 373 370 374 375 376 }377 371 } -
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__ 3 3 4 4 #include "xmlioserver_spl.hpp" … … 8 8 namespace xios 9 9 { 10 namespace ym11 {12 10 class CServer 13 11 { … … 40 38 static bool is_MPI_Initialized ; 41 39 } ; 42 }43 40 } 44 41 -
XIOS/trunk/src/test/test_xios.cpp
r300 r342 1 1 #include "xmlioserver.hpp" 2 2 #include "attribute_template_impl.hpp" 3 /*4 #include "group_template_impl.hpp"5 #include "file.hpp"6 */7 3 #include "buffer_out.hpp" 8 4 #include "buffer_in.hpp" 9 5 #include "type.hpp" 10 6 #include "cxios.hpp" 11 #include "client _ym.hpp"7 #include "client.hpp" 12 8 #include "event_client.hpp" 13 9 #include "context.hpp" … … 19 15 20 16 using namespace std ; 21 using namespace ym ;22 17 23 18 int main (int argc, char ** argv, char ** UNUSED (env)) … … 70 65 { 71 66 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) ; 75 70 CObjectFactory::SetCurrentContextId("tutu") ; 76 71 CContext* tutu=(CObjectFactory::GetObject<CContext>("tutu")).get(); … … 105 100 { 106 101 CXios::initClientSide("test2") ; 107 ym::CClient::registerContext("tito",ym::CClient::intraComm) ;102 CClient::registerContext("tito",CClient::intraComm) ; 108 103 CObjectFactory::SetCurrentContextId("tito") ; 109 104 CContext* tito=(CObjectFactory::GetObject<CContext>("tito")).get(); 110 105 111 ym::CClient::registerContext("tete",ym::CClient::intraComm) ;106 CClient::registerContext("tete",CClient::intraComm) ; 112 107 CObjectFactory::SetCurrentContextId("tete") ; 113 108 CContext* tete=(CObjectFactory::GetObject<CContext>("tete")).get(); … … 120 115 { 121 116 CXios::initClientSide("test3") ; 122 ym::CClient::registerContext("turlututu",ym::CClient::intraComm) ;117 CClient::registerContext("turlututu",CClient::intraComm) ; 123 118 CObjectFactory::SetCurrentContextId("turlututu") ; 124 119 CContext* turlututu=(CObjectFactory::GetObject<CContext>("turlututu")).get();
Note: See TracChangeset
for help on using the changeset viewer.