Changeset 1601 for XIOS/dev/dev_trunk_omp/src/interface

Timestamp:

11/19/18 15:52:54 (6 years ago)

Author:

yushan

Message:

branch_openmp merged with trunk r1597

Location:

XIOS/dev/dev_trunk_omp/src/interface/c

Files:

• icdata.cpp (modified) (5 diffs)
• oasis_cinterface.cpp (modified) (4 diffs)
• oasis_cinterface.hpp (modified) (2 diffs)

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

@@ -9 +9 @@
 #include <iostream>
 
-
+#include "mpi_std.hpp"
 #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 "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;
 
       if (!cstr2string(client_id, len_client_id, str)) return;
@@ -62 +62 @@
       int initialized;
       MPI_Initialized(&initialized);
+      #ifdef _usingMPI
       if (initialized) local_comm=MPI_Comm_f2c(*f_local_comm);
       else local_comm=MPI_COMM_NULL;
+      #elif _usingEP
+      ep_lib::fc_comm_map.clear();
+      if (initialized) local_comm=ep_lib::EP_Comm_f2c((f_local_comm));
+      else local_comm=MPI_COMM_NULL;
+      #endif
+      
+
+
       CXios::initClientSide(str, local_comm, return_comm);
+      #ifdef _usingMPI
       *f_return_comm=MPI_Comm_c2f(return_comm);
+      #elif _usingEP
+      *f_return_comm=*static_cast<MPI_Fint*>(ep_lib::EP_Comm_c2f(return_comm));
+      #endif
       CTimer::get("XIOS init").suspend();
       CTimer::get("XIOS").suspend();
@@ -73 +86 @@
    {
      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();
+     #ifdef _usingMPI
      comm=MPI_Comm_f2c(*f_comm);
+     #elif _usingEP
+     comm = ep_lib::EP_Comm_f2c(f_comm);
+     #endif
      CClient::registerContext(str, comm);
      CTimer::get("XIOS init context").suspend();

XIOS/dev/dev_trunk_omp/src/interface/c/oasis_cinterface.cpp

@@ -1 +1 @@
 #include "oasis_cinterface.hpp"
 #include <string>
-#include "mpi.hpp"
+using namespace ep_lib;
 
 namespace xios
@@ -26 +26 @@
     
     fxios_oasis_get_localcomm(&f_comm) ;
-    comm=MPI_Comm_f2c(f_comm) ;
+    //comm=MPI_Comm_f2c(f_comm) ;
   }
  
@@ -34 +34 @@
     
     fxios_oasis_get_intracomm(&f_comm,server_id.data(),server_id.size()) ;
-    comm_client_server=MPI_Comm_f2c(f_comm) ;
+    //comm_client_server=MPI_Comm_f2c(f_comm) ;
   }
  
@@ -42 +42 @@
     
     fxios_oasis_get_intercomm(&f_comm,server_id.data(),server_id.size()) ;
-    comm_client_server=MPI_Comm_f2c(f_comm) ;
+    //comm_client_server=MPI_Comm_f2c(f_comm) ;
   }
 }

XIOS/dev/dev_trunk_omp/src/interface/c/oasis_cinterface.hpp

@@ -10 +10 @@
   void fxios_oasis_enddef(void) ;
   void fxios_oasis_finalize(void) ;
-  void fxios_oasis_get_localcomm(MPI_Fint* f_comm) ;
-  void fxios_oasis_get_intracomm(MPI_Fint* f_comm_client_server,const char* client_id,int str_len) ;
-  void fxios_oasis_get_intercomm(MPI_Fint* f_comm_client_server,const char* client_id,int str_len) ;
+  void fxios_oasis_get_localcomm(ep_lib::MPI_Fint* f_comm) ;
+  void fxios_oasis_get_intracomm(ep_lib::MPI_Fint* f_comm_client_server,const char* client_id,int str_len) ;
+  void fxios_oasis_get_intercomm(ep_lib::MPI_Fint* f_comm_client_server,const char* client_id,int str_len) ;
 }
  
@@ -20 +20 @@
   void oasis_enddef(void) ;
   void oasis_finalize(void) ;
-  void oasis_get_localcomm(MPI_Comm& comm) ;
-  void oasis_get_intracomm(MPI_Comm& comm_client_server,const std::string& server_id) ;
-  void oasis_get_intercomm(MPI_Comm& comm_client_server,const std::string& server_id) ;
+  void oasis_get_localcomm(ep_lib::MPI_Comm& comm) ;
+  void oasis_get_intracomm(ep_lib::MPI_Comm& comm_client_server,const std::string& server_id) ;
+  void oasis_get_intercomm(ep_lib::MPI_Comm& comm_client_server,const std::string& server_id) ;
 }
 #endif