Changeset 1157 for XIOS/dev/branch_yushan_merged/src/node/context.cpp

Timestamp:

06/06/17 17:09:31 (7 years ago)

Author:

yushan

Message:

branch re-merged with trunk @1156

File:

• XIOS/dev/branch_yushan_merged/src/node/context.cpp (modified) (2 diffs)

XIOS/dev/branch_yushan_merged/src/node/context.cpp

@@ -16 +16 @@
 #include "timer.hpp"
 #include "memtrack.hpp"
-
 
 namespace xios {
@@ -1212 +1211 @@
    {
       calendar->update(step);
-      #ifdef XIOS_MEMTRACK_LIGHT
+#ifdef XIOS_MEMTRACK_LIGHT
+      #pragma omp critical (_output)
       info(50) << " Current memory used by XIOS : "<<  MemTrack::getCurrentMemorySize()*1.0/(1024*1024)<<" Mbyte, at timestep "<<step<<" of context "<<this->getId()<<endl ;
 #endif
+
       if (hasClient)
       {