Changeset 1160 for XIOS/dev/branch_yushan_merged/src/cxios.cpp

Timestamp:

06/06/17 19:06:45 (7 years ago)

Author:

yushan

Message:

fix bad commit. Back to R1155 branch not merged

File:

• XIOS/dev/branch_yushan_merged/src/cxios.cpp (modified) (3 diffs)

XIOS/dev/branch_yushan_merged/src/cxios.cpp

@@ -163 +163 @@
        delete globalRegistry ;
      }
+     CClient::closeInfoStream();
+  
+
 #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
@@ -182 +176 @@
      MemTrack::TrackListMemoryUsage() ;
      MemTrack::TrackDumpBlocks();
-#endif
-
-     CClient::closeInfoStream();
-
 #endif
   }
@@ -245 +235 @@
        delete globalRegistry ;
      }
+
     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 ;
-       #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
-     MemTrack::TrackListMemoryUsage() ;
-     MemTrack::TrackDumpBlocks();
-#endif
-
-#endif 
+        
     CServer::closeInfoStream();
   }