Changeset 403 for XIOS/trunk

Timestamp:

01/10/13 17:33:18 (11 years ago)

Author:

ymipsl

Message:

Give the hand at each time step to the mpi library for better asynchronism

YM

Location:

XIOS/trunk/src/interface/c

Files:

• icdata.cpp (modified) (7 diffs)
• icdate.cpp (modified) (2 diffs)

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

@@ -21 +21 @@
 #include "field.hpp"
 #include "context.hpp"
+#include "context_client.hpp"
 #include "mpi.hpp"
 #include "timer.hpp"
 #include "array_new.hpp"
+
 
 extern "C"
@@ -112 +114 @@
       CTimer::get("XIOS send field").resume() ;
       CContext* context = CContext::getCurrent() ;
-
+      if (!context->hasServer) context->client->checkBuffers() ;
       CArray<double,(StdSize)1> data(data_k8,shape(data_Xsize),neverDeleteData) ;
       CField::get(fieldid_str)->setData(data) ;
@@ -129 +131 @@
       CTimer::get("XIOS send field").resume() ;
       CContext* context = CContext::getCurrent() ;
+      if (!context->hasServer) context->client->checkBuffers() ;
       
       CArray<double,2>data(data_k8,shape(data_Xsize,data_Ysize),neverDeleteData) ;
@@ -144 +147 @@
       CTimer::get("XIOS send field").resume() ;
       CContext* context = CContext::getCurrent() ;
+      if (!context->hasServer) context->client->checkBuffers() ;
 
       CArray<double,3>data(data_k8,shape(data_Xsize,data_Ysize,data_Zsize),neverDeleteData) ;
@@ -159 +163 @@
       CTimer::get("XIOS send field").resume() ;
       CContext* context = CContext::getCurrent() ;
+      if (!context->hasServer) context->client->checkBuffers() ;
+
       CArray<float,1> data_tmp(data_k4,shape(data_Xsize),neverDeleteData) ;
       CArray<double,1> data(data_Xsize) ;
@@ -175 +181 @@
       CTimer::get("XIOS send field").resume() ;
       CContext* context = CContext::getCurrent() ;
+      if (!context->hasServer) context->client->checkBuffers() ;
+
       CArray<float,2> data_tmp(data_k4,shape(data_Xsize,data_Ysize),neverDeleteData) ;
       CArray<double,2> data(data_Xsize,data_Ysize) ;
@@ -192 +200 @@
       CTimer::get("XIOS send field").resume() ;
       CContext* context = CContext::getCurrent() ;
+      if (!context->hasServer) context->client->checkBuffers() ;
 
       CArray<float,3> data_tmp(data_k4,shape(data_Xsize,data_Ysize,data_Zsize),neverDeleteData) ;

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

@@ -17 +17 @@
 #include "timer.hpp"
 #include "context.hpp"
+#include "context_client.hpp"
 
 extern "C"
@@ -46 +47 @@
       CTimer::get("XIOS").resume() ;
       xios::CContext* context = CContext::getCurrent() ;
+      if (!context->hasServer) context->client->checkBuffers() ;
       context->updateCalendar(step) ;
       context->sendUpdateCalendar(step) ;