Changeset 1053 for XIOS/dev/branch_yushan/src/interface

Timestamp:

02/17/17 17:55:37 (7 years ago)

Author:

yushan

Message:

ep_lib namespace specified when netcdf involved

Location:

XIOS/dev/branch_yushan/src/interface

Files:

• c/icdata.cpp (modified) (5 diffs)
• c/oasis_cinterface.cpp (modified) (3 diffs)
• fortran/idata.F90 (modified) (1 diff)

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

@@ -23 +23 @@
 #include "context.hpp"
 #include "context_client.hpp"
-#include "mpi.hpp"
+#include "mpi_std.hpp"
 #include "timer.hpp"
 #include "array_new.hpp"
@@ -54 +54 @@
    {
       std::string str;
-      MPI_Comm local_comm;
-      MPI_Comm return_comm;
+      ep_lib::MPI_Comm local_comm;
+      ep_lib::MPI_Comm return_comm;
       
-      fc_comm_map.clear();
+      ep_lib::fc_comm_map.clear();
 
       if (!cstr2string(client_id, len_client_id, str)) return;
@@ -63 +63 @@
       int initialized;
       MPI_Initialized(&initialized);
-      if (initialized) local_comm=MPI_Comm_f2c(*f_local_comm);
+      //if (initialized) local_comm.mpi_comm = MPI_Comm_f2c(*f_local_comm);
+      if (initialized) local_comm = ep_lib::EP_Comm_f2c(static_cast< int >(*f_local_comm));
       else local_comm = MPI_COMM_NULL;
       
@@ -69 +70 @@
 
       CXios::initClientSide(str, local_comm, return_comm);
-      *f_return_comm = MPI_Comm_c2f(return_comm);
+
+      *f_return_comm = ep_lib::EP_Comm_c2f(return_comm);
 
       printf("in icdata.cpp, f_return_comm = %d\n", *f_return_comm);
@@ -80 +82 @@
    {
      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);
+     comm = ep_lib::EP_Comm_f2c(static_cast< int >(*f_comm));
     
      CClient::registerContext(str, comm);
      
-     //printf("client register context OK\n");
+     printf("icdata.cpp: client register context OK\n");
      
      CTimer::get("XIOS init context").suspend();

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

@@ -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/branch_yushan/src/interface/fortran/idata.F90

@@ -476 +476 @@
       
       !print*, "in fortran, world_f = ", MPI_COMM_WORLD 
+
       print*, "in fortran, f_return_comm = ", f_return_comm