Changeset 286 for XMLIO_V2/dev/common/src/xmlio/manager/xios_manager.hpp

Timestamp:

10/21/11 19:01:35 (13 years ago)

Author:

ymipsl

Message:

reprise en main de la version de H. Ozdoba. Correction de différentes erreurs de conception et bug.
Version NEMO operationnel en client/server, interoperabilita avec OASIS, reconstition de fichiers via netcdf4/HDF5

YM

File:

• XMLIO_V2/dev/common/src/xmlio/manager/xios_manager.hpp (modified) (4 diffs)

XMLIO_V2/dev/common/src/xmlio/manager/xios_manager.hpp

@@ -25 +25 @@
             StdSize nbClient;
             StdSize nbClientPServer;
-            void (*entry)(comm::MPIComm, comm::MPIComm, comm::MPIComm) ;
+            void (*entry)(MPI_Comm, MPI_Comm, MPI_Comm) ;
          } XIOSClient;
          
@@ -38 +38 @@
          /// Ajout de client en mode CLIENT_SERVER et CLIENT///
          static void AddClient(StdString clientName, StdSize nbClient, StdSize nbClientPServer,
-                               void (*entry_point)(comm::MPIComm, comm::MPIComm, comm::MPIComm));
+                               void (*entry_point)(MPI_Comm, MPI_Comm, MPI_Comm));
 
          /// Lancement des serveurs et/ou des clients ///
-         static void RunServer(StdString clientName,
-                               comm::MPIComm comm_client_server, comm::MPIComm comm_server);
-         static void RunClient(bool launch = false, comm::MPIComm comm_client =
-                                                    comm::CMPIManager::GetCommWorld());
-         static void RunClientServer(comm::MPIComm comm_client_server =
-                                     comm::CMPIManager::GetCommWorld());
+         static void RunServer(StdString clientName,MPI_Comm comm_client_server,MPI_Comm comm_server);
+         static void RunClient(bool launch = false, MPI_Comm comm_client = comm::CMPIManager::GetCommWorld());
+         static void RunClientServer(MPI_Comm comm_client_server = comm::CMPIManager::GetCommWorld());
 
       public :
@@ -66 +63 @@
       
          /// Information ///
-         static void ShowInformation_CS(comm::MPIComm comm_client_server);
+         static void ShowInformation_CS(MPI_Comm comm_client_server);
 
          /// Variables statiques privées ///
@@ -75 +72 @@
          static XIOSStatus Status;
          static StdString  ClientName;
-         static comm::MPIComm Comm_Client_Server, Comm_Server;
+         static MPI_Comm Comm_Client_Server, Comm_Server;
          static xios_map<StdString, XIOSClient> Clients;