Changeset 286 for XMLIO_V2/dev/common/src/xmlio/fortran/icdata.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/fortran/icdata.cpp (modified) (14 diffs)

XMLIO_V2/dev/common/src/xmlio/fortran/icdata.cpp

@@ -5 +5 @@
 #include <boost/multi_array.hpp>
 #include <boost/shared_ptr.hpp>
+#include <string>
+#include <iostream>
+
 
 #include "xmlioserver.hpp"
+#include "oasis_cinterface.hpp"
 
 #include "attribute_template_impl.hpp"
@@ -13 +17 @@
 
 #include "icutil.hpp"
+#include "mpi_manager.hpp"
+#include "buffer.hpp"
 
 extern "C"
@@ -26 +32 @@
    // -------------------- Traitement des données ------------------------------
    
-   void xios_dtreatment_start(XContextPtr context_hdl, XFileType filetype, int comm_client_server, int comm_server)
+   void cxios_dtreatment_start()
    {
       using namespace xmlioserver::tree;
@@ -32 +38 @@
       try
       {
+        MPI_Comm comm_client_server=comm::CMPIManager::GetCommClientServer() ;
+        MPI_Comm comm_server=comm::CMPIManager::GetCommServer() ;
+        
          boost::shared_ptr<CContext> context =
-                CObjectFactory::GetObject<CContext>(context_hdl);
+            CObjectFactory::GetObject<CContext>(CObjectFactory::GetCurrentContextId());
+                
          StdOStringStream oss;
          oss << StdString("def_client_next.")
-             << CMPIManager::GetCommRank(CMPIManager::GetCommWorld());
+             << CMPIManager::GetCommRank(CMPIManager::GetCommClient());
          CTreeManager::PrintTreeToFile(oss.str());
          oss.str("");
@@ -43 +53 @@
 
          oss << StdString("def_client_end.")
-             << CMPIManager::GetCommRank(CMPIManager::GetCommWorld());
+             << CMPIManager::GetCommRank(CMPIManager::GetCommClient());
          CTreeManager::PrintTreeToFile(oss.str());
 
-         if ((comm_client_server != -1))
+         if ( !comm::CMPIManager::IsConnected() )
          {
             MPI_Request request = 0;
             StdOStringStream ostrs;
+/*
             if (CMPIManager::GetCommRank(comm_client_server) == 1)
             {
                CTreeManager::ToBinary(ostrs);
-               CLinearBuffer lbuffer(ostrs.str().size()+13);
+               CLinearBuffer lbuffer(ostrs.str().size()+CBuffer::getDataHeaderSize());
+               std::cout<<"lbuffer size "<<ostrs.str().size()<<std::endl ;
                lbuffer.appendString(ostrs.str());
                CMPIManager::SendLinearBuffer(comm_client_server, 0, lbuffer, request);
@@ -61 +73 @@
             {
                CTreeManager::DomainsToBinary(ostrs);
-               CLinearBuffer lbuffer(ostrs.str().size()+13);
+               CLinearBuffer lbuffer(ostrs.str().size()+CBuffer::getDataHeaderSize()); 
+               std::cout<<"lbuffer size "<<ostrs.str().size()<<std::endl ;
                lbuffer.appendString(ostrs.str());
                CMPIManager::SendLinearBuffer(comm_client_server, 0, lbuffer, request);
                CMPIManager::Wait(request);  // Pas encore en mode RPC
             }
-            CXIOSManager::RunClient(false, CMPIManager::GetCommWorld());
-            CClient::CreateClient(comm_client_server);
+*/
+            CTreeManager::ToBinary(ostrs);
+            CLinearBuffer lbuffer(ostrs.str().size()+CBuffer::getDataHeaderSize());
+            lbuffer.appendString(ostrs.str());
+            CMPIManager::SendLinearBuffer(comm_client_server, 0, lbuffer, request);
+            CMPIManager::Wait(request);  // Pas encore en mode RPC
+               
+               
+            CXIOSManager::RunClient(false, CMPIManager::GetCommClient());
+            CClient::CreateClient(CMPIManager::GetCommClientServer());
          }
          else
          {
-            dt->createDataOutput<CNc4DataOutput>(CMPIManager::GetCommWorld());
+            dt->createDataOutput<CNc4DataOutput>(CMPIManager::GetCommClient());
          }
       }
@@ -81 +102 @@
    }
    
