Changeset 1037 for XIOS/dev/branch_yushan/src/interface/c/icdata.cpp

Timestamp:

01/25/17 16:25:17 (7 years ago)

Author:

yushan

Message:

initialize the branch

File:

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

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

@@ -11 +11 @@
 
 #include "xios.hpp"
-#include "oasis_cinterface.hpp"
+//#include "oasis_cinterface.hpp"
 
 #include "attribute_template.hpp"
@@ -27 +27 @@
 #include "array_new.hpp"
 
-
 extern "C"
 {
@@ -57 +56 @@
       MPI_Comm local_comm;
       MPI_Comm return_comm;
+      
+      fc_comm_map.clear();
 
       if (!cstr2string(client_id, len_client_id, str)) return;
@@ -63 +64 @@
       MPI_Initialized(&initialized);
       if (initialized) local_comm=MPI_Comm_f2c(*f_local_comm);
-      else local_comm=MPI_COMM_NULL;
+      else local_comm = MPI_COMM_NULL;
+      
+     
+
       CXios::initClientSide(str, local_comm, return_comm);
-      *f_return_comm=MPI_Comm_c2f(return_comm);
+      *f_return_comm = MPI_Comm_c2f(return_comm);
+
+      printf("in icdata.cpp, f_return_comm = %d\n", *f_return_comm);
+
       CTimer::get("XIOS init").suspend();
       CTimer::get("XIOS").suspend();
@@ -79 +86 @@
      CTimer::get("XIOS init context").resume();
      comm=MPI_Comm_f2c(*f_comm);
+    
      CClient::registerContext(str, comm);
+     
+     //printf("client register context OK\n");
+     
      CTimer::get("XIOS init context").suspend();
      CTimer::get("XIOS").suspend();
@@ -100 +111 @@
      CTimer::get("XIOS close definition").resume();
      CContext* context = CContext::getCurrent();
+     
      context->closeDefinition();
+     
      CTimer::get("XIOS close definition").suspend();
      CTimer::get("XIOS").suspend();
@@ -109 +122 @@
      CTimer::get("XIOS").resume();
      CTimer::get("XIOS context finalize").resume();
+     
+     
+     
      CContext* context = CContext::getCurrent();
+     //printf("CContext* context = CContext::getCurrent();\n");
      context->finalize();
+     
+     //printf("client context_finalize OK\n");
+     
      CTimer::get("XIOS context finalize").suspend();
      CTimer::get("XIOS").suspend();
@@ -429 +449 @@
       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);