Changeset 1134 for XIOS/dev/branch_yushan_merged/src/interface/c/icdata.cpp

Timestamp:

05/16/17 17:54:30 (7 years ago)

Author:

yushan

Message:

branch merged with trunk r1130

File:

• XIOS/dev/branch_yushan_merged/src/interface/c/icdata.cpp (modified) (8 diffs)

XIOS/dev/branch_yushan_merged/src/interface/c/icdata.cpp

@@ -11 +11 @@
 
 #include "xios.hpp"
-#include "oasis_cinterface.hpp"
+//#include "oasis_cinterface.hpp"
 
 #include "attribute_template.hpp"
@@ -23 +23 @@
 #include "context.hpp"
 #include "context_client.hpp"
-#include "mpi.hpp"
+#include "mpi_std.hpp"
 #include "timer.hpp"
 #include "array_new.hpp"
@@ -55 +55 @@
    {
       std::string str;
-      MPI_Comm local_comm;
-      MPI_Comm return_comm;
+      ep_lib::MPI_Comm local_comm;
+      ep_lib::MPI_Comm return_comm;
+      
+      ep_lib::fc_comm_map.clear();
 
       if (!cstr2string(client_id, len_client_id, str)) return;
@@ -62 +64 @@
       int initialized;
       MPI_Initialized(&initialized);
+
+      #ifdef _usingEP
+      if (initialized) local_comm = ep_lib::EP_Comm_f2c(static_cast< int >(*f_local_comm));
+      else local_comm = MPI_COMM_NULL;
+      #else
       if (initialized) local_comm=MPI_Comm_f2c(*f_local_comm);
-      else local_comm=MPI_COMM_NULL;
+      else local_comm = MPI_COMM_NULL;
+      #endif
+      
+     
+
       CXios::initClientSide(str, local_comm, return_comm);
-      *f_return_comm=MPI_Comm_c2f(return_comm);
+
+      #ifdef _usingEP
+      *f_return_comm = ep_lib::EP_Comm_c2f(return_comm);
+      #else
+      *f_return_comm = MPI_Comm_c2f(return_comm);
+      #endif
+
       CTimer::get("XIOS init").suspend();
       CTimer::get("XIOS").suspend();
@@ -73 +90 @@
    {
      std::string str;
-     MPI_Comm comm;
+     ep_lib::MPI_Comm comm;
 
      if (!cstr2string(context_id, len_context_id, str)) return;
      CTimer::get("XIOS").resume();
      CTimer::get("XIOS init context").resume();
-     comm=MPI_Comm_f2c(*f_comm);
-     CClient::registerContext(str, comm);
+     comm = ep_lib::EP_Comm_f2c(static_cast< int >(*f_comm));
+
+     CClient::registerContext(str,comm);
+          
      CTimer::get("XIOS init context").suspend();
      CTimer::get("XIOS").suspend();
@@ -100 +119 @@
      CTimer::get("XIOS close definition").resume();
      CContext* context = CContext::getCurrent();
+     
      context->closeDefinition();
+     
      CTimer::get("XIOS close definition").suspend();
      CTimer::get("XIOS").suspend();
@@ -109 +130 @@
      CTimer::get("XIOS").resume();
      CTimer::get("XIOS context finalize").resume();
+     
+     
+     
      CContext* context = CContext::getCurrent();
      context->finalize();
@@ -429 +453 @@
       CContext* context = CContext::getCurrent();
       if (!context->hasServer && !context->client->isAttachedModeEnabled())
-        context->checkBuffersAndListen();
+      {
+        context->checkBuffersAndListen();
+      }  
 
       CArray<double, 3>data(data_k8, shape(data_Xsize, data_Ysize, data_Zsize), neverDeleteData);