-   void xios_dtreatment_end(void)
+   void cxios_dtreatment_end(void)
+   {
+      try
+      {
+         boost::shared_ptr<xmlioserver::tree::CContext> context =
+         xmlioserver::CObjectFactory::GetObject<xmlioserver::tree::CContext>
+            (CObjectFactory::GetCurrentContextId());
+         boost::shared_ptr<xmlioserver::data::CDataTreatment> dtreat = context->getDataTreatment();
+         dtreat->finalize();
+         
+//         CMPIManager::Finalize();
+      }
+      catch (CException & exc)
+      {
+         std::cerr << exc.getMessage() << std::endl;
+         exit (EXIT_FAILURE);
+      }
+   }
+
+   // ---------------------- Finalize du serveur -------------------------
+
+   void cxios_finalize_ioserver(void)
    {
       try
@@ -92 +134 @@
          exit (EXIT_FAILURE);
       }
-   }
+    }
 
    // ---------------------- Initialisation du serveur -------------------------
 
-   void xios_init_ioserver(MPIComm * comm_client)
-   {
-      try
-      {
-         MPIComm comm_client_server, comm_server;
-         CMPIManager::Initialise(NULL, NULL);
-         CMPIManager::DispatchClient(false, *comm_client, comm_client_server, comm_server);
+   void cxios_init_ioserver(MPIComm * f_comm_client, MPIComm * f_comm_parent)
+   {
+      try
+      {
+         MPI_Comm comm_client_server, comm_server,comm_client,comm_parent;
+         xmlioserver::CTreeManager::ParseFile("iodef.xml");
+         CTreeManager::SetCurrentContextId(StdString("xios"));
+         CMPIManager::InitialiseClient(NULL, NULL);
+         comm_parent=MPI_Comm_f2c(*f_comm_parent) ;
+         CMPIManager::DispatchClient(false, comm_client, comm_client_server, comm_server,comm_parent);
+         *f_comm_client=MPI_Comm_c2f(comm_client) ;
       }
       catch (CException & exc)
@@ -113 +159 @@
    // ---------------------- Ecriture des données ------------------------------
    
-   void xios_write_data_k81(const char * fieldid, int fieldid_size, double * data_k8, int data_Xsize)
+   void cxios_write_data_k81(const char * fieldid, int fieldid_size, double * data_k8, int data_Xsize)
    {
       std::string fieldid_str;
@@ -129 +175 @@
    }
    
-   void xios_write_data_k82(const char * fieldid, int fieldid_size, double * data_k8, int data_Xsize, int data_Ysize)
+   void cxios_write_data_k82(const char * fieldid, int fieldid_size, double * data_k8, int data_Xsize, int data_Ysize)
    {
       std::string fieldid_str;
@@ -145 +191 @@
    }
    
-   void xios_write_data_k83(const char * fieldid, int fieldid_size, double * data_k8, int data_Xsize, int data_Ysize, int data_Zsize)
+   void cxios_write_data_k83(const char * fieldid, int fieldid_size, double * data_k8, int data_Xsize, int data_Ysize, int data_Zsize)
    {
       std::string fieldid_str;
@@ -161 +207 @@
    }
    
-   void xios_write_data_k41(const char * fieldid, int fieldid_size, float * data_k4, int data_Xsize)
+   void cxios_write_data_k41(const char * fieldid, int fieldid_size, float * data_k4, int data_Xsize)
    {
       std::string fieldid_str;
@@ -177 +223 @@
    }
    
-   void xios_write_data_k42(const char * fieldid, int fieldid_size, float * data_k4, int data_Xsize, int data_Ysize)
+   void cxios_write_data_k42(const char * fieldid, int fieldid_size, float * data_k4, int data_Xsize, int data_Ysize)
    {
       std::string fieldid_str;
@@ -193 +239 @@
    }
    
-   void xios_write_data_k43(const char * fieldid, int fieldid_size, float * data_k4, int data_Xsize, int data_Ysize, int data_Zsize)
+   void cxios_write_data_k43(const char * fieldid, int fieldid_size, float * data_k4, int data_Xsize, int data_Ysize, int data_Zsize)
    {
       std::string fieldid_str;