Changeset 1646 for XIOS/dev/dev_trunk_omp/src/context_server.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/context_server.cpp (modified) (3 diffs)

XIOS/dev/dev_trunk_omp/src/context_server.cpp

@@ -18 +18 @@
 #include <boost/functional/hash.hpp>
 
+#ifdef _usingEP
 using namespace ep_lib;
+#endif
 
 namespace xios
@@ -265 +267 @@
       finished=true;
       #pragma omp critical (_output)
-      info(20)<<" CContextServer: Receive context <"<<context->getId()<<"> finalize."<<endl;
+      {
+        info(20)<<" CContextServer: Receive context <"<<context->getId()<<"> finalize."<<endl;
+      }
       context->finalize();
       std::map<int, StdSize>::const_iterator itbMap = mapBufferSize_.begin(),
@@ -273 +277 @@
         rank = itMap->first;
         #pragma omp critical (_output)
-        report(10)<< " Memory report : Context <"<<ctxId<<"> : server side : memory used for buffer of each connection to client" << endl
+        {
+          report(10)<< " Memory report : Context <"<<ctxId<<"> : server side : memory used for buffer of each connection to client" << endl
             << "  +) With client of rank " << rank << " : " << itMap->second << " bytes " << endl;
+        }
         totalBuf += itMap->second;
       }
       #pragma omp critical (_output)
-      report(0)<< " Memory report : Context <"<<ctxId<<"> : server side : total memory used for buffer "<<totalBuf<<" bytes"<<endl;
+      {
+        report(0)<< " Memory report : Context <"<<ctxId<<"> : server side : total memory used for buffer "<<totalBuf<<" bytes"<<endl;
+      }
     }
     else if (event.classId==CContext::GetType()) CContext::dispatchEvent(event);