Changeset 314 for XIOS/trunk


Ignore:
Timestamp:
02/20/12 11:22:02 (12 years ago)
Author:
ymipsl
Message:

Removing obsolete files and some cleaning...

YM

Location:
XIOS/trunk
Files:
34 added
20 deleted
16 edited

Legend:

Unmodified
Added
Removed

  • XIOS/trunk/bld.cfg

    r313 r314  
    2727bld::lib xios 
    2828bld::target libxios.a 
    29 #bld::target main_server.exe test_xios.exe  
    30 bld::target generate_fortran_interface.exe server_main.exe test_cs.exe  
     29bld::target generate_fortran_interface.exe  
     30bld::target xios_server.exe test_cs.exe  
    3131bld::exe_dep 
    3232 

  • XIOS/trunk/src/client_ym.cpp

    r300 r314  
    44#include <boost/functional/hash.hpp> 
    55#include "type.hpp" 
    6 #include "buffer.hpp" 
    76#include "context.hpp" 
    87#include "context_client.hpp" 
    … …  
    130129     
    131130     
    132      
    133      
    134 /*     
    135     void CClient::initialize(const string& codeId,MPI_Comm& localComm,MPI_Comm& returnComm) 
    136     { 
    137       boost::hash<string> hashString ;     
    138      
    139       unsigned long hashClient=hashString(codeId) ; 
    140       unsigned long hashServer=hashString(CXios::xiosCodeId) ; 
    141       unsigned long* hashAll ; 
    142       int rank ; 
    143       int size ; 
    144       int myColor ; 
    145       int i,c ; 
    146       MPI_Comm newComm ; 
    147        
    148       MPI_Comm_size(CXios::globalComm,&size) ; 
    149       MPI_Comm_rank(CXios::globalComm,&rank); 
    150       hashAll=new unsigned long[size] ; 
    151       
    152       MPI_Allgather(&hashClient,1,MPI_LONG,hashAll,1,MPI_LONG,CXios::globalComm) ; 
    153  
    154       map<unsigned long, int> colors ; 
    155       map<unsigned long, int> leaders ; 
    156        
    157       for(i=0,c=0;i<size;i++) 
    158       { 
    159         if (colors.find(hashAll[i])==colors.end()) 
    160         { 
    161           colors[hashAll[i]] =c ; 
    162           leaders[hashAll[i]]=i ; 
    163           c++ ; 
    164         } 
    165          
    166       } 
    167       
    168       myColor=colors[hashClient] ; 
    169        
    170       MPI_Comm_split(CXios::globalComm,myColor,rank,&intraComm) ; 
    171  
    172       if (!CXios::isServer) 
    173       {      
    174         int clientLeader=leaders[hashClient] ; 
    175         serverLeader=leaders[hashServer] ; 
    176         MPI_Intercomm_create(intraComm,0,CXios::globalComm,serverLeader,0,&interComm) ; 
    177       } 
    178       else 
    179       { 
    180         MPI_Comm_dup(intraComm,&interComm) ; 
    181       } 
    182  
    183       delete [] hashAll ; 
    184     } 
    185   */ 
    186      
    187131    void CClient::registerContext(const string& id,MPI_Comm contextComm) 
    188132    { 

  • XIOS/trunk/src/context_client.cpp

    r300 r314  
    88#include "message.hpp" 
    99#include "event_client.hpp" 
    10 #include "transfert_parameters.hpp" 
    1110#include "context.hpp" 
    1211#include <mpi.h> 

  • XIOS/trunk/src/context_server.cpp

    r300 r314  
    22#include "buffer_in.hpp" 
    33#include "type.hpp" 
    4 #include "transfert_parameters.hpp" 
    54#include "context.hpp" 
    65#include "object_template_impl.hpp" 

  • XIOS/trunk/src/fortran/icdata.cpp

    r312 r314  
    1717 
    1818#include "icutil.hpp" 
    19 #include "mpi_manager.hpp" 
    20 #include "buffer.hpp" 
    2119#include "cxios.hpp" 
    2220#include "client_ym.hpp" 

  • XIOS/trunk/src/node/axis.cpp

    r313 r314  
    44#include "object_template_impl.hpp" 
    55#include "group_template_impl.hpp" 
    6 #include "transfert_parameters.hpp" 
    76 
    87namespace xmlioserver { 

  • XIOS/trunk/src/node/context.cpp

    r300 r314  
    99#include "duration.hpp" 
    1010 
    11 #include "data_treatment.hpp" 
    1211#include "context_client.hpp" 
    1312#include "context_server.hpp" 

  • XIOS/trunk/src/node/domain.cpp

    r300 r314  
    44#include "object_template_impl.hpp" 
    55#include "group_template_impl.hpp" 
    6  
    7 #include "mpi_manager.hpp" 
    86 
    97#include "tree_manager.hpp" 

  • XIOS/trunk/src/node/field.cpp

    r310 r314  
    77#include "node_type.hpp" 
    88#include "calendar_util.hpp" 
    9 #include "xios_manager.hpp" 
    109 
    1110namespace xmlioserver{ 

  • XIOS/trunk/src/node/grid.cpp

    r300 r314  
    66#include "group_template_impl.hpp" 
    77#include <iostream> 
    8 #include "mpi_manager.hpp" 
    98 
    109namespace xmlioserver { 
    … …  
    533532 
    534533 
    535  
     534/* 
    536535   void CGrid::computeIndexServer(void) 
    537536   { 
    … …  
    669668      this->out_l_index[0] = out_l_index_srv;       
    670669   } 
    671     
     670*/ 
    672671    
    673672   void CGrid::inputFieldServer 

  • XIOS/trunk/src/object_template_impl.hpp

    r313 r314  
    44#include "object_factory.hpp" 
    55#include "context.hpp" 
    6 #include "transfert_parameters.hpp" 
    76#include "buffer_in.hpp" 
    87#include "attribute.hpp" 

  • XIOS/trunk/src/output/nc4_data_output.cpp

    r313 r314  
    88#include "file.hpp" 
    99#include "calendar.hpp" 
    10 #include "xios_manager.hpp" 
    1110#include "context.hpp" 
    1211#include "context_server.hpp" 

  • XIOS/trunk/src/output/onetcdf4.cpp

    r300 r314  
    11#include "onetcdf4.hpp" 
    22#include "group_template_impl.hpp" 
    3 #include "mpi_manager.hpp" 
    43 
    54namespace xmlioserver 
    … …  
    404403      void CONetCDF4::sync(void) 
    405404      { 
    406          
    407          comm::CMPIManager::Barrier(comm::CMPIManager::GetCommServer()); 
    408405         CheckError(nc_sync(this->ncidp)) ; 
    409406      }  

  • XIOS/trunk/src/output/onetcdf4.hpp

    r286 r314  
    77#include "array.hpp" 
    88#include "data_output.hpp" 
    9 #include "mpi_manager.hpp" 
    109 
    1110#include <mpi.h> 

  • XIOS/trunk/src/server_ym.cpp

    r300 r314  
    33#include "server_ym.hpp" 
    44#include "type.hpp" 
    5 #include "buffer.hpp" 
    65#include "context.hpp" 
    76#include "object_template_impl.hpp" 
    … …  
    350349              <<"Context has already been registred") ; 
    351350       
    352 //      tree::CContext* ptr ; 
    353 //      if (tree::CContext::has(contextId)) ptr=tree::CContext::get(contextId).get() ; 
    354 //      else ptr=tree::CContext::create(contextId).get() ; 
    355351      shared_ptr<CContext> context=tree::CTreeManager::CreateContext(contextId) ; 
    356352      contextList[contextId]=context.get() ; 

  • XIOS/trunk/src/xmlioserver.hpp

    r219 r314  
    55 
    66/// xmlioserver headers /// 
    7 #include "mpi_manager.hpp" 
    87#include "tree_manager.hpp" 
    9 #include "xios_manager.hpp" 
    10 #include "data_treatment.hpp" 
    118#include "nc4_data_output.hpp" 
    129 
    … …  
    1916using namespace xmlioserver::tree; 
    2017using namespace xmlioserver::xml; 
    21 using namespace xmlioserver::comm; 
    2218using namespace xmlioserver::func; 
    2319 
Note: See TracChangeset for help on using the changeset viewer.