Changeset 1160 for XIOS/dev/branch_yushan_merged/src/node

Timestamp:

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

Author:

yushan

Message:

fix bad commit. Back to R1155 branch not merged

Location:

XIOS/dev/branch_yushan_merged/src/node

Files:

• context.cpp (modified) (4 diffs)
• field.cpp (modified) (4 diffs)
• file.cpp (modified) (2 diffs)

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

@@ -14 +14 @@
 #include "type.hpp"
 #include "xios_spl.hpp"
-#include "timer.hpp"
-#include "memtrack.hpp"
 
 namespace xios {
@@ -403 +401 @@
    void CContext::closeDefinition(void)
    {
-     CTimer::get("Context : close definition").resume() ;
      // There is nothing client need to send to server
      if (hasClient)
@@ -457 +454 @@
       startPrefetchingOfEnabledReadModeFiles();
     }
-    CTimer::get("Context : close definition").suspend() ;
    }
 
@@ -1211 +1207 @@
    {
       calendar->update(step);
-#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)

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

@@ -125 +125 @@
   void CField::sendUpdateData(const CArray<double,1>& data)
   {
-    CTimer::get("XIOS send data").resume();
+    CTimer::get("XIOS Send Data").resume();
 
     CContext* context = CContext::getCurrent();
@@ -177 +177 @@
     }
 
-    CTimer::get("XIOS send data").suspend();
+    CTimer::get("XIOS Send Data").suspend();
   }
 
@@ -187 +187 @@
     list<CEventServer::SSubEvent>::iterator it;
     string fieldId;
-    CTimer::get("Field : recv data").resume();
+
     for (it = event.subEvents.begin(); it != event.subEvents.end(); ++it)
     {
@@ -197 +197 @@
     }
     get(fieldId)->recvUpdateData(ranks,buffers);
-    CTimer::get("Field : recv data").suspend();
   }
 

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

@@ -16 +16 @@
 #include "context_client.hpp"
 #include "mpi.hpp"
-#include "timer.hpp"
 
 namespace xios {
@@ -275 +274 @@
       if (mode.isEmpty() || mode.getValue() == mode_attr::write)
       {
-        CTimer::get("Files : create headers").resume();
         if (!isOpen) createHeader();
-        CTimer::get("Files : create headers").suspend();
         checkSync();
       }
       else
       {
-        CTimer::get("Files : open headers").resume();
         if (!isOpen) openInReadMode();
-        CTimer::get("Files : open headers").suspend();
       }
       checkSplit();