Ignore:
Timestamp:
05/16/17 17:54:30 (7 years ago)
Author:
yushan
Message:

branch merged with trunk r1130

File:
1 edited

Legend:

Unmodified
Added
Removed

  • XIOS/dev/branch_yushan_merged/src/cxios.hpp

    r1029 r1134  
    55#include "mpi.hpp" 
    66#include "registry.hpp" 
     7#include "log.hpp" 
    78 
    89namespace xios 
    … …  
    1415  { 
    1516    public: 
    16      static void initialize(void) ; 
    17      static void initClientSide(const string & codeId, MPI_Comm& localComm, MPI_Comm& returnComm) ; 
    18      static void initServerSide(void) ; 
    19      static void clientFinalize(void) ; 
    20      static void parseFile(const string& filename) ; 
     17      static void initialize(void) ; 
     18      static void initClientSide(const string & codeId, ep_lib::MPI_Comm& localComm, ep_lib::MPI_Comm& returnComm) ; 
     19      static void initServerSide(void) ; 
     20      static void clientFinalize(void) ; 
     21      static void parseFile(const string& filename) ; 
    2122 
    22      template <typename T> 
    23      static T getin(const string& id,const T& defaultValue) ; 
     23      template <typename T> 
     24      static T getin(const string& id,const T& defaultValue) ; 
    2425 
    25      template <typename T> 
    26      static T getin(const string& id) ; 
     26      template <typename T> 
     27      static T getin(const string& id) ; 
    2728 
    2829    public: 
    29      static string rootFile ; //!< Configuration filename 
    30      static string xiosCodeId ; //!< Identity for XIOS 
    31      static string clientFile; //!< Filename template for client 
    32      static string serverFile; //!< Filename template for server 
     30      static const string rootFile; //!< Configuration filename 
     31      static const string xiosCodeId ; //!< Identity for XIOS 
     32      static const string clientFile; //!< Filename template for client 
     33      static const string serverFile; //!< Filename template for server 
    3334 
    34      static bool isClient ; //!< Check if xios is client 
    35      static bool isServer ; //!< Check if xios is server 
     35      static bool isClient ; //!< Check if xios is client 
     36      static bool isServer ; //!< Check if xios is server 
     37      #pragma omp threadprivate(isClient, isServer) 
    3638 
    37      static MPI_Comm globalComm ; //!< Global communicator 
     39      static MPI_Comm globalComm ; //!< Global communicator 
     40      #pragma omp threadprivate(globalComm) 
    3841 
    39      static bool printLogs2Files; //!< Printing out logs into files 
    40      static bool usingOasis ; //!< Using Oasis 
    41      static bool usingServer ; //!< Using server (server mode) 
    42      static double bufferSizeFactor; //!< Factor used to tune the buffer size 
    43      static const double defaultBufferSizeFactor; //!< Default factor value 
    44      static StdSize minBufferSize; //!< Minimum buffer size 
    45      static bool isOptPerformance; //!< Check if buffer size is for performance (as large as possible) 
    46      static CRegistry* globalRegistry ; //!< global registry which is wrote by the root process of the servers 
    47      static double recvFieldTimeout; //!< Time to wait for data before issuing an error when receiving a field 
    48  
     42      static bool printLogs2Files; //!< Printing out logs into files 
     43      static bool usingOasis ; //!< Using Oasis 
     44      static bool usingServer ; //!< Using server (server mode) 
     45      static double bufferSizeFactor; //!< Factor used to tune the buffer size 
     46      static const double defaultBufferSizeFactor; //!< Default factor value 
     47      static StdSize minBufferSize; //!< Minimum buffer size 
     48      static bool isOptPerformance; //!< Check if buffer size is for performance (as large as possible) 
     49      #pragma omp threadprivate(printLogs2Files, usingOasis, usingServer, bufferSizeFactor, minBufferSize, isOptPerformance) 
     50       
     51      static CRegistry* globalRegistry ; //!< global registry which is wrote by the root process of the servers 
     52      static double recvFieldTimeout; 
     53      #pragma omp threadprivate(recvFieldTimeout) 
     54       
     55       
    4956    public: 
    5057     //! Setting xios to use server mode 
Note: See TracChangeset for help on using the changeset viewer.