Changeset 1639 for XIOS/trunk/src/interface

Timestamp:

01/22/19 16:43:32 (5 years ago)

Author:

yushan

Message:

revert erroneous commit on trunk

Location:

XIOS/trunk/src/interface/c

Files:

• icdata.cpp (modified) (2 diffs)
• oasis_cinterface.cpp (modified) (1 diff)
• oasis_cinterface.hpp (modified) (2 diffs)

XIOS/trunk/src/interface/c/icdata.cpp

@@ -60 +60 @@
    {
       std::string str;
-      ep_lib::MPI_Comm local_comm;
-      ep_lib::MPI_Comm return_comm;
+      MPI_Comm local_comm;
+      MPI_Comm return_comm;
 
       if (!cstr2string(client_id, len_client_id, str)) return;
 
       int initialized;
-      ep_lib::MPI_Initialized(&initialized);
-      #ifdef _usingMPI
+      MPI_Initialized(&initialized);
       if (initialized) local_comm=MPI_Comm_f2c(*f_local_comm);
       else local_comm=MPI_COMM_NULL;
-      #elif _usingEP
-      if (initialized) local_comm=EP_Comm_f2c(f_local_comm);
-      else local_comm=EP_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_Comm_c2f(return_comm));
-      #endif
       CTimer::get("XIOS init").suspend();
       CTimer::get("XIOS").suspend();
@@ -89 +80 @@
    {
      std::string str;
-     ep_lib::MPI_Comm comm;
+     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_Comm_f2c(f_comm);
-     #endif
      CClient::registerContext(str, comm);
      CTimer::get("XIOS init context").suspend();

XIOS/trunk/src/interface/c/oasis_cinterface.cpp

@@ -21 +21 @@
   }
 
-  void oasis_get_localcomm(ep_lib::MPI_Comm& comm)
+  void oasis_get_localcomm(MPI_Comm& comm)
   {
-    ep_lib::MPI_Fint f_comm ;
+    MPI_Fint f_comm ;
     
     fxios_oasis_get_localcomm(&f_comm) ;
-    //comm=MPI_Comm_f2c(f_comm) ;
+    comm=MPI_Comm_f2c(f_comm) ;
   }
  
-  void oasis_get_intracomm(ep_lib::MPI_Comm& comm_client_server,const std::string& server_id)
+  void oasis_get_intracomm(MPI_Comm& comm_client_server,const std::string& server_id)
   {
-    ep_lib::MPI_Fint f_comm ;
+    MPI_Fint f_comm ;
     
     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) ;
   }
  
-  void oasis_get_intercomm(ep_lib::MPI_Comm& comm_client_server,const std::string& server_id)
+  void oasis_get_intercomm(MPI_Comm& comm_client_server,const std::string& server_id)
   {
-    ep_lib::MPI_Fint f_comm ;
+    MPI_Fint f_comm ;
     
     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/trunk/src/interface/c/oasis_cinterface.hpp

@@ -10 +10 @@
   void fxios_oasis_enddef(void) ;
   void fxios_oasis_finalize(void) ;
-  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) ;
+  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) ;
 }
  
@@ -20 +20 @@
   void oasis_enddef(void) ;
   void oasis_finalize(void) ;
-  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) ;
+  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) ;
 }
 #endif