Changeset 1328 for XIOS/dev/branch_openmp/src/interface

Timestamp:

11/15/17 12:14:34 (6 years ago)

Author:

yushan

Message:

dev_omp

Location:

XIOS/dev/branch_openmp/src/interface/c

Files:

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

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

@@ -1 +1 @@
 /* ************************************************************************** *
- *      Copyright © IPSL/LSCE, xios, Avril 2010 - Octobre 2011         *
+ *      Copyright  IPSL/LSCE, xios, Avril 2010 - Octobre 2011         *
  * ************************************************************************** */
 
@@ -9 +9 @@
 #include <iostream>
 
-
+#include "mpi_std.hpp"
 #include "xios.hpp"
 //#include "oasis_cinterface.hpp"
@@ -23 +23 @@
 #include "context.hpp"
 #include "context_client.hpp"
-#include "mpi_std.hpp"
+
 #include "timer.hpp"
-#include "array_new.hpp"
-
 
 extern "C"
 {
-// /////////////////////////////// Définitions ////////////////////////////// //
-
-   // ----------------------- Redéfinition de types ----------------------------
+// /////////////////////////////// Dfinitions ////////////////////////////// //
+
+   // ----------------------- Redfinition de types ----------------------------
 
    typedef enum { NETCDF4 = 0 } XFileType;
@@ -38 +36 @@
    typedef xios::CContext* XContextPtr;
 
-   // -------------------- Traitement des données ------------------------------
+   // -------------------- Traitement des donnes ------------------------------
 
    // This function is not exported to the public Fortran interface,
@@ -64 +62 @@
       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
+      #ifdef _usingMPI
       if (initialized) local_comm=MPI_Comm_f2c(*f_local_comm);
-      else local_comm = MPI_COMM_NULL;
+      else local_comm=MPI_COMM_NULL;
+      #elif _usingEP
+      ep_lib::fc_comm_map.clear();
+      if (initialized) local_comm=ep_lib::EP_Comm_f2c(static_cast<int>(*f_local_comm));
+      else local_comm=MPI_COMM_NULL;
       #endif
       
-     
+
 
       CXios::initClientSide(str, local_comm, return_comm);
-
-      #ifdef _usingEP
-      *f_return_comm = ep_lib::EP_Comm_c2f(return_comm);
-      #else
-      *f_return_comm = MPI_Comm_c2f(return_comm);
+      #ifdef _usingMPI
+      *f_return_comm=MPI_Comm_c2f(return_comm);
+      #elif _usingEP
+      *f_return_comm=ep_lib::EP_Comm_c2f(return_comm);
       #endif
-
       CTimer::get("XIOS init").suspend();
       CTimer::get("XIOS").suspend();
@@ -95 +91 @@
      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(static_cast< int >(*f_comm));
-
-     CClient::registerContext(str,comm);
-          
+     #endif
+     CClient::registerContext(str, comm);
      CTimer::get("XIOS init context").suspend();
      CTimer::get("XIOS").suspend();
@@ -382 +380 @@
 
 
-   // ---------------------- Ecriture des données ------------------------------
+   // ---------------------- Ecriture des donnes ------------------------------
 
    void cxios_write_data_k80(const char* fieldid, int fieldid_size, double* data_k8, int data_Xsize)
@@ -448 +446 @@
       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);
@@ -717 +713 @@
     }
 
-   // ---------------------- Lecture des données ------------------------------
+   // ---------------------- Lecture des donnes ------------------------------
 
    void cxios_read_data_k80(const char* fieldid, int fieldid_size, double* data_k8, int data_Xsize)

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

@@ -1 +1 @@
 #include "oasis_cinterface.hpp"
 #include <string>
-//#include "mpi_std.hpp"
+using namespace ep_lib;
 
 namespace xios
@@ -26 +26 @@
     
     fxios_oasis_get_localcomm(&f_comm) ;
-    #ifdef _usingEP
     comm=EP_Comm_f2c(f_comm.mpi_fint) ;
-    #else
-    comm=MPI_Comm_f2c(f_comm) ;
-    #endif
   }
  
@@ -38 +34 @@
     
     fxios_oasis_get_intracomm(&f_comm,server_id.data(),server_id.size()) ;
-    #ifdef _usingEP
     comm_client_server=EP_Comm_f2c(f_comm.mpi_fint) ;
-    #else
-    comm_client_server=MPI_Comm_f2c(f_comm) ;
-    #endif
   }
  
@@ -50 +42 @@
     
     fxios_oasis_get_intercomm(&f_comm,server_id.data(),server_id.size()) ;
-    #ifdef _usingEP
     comm_client_server=EP_Comm_f2c(f_comm.mpi_fint) ;
-    #else
-    comm_client_server=MPI_Comm_f2c(f_comm) ;
-    #endif
   }
 }

XIOS/dev/branch_openmp/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