Changeset 286 for XMLIO_V2/dev/common/src/xmlio/main_server.cpp

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/main_server.cpp (modified) (2 diffs)

XMLIO_V2/dev/common/src/xmlio/main_server.cpp

@@ -7 +7 @@
 #include "client.hpp"
 #include "server.hpp"
-extern "C"
-{
-   void xios_dtreatment_start(tree::CContext * context_hdl, int filetype, int comm_client_server, int comm_server);
-   void xios_set_timestep(double ts_year, double ts_month,  double ts_day,
-                          double ts_hour, double ts_minute, double ts_second);
-   void xios_write_data_k83(const char * fieldid, int fieldid_size, double * data_k8, int data_Xsize, int data_Ysize, int data_Zsize);
-   void xios_update_calendar(int step);
-}
+#include "oasis_cinterface.hpp"
+#include <string>
+#include <iostream>
+
+#include <unistd.h>
+
+
 // Point d'entrée du programme principal
 
@@ -21 +20 @@
    try
    {
-      MPIComm comm_client, comm_client_server, comm_server;
-      CXIOSManager::Initialise (CXIOSManager::CLIENT_SERVER, &argc, &argv);
-      CMPIManager::DispatchClient(true, comm_client, comm_client_server,  comm_server);
+      MPI_Comm comm_client=MPI_COMM_NULL, comm_client_server=MPI_COMM_NULL, comm_server=MPI_COMM_NULL, comm_parent=MPI_COMM_NULL;
+//      sleep(60) ;
+      CTreeManager::ParseFile("iodef.xml");
+
+      CTreeManager::SetCurrentContextId(StdString("xios"));
+      boost::shared_ptr<CVariable> var = CObjectFactory::GetObject<CVariable>("buffer_client_size"); 
+      std::cout<<CObjectFactory::GetObject<CVariable>("xios","using_oasis")->getData<bool>()<<std::endl;
+     
+//      oasis_init(std::string("ionemo")) ;
+//      std::cout<<"Initialisation OASIS Ok"<<std::endl ;
+//      oasis_get_intracomm(comm_parent,std::string("oceanx")) ;
+//      std::cout<<"Appel Oasis intracom Ok"<<std::endl ;
+      CXIOSManager::Initialise(CXIOSManager::CLIENT_SERVER, &argc, &argv);
+     
+      std::cout<<"Appel Dispatch client ?"<<std::endl ;
+      std::cout<<comm_client<<" "<<comm_client_server<<" "<<comm_server<<"  "<<comm_parent<<std::endl ;
+      CMPIManager::DispatchClient(true, comm_client, comm_client_server, comm_server, comm_parent);
+      std::cout<<"Appel Dispatch client Ok"<<std::endl ;
       CXIOSManager::RunServer("Nemo", comm_client_server, comm_server);
-      CXIOSManager::Finalize ();         
+      CTreeManager::SetCurrentContextId(StdString("nemo"));
+      CServer::CreateServer(comm_client_server)->run();
+      CXIOSManager::Finalize ();  
+
    }
    catch (CException & exc)