Changeset 300 for XMLIO_V2/dev/common/src/fortran/icdata.cpp

Timestamp:

02/13/12 19:35:25 (12 years ago)

Author:

ymipsl

Message:

nouvelle version de developpement de xios

• nouvelle interface fortran
• recodage complet de la couche de communication
• et bien d'autres choses...

YM

File:

• XMLIO_V2/dev/common/src/fortran/icdata.cpp (modified) (9 diffs)

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

@@ -19 +19 @@
 #include "mpi_manager.hpp"
 #include "buffer.hpp"
+#include "cxios.hpp"
+#include "client_ym.hpp"
+#include "field.hpp"
 
 extern "C"
@@ -31 +34 @@
 
    // -------------------- Traitement des données ------------------------------
+   void cxios_init_server(void)
+   {
+     CXios::initServerSide();      
+   }
+
+   void cxios_init_client(const char * client_id , int len_client_id, MPI_Fint* f_local_comm, MPI_Fint* f_return_comm )
+   {
+      std::string str; 
+      MPI_Comm local_comm ;
+      MPI_Comm return_comm ;
+      
+      if (!cstr2string(client_id, len_client_id, str)) return;
+      
+      int initialized ;
+      MPI_Initialized(&initialized) ;
+      if (initialized) local_comm=MPI_Comm_f2c(*f_local_comm) ;
+      else local_comm=MPI_COMM_NULL ;
+      CXios::initClientSide(str,local_comm,return_comm);
+      *f_return_comm=MPI_Comm_c2f(return_comm) ;
+   }
+
+   void cxios_context_initialize(const char * context_id , int len_context_id, MPI_Fint* f_comm)
+   {
+     std::string str; 
+     MPI_Comm comm ;
+     
+     if (!cstr2string(context_id, len_context_id, str)) return;
+     comm=MPI_Comm_f2c(*f_comm) ;
+     ym::CClient::registerContext(context_id,comm) ;
+   }
+ 
+    void cxios_context_close_definition()
+   {
+     boost::shared_ptr<CContext> context =
+            CObjectFactory::GetObject<CContext>(CObjectFactory::GetCurrentContextId());
+     context->closeDefinition() ;
+   }  
+
+   void cxios_context_finalize()
+   {
+     boost::shared_ptr<CContext> context =
+            CObjectFactory::GetObject<CContext>(CObjectFactory::GetCurrentContextId());
+     context->finalize() ;
+   }
+   
+   void cxios_finalize()
+   {
+     CXios::clientFinalize() ;
+   }
+
    
    void cxios_dtreatment_start()
@@ -60 +113 @@
             MPI_Request request = 0;
             StdOStringStream ostrs;
-/*
-            if (CMPIManager::GetCommRank(comm_client_server) == 1)
-            {
-               CTreeManager::ToBinary(ostrs);
-               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
-            }
-            else
-            {
-               CTreeManager::DomainsToBinary(ostrs);
-               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
-            }
-*/
+
             CTreeManager::ToBinary(ostrs);
             CLinearBuffer lbuffer(ostrs.str().size()+CBuffer::getDataHeaderSize());
@@ -172 +206 @@
       ARRAY(double, 1) data(new CArray<double, 1>(boost::extents [data_Xsize]));
       std::copy(data_k8, &(data_k8[data->num_elements()]), data->data());
-      dtreat->write_data(fieldid_str, data);
+      
+//      dtreat->write_data(fieldid_str, data);
+      CField::get(fieldid)->setData(data) ;
    }
    
@@ -188 +224 @@
       ARRAY(double, 2) data(new CArray<double, 2>(boost::extents [data_Xsize][data_Ysize]));
       std::copy(data_k8, &(data_k8[data->num_elements()]), data->data());
-      dtreat->write_data(fieldid_str, data);
+//      dtreat->write_data(fieldid_str, data);
+      CField::get(fieldid)->setData(data) ;
    }
    
@@ -204 +241 @@
       ARRAY(double, 3) data(new CArray<double, 3>(boost::extents [data_Xsize][data_Ysize][data_Zsize]));
       std::copy(data_k8, &(data_k8[data->num_elements()]), data->data());
-      dtreat->write_data(fieldid_str, data);
+//      dtreat->write_data(fieldid_str, data);
+      CField::get(fieldid)->setData(data) ;
+
    }
    
@@ -218 +257 @@
 //          boost::extents [data_Xsize],
 //          boost::fortran_storage_order());
-      ARRAY(float, 1) data(new CArray<float, 1>(boost::extents [data_Xsize]));
-      std::copy(data_k4, &(data_k4[data->num_elements()]), data->data());
-      dtreat->write_data(fieldid_str, data);
+//      ARRAY(float, 1) data(new CArray<float, 1>(boost::extents [data_Xsize]));
+//      std::copy(data_k4, &(data_k4[data->num_elements()]), data->data());
+//      dtreat->write_data(fieldid_str, data);
+      ARRAY(double, 1) data(new CArray<double, 1>(boost::extents [data_Xsize]));
+      double* ptr_data=data->data() ; 
+      for(int i=0;i<data->num_elements();i++) ptr_data[i]=data_k4[i];
+      CField::get(fieldid)->setData(data) ;
    }
    
@@ -234 +277 @@
 //          boost::extents [data_Xsize][data_Ysize],
 //          boost::fortran_storage_order());
-      ARRAY(float, 2) data(new CArray<float, 2>(boost::extents [data_Xsize][data_Ysize]));
-      std::copy(data_k4, &(data_k4[data->num_elements()]), data->data());
-      dtreat->write_data(fieldid_str, data);
+//      ARRAY(float, 2) data(new CArray<float, 2>(boost::extents [data_Xsize][data_Ysize]));
+//      std::copy(data_k4, &(data_k4[data->num_elements()]), data->data());
+//      dtreat->write_data(fieldid_str, data);
+      ARRAY(double, 2) data(new CArray<double, 2>(boost::extents [data_Xsize][data_Ysize]));
+      double* ptr_data=data->data() ; 
+      for(int i=0;i<data->num_elements();i++) ptr_data[i]=data_k4[i];
+      CField::get(fieldid)->setData(data) ;
    }
    
@@ -250 +297 @@
 //          boost::extents [data_Xsize][data_Ysize][data_Zsize],
 //          boost::fortran_storage_order());
-      ARRAY(float, 3) data(new CArray<float, 3>(boost::extents [data_Xsize][data_Ysize][data_Zsize]));
-      std::copy(data_k4, &(data_k4[data->num_elements()]), data->data());
-      dtreat->write_data(fieldid_str, data);
-   } 
+//      ARRAY(float, 3) data(new CArray<float, 3>(boost::extents [data_Xsize][data_Ysize][data_Zsize]));
+//      std::copy(data_k4, &(data_k4[data->num_elements()]), data->data());
+//      dtreat->write_data(fieldid_str, data);
+      ARRAY(double, 3) data(new CArray<double, 3>(boost::extents [data_Xsize][data_Ysize][data_Zsize]));
+      double* ptr_data=data->data() ; 
+      for(int i=0;i<data->num_elements();i++) ptr_data[i]=data_k4[i];
+      CField::get(fieldid)->setData(data) ;
+    } 
 
 } // extern "C"