Ignore:
Timestamp:
06/06/17 15:52:13 (7 years ago)
Author:
yushan
Message:

branch merged with trunk @1155

File:
1 edited

Legend:

Unmodified
Added
Removed
  • XIOS/dev/branch_yushan_merged/src/node/context.cpp

    r1146 r1156  
    1414#include "type.hpp" 
    1515#include "xios_spl.hpp" 
     16#include "timer.hpp" 
     17#include "memtrack.hpp" 
    1618 
    1719 
     
    402404   void CContext::closeDefinition(void) 
    403405   { 
     406     CTimer::get("Context : close definition").resume() ; 
    404407     // There is nothing client need to send to server 
    405408     if (hasClient) 
     
    455458      startPrefetchingOfEnabledReadModeFiles(); 
    456459    } 
     460    CTimer::get("Context : close definition").suspend() ; 
    457461   } 
    458462 
     
    12081212   { 
    12091213      calendar->update(step); 
    1210  
     1214      #ifdef XIOS_MEMTRACK_LIGHT 
     1215      info(50) << " Current memory used by XIOS : "<<  MemTrack::getCurrentMemorySize()*1.0/(1024*1024)<<" Mbyte, at timestep "<<step<<" of context "<<this->getId()<<endl ; 
     1216#endif 
    12111217      if (hasClient) 
    12121218      { 
Note: See TracChangeset for help on using the changeset viewer.