Changeset 1646 for XIOS/dev/dev_trunk_omp/src/client.cpp

Timestamp:

01/31/19 12:12:52 (5 years ago)

Author:

yushan

Message:

branch merged with trunk @1645. arch file (ep&mpi) added for ADA

File:

• XIOS/dev/dev_trunk_omp/src/client.cpp (modified) (3 diffs)

XIOS/dev/dev_trunk_omp/src/client.cpp

@@ -12 +12 @@
 #include "buffer_client.hpp"
 #include "string_tools.hpp"
+#ifdef _usingEP
 using namespace ep_lib;
+#endif
 
 namespace xios
@@ -226 +228 @@
         MPI_Intercomm_create(contextComm,0,CXios::globalComm,serverLeader,10+globalRank,&contextInterComm) ;
         #pragma omp critical (_output)
-        info(10)<<"Register new Context : "<<id<<endl ;
+        {
+          info(10)<<"Register new Context : "<<id<<endl ;
+        }
         MPI_Comm inter ;
         MPI_Intercomm_merge(contextInterComm,0,&inter) ;
@@ -303 +307 @@
       }
       #pragma omp critical (_output)
-      info(20) << "Client side context is finalized"<<endl ;
+      {
+        info(20) << "Client side context is finalized"<<endl ;
+      }
 
       #pragma omp critical (_output)