Changeset 1157 for XIOS/dev/branch_yushan_merged/src/cxios.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/cxios.cpp (modified) (3 diffs)

XIOS/dev/branch_yushan_merged/src/cxios.cpp

@@ -163 +163 @@
        delete globalRegistry ;
      }
-
 #ifdef XIOS_MEMTRACK
+
+#ifdef XIOS_MEMTRACK_LIGHT
+       #pragma omp critical (_output)
+       report(10) << " Memory report : current memory used by XIOS : "<<  MemTrack::getCurrentMemorySize()*1.0/(1024*1024)<<" Mbyte" << endl ;
+       #pragma omp critical (_output)
+       report(10) << " Memory report : maximum memory used by XIOS : "<<  MemTrack::getMaxMemorySize()*1.0/(1024*1024)<<" Mbyte" << endl ;
+#endif
+
+#ifdef XIOS_MEMTRACK_FULL
 
 #ifdef XIOS_MEMTRACK_LIGHT
@@ -239 +247 @@
     CServer::finalize();
 
+    CServer::finalize();
 #ifdef XIOS_MEMTRACK
 
 #ifdef XIOS_MEMTRACK_LIGHT
        #pragma omp critical (_output)
-       {
-         report(10) << " Memory report : current memory used by XIOS : "<<  MemTrack::getCurrentMemorySize()*1.0/(1024*1024)<<" Mbyte" << endl ;
-         report(10) << " Memory report : maximum memory used by XIOS : "<<  MemTrack::getMaxMemorySize()*1.0/(1024*1024)<<" Mbyte" << endl ;
-       }
+       report(10) << " Memory report : current memory used by XIOS : "<<  MemTrack::getCurrentMemorySize()*1.0/(1024*1024)<<" Mbyte" << endl ;
+       #pragma omp critical (_output)
+       report(10) << " Memory report : maximum memory used by XIOS : "<<  MemTrack::getMaxMemorySize()*1.0/(1024*1024)<<" Mbyte" << endl ;
 #endif
 
@@ -253 +261 @@
      MemTrack::TrackDumpBlocks();
 #endif
-#endif
+
+#endif 
     CServer::closeInfoStream();
   